Skip to content

Commit c2fbe51

Browse files
fix: banall logs, forward exception, user storage trigger (#131)
* fix: tg-logger fixes * fix: store user on join * fix: real join
1 parent f132aeb commit c2fbe51

3 files changed

Lines changed: 12 additions & 7 deletions

File tree

src/middlewares/message-user-storage.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,15 @@ export class MessageUserStorage<C extends TC> extends TrackedMiddleware<C> {
4444
this.userStorage.set(ctx.from.id, ctx.from)
4545
return next()
4646
})
47+
48+
// save user on join
49+
this.composer.on("chat_member").filter(
50+
(ctx) => ctx.chatMember.old_chat_member.status === "left" && ctx.chatMember.new_chat_member.status === "member",
51+
(ctx, next) => {
52+
this.userStorage.set(ctx.chatMember.new_chat_member.user.id, ctx.chatMember.new_chat_member.user)
53+
return next()
54+
}
55+
)
4756
}
4857

4958
async get(chatId: number, messageId: number): Promise<Message | null> {

src/modules/tg-logger/index.ts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,8 @@ export class TgLogger extends Module<ModuleShared> {
9191
e.description.includes("there are no messages to forward")
9292
) {
9393
logger.warn({ e }, "[TgLogger:forward] Message(s) to forward not found")
94-
// await this.log(
95-
// topicId,
96-
// fmt(({ b, i }) => [b`Could not forward the message`, i`It probably was deleted before forwarding`], {
97-
// sep: "\n",
98-
// })
99-
// )
94+
} else if (e.description.includes("MESSAGE_ID_INVALID")) {
95+
logger.warn({ e, chatId, messageIds }, "[TgLogger:forward] Message ID(s) is not valid for telegram API")
10096
} else {
10197
await this.exception({ type: "BOT_ERROR", error: e }, "TgLogger.forward")
10298
logger.error({ e }, "[TgLogger:forward] There was an error while trying to forward a message")
@@ -194,7 +190,6 @@ export class TgLogger extends Module<ModuleShared> {
194190
},
195191
}
196192

197-
await this.log(this.topics.banAll, "———————————————")
198193
const msg = await this.log(this.topics.banAll, getBanAllText(banAll))
199194

200195
if (!msg?.message_id) {

src/modules/tg-logger/report.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ export const reportMenu = MenuGenerator.getInstance<Context>().create<Report>("r
140140
{
141141
text: "🚨 Start BAN ALL 🚨",
142142
cb: async ({ data, ctx }) => {
143+
await ctx.api.deleteMessage(data.message.chat.id, data.message.message_id).catch(() => {})
143144
modules
144145
.get("tgLogger")
145146
.banAll(

0 commit comments

Comments
 (0)