mirror
/
TLG_JoinCaptchaBot
kopia lustrzana https://github.com/J-Rios/TLG_JoinCaptchaBot
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Avoid confusing text for enable/disable commands from private

pull/145/head
J-Rios 2022-01-19 19:41:10 +01:00
rodzic 29d4b7f6e3
commit eb0aca4cbe
25 zmienionych plików z 87 dodań i 15 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

30
sources/join_captcha_bot.py
Wyświetl plik

@ -1663,7 +1663,7 @@ def cmd_checkcfg(update: Update, context: CallbackContext):
if chat_type == "private":
if user_id not in connections:
tlg_send_msg_type_chat(bot, chat_type, chat_id,
TEXT[lang]["CMD_NOT_ALLOW_PRIVATE"])
TEXT[lang]["CMD_NEEDS_CONNECTION"])
return
group_id = connections[user_id]["group_id"]
else:
@ -1699,7 +1699,7 @@ def cmd_language(update: Update, context: CallbackContext):
if chat_type == "private":
if user_id not in connections:
tlg_send_msg_type_chat(bot, chat_type, chat_id,
TEXT[lang]["CMD_NOT_ALLOW_PRIVATE"])
TEXT[lang]["CMD_NEEDS_CONNECTION"])
return
group_id = connections[user_id]["group_id"]
else:
@ -1752,7 +1752,7 @@ def cmd_time(update: Update, context: CallbackContext):
if chat_type == "private":
if user_id not in connections:
tlg_send_msg_type_chat(bot, chat_type, chat_id,
TEXT[lang]["CMD_NOT_ALLOW_PRIVATE"])
TEXT[lang]["CMD_NEEDS_CONNECTION"])
return
group_id = connections[user_id]["group_id"]
else:
@ -1826,7 +1826,7 @@ def cmd_difficulty(update: Update, context: CallbackContext):
if chat_type == "private":
if user_id not in connections:
tlg_send_msg_type_chat(bot, chat_type, chat_id,
TEXT[lang]["CMD_NOT_ALLOW_PRIVATE"])
TEXT[lang]["CMD_NEEDS_CONNECTION"])
return
group_id = connections[user_id]["group_id"]
else:
@ -1875,7 +1875,7 @@ def cmd_captcha_mode(update: Update, context: CallbackContext):
if chat_type == "private":
if user_id not in connections:
tlg_send_msg_type_chat(bot, chat_type, chat_id,
TEXT[lang]["CMD_NOT_ALLOW_PRIVATE"])
TEXT[lang]["CMD_NEEDS_CONNECTION"])
return
group_id = connections[user_id]["group_id"]
else:
@ -1920,7 +1920,7 @@ def cmd_welcome_msg(update: Update, context: CallbackContext):
if chat_type == "private":
if user_id not in connections:
tlg_send_msg_type_chat(bot, chat_type, chat_id,
TEXT[lang]["CMD_NOT_ALLOW_PRIVATE"])
TEXT[lang]["CMD_NEEDS_CONNECTION"])
return
group_id = connections[user_id]["group_id"]
else:
@ -1969,7 +1969,7 @@ def cmd_captcha_poll(update: Update, context: CallbackContext):
if chat_type == "private":
if user_id not in connections:
tlg_send_msg_type_chat(bot, chat_type, chat_id,
TEXT[lang]["CMD_NOT_ALLOW_PRIVATE"])
TEXT[lang]["CMD_NEEDS_CONNECTION"])
return
group_id = connections[user_id]["group_id"]
else:
@ -2088,7 +2088,7 @@ def cmd_restrict_non_text(update: Update, context: CallbackContext):
if chat_type == "private":
if user_id not in connections:
tlg_send_msg_type_chat(bot, chat_type, chat_id,
TEXT[lang]["CMD_NOT_ALLOW_PRIVATE"])
TEXT[lang]["CMD_NEEDS_CONNECTION"])
return
group_id = connections[user_id]["group_id"]
else:
@ -2145,7 +2145,7 @@ def cmd_add_ignore(update: Update, context: CallbackContext):
if chat_type == "private":
if user_id not in connections:
tlg_send_msg_type_chat(bot, chat_type, chat_id,
TEXT[lang]["CMD_NOT_ALLOW_PRIVATE"])
TEXT[lang]["CMD_NEEDS_CONNECTION"])
return
group_id = connections[user_id]["group_id"]
else:
@ -2198,7 +2198,7 @@ def cmd_remove_ignore(update: Update, context: CallbackContext):
if chat_type == "private":
if user_id not in connections:
tlg_send_msg_type_chat(bot, chat_type, chat_id,
TEXT[lang]["CMD_NOT_ALLOW_PRIVATE"])
TEXT[lang]["CMD_NEEDS_CONNECTION"])
return
group_id = connections[user_id]["group_id"]
else:
@ -2242,7 +2242,7 @@ def cmd_ignore_list(update: Update, context: CallbackContext):
if chat_type == "private":
if user_id not in connections:
tlg_send_msg_type_chat(bot, chat_type, chat_id,
TEXT[lang]["CMD_NOT_ALLOW_PRIVATE"])
TEXT[lang]["CMD_NEEDS_CONNECTION"])
return
group_id = connections[user_id]["group_id"]
else:
@ -2280,7 +2280,7 @@ def cmd_remove_solve_kick_msg(update: Update, context: CallbackContext):
if chat_type == "private":
if user_id not in connections:
tlg_send_msg_type_chat(bot, chat_type, chat_id,
TEXT[lang]["CMD_NOT_ALLOW_PRIVATE"])
TEXT[lang]["CMD_NEEDS_CONNECTION"])
return
group_id = connections[user_id]["group_id"]
else:
@ -2327,7 +2327,7 @@ def cmd_remove_welcome_msg(update: Update, context: CallbackContext):
if chat_type == "private":
if user_id not in connections:
tlg_send_msg_type_chat(bot, chat_type, chat_id,
TEXT[lang]["CMD_NOT_ALLOW_PRIVATE"])
TEXT[lang]["CMD_NEEDS_CONNECTION"])
return
group_id = connections[user_id]["group_id"]
else:
@ -2371,7 +2371,7 @@ def cmd_url_enable(update: Update, context: CallbackContext):
lang = get_update_user_lang(update_msg.from_user)
# Check and deny usage in private chat
if chat_type == "private":
tlg_send_msg(bot, chat_id, TEXT[lang]["CMD_NOT_ALLOW_PRIVATE"])
tlg_send_msg(bot, chat_id, TEXT[lang]["CMD_NEEDS_CONNECTION"])
return
# Ignore if not requested by a group Admin
is_admin = tlg_user_is_admin(bot, user_id, chat_id)
@ -2405,7 +2405,7 @@ def cmd_url_disable(update: Update, context: CallbackContext):
lang = get_update_user_lang(update_msg.from_user)
# Check and deny usage in private chat
if chat_type == "private":
tlg_send_msg(bot, chat_id, TEXT[lang]["CMD_NOT_ALLOW_PRIVATE"])
tlg_send_msg(bot, chat_id, TEXT[lang]["CMD_NEEDS_CONNECTION"])
return
# Ignore if not requested by a group Admin
is_admin = tlg_user_is_admin(bot, user_id, chat_id)

3
sources/language/ar.json
Wyświetl plik

@ -264,6 +264,9 @@
"إعدادات المجموعة:\n————————————————\n```\n{}\n```",
"CMD_NOT_ALLOW_PRIVATE":
"This command cannot be used in private chat.",
"CMD_NEEDS_CONNECTION":
"لا يمكن استخدام هذا الأمر في محادثة خاصة إلا بعد اجراءك ربطا (/connect) لضبط بعض المجموعات.",
"CMD_JUST_IN_PRIVATE":

3
sources/language/be.json
Wyświetl plik

@ -264,6 +264,9 @@
"Group Configuration:\n————————————————\n```\n{}\n```",
"CMD_NOT_ALLOW_PRIVATE":
"This command cannot be used in private chat.",
"CMD_NEEDS_CONNECTION":
"This command cannot be used in private chat unless you make a connection (/connect) to configure some group.",
"CMD_JUST_IN_PRIVATE":

3
sources/language/ca.json
Wyświetl plik

@ -264,6 +264,9 @@
"Group Configuration:\n————————————————\n```\n{}\n```",
"CMD_NOT_ALLOW_PRIVATE":
"This command cannot be used in private chat.",
"CMD_NEEDS_CONNECTION":
"This command cannot be used in private chat unless you make a connection (/connect) to configure some group.",
"CMD_JUST_IN_PRIVATE":

3
sources/language/de.json
Wyświetl plik

@ -264,6 +264,9 @@
"Group Configuration:\n————————————————\n```\n{}\n```",
"CMD_NOT_ALLOW_PRIVATE":
"This command cannot be used in private chat.",
"CMD_NEEDS_CONNECTION":
"This command cannot be used in private chat unless you make a connection (/connect) to configure some group.",
"CMD_JUST_IN_PRIVATE":

3
sources/language/el.json
Wyświetl plik

@ -264,6 +264,9 @@
"Group Configuration:\n————————————————\n```\n{}\n```",
"CMD_NOT_ALLOW_PRIVATE":
"This command cannot be used in private chat.",
"CMD_NEEDS_CONNECTION":
"This command cannot be used in private chat unless you make a connection (/connect) to configure some group.",
"CMD_JUST_IN_PRIVATE":

3
sources/language/en.json
Wyświetl plik

@ -264,6 +264,9 @@
"Group Configuration:\n————————————————\n```\n{}\n```",
"CMD_NOT_ALLOW_PRIVATE":
"This command cannot be used in private chat.",
"CMD_NEEDS_CONNECTION":
"This command cannot be used in private chat unless you make a connection (/connect) to configure some group.",
"CMD_JUST_IN_PRIVATE":

3
sources/language/eo.json
Wyświetl plik

@ -264,6 +264,9 @@
"Group Configuration:\n————————————————\n```\n{}\n```",
"CMD_NOT_ALLOW_PRIVATE":
"This command cannot be used in private chat.",
"CMD_NEEDS_CONNECTION":
"This command cannot be used in private chat unless you make a connection (/connect) to configure some group.",
"CMD_JUST_IN_PRIVATE":

3
sources/language/es.json
Wyświetl plik

@ -264,6 +264,9 @@
"Configuración del Grupo:\n————————————————\n```\n{}\n```",
"CMD_NOT_ALLOW_PRIVATE":
"Este comando no puede ser utilizado en un chat privado.",
"CMD_NEEDS_CONNECTION":
"Este comando no puede ser utilizado en un chat privado a menos que te conectes (/connect) a un grupo para configurarlo.",
"CMD_JUST_IN_PRIVATE":

3
sources/language/eu.json
Wyświetl plik

@ -264,6 +264,9 @@
"Group Configuration:\n————————————————\n```\n{}\n```",
"CMD_NOT_ALLOW_PRIVATE":
"This command cannot be used in private chat.",
"CMD_NEEDS_CONNECTION":
"This command cannot be used in private chat unless you make a connection (/connect) to configure some group.",
"CMD_JUST_IN_PRIVATE":

3
sources/language/fa.json
Wyświetl plik

@ -264,6 +264,9 @@
"تنظیمات گروه:\n————————————————\n```\n{}\n```",
"CMD_NOT_ALLOW_PRIVATE":
"This command cannot be used in private chat.",
"CMD_NEEDS_CONNECTION":
"این دستور در پیوی کار نمیکند مگر اینکه با دستور (/connect) به یک گروه جهت تغییر تنظیمات گروه متصل شوید.",
"CMD_JUST_IN_PRIVATE":

3
sources/language/fr.json
Wyświetl plik

@ -264,6 +264,9 @@
"Group Configuration:\n————————————————\n```\n{}\n```",
"CMD_NOT_ALLOW_PRIVATE":
"This command cannot be used in private chat.",
"CMD_NEEDS_CONNECTION":
"This command cannot be used in private chat unless you make a connection (/connect) to configure some group.",
"CMD_JUST_IN_PRIVATE":

3
sources/language/gl.json
Wyświetl plik

@ -264,6 +264,9 @@
"Group Configuration:\n————————————————\n```\n{}\n```",
"CMD_NOT_ALLOW_PRIVATE":
"This command cannot be used in private chat.",
"CMD_NEEDS_CONNECTION":
"This command cannot be used in private chat unless you make a connection (/connect) to configure some group.",
"CMD_JUST_IN_PRIVATE":

3
sources/language/id.json
Wyświetl plik

@ -264,6 +264,9 @@
"Group Configuration:\n————————————————\n```\n{}\n```",
"CMD_NOT_ALLOW_PRIVATE":
"This command cannot be used in private chat.",
"CMD_NEEDS_CONNECTION":
"This command cannot be used in private chat unless you make a connection (/connect) to configure some group.",
"CMD_JUST_IN_PRIVATE":

3
sources/language/it.json
Wyświetl plik

@ -264,6 +264,9 @@
"Configurazioni del gruppo:\n————————————————\n```\n{}\n```",
"CMD_NOT_ALLOW_PRIVATE":
"Questo comando non può essere usato in modo privato.",
"CMD_NEEDS_CONNECTION":
"Questo comando non può essere usato in modo privato a meno di non fare una connessione tramite il comando /connect.",
"CMD_JUST_IN_PRIVATE":

3
sources/language/kn.json
Wyświetl plik

@ -264,6 +264,9 @@
"Group Configuration:\n————————————————\n```\n{}\n```",
"CMD_NOT_ALLOW_PRIVATE":
"This command cannot be used in private chat.",
"CMD_NEEDS_CONNECTION":
"This command cannot be used in private chat unless you make a connection (/connect) to configure some group.",
"CMD_JUST_IN_PRIVATE":

3
sources/language/ko.json
Wyświetl plik

@ -264,6 +264,9 @@
"Group Configuration:\n————————————————\n```\n{}\n```",
"CMD_NOT_ALLOW_PRIVATE":
"This command cannot be used in private chat.",
"CMD_NEEDS_CONNECTION":
"This command cannot be used in private chat unless you make a connection (/connect) to configure some group.",
"CMD_JUST_IN_PRIVATE":

3
sources/language/nl.json
Wyświetl plik

@ -264,6 +264,9 @@
"Group Configuration:\n————————————————\n```\n{}\n```",
"CMD_NOT_ALLOW_PRIVATE":
"This command cannot be used in private chat.",
"CMD_NEEDS_CONNECTION":
"This command cannot be used in private chat unless you make a connection (/connect) to configure some group.",
"CMD_JUST_IN_PRIVATE":

3
sources/language/pl.json
Wyświetl plik

@ -264,6 +264,9 @@
"Group Configuration:\n————————————————\n```\n{}\n```",
"CMD_NOT_ALLOW_PRIVATE":
"This command cannot be used in private chat.",
"CMD_NEEDS_CONNECTION":
"This command cannot be used in private chat unless you make a connection (/connect) to configure some group.",
"CMD_JUST_IN_PRIVATE":

3
sources/language/pt_br.json
Wyświetl plik

@ -264,6 +264,9 @@
"Group Configuration:\n————————————————\n```\n{}\n```",
"CMD_NOT_ALLOW_PRIVATE":
"This command cannot be used in private chat.",
"CMD_NEEDS_CONNECTION":
"This command cannot be used in private chat unless you make a connection (/connect) to configure some group.",
"CMD_JUST_IN_PRIVATE":

3
sources/language/ru.json
Wyświetl plik

@ -264,6 +264,9 @@
"Параметры конфигурации:\n————————————————\n```\n{}\n```",
"CMD_NOT_ALLOW_PRIVATE":
"This command cannot be used in private chat.",
"CMD_NEEDS_CONNECTION":
"Чтобы использовать эту команду в приватном чате, нужно сначала подключиться к чату через команду /connect .",
"CMD_JUST_IN_PRIVATE":

3
sources/language/sk.json
Wyświetl plik

@ -264,6 +264,9 @@
"Group Configuration:\n————————————————\n```\n{}\n```",
"CMD_NOT_ALLOW_PRIVATE":
"This command cannot be used in private chat.",
"CMD_NEEDS_CONNECTION":
"This command cannot be used in private chat unless you make a connection (/connect) to configure some group.",
"CMD_JUST_IN_PRIVATE":

3
sources/language/tr.json
Wyświetl plik

@ -264,6 +264,9 @@
"Group Configuration:\n————————————————\n```\n{}\n```",
"CMD_NOT_ALLOW_PRIVATE":
"This command cannot be used in private chat.",
"CMD_NEEDS_CONNECTION":
"This command cannot be used in private chat unless you make a connection (/connect) to configure some group.",
"CMD_JUST_IN_PRIVATE":

3
sources/language/uk.json
Wyświetl plik

@ -264,6 +264,9 @@
"Параметри конфігурації:\n————————————————\n```\n{}\n```",
"CMD_NOT_ALLOW_PRIVATE":
"This command cannot be used in private chat.",
"CMD_NEEDS_CONNECTION":
"Щоб використовувати цю команду в приватному чаті, потрібно спочатку підключитися до чату через команду: /connect .",
"CMD_JUST_IN_PRIVATE":

3
sources/language/zh_cn.json
Wyświetl plik

@ -264,6 +264,9 @@
"Group Configuration:\n————————————————\n```\n{}\n```",
"CMD_NOT_ALLOW_PRIVATE":
"This command cannot be used in private chat.",
"CMD_NEEDS_CONNECTION":
"This command cannot be used in private chat unless you make a connection (/connect) to configure some group.",
"CMD_JUST_IN_PRIVATE":