slidge 0.1.2__py3-none-any.whl → 0.2.0a0__py3-none-any.whl

slidge/core/mixins/message.py

@@ -111,7 +111,7 @@ class MarkerMixin(MessageMaker):
                 self.xmpp.delivery_receipt.make_ack(
                     self._legacy_to_xmpp(legacy_msg_id),
                     mfrom=self.jid,
-                    mto=self.user.jid,
+                    mto=self.user_jid,
                 )
             )
         self._send(
@@ -144,7 +144,7 @@ class MarkerMixin(MessageMaker):
             # We'll see if we need to implement that later
             return
         xmpp_msg_id = self._legacy_to_xmpp(legacy_msg_id)
-        iq = Iq(sto=self.user.bare_jid, sfrom=self.user.bare_jid, stype="set")
+        iq = Iq(sto=self.user_jid.bare, sfrom=self.user_jid.bare, stype="set")
         iq["pubsub"]["publish"]["node"] = self.xmpp["xep_0490"].stanza.NS
         iq["pubsub"]["publish"]["item"]["id"] = muc_jid
         displayed = self.xmpp["xep_0490"].stanza.Displayed()
@@ -169,8 +169,8 @@ class ContentMessageMixin(AttachmentMixin):
 
     def __replace_id(self, legacy_msg_id: LegacyMessageType):
         if self.mtype == "groupchat":
-            return self.session.muc_sent_msg_ids.get(
-                legacy_msg_id
+            return self.xmpp.store.sent.get_group_xmpp_id(
+                self.session.user_pk, str(legacy_msg_id)
             ) or self._legacy_to_xmpp(legacy_msg_id)
         else:
             return self._legacy_to_xmpp(legacy_msg_id)
@@ -215,14 +215,18 @@ class ContentMessageMixin(AttachmentMixin):
             but store it in the archive. Meant to be used during ``MUC.backfill()``
         """
         if carbon:
-            if not correction and legacy_msg_id in self.session.sent:
+            if not correction and self.xmpp.store.sent.was_sent_by_user(
+                self.session.user_pk, str(legacy_msg_id)
+            ):
                 log.warning(
                     "Carbon message for a message an XMPP has sent? This is a bug! %s",
                     legacy_msg_id,
                 )
                 return
-            self.session.sent[legacy_msg_id] = self.session.legacy_to_xmpp_msg_id(
-                legacy_msg_id
+            self.xmpp.store.sent.set_message(
+                self.session.user_pk,
+                str(legacy_msg_id),
+                self.session.legacy_to_xmpp_msg_id(legacy_msg_id),
             )
         hints = self.__default_hints(hints)
         msg = self._make_message(

slidge/core/mixins/message_maker.py

@@ -7,8 +7,8 @@ from uuid import uuid4
 from slixmpp import Message
 from slixmpp.types import MessageTypes
 
+from ...db.models import GatewayUser
 from ...slixfix.link_preview.stanza import LinkPreview as LinkPreviewStanza
-from ...util.db import GatewayUser
 from ...util.types import (
     ChatState,
     LegacyMessageType,
@@ -60,8 +60,9 @@ class MessageMaker(BaseSender):
             msg["body"] = body
             state = "active"
         if thread:
-            known_threads = self.session.threads.inverse  # type:ignore
-            msg["thread"] = known_threads.get(thread) or str(thread)
+            msg["thread"] = self.xmpp.store.sent.get_legacy_thread(
+                self.user_pk, str(thread)
+            ) or str(thread)
         if state:
             msg["chat_state"] = state
         for hint in hints:
@@ -88,9 +89,9 @@ class MessageMaker(BaseSender):
             msg["stanza_id"]["by"] = self.muc.jid  # type: ignore
 
     def _legacy_to_xmpp(self, legacy_id: LegacyMessageType):
-        return self.session.sent.get(legacy_id) or self.session.legacy_to_xmpp_msg_id(
-            legacy_id
-        )
+        return self.xmpp.store.sent.get_xmpp_id(
+            self.session.user_pk, str(legacy_id)
+        ) or self.session.legacy_to_xmpp_msg_id(legacy_id)
 
     def _add_delay(self, msg: Message, when: Optional[datetime]):
         if when:
@@ -110,16 +111,23 @@ class MessageMaker(BaseSender):
         muc = getattr(self, "muc", None)
 
         if entity := reply_to.author:
-            if isinstance(entity, GatewayUser):
+            if entity == "user" or isinstance(entity, GatewayUser):
+                if isinstance(entity, GatewayUser):
+                    warnings.warn(
+                        "Using a GatewayUser as the author of a "
+                        "MessageReference is deprecated. Use the string 'user' "
+                        "instead.",
+                        DeprecationWarning,
+                    )
                 if muc:
                     jid = copy(muc.jid)
                     jid.resource = fallback_nick = muc.user_nick
                     msg["reply"]["to"] = jid
                 else:
-                    msg["reply"]["to"] = entity.jid
+                    msg["reply"]["to"] = self.session.user_jid
                     # TODO: here we should use preferably use the PEP nick of the user
                     # (but it doesn't matter much)
-                    fallback_nick = entity.jid.local
+                    fallback_nick = self.session.user_jid.local
             else:
                 if muc:
                     if hasattr(entity, "muc"):

slidge/core/mixins/presence.py

@@ -5,7 +5,7 @@ from typing import Optional
 
 from slixmpp.types import PresenceShows, PresenceTypes
 
-from ...util.sql import CachedPresence, db
+from ...util.types import CachedPresence
 from .. import config
 from .base import BaseSender
 
@@ -19,9 +19,12 @@ _FRIEND_REQUEST_PRESENCES = {"subscribe", "unsubscribe", "subscribed", "unsubscr
 
 class PresenceMixin(BaseSender):
     _ONLY_SEND_PRESENCE_CHANGES = False
+    contact_pk: Optional[int]
 
     def __init__(self, *a, **k):
         super().__init__(*a, **k)
+        # FIXME: this should not be an attribute of this mixin to allow garbage
+        #        collection of instances
         self.__update_last_seen_fallback_task: Optional[Task] = None
 
     async def __update_last_seen_fallback(self):
@@ -29,10 +32,16 @@ class PresenceMixin(BaseSender):
         self.send_last_presence(force=True, no_cache_online=False)
 
     def _get_last_presence(self) -> Optional[CachedPresence]:
-        return db.presence_get(self.jid, self.user)
+        # TODO: use contact PK instead of JID
+        if self.contact_pk is None:
+            return None
+        return self.xmpp.store.contacts.get_presence(self.contact_pk)
 
     def _store_last_presence(self, new: CachedPresence):
-        return db.presence_store(self.jid, new, self.user)
+        # TODO: use contact PK instead of JID
+        if self.contact_pk is None:
+            return
+        self.xmpp.store.contacts.set_presence(self.contact_pk, new)
 
     def _make_presence(
         self,
@@ -55,7 +64,8 @@ class PresenceMixin(BaseSender):
             )
             if old != new:
                 if hasattr(self, "muc") and ptype == "unavailable":
-                    db.presence_delete(self.jid, self.user)
+                    if self.contact_pk is not None:
+                        self.xmpp.store.contacts.reset_presence(self.contact_pk)
                 else:
                     self._store_last_presence(new)
             if old and not force and self._ONLY_SEND_PRESENCE_CHANGES:

slidge/core/pubsub.py

@@ -1,12 +1,8 @@
-import hashlib
-import io
 import logging
 from copy import copy
 from pathlib import Path
-from typing import TYPE_CHECKING, Optional, Type, Union
+from typing import TYPE_CHECKING, Optional, Union
 
-from PIL import Image, UnidentifiedImageError
-from PIL.Image import Image as PILImage
 from slixmpp import (
     JID,
     CoroutineCallback,
@@ -26,10 +22,8 @@ from slixmpp.types import JidStr, OptJidStr
 
 from ..contact.contact import LegacyContact
 from ..contact.roster import ContactIsUser
-from ..util.db import GatewayUser, user_store
-from ..util.sql import db
-from ..util.types import AvatarType, LegacyFileIdType, PepItemType
-from .cache import CachedAvatar, avatar_cache
+from ..db.avatar import CachedAvatar, avatar_cache
+from ..db.store import ContactStore, SlidgeStore
 from .mixins.lock import NamedLockMixin
 
 if TYPE_CHECKING:
@@ -39,19 +33,15 @@ VCARD4_NAMESPACE = "urn:xmpp:vcard4"
 
 
 class PepItem:
-    @staticmethod
-    def from_db(jid: JID, user: Optional[GatewayUser] = None) -> Optional["PepItem"]:
-        raise NotImplementedError
-
-    def to_db(self, jid: JID, user: Optional[GatewayUser] = None):
-        raise NotImplementedError
+    pass
 
 
 class PepAvatar(PepItem):
-    def __init__(self, jid: JID):
+    store: SlidgeStore
+
+    def __init__(self):
         self.metadata: Optional[AvatarMetadata] = None
         self.id: Optional[str] = None
-        self.jid = jid
         self._avatar_data_path: Optional[Path] = None
 
     @property
@@ -62,63 +52,7 @@ class PepAvatar(PepItem):
         data.set_value(self._avatar_data_path.read_bytes())
         return data
 
-    @staticmethod
-    def _sha(b: bytes):
-        return hashlib.sha1(b).hexdigest()
-
-    def _get_weak_unique_id(self, avatar: AvatarType):
-        if isinstance(avatar, str):
-            return avatar  # url
-        elif isinstance(avatar, bytes):
-            return self._sha(avatar)
-        elif isinstance(avatar, Path):
-            return self._sha(avatar.read_bytes())
-
-    @staticmethod
-    async def _get_image(avatar: AvatarType) -> PILImage:
-        if isinstance(avatar, str):
-            # async with aiohttp.ClientSession() as session:
-            async with avatar_cache.http.get(avatar) as response:
-                return Image.open(io.BytesIO(await response.read()))
-        elif isinstance(avatar, bytes):
-            return Image.open(io.BytesIO(avatar))
-        elif isinstance(avatar, Path):
-            return Image.open(avatar)
-        else:
-            raise TypeError("Avatar must be bytes, a Path or a str (URL)", avatar)
-
-    async def set_avatar(
-        self, avatar: AvatarType, unique_id: Optional[LegacyFileIdType] = None
-    ):
-        if unique_id is None:
-            if isinstance(avatar, str):
-                await self._set_avatar_from_url_alone(avatar)
-                return
-            unique_id = self._get_weak_unique_id(avatar)
-
-        await self._set_avatar_from_unique_id(avatar, unique_id)
-
-    async def _set_avatar_from_unique_id(
-        self, avatar: AvatarType, unique_id: LegacyFileIdType
-    ):
-        cached_avatar = avatar_cache.get(unique_id)
-        if cached_avatar:
-            # this shouldn't be necessary but here to re-use avatars downloaded
-            # before the change introducing the JID to unique ID mapping
-            avatar_cache.store_jid(self.jid, unique_id)
-        else:
-            img = await self._get_image(avatar)
-            cached_avatar = await avatar_cache.convert_and_store(
-                img, unique_id, self.jid
-            )
-
-        self._set_avatar_from_cache(cached_avatar)
-
-    async def _set_avatar_from_url_alone(self, url: str):
-        cached_avatar = await avatar_cache.get_avatar_from_url_alone(url, self.jid)
-        self._set_avatar_from_cache(cached_avatar)
-
-    def _set_avatar_from_cache(self, cached_avatar: CachedAvatar):
+    def set_avatar_from_cache(self, cached_avatar: CachedAvatar):
         metadata = AvatarMetadata()
         self.id = cached_avatar.hash
         metadata.add_info(
@@ -131,31 +65,10 @@ class PepAvatar(PepItem):
         self.metadata = metadata
         self._avatar_data_path = cached_avatar.path
 
-    @staticmethod
-    def from_db(jid: JID, user: Optional[GatewayUser] = None) -> Optional["PepAvatar"]:
-        cached_id = db.avatar_get(jid)
-        if cached_id is None:
-            return None
-        item = PepAvatar(jid)
-        cached_avatar = avatar_cache.get(cached_id)
-        if cached_avatar is None:
-            raise XMPPError("internal-server-error")
-        item._set_avatar_from_cache(cached_avatar)
-        return item
-
-    def to_db(self, jid: JID, user=None):
-        cached_id = avatar_cache.get_cached_id_for(jid)
-        if cached_id is None:
-            log.warning("Could not store avatar for %s", jid)
-            return
-        db.avatar_store(jid, cached_id)
-
-    @staticmethod
-    def remove_from_db(jid: JID):
-        db.avatar_delete(jid)
-
 
 class PepNick(PepItem):
+    contact_store: ContactStore
+
     def __init__(self, nick: Optional[str] = None):
         nickname = UserNick()
         if nick is not None:
@@ -163,20 +76,6 @@ class PepNick(PepItem):
         self.nick = nickname
         self.__nick_str = nick
 
-    @staticmethod
-    def from_db(jid: JID, user: Optional[GatewayUser] = None) -> Optional["PepNick"]:
-        if user is None:
-            raise XMPPError("not-allowed")
-        nick = db.nick_get(jid, user)
-        if nick is None:
-            return None
-        return PepNick(nick)
-
-    def to_db(self, jid: JID, user: Optional[GatewayUser] = None):
-        if user is None:
-            raise XMPPError("not-allowed")
-        db.nick_store(jid, str(self.__nick_str), user)
-
 
 class PubSubComponent(NamedLockMixin, BasePlugin):
     xmpp: "BaseGateway"
@@ -186,7 +85,6 @@ class PubSubComponent(NamedLockMixin, BasePlugin):
     dependencies = {
         "xep_0030",
         "xep_0060",
-        # "xep_0084",
         "xep_0115",
         "xep_0163",
     }
@@ -276,7 +174,7 @@ class PubSubComponent(NamedLockMixin, BasePlugin):
             else:
                 if pep_avatar.metadata is None:
                     raise XMPPError("internal-server-error", "Avatar but no metadata?")
-                await self._broadcast(
+                await self.broadcast(
                     data=pep_avatar.metadata,
                     from_=p.get_to(),
                     to=from_,
@@ -288,7 +186,7 @@ class PubSubComponent(NamedLockMixin, BasePlugin):
             except XMPPError:
                 pass
             else:
-                await self._broadcast(data=pep_nick.nick, from_=p.get_to(), to=from_)
+                await self.broadcast(data=pep_nick.nick, from_=p.get_to(), to=from_)
 
         if VCARD4_NAMESPACE + "+notify" in features:
             await self.broadcast_vcard_event(p.get_to(), to=from_)
@@ -303,7 +201,7 @@ class PubSubComponent(NamedLockMixin, BasePlugin):
         # but movim expects it to be here, and I guess
 
         log.debug("Broadcast vcard4 event: %s", vcard)
-        await self._broadcast(
+        await self.broadcast(
             data=vcard,
             from_=JID(from_).bare,
             to=to,
@@ -311,26 +209,34 @@ class PubSubComponent(NamedLockMixin, BasePlugin):
             node=VCARD4_NAMESPACE,
         )
 
-    async def _get_authorized_item(
-        self, cls: Type[PepItemType], stanza: Union[Iq, Presence]
-    ) -> PepItemType:
-        sto = stanza.get_to()
-        user = user_store.get_by_jid(stanza.get_from())
-        item = cls.from_db(sto, user)
-        if item is None:
-            raise XMPPError("item-not-found")
-
-        if sto != self.xmpp.boundjid.bare:
-            session = self.xmpp.get_session_from_stanza(stanza)
-            await session.contacts.by_jid(sto)
-
-        return item  # type:ignore
-
     async def _get_authorized_avatar(self, stanza: Union[Iq, Presence]) -> PepAvatar:
-        return await self._get_authorized_item(PepAvatar, stanza)
+        if stanza.get_to() == self.xmpp.boundjid.bare:
+            item = PepAvatar()
+            item.set_avatar_from_cache(avatar_cache.get_by_pk(self.xmpp.avatar_pk))
+            return item
+
+        session = self.xmpp.get_session_from_stanza(stanza)
+        entity = await session.get_contact_or_group_or_participant(stanza.get_to())
+
+        item = PepAvatar()
+        avatar_id = entity.avatar_id
+        if avatar_id is not None:
+            stored = avatar_cache.get(str(avatar_id))
+            assert stored is not None
+            item.set_avatar_from_cache(stored)
+        return item
 
     async def _get_authorized_nick(self, stanza: Union[Iq, Presence]) -> PepNick:
-        return await self._get_authorized_item(PepNick, stanza)
+        if stanza.get_to() == self.xmpp.boundjid.bare:
+            return PepNick(self.xmpp.COMPONENT_NAME)
+
+        session = self.xmpp.get_session_from_stanza(stanza)
+        entity = await session.contacts.by_jid(stanza.get_to())
+
+        if entity.name is not None:
+            return PepNick(entity.name)
+        else:
+            return PepNick()
 
     async def _get_avatar_data(self, iq: Iq):
         pep_avatar = await self._get_authorized_avatar(iq)
@@ -372,10 +278,6 @@ class PubSubComponent(NamedLockMixin, BasePlugin):
             raise XMPPError("item-not-found")
         self._reply_with_payload(iq, vcard, "current", VCARD4_NAMESPACE)
 
-    @staticmethod
-    def get_avatar(jid: JID):
-        return PepAvatar.from_db(jid)
-
     @staticmethod
     def _reply_with_payload(
         iq: Iq,
@@ -394,7 +296,7 @@ class PubSubComponent(NamedLockMixin, BasePlugin):
         result["pubsub"]["items"].append(item)
         result.send()
 
-    async def _broadcast(self, data, from_: JidStr, to: OptJidStr = None, **kwargs):
+    async def broadcast(self, data, from_: JidStr, to: OptJidStr = None, **kwargs):
         from_ = JID(from_)
         if from_ != self.xmpp.boundjid.bare and to is not None:
             to = JID(to)
@@ -428,97 +330,37 @@ class PubSubComponent(NamedLockMixin, BasePlugin):
         msg.append(event)
 
         if to is None:
-            for u in user_store.get_all():
+            for u in self.xmpp.store.users.get_all():
                 new_msg = copy(msg)
-                new_msg.set_to(u.bare_jid)
+                new_msg.set_to(u.jid.bare)
                 new_msg.send()
         else:
             msg.set_to(to)
             msg.send()
 
-    async def set_avatar(
-        self,
-        jid: JidStr,
-        avatar: Optional[AvatarType] = None,
-        broadcast_to: OptJidStr = None,
-        unique_id=None,
-        broadcast=True,
-    ):
-        jid = JID(jid)
-        if avatar is None:
-            PepAvatar.remove_from_db(jid)
-            await self._broadcast(AvatarMetadata(), jid, broadcast_to)
-            avatar_cache.delete_jid(jid)
-        else:
-            pep_avatar = PepAvatar(jid)
-            try:
-                await pep_avatar.set_avatar(avatar, unique_id)
-            except (UnidentifiedImageError, FileNotFoundError) as e:
-                log.warning("Failed to set avatar for %s: %r", self, e)
-                return
-            pep_avatar.to_db(jid)
-            if pep_avatar.metadata is None:
-                raise RuntimeError
-            if not broadcast:
-                return
-            await self._broadcast(
-                pep_avatar.metadata,
-                jid,
-                broadcast_to,
-                id=pep_avatar.metadata["info"]["id"],
-            )
-
-    async def set_avatar_from_cache(
-        self, jid: JID, send_empty: bool, broadcast_to: OptJidStr = None, broadcast=True
-    ):
-        uid = avatar_cache.get_cached_id_for(jid)
-        if uid is None:
-            if not send_empty:
-                return
-            self.xmpp.loop.create_task(
-                self.set_avatar(jid, None, broadcast_to, uid, broadcast)
-            )
-            return
-        cached_avatar = avatar_cache.get(str(uid))
+    async def broadcast_avatar(
+        self, from_: JidStr, to: JidStr, cached_avatar: Optional[CachedAvatar]
+    ) -> None:
         if cached_avatar is None:
-            # should not happen but well…
-            log.warning(
-                "Something is wrong with the avatar, %s won't have an "
-                "avatar because avatar not found in cache",
-                jid,
+            await self.broadcast(AvatarMetadata(), from_, to)
+        else:
+            pep_avatar = PepAvatar()
+            pep_avatar.set_avatar_from_cache(cached_avatar)
+            assert pep_avatar.metadata is not None
+            await self.broadcast(
+                pep_avatar.metadata, from_, to, id=pep_avatar.metadata["info"]["id"]
             )
-            return
-        self.xmpp.loop.create_task(
-            self.set_avatar(jid, cached_avatar.path, broadcast_to, uid, broadcast)
-        )
 
-    def set_nick(
+    def broadcast_nick(
         self,
-        user: GatewayUser,
+        user_jid: JID,
         jid: JidStr,
         nick: Optional[str] = None,
     ):
         jid = JID(jid)
         nickname = PepNick(nick)
-        nickname.to_db(jid, user)
         log.debug("New nickname: %s", nickname.nick)
-        self.xmpp.loop.create_task(self._broadcast(nickname.nick, jid, user.bare_jid))
-
-    async def broadcast_all(self, from_: JID, to: JID):
-        """
-        Force push avatar and nick for a stored JID.
-        """
-        a = PepAvatar.from_db(from_)
-        if a:
-            if a.metadata:
-                await self._broadcast(
-                    a.metadata, from_, to, id=a.metadata["info"]["id"]
-                )
-            else:
-                log.warning("No metadata associated to this cached avatar?!")
-        n = PepNick.from_db(from_, user_store.get_by_jid(to))
-        if n:
-            await self._broadcast(n.nick, from_, to)
+        self.xmpp.loop.create_task(self.broadcast(nickname.nick, jid, user_jid.bare))
 
 
 log = logging.getLogger(__name__)