Fix for hidden settings & tower messages

modules/core/accounting/services/account_service.py

@@ -323,6 +323,20 @@ class AccountService:
                 return self.orgs
         return self.orgs
 
+    def get_org_names(self) -> list:
+        if not hasattr(self, "org_names"):
+            try:
+                def del_orgs(_):
+                    del self.org_names
+                self.orgs = [x["org_name"] for x in self.db.query("SELECT * from orgs o "
+                                                                  "LEFT JOIN all_orgs a on o.org_id = ao.org_id", [])]
+                self.bot.job_scheduler.delayed_job(del_orgs, 60)
+                return self.org_names
+            except SqlException:
+                self.org_names = [self.bot.public_channel_service.org_name]
+                return self.org_names
+        return self.org_names
+
     def create_users(self, users, disable=False) -> int:
         # Default preferences
         pref_autoinvite = self.setting_service.get_value("pref_autoinvite")

modules/core/discord/discord_controller.py

@@ -108,7 +108,7 @@ class DiscordController:
 
     def pre_start(self):
         self.setting_service.register(self.module_name, "discord_token", "", HiddenSettingType(allow_empty=True),
-                                          "Enter your Discord token her")
+                                          "Enter your Discord token here")
 
     def get_name(self, discord_id):
         data = self.db.query_single(
@@ -181,7 +181,7 @@ class DiscordController:
     @event(event_type="connect", description="Connects the Discord client automatically on startup, if a token exists")
     def handle_connect_event(self, _, _1):
         token = self.setting_discord_token().get_value()
-        if token == "None":
+        if token.lower() in ["none", "", "null"]:
             return
 
         # noinspection PyTypeChecker
@@ -193,7 +193,7 @@ class DiscordController:
     @event(event_type=BanService.BAN_ADDED_EVENT, description="Ban user from Discord")
     def ban_added_event(self, _, event_data):
         token = self.setting_discord_token().get_value()
-        if token == "None":
+        if token.lower() in ["none", "", "null"]:
             return
         account = self.account_service.get_account(event_data.char_id)
         if account.discord_joined == 1 and account.discord_id != "":
@@ -204,7 +204,7 @@ class DiscordController:
     @event(event_type=BanService.BAN_REMOVED_EVENT, description="Remove Discord ban")
     def ban_removed_event(self, _, event_data):
         token = self.setting_discord_token().get_value()
-        if token == "None":
+        if token.lower() in ["none", "", "null"]:
             return
         account = self.account_service.get_account(event_data.char_id)
         if account.discord_id != "":
@@ -288,7 +288,7 @@ class DiscordController:
     @timerevent(budatime="1h", description="Verify Discord members", run_at_startup=True)
     def timer_check_discord_members(self, event_type, event_data):
         token = self.setting_discord_token().get_value()
-        if token in ["None", "", "NULL", None]:
+        if token.lower() in ["none", "", "null"]:
             return
         if not self.bot.is_ready():
             return