Add welcome file

docker-compose.yml

@@ -21,5 +21,6 @@ services:
       - ${PWD}/config/:/bot/config
       - ${PWD}/credentials.json:/bot/credentials.json
       - ${PWD}/token.pickle:/bot/token.pickle
+      - ${PWD}/welcome.md:/bot/welcome.md
 
     stop_signal: SIGINT

modules/welcome_room.py

@@ -11,14 +11,13 @@ class MatrixModule(BotModule):
 
     def __init__(self, name):
         super().__init__(name)
-        room_id = os.getenv("WELCOME_ROOMID")
-        self.room_id = room_id
+        self.room_id = os.getenv("WELCOME_ROOMID")
         self.last_welcome_room_user_count = 0
         self.last_welcome_room_users = []
 
         # If the provided welcome message is a file path, read the file into
         # the welcome message. Otherwise, use the variable data as the message.
-        if os.path.isFile(os.getenv("WELCOME_MESSAGE")):
+        if os.path.isfile(os.getenv("WELCOME_MESSAGE")):
             with open(os.getenv("WELCOME_MESSAGE"), "r") as file:
                 self.welcome_message = file.read()
         else:
@@ -38,13 +37,13 @@ class MatrixModule(BotModule):
 
         if pollcount != 1:
             new_users = newcomer_room_user_delta.get("recently_added", [])
-            if os.getenv("WELCOME_ROOM_NOTIFY_DEPARTURE") and \
+            if os.getenv("WELCOME_ROOM_NOTIFY_DEPARTURE", 0) and \
                     len(newcomer_room_user_delta.get("recently_removed")) > 0:
                 for owner in bot.owners:
                     await bot.send_msg(
                         owner,
                         "Welcome Bot",
-                        "User {left} left the Newcomers channel".format(
+                        "User {left} left the welcome channel".format(
                             left=newcomer_room_user_delta.get(
                                 "recently_removed")
                         )
@@ -61,6 +60,7 @@ class MatrixModule(BotModule):
                 "Welcome",
                 self.welcome_message
             )
+        if len(user_list) > 0:
             for owner in bot.owners:
                 await bot.send_msg(
                     owner,

modules/welcome_server.py

@@ -22,7 +22,7 @@ class MatrixModule(BotModule):
 
         # If the provided welcome message is a file path, read the file into
         # the welcome message. Otherwise, use the variable data as the message.
-        if os.path.isFile(os.getenv("WELCOME_MESSAGE")):
+        if os.path.isfile(os.getenv("WELCOME_MESSAGE")):
             with open(os.getenv("WELCOME_MESSAGE"), "r") as file:
                 self.welcome_message = file.read()
         else:
@@ -51,6 +51,7 @@ class MatrixModule(BotModule):
                 "Welcome",
                 self.welcome_message
             )
+        if len(user_list) > 0:
             for owner in bot.owners:
                 await bot.send_msg(
                     owner,

welcome.md

@@ -0,0 +1 @@
+Welcome to the server.