From dc76dfefc87d1d8780e748636b4b71359de8737e Mon Sep 17 00:00:00 2001 From: J-Rios Date: Thu, 16 Sep 2021 20:59:47 +0200 Subject: [PATCH] Notify connection commands can't be used in groups --- sources/join_captcha_bot.py | 16 ++++++++++++++++ sources/language/ar.json | 5 ++++- sources/language/be.json | 5 ++++- sources/language/ca.json | 5 ++++- sources/language/de.json | 5 ++++- sources/language/el.json | 5 ++++- sources/language/en.json | 5 ++++- sources/language/eo.json | 5 ++++- sources/language/es.json | 5 ++++- sources/language/eu.json | 5 ++++- sources/language/fr.json | 5 ++++- sources/language/gl.json | 5 ++++- sources/language/id.json | 5 ++++- sources/language/it.json | 5 ++++- sources/language/kn.json | 5 ++++- sources/language/ko.json | 5 ++++- sources/language/nl.json | 5 ++++- sources/language/pl.json | 5 ++++- sources/language/pt_br.json | 5 ++++- sources/language/ru.json | 5 ++++- sources/language/sk.json | 5 ++++- sources/language/tr.json | 5 ++++- sources/language/uk.json | 5 ++++- sources/language/zh_cn.json | 5 ++++- 24 files changed, 108 insertions(+), 23 deletions(-) diff --git a/sources/join_captcha_bot.py b/sources/join_captcha_bot.py index 96d96d5..aa70d34 100644 --- a/sources/join_captcha_bot.py +++ b/sources/join_captcha_bot.py @@ -1477,6 +1477,14 @@ def cmd_connect(update: Update, context: CallbackContext): lang = lang.upper() # Ignore if command is not in private chat if chat_type != "private": + # Ignore if not requested by a group Admin + is_admin = tlg_user_is_admin(bot, user_id, chat_id) + if (is_admin is None) or (is_admin == False): + return + # Send just allowed in private chat message + lang = get_chat_config(chat_id, "Language") + tlg_send_msg_type_chat(bot, chat_type, chat_id, + TEXT[lang]["CMD_JUST_IN_PRIVATE"]) return # Check for group chat ID if len(args) == 0: @@ -1521,6 +1529,14 @@ def cmd_disconnect(update: Update, context: CallbackContext): lang = lang.upper() # Ignore if command is not in private chat if chat_type != "private": + # Ignore if not requested by a group Admin + is_admin = tlg_user_is_admin(bot, user_id, chat_id) + if (is_admin is None) or (is_admin == False): + return + # Send just allowed in private chat message + lang = get_chat_config(chat_id, "Language") + tlg_send_msg_type_chat(bot, chat_type, chat_id, + TEXT[lang]["CMD_JUST_IN_PRIVATE"]) return # Check if User is connected to some group if user_id not in connections: diff --git a/sources/language/ar.json b/sources/language/ar.json index dd350c6..9fdd22f 100644 --- a/sources/language/ar.json +++ b/sources/language/ar.json @@ -249,5 +249,8 @@ "Group Configuration:\n————————————————\n```\n{}\n```", "CMD_NOT_ALLOW_PRIVATE": - "This command cannot be used in private chat unless you make a connection (/connect) to configure some group." + "This command cannot be used in private chat unless you make a connection (/connect) to configure some group.", + + "CMD_JUST_IN_PRIVATE": + "This command can't be used inside a group (use it in private Bot chat)." } diff --git a/sources/language/be.json b/sources/language/be.json index d769dd6..9c02c72 100644 --- a/sources/language/be.json +++ b/sources/language/be.json @@ -249,5 +249,8 @@ "Group Configuration:\n————————————————\n```\n{}\n```", "CMD_NOT_ALLOW_PRIVATE": - "This command cannot be used in private chat unless you make a connection (/connect) to configure some group." + "This command cannot be used in private chat unless you make a connection (/connect) to configure some group.", + + "CMD_JUST_IN_PRIVATE": + "This command can't be used inside a group (use it in private Bot chat)." } diff --git a/sources/language/ca.json b/sources/language/ca.json index 5f06d0c..23ad055 100644 --- a/sources/language/ca.json +++ b/sources/language/ca.json @@ -249,5 +249,8 @@ "Group Configuration:\n————————————————\n```\n{}\n```", "CMD_NOT_ALLOW_PRIVATE": - "This command cannot be used in private chat unless you make a connection (/connect) to configure some group." + "This command cannot be used in private chat unless you make a connection (/connect) to configure some group.", + + "CMD_JUST_IN_PRIVATE": + "This command can't be used inside a group (use it in private Bot chat)." } diff --git a/sources/language/de.json b/sources/language/de.json index 0a43bbf..664cfa0 100644 --- a/sources/language/de.json +++ b/sources/language/de.json @@ -249,5 +249,8 @@ "Group Configuration:\n————————————————\n```\n{}\n```", "CMD_NOT_ALLOW_PRIVATE": - "This command cannot be used in private chat unless you make a connection (/connect) to configure some group." + "This command cannot be used in private chat unless you make a connection (/connect) to configure some group.", + + "CMD_JUST_IN_PRIVATE": + "This command can't be used inside a group (use it in private Bot chat)." } diff --git a/sources/language/el.json b/sources/language/el.json index 6a4ece0..c7bb104 100644 --- a/sources/language/el.json +++ b/sources/language/el.json @@ -249,5 +249,8 @@ "Group Configuration:\n————————————————\n```\n{}\n```", "CMD_NOT_ALLOW_PRIVATE": - "This command cannot be used in private chat unless you make a connection (/connect) to configure some group." + "This command cannot be used in private chat unless you make a connection (/connect) to configure some group.", + + "CMD_JUST_IN_PRIVATE": + "This command can't be used inside a group (use it in private Bot chat)." } diff --git a/sources/language/en.json b/sources/language/en.json index c13beb9..ad446e5 100644 --- a/sources/language/en.json +++ b/sources/language/en.json @@ -249,5 +249,8 @@ "Group Configuration:\n————————————————\n```\n{}\n```", "CMD_NOT_ALLOW_PRIVATE": - "This command cannot be used in private chat unless you make a connection (/connect) to configure some group." + "This command cannot be used in private chat unless you make a connection (/connect) to configure some group.", + + "CMD_JUST_IN_PRIVATE": + "This command can't be used inside a group (use it in private Bot chat)." } diff --git a/sources/language/eo.json b/sources/language/eo.json index 023bbf3..27168bf 100644 --- a/sources/language/eo.json +++ b/sources/language/eo.json @@ -249,5 +249,8 @@ "Group Configuration:\n————————————————\n```\n{}\n```", "CMD_NOT_ALLOW_PRIVATE": - "This command cannot be used in private chat unless you make a connection (/connect) to configure some group." + "This command cannot be used in private chat unless you make a connection (/connect) to configure some group.", + + "CMD_JUST_IN_PRIVATE": + "This command can't be used inside a group (use it in private Bot chat)." } diff --git a/sources/language/es.json b/sources/language/es.json index 214a379..6fcccd3 100644 --- a/sources/language/es.json +++ b/sources/language/es.json @@ -249,5 +249,8 @@ "Configuración del Grupo:\n————————————————\n```\n{}\n```", "CMD_NOT_ALLOW_PRIVATE": - "Este comando no puede ser utilizado en un chat privado a menos que te conectes (/connect) a un grupo para configurarlo." + "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": + "Este comando no puede usarse dentro de un grupo (utilízalo en chat privado con el Bot)." } diff --git a/sources/language/eu.json b/sources/language/eu.json index 4fe7e30..4fd43a2 100644 --- a/sources/language/eu.json +++ b/sources/language/eu.json @@ -249,5 +249,8 @@ "Group Configuration:\n————————————————\n```\n{}\n```", "CMD_NOT_ALLOW_PRIVATE": - "This command cannot be used in private chat unless you make a connection (/connect) to configure some group." + "This command cannot be used in private chat unless you make a connection (/connect) to configure some group.", + + "CMD_JUST_IN_PRIVATE": + "This command can't be used inside a group (use it in private Bot chat)." } diff --git a/sources/language/fr.json b/sources/language/fr.json index ac6638f..07ab822 100644 --- a/sources/language/fr.json +++ b/sources/language/fr.json @@ -249,5 +249,8 @@ "Group Configuration:\n————————————————\n```\n{}\n```", "CMD_NOT_ALLOW_PRIVATE": - "This command cannot be used in private chat unless you make a connection (/connect) to configure some group." + "This command cannot be used in private chat unless you make a connection (/connect) to configure some group.", + + "CMD_JUST_IN_PRIVATE": + "This command can't be used inside a group (use it in private Bot chat)." } diff --git a/sources/language/gl.json b/sources/language/gl.json index 2d39c4c..4d6343f 100644 --- a/sources/language/gl.json +++ b/sources/language/gl.json @@ -249,5 +249,8 @@ "Group Configuration:\n————————————————\n```\n{}\n```", "CMD_NOT_ALLOW_PRIVATE": - "This command cannot be used in private chat unless you make a connection (/connect) to configure some group." + "This command cannot be used in private chat unless you make a connection (/connect) to configure some group.", + + "CMD_JUST_IN_PRIVATE": + "This command can't be used inside a group (use it in private Bot chat)." } diff --git a/sources/language/id.json b/sources/language/id.json index dd8fd88..70f135c 100644 --- a/sources/language/id.json +++ b/sources/language/id.json @@ -249,5 +249,8 @@ "Group Configuration:\n————————————————\n```\n{}\n```", "CMD_NOT_ALLOW_PRIVATE": - "This command cannot be used in private chat unless you make a connection (/connect) to configure some group." + "This command cannot be used in private chat unless you make a connection (/connect) to configure some group.", + + "CMD_JUST_IN_PRIVATE": + "This command can't be used inside a group (use it in private Bot chat)." } diff --git a/sources/language/it.json b/sources/language/it.json index 3533be1..4abe540 100644 --- a/sources/language/it.json +++ b/sources/language/it.json @@ -249,5 +249,8 @@ "Group Configuration:\n————————————————\n```\n{}\n```", "CMD_NOT_ALLOW_PRIVATE": - "This command cannot be used in private chat unless you make a connection (/connect) to configure some group." + "This command cannot be used in private chat unless you make a connection (/connect) to configure some group.", + + "CMD_JUST_IN_PRIVATE": + "This command can't be used inside a group (use it in private Bot chat)." } diff --git a/sources/language/kn.json b/sources/language/kn.json index df98753..17aa814 100644 --- a/sources/language/kn.json +++ b/sources/language/kn.json @@ -249,5 +249,8 @@ "Group Configuration:\n————————————————\n```\n{}\n```", "CMD_NOT_ALLOW_PRIVATE": - "This command cannot be used in private chat unless you make a connection (/connect) to configure some group." + "This command cannot be used in private chat unless you make a connection (/connect) to configure some group.", + + "CMD_JUST_IN_PRIVATE": + "This command can't be used inside a group (use it in private Bot chat)." } diff --git a/sources/language/ko.json b/sources/language/ko.json index 4daf109..50642c3 100644 --- a/sources/language/ko.json +++ b/sources/language/ko.json @@ -249,5 +249,8 @@ "Group Configuration:\n————————————————\n```\n{}\n```", "CMD_NOT_ALLOW_PRIVATE": - "This command cannot be used in private chat unless you make a connection (/connect) to configure some group." + "This command cannot be used in private chat unless you make a connection (/connect) to configure some group.", + + "CMD_JUST_IN_PRIVATE": + "This command can't be used inside a group (use it in private Bot chat)." } diff --git a/sources/language/nl.json b/sources/language/nl.json index acc20ba..cf7e8bc 100644 --- a/sources/language/nl.json +++ b/sources/language/nl.json @@ -249,5 +249,8 @@ "Group Configuration:\n————————————————\n```\n{}\n```", "CMD_NOT_ALLOW_PRIVATE": - "This command cannot be used in private chat unless you make a connection (/connect) to configure some group." + "This command cannot be used in private chat unless you make a connection (/connect) to configure some group.", + + "CMD_JUST_IN_PRIVATE": + "This command can't be used inside a group (use it in private Bot chat)." } diff --git a/sources/language/pl.json b/sources/language/pl.json index f3fb582..2f002d9 100644 --- a/sources/language/pl.json +++ b/sources/language/pl.json @@ -249,5 +249,8 @@ "Group Configuration:\n————————————————\n```\n{}\n```", "CMD_NOT_ALLOW_PRIVATE": - "This command cannot be used in private chat unless you make a connection (/connect) to configure some group." + "This command cannot be used in private chat unless you make a connection (/connect) to configure some group.", + + "CMD_JUST_IN_PRIVATE": + "This command can't be used inside a group (use it in private Bot chat)." } diff --git a/sources/language/pt_br.json b/sources/language/pt_br.json index 31882fd..38f61a2 100644 --- a/sources/language/pt_br.json +++ b/sources/language/pt_br.json @@ -249,5 +249,8 @@ "Group Configuration:\n————————————————\n```\n{}\n```", "CMD_NOT_ALLOW_PRIVATE": - "This command cannot be used in private chat unless you make a connection (/connect) to configure some group." + "This command cannot be used in private chat unless you make a connection (/connect) to configure some group.", + + "CMD_JUST_IN_PRIVATE": + "This command can't be used inside a group (use it in private Bot chat)." } diff --git a/sources/language/ru.json b/sources/language/ru.json index 3e9ce94..3202a3b 100644 --- a/sources/language/ru.json +++ b/sources/language/ru.json @@ -249,5 +249,8 @@ "Group Configuration:\n————————————————\n```\n{}\n```", "CMD_NOT_ALLOW_PRIVATE": - "This command cannot be used in private chat unless you make a connection (/connect) to configure some group." + "This command cannot be used in private chat unless you make a connection (/connect) to configure some group.", + + "CMD_JUST_IN_PRIVATE": + "This command can't be used inside a group (use it in private Bot chat)." } diff --git a/sources/language/sk.json b/sources/language/sk.json index 64e32cd..b82643e 100644 --- a/sources/language/sk.json +++ b/sources/language/sk.json @@ -249,5 +249,8 @@ "Group Configuration:\n————————————————\n```\n{}\n```", "CMD_NOT_ALLOW_PRIVATE": - "This command cannot be used in private chat unless you make a connection (/connect) to configure some group." + "This command cannot be used in private chat unless you make a connection (/connect) to configure some group.", + + "CMD_JUST_IN_PRIVATE": + "This command can't be used inside a group (use it in private Bot chat)." } diff --git a/sources/language/tr.json b/sources/language/tr.json index 8a541f0..ba1d3aa 100644 --- a/sources/language/tr.json +++ b/sources/language/tr.json @@ -249,5 +249,8 @@ "Group Configuration:\n————————————————\n```\n{}\n```", "CMD_NOT_ALLOW_PRIVATE": - "This command cannot be used in private chat unless you make a connection (/connect) to configure some group." + "This command cannot be used in private chat unless you make a connection (/connect) to configure some group.", + + "CMD_JUST_IN_PRIVATE": + "This command can't be used inside a group (use it in private Bot chat)." } diff --git a/sources/language/uk.json b/sources/language/uk.json index abf0b84..2276852 100644 --- a/sources/language/uk.json +++ b/sources/language/uk.json @@ -249,5 +249,8 @@ "Group Configuration:\n————————————————\n```\n{}\n```", "CMD_NOT_ALLOW_PRIVATE": - "This command cannot be used in private chat unless you make a connection (/connect) to configure some group." + "This command cannot be used in private chat unless you make a connection (/connect) to configure some group.", + + "CMD_JUST_IN_PRIVATE": + "This command can't be used inside a group (use it in private Bot chat)." } diff --git a/sources/language/zh_cn.json b/sources/language/zh_cn.json index bd82b76..5d27196 100644 --- a/sources/language/zh_cn.json +++ b/sources/language/zh_cn.json @@ -249,5 +249,8 @@ "Group Configuration:\n————————————————\n```\n{}\n```", "CMD_NOT_ALLOW_PRIVATE": - "This command cannot be used in private chat unless you make a connection (/connect) to configure some group." + "This command cannot be used in private chat unless you make a connection (/connect) to configure some group.", + + "CMD_JUST_IN_PRIVATE": + "This command can't be used inside a group (use it in private Bot chat)." }