Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/middlewares/message-user-storage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,15 @@ export class MessageUserStorage<C extends TC> extends TrackedMiddleware<C> {
this.userStorage.set(ctx.from.id, ctx.from)
return next()
})

// save user on join
this.composer.on("chat_member").filter(
(ctx) => ctx.chatMember.old_chat_member.status === "left" && ctx.chatMember.new_chat_member.status === "member",
(ctx, next) => {
this.userStorage.set(ctx.chatMember.new_chat_member.user.id, ctx.chatMember.new_chat_member.user)
return next()
}
)
Comment thread
toto04 marked this conversation as resolved.
}

async get(chatId: number, messageId: number): Promise<Message | null> {
Expand Down
9 changes: 2 additions & 7 deletions src/modules/tg-logger/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,8 @@ export class TgLogger extends Module<ModuleShared> {
e.description.includes("there are no messages to forward")
) {
logger.warn({ e }, "[TgLogger:forward] Message(s) to forward not found")
// await this.log(
// topicId,
// fmt(({ b, i }) => [b`Could not forward the message`, i`It probably was deleted before forwarding`], {
// sep: "\n",
// })
// )
} else if (e.description.includes("MESSAGE_ID_INVALID")) {
logger.warn({ e, chatId, messageIds }, "[TgLogger:forward] Message ID(s) is not valid for telegram API")
} else {
await this.exception({ type: "BOT_ERROR", error: e }, "TgLogger.forward")
logger.error({ e }, "[TgLogger:forward] There was an error while trying to forward a message")
Expand Down Expand Up @@ -194,7 +190,6 @@ export class TgLogger extends Module<ModuleShared> {
},
}

await this.log(this.topics.banAll, "———————————————")
const msg = await this.log(this.topics.banAll, getBanAllText(banAll))

if (!msg?.message_id) {
Expand Down
1 change: 1 addition & 0 deletions src/modules/tg-logger/report.ts
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ export const reportMenu = MenuGenerator.getInstance<Context>().create<Report>("r
{
text: "🚨 Start BAN ALL 🚨",
cb: async ({ data, ctx }) => {
await ctx.api.deleteMessage(data.message.chat.id, data.message.message_id).catch(() => {})
modules
.get("tgLogger")
.banAll(
Expand Down
Loading