Skip to content

Commit

Permalink
Fixed the warning callback response.
Browse files Browse the repository at this point in the history
  • Loading branch information
mleandrojr committed May 13, 2024
1 parent c68e4fa commit 1096cc2
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 7 deletions.
12 changes: 9 additions & 3 deletions src/callback/Warning.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import ChatHelper from "../helper/Chat.js";
import Lang from "../helper/Lang.js";
import { parse } from "dotenv";

export default class CaptchaConfirmation extends Callback {
export default class Warning extends Callback {

/**
* The constructor.
Expand All @@ -44,14 +44,20 @@ export default class CaptchaConfirmation extends Callback {
const chat = await ChatHelper.getByTelegramId(this.context.chat.getId());

if (!user || !chat) {
this.context.callbackQuery?.answer(Lang.get("adminOnlyAction"));
return;
return Promise.resolve();
}

Lang.set(chat.language || "us");

if (!await this.context.user.isAdmin()) {
this.context.callbackQuery?.answer(Lang.get("adminOnlyAction"));

const message = Lang.get("adminOnlyActionMessage")
.replace("{userid}", this.context.user.getId())
.replace("{username}", this.context.user.getFirstName() || this.context.user.getUsername());

this.context.chat.sendMessage(message, { parseMode: "HTML" });
return Promise.resolve();
}

const [userId, chatId, warningId] = this.context.callbackQuery?.callbackData?.d?.split(",");
Expand Down
2 changes: 1 addition & 1 deletion src/command/Ban.ts
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ export default class Ban extends Command {
const message = Lang.get("bannedMessage")
.replace("{userid}", contextUser.getId())
.replace("{username}", contextUser.getFirstName() || contextUser.getUsername())
.replace("{reason}", reason.length ? reason : "Unknown");
.replace("{reason}", reason.length ? reason : Lang.get("reasonUnknown"));

this.context.chat.sendMessage(message, { parseMode: "HTML" });

Expand Down
2 changes: 1 addition & 1 deletion src/command/Warning/Warn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ export default class Warn extends WarningsBase {
.set("user_id", user.id)
.set("chat_id", chat.id)
.set("date", Math.ceil(Date.now() / 1000))
.set("reason", reason);
.set("reason", reason.length ? reason : Lang.get("reasonUnknown"));

try {

Expand Down
4 changes: 3 additions & 1 deletion src/lang/br.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,5 +97,7 @@ export default {
macroRemoveError: "Ocorreu um erro ao remover a macro. Por favor, tente novamente mais tarde.",
lastWarningRemovalButton: "Remover Advertência (somente admins)",
warningsRemovalButton: "Remover todas as advertências (somente admins)",
adminOnlyAction: "Esta ação só pode ser executada por administradores."
adminOnlyAction: "Esta ação só pode ser executada por administradores.",
adminOnlyActionMessage: "<a href=\"tg://user?id={userid}\">{username}</a> você sabe o que quer dizer \"somente admins\"? O que você pensa que está fazendo?",
reasonUnknown: "Desconhecido",
};
4 changes: 3 additions & 1 deletion src/lang/us.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,5 +97,7 @@ export default {
macroRemoveError: "An error occurred while removing the macro. Please try again later.",
lastWarningRemovalButton: "Remove warning (admin only)",
warningsRemovalButton: "Remove all warnings (admin only)",
adminOnlyAction: "This action can only be performed by admins."
adminOnlyAction: "This action can only be performed by admins.",
adminOnlyActionMessage: "<a href=\"tg://user?id={userid}\">{username}</a> do you know what \"admin only\" means? What do you think you're doing?",
reasonUnknown: "Unknown",
};
1 change: 1 addition & 0 deletions src/library/telegram/type/ChatMemberUpdated.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,6 @@ export type ChatMemberUpdated = {
oldChatMember: ChatMember;
newChatMember: ChatMember;
inviteLink?: ChatInviteLink;
viaJoinRequest?: boolean;
viaChatFolderInviteLink?: boolean;
};

0 comments on commit 1096cc2

Please sign in to comment.