diff --git a/src/helpers/newcomers/kickCandidates.ts b/src/helpers/newcomers/kickCandidates.ts index 2536c55e..ecbda0c0 100644 --- a/src/helpers/newcomers/kickCandidates.ts +++ b/src/helpers/newcomers/kickCandidates.ts @@ -30,7 +30,7 @@ export async function kickCandidates(chat: Chat, candidates: Candidate[]) { kickChatMemberProxy( chat.id, candidate.id, - chat.banUsers ? 0 : parseInt(`${new Date().getTime() / 1000 + 45}`) + chat.banUsers ) } catch (err) { report(err, addKickedUser.name) @@ -52,14 +52,18 @@ export async function kickCandidates(chat: Chat, candidates: Candidate[]) { async function kickChatMemberProxy( id: number, candidateId: number, - duration: number + banUsers: boolean ) { try { if (!chatMembersBeingKicked[id]) { chatMembersBeingKicked[id] = {} } chatMembersBeingKicked[id][candidateId] = true - await bot.telegram.kickChatMember(id, candidateId, duration) + if (banUsers) { + await bot.telegram.kickChatMember(id, candidateId) + } else { + await bot.telegram.unbanChatMember(id, candidateId) // kick without ban + } } catch (err) { report(err, kickChatMemberProxy.name) } finally { diff --git a/src/helpers/newcomers/kickChatMember.ts b/src/helpers/newcomers/kickChatMember.ts index bcfd4294..c662e71e 100644 --- a/src/helpers/newcomers/kickChatMember.ts +++ b/src/helpers/newcomers/kickChatMember.ts @@ -11,11 +11,11 @@ export async function kickChatMember(chat: DocumentType, user: User) { // Try kicking the member try { await addKickedUser(chat, user.id) - await bot.telegram.kickChatMember( - chat.id, - user.id, - chat.banUsers ? 0 : parseInt(`${new Date().getTime() / 1000 + 45}`) - ) + if (chat.banUsers) { + await bot.telegram.kickChatMember(chat.id, user.id) + } else { + await bot.telegram.unbanChatMember(chat.id, user.id) // kick without ban + } } catch (err) { report(err, kickChatMember.name) }