mirror of
https://github.com/moltbot/moltbot.git
synced 2026-05-13 15:47:28 +00:00
fix(telegram): keep dm allow separate from group auth
This commit is contained in:
@@ -262,23 +262,21 @@ export const buildTelegramMessageContext = async ({
|
||||
return null;
|
||||
}
|
||||
const groupAllowOverride = firstDefined(topicConfig?.allowFrom, groupConfig?.allowFrom);
|
||||
const [dmAllow, expandedGroupAllowFrom] = await Promise.all([
|
||||
resolveTelegramDmAllow({
|
||||
cfg: freshCfg,
|
||||
groupAllowOverride,
|
||||
allowFrom,
|
||||
accountId: account.accountId,
|
||||
senderId,
|
||||
storeAllowFrom,
|
||||
dmPolicy: effectiveDmPolicy,
|
||||
}),
|
||||
expandTelegramAllowFromWithAccessGroups({
|
||||
cfg: freshCfg,
|
||||
allowFrom: groupAllowOverride ?? groupAllowFrom,
|
||||
accountId: account.accountId,
|
||||
senderId,
|
||||
}),
|
||||
]);
|
||||
const dmAllow = await resolveTelegramDmAllow({
|
||||
cfg: freshCfg,
|
||||
groupAllowOverride,
|
||||
allowFrom,
|
||||
accountId: account.accountId,
|
||||
senderId,
|
||||
storeAllowFrom,
|
||||
dmPolicy: effectiveDmPolicy,
|
||||
});
|
||||
const expandedGroupAllowFrom = await expandTelegramAllowFromWithAccessGroups({
|
||||
cfg: freshCfg,
|
||||
allowFrom: groupAllowOverride ?? groupAllowFrom,
|
||||
accountId: account.accountId,
|
||||
senderId,
|
||||
});
|
||||
const effectiveGroupAllow = normalizeAllowFrom(expandedGroupAllowFrom);
|
||||
const hasGroupAllowOverride = groupAllowOverride !== undefined;
|
||||
const senderUsername = msg.from?.username ?? "";
|
||||
|
||||
Reference in New Issue
Block a user