Messaggi di benvenuto più articolati

.github/workflows/ci.yml

@@ -27,7 +27,7 @@ jobs:
           if [ -f requirements_dev.txt ]; then pip install -r requirements_dev.txt; fi
       - name: Test with pytest
         run: |
-          pytest --cov src tests/ --cov-fail-under=100 --cov-report xml
+          pytest --cov . tests/
       - name: Upload to CodeCoverage
         uses: codecov/codecov-action@v2
         with:

README.md

@@ -10,11 +10,11 @@ A simple Telegram bot built with [python-telegram-bot](https://python-telegram-b
 It simply sends a randomized welcome message from a pre-defined message list each time a new user joins a specific group.
 
 ## How to use?
-Just set a `QDBotToken` env variable, this is your bot token obtained from [BotFather](https://t.me/botfather)
+Just set a `TOKEN` env variable, this is your bot token obtained from [BotFather](https://t.me/botfather)
 
 ### Example in bash
 ```bash
-export QDBotToken="123456:ABC-DEF1234ghIkl-zyx57W2v1u123ew11" # Your bot token
+export TOKEN="123456:ABC-DEF1234ghIkl-zyx57W2v1u123ew11" # Your bot token
 ```
 
 ## Write Unit Tests
@@ -33,4 +33,4 @@ To add a new unit test without mocking, there are some examples at the beginning
 If is necessary one or more mock(s), it's possible to append three more keys to the unit test. The test should have the same keys with three more keys:
 - `mock_obj`: it's a list of the objects in which there are the functions to mock. In our examples they often refer to the main object (the one imported from src.main)
 - `mock_func`: an array of strings, it indicates the functions to mock
-- `mock_ret`: a list of the returned values
+- `mock_ret`: a list of the returned values

data/welcome.json

@@ -0,0 +1,11 @@
+{
+    "it": ["Benvenuto USER nel nostro gruppo ^-^","Ciao USER!","Salve USER!"],
+    "en": ["Welcome USER to our group ^-^","Hello USER!","Howdy USER!"],
+    "readme": "https://t.me/c/1095167198/67194",
+    "utils": [
+            "Se hai idee o suggerimenti, condividili con noi. Siamo aperti a nuove prospettive!", 
+            "Non esitare a fare domande se hai bisogno di aiuto.",
+            "Speriamo che ti possa sentire come a casa tua.", 
+            "Ricorda di rispettare le opinioni degli altri membri, anche se non sempre concordi. La diversità ci arricchisce."
+        ]
+}

main.py

@@ -0,0 +1,16 @@
+from os import getenv
+from telegram.ext import MessageHandler, Updater, Filters
+from module.commands.welcome import send_welcome
+
+def main() -> None:
+    TOKEN = getenv("TOKEN")
+    updater = Updater(TOKEN, use_context=True)
+    dp = updater.dispatcher
+
+    dp.add_handler(MessageHandler(Filters.status_update.new_chat_members, send_welcome))
+
+    updater.start_polling()
+    updater.idle()
+
+if __name__ == '__main__':
+    main()

module/commands/welcome.py

@@ -0,0 +1,36 @@
+from telegram import Update, User
+from telegram.ext import CallbackContext
+from module.shared import welcome
+from random import randrange
+
+
+def get_new_user_name(user: User) -> str:
+    return f"@{user['username']}" if user['username'] is not None else user['first_name']
+
+
+def generate_welcome(new_member: User) -> str:
+    new_member_username = get_new_user_name(new_member)
+
+    match new_member["language_code"]:
+        case "en":
+            lan_code = "en"
+        case "it" | _ :
+            lan_code = "it"
+
+    wlc_mess_list = welcome[lan_code]
+
+    return wlc_mess_list[randrange(0, len(wlc_mess_list))].replace("USER", new_member_username)
+
+
+def send_welcome(update: Update, _: CallbackContext) -> None:
+    if update.message.new_chat_members:
+        for new_member in update.message.new_chat_members:
+            if not new_member.is_bot:
+                handle_welcome(update, new_member)
+
+
+def handle_welcome(update: Update, new_member: User) -> None:
+        welcome_msg = f'{generate_welcome(new_member)}\n' + \
+                      f"- Dai un'occhiata al [README]({welcome['readme']})\n" + \
+                      f"- {welcome['utils'][randrange(0, len(welcome['utils']))]}"
+        update.message.reply_markdown(welcome_msg, disable_web_page_preview=True)

module/shared.py

@@ -0,0 +1,4 @@
+from json import load
+
+with open("data/welcome.json", "r") as f:
+    welcome = load(f)

requirements.txt

@@ -1 +1 @@
-python-telegram-bot == 20.0a0
+python-telegram-bot==13.8.1

tests/main_test.py

@@ -3,7 +3,7 @@
 from telegram import Message, Chat
 from telegram.ext import Application
 from datetime import datetime
-import src.main as main
+import main as main
 
 
 def get_wel(lan_code: str) -> str: