Update

diff --git a/angel.png b/angel.png
index aea2895..991cbb4 100644 (file)
Binary files a/angel.png and b/angel.png differ

diff --git a/main.py b/main.py
index ff0affd..a49ee0f 100644 (file)
--- a/main.py
+++ b/main.py
@@ -6,6 +6,7 @@ import configparser
 import re
 import io
 import mimetypes
+import asyncio
 
 from collections import defaultdict
 from PythonSed import Sed
@@ -13,7 +14,6 @@ from slixmpp import ClientXMPP
 from urllib.parse import urlparse, parse_qs, urlunparse
 from pantomime import normalize_mimetype
 
-sed = Sed()
 
 sed_parse = re.compile("(?<!\\\\)[/#]")
 sed_cmd = re.compile("^s[/#].*[/#].*[/#]")
@@ -121,15 +121,11 @@ class AngelBot(ClientXMPP):
 
     async def process_link(self, uri, sender, mtype):
         url = urlunparse(uri)
-        try:
-            r = requests.get(url, stream=True, headers=headers, timeout=5)
-            if r.status_code != 200:
-                return
-        except Exception:
+        r = requests.get(url, stream=True, headers=headers, timeout=5)
+        if not r.ok:
             return
 
         ftype = normalize_mimetype(r.headers.get("content-type"))
-
         if ftype in html_files:
             data = ""
             for i in r.iter_content(chunk_size=1024, decode_unicode=False):
@@ -141,22 +137,30 @@ class AngelBot(ClientXMPP):
                 output = title.text.strip()
                 if output:
                     output = f"*{output}*" if ("\n" not in output) else output
+                    if output in self.messages[sender]["previews"]:
+                        return
+
+                    self.messages[sender]["previews"].add(output)
+                    if r.history:
+                        self.send_message(mto=sender, mbody=r.url, mtype=mtype)
                     self.send_message(mto=sender, mbody=output, mtype=mtype)
+
         else:
             try:
-                lenght = int(r.headers.get("content-length") or "0")
-                if not lenght or (lenght > data_limit):
-                    return
+                lenght = 0
                 outfile = io.BytesIO()
                 for chunk in r.iter_content(
                     chunk_size=512,
                     decode_unicode=False,
                 ):
+                    lenght += 512
+                    if lenght >= data_limit:
+                        return
                     outfile.write(chunk)
 
                 await self.embed_file(url, sender, mtype, ftype, outfile)
-            except Exception as e:
-                print(e)
+            except Exception:
+                ...
 
     async def embed_file(self, url, sender, mtype, ftype, outfile):
         ext = mimetypes.guess_extension(ftype)
@@ -171,6 +175,8 @@ class AngelBot(ClientXMPP):
         message.send()
 
     async def parse_urls(self, msg, urls, sender, mtype):
+        if "nsfw" in msg["body"].lower():
+            return
         for u in urls:
             if u in self.messages[sender]["links"]:
                 continue
@@ -180,7 +186,7 @@ class AngelBot(ClientXMPP):
             uri = urlparse(u)
             await self.parse_uri(uri, sender, mtype)
 
-    def s(self, msg, sender, mtype):
+    def sed_command(self, msg, sender, mtype):
         try:
             text = msg["body"]
             if not sed_cmd.match(text):
@@ -191,21 +197,21 @@ class AngelBot(ClientXMPP):
             if len(sed_args) < 4:
                 return
 
+            sed = Sed()
+            sed.load_string(text)
+
             for message in self.messages[sender]["messages"]:
-                if sed_args[1] in message:
-                    sed.load_string(text)
-                    fobj = io.StringIO(message)
-                    res = sed.apply(fobj, None)
-                    res = "\n".join(res)
-                    self.messages[sender]["messages"].add(res)
+                msg = io.StringIO(message)
+                if res := sed.apply(msg, None):
+                    out = "\n".join(res)
+                    self.messages[sender]["messages"].add(out)
                     return self.send_message(
                         mto=sender,
                         mbody=res,
                         mtype=mtype,
                     )
 
-        except Exception as e:
-            print(e)
+        except Exception:
             return
 
     def __init__(self, jid, password, nick="angel", autojoin=None):
@@ -213,11 +219,6 @@ class AngelBot(ClientXMPP):
         self.jid = jid
         self.nick = nick
         self.autojoin = autojoin or []
-        self.add_event_handler("session_start", self.session_start)
-        self.add_event_handler("message", self.message)
-        self.add_event_handler("groupchat_message", self.muc_message)
-        self.add_event_handler("disconnected", lambda _: self.connect())
-
         self.register_plugin("xep_0030")
         self.register_plugin("xep_0060")
         self.register_plugin("xep_0054")
@@ -227,14 +228,21 @@ class AngelBot(ClientXMPP):
         self.register_plugin("xep_0153")
         self.register_plugin("xep_0363")
 
+        self.add_event_handler("session_start", self.session_start)
+        self.add_event_handler("message", self.message)
+        self.add_event_handler("groupchat_message", self.muc_message)
+        # self.add_event_handler("vcard_avatar_update", self.debug_event)
+        # self.add_event_handler("stream_error", self.debug_event)
+        self.add_event_handler("disconnected", lambda _: self.connect())
+
     async def session_start(self, event):
         self.send_presence()
         await self.get_roster()
         for channel in self.autojoin:
             self.plugin["xep_0045"].join_muc(channel, self.nick)
-        # await self.avatar()
+        await self.update_info()
 
-    async def avatar(self):
+    async def update_info(self):
         with open("angel.png", "rb") as avatar_file:
             avatar = avatar_file.read()
 
@@ -242,15 +250,22 @@ class AngelBot(ClientXMPP):
         avatar_id = self.plugin["xep_0084"].generate_id(avatar)
         avatar_bytes = len(avatar)
 
-        info = {"id": avatar_id, "type": avatar_type, "bytes": avatar_bytes}
+        info = {
+            "id": avatar_id,
+            "type": avatar_type,
+            "bytes": avatar_bytes,
+        }
+
+        asyncio.gather(self.plugin["xep_0084"].publish_avatar(avatar))
 
-        await self.plugin["xep_0153"].set_avatar(
-            jid=self.jid,
-            avatar=avatar,
-            mtype=avatar_type,
+        asyncio.gather(
+            self.plugin["xep_0153"].set_avatar(
+                avatar=avatar,
+                mtype=avatar_type,
+            )
         )
-        await self.plugin["xep_0084"].publish_avatar(avatar)
-        await self.plugin["xep_0084"].publish_avatar_metadata([info])
+
+        asyncio.gather(self.plugin["xep_0084"].publish_avatar_metadata([info]))
 
     async def message(self, msg):
         if msg["type"] in ("chat", "normal"):
@@ -266,9 +281,9 @@ class AngelBot(ClientXMPP):
                     if urls := self.get_urls(msg):
                         await self.parse_urls(msg, urls, sender, mtype)
             except Exception:
-                pass
+                ...
 
-            self.s(msg, sender, mtype)
+            self.sed_command(msg, sender, mtype)
 
     async def muc_message(self, msg):
         if msg["type"] in ("groupchat", "normal"):
@@ -288,7 +303,7 @@ class AngelBot(ClientXMPP):
             except Exception:
                 pass
 
-            self.s(msg, sender, mtype)
+            self.sed_command(msg, sender, mtype)
 
 
 if __name__ == "__main__":
@@ -302,4 +317,4 @@ if __name__ == "__main__":
     bot = AngelBot(jid, password, autojoin=autojoin)
 
     bot.connect()
-    bot.process()
+    bot.process(forever=True)