From: Czar <czar@kalli.st>
Date: Sun, 31 Oct 2021 23:44:32 +0000 (+0100)
Subject: Merge
X-Git-Url: https://git.patchysicp.xyz/?a=commitdiff_plain;h=b39b887e253d7c0507063b9f350cb9ead461f592;p=angel.git

Merge
---

b39b887e253d7c0507063b9f350cb9ead461f592
diff --cc main.py
index 491a556,a49ee0f..cdaa08e
--- a/main.py
+++ b/main.py
@@@ -7,8 -7,7 +7,6 @@@ import r
  import io
  import mimetypes
  import asyncio
- import logging
--
  from collections import defaultdict
  from PythonSed import Sed
  from slixmpp import ClientXMPP
@@@ -244,12 -239,8 +239,10 @@@ class AngelBot(ClientXMPP)
          self.send_presence()
          await self.get_roster()
          for channel in self.autojoin:
 -            self.plugin["xep_0045"].join_muc(channel, self.nick)
 -        await self.update_info()
 +            try:
 +                self.plugin["xep_0045"].join_muc(channel, self.nick)
 +            except:
 +                ...
-         # await self.update_info()
-         logging.info("Session started!")
  
      async def update_info(self):
          with open("angel.png", "rb") as avatar_file:
@@@ -318,7 -309,7 +311,6 @@@
  if __name__ == "__main__":
      config = configparser.ConfigParser()
      config.read("config.ini")
-     logging.basicConfig(level=logging.DEBUG)
 -
      jid = config["angel"]["jid"]
      password = config["angel"]["password"]
      autojoin = config["angel"]["autojoin"].split()