slidge 0.2.0a1__tar.gz → 0.2.0a2__tar.gz

{slidge-0.2.0a1 → slidge-0.2.0a2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: slidge
-Version: 0.2.0a1
+Version: 0.2.0a2
 Summary: XMPP bridging framework
 Home-page: https://sr.ht/~nicoco/slidge/
 License: AGPL-3.0-or-later

{slidge-0.2.0a1 → slidge-0.2.0a2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "slidge"
-version = "0.2.0alpha1"
+version = "0.2.0alpha2"
 description = "XMPP bridging framework"
 authors = ["Nicolas Cedilnik <nicoco@nicoco.fr>"]
 readme = "README.md"

{slidge-0.2.0a1 → slidge-0.2.0a2}/slidge/__version__.py

@@ -2,4 +2,4 @@ from slidge.util.util import get_version  # noqa: F401
 
 # this is modified before publish, but if someone cloned from the repo,
 # it can help
-__version__ = "0.2.0alpha1"
+__version__ = "0.2.0alpha2"

{slidge-0.2.0a1 → slidge-0.2.0a2}/slidge/contact/contact.py

@@ -120,7 +120,8 @@ class LegacyContact(
         self.xmpp = session.xmpp
         self.jid = JID(self.jid_username + "@" + self.xmpp.boundjid.bare)
         self.jid.resource = self.RESOURCE
-        self.log = logging.getLogger(f"{self.user_jid.bare}:{self.jid.bare}")
+        self.log = logging.getLogger(self.jid.bare)
+        self._set_logger_name()
         self._is_friend: bool = False
         self._added_to_roster = False
         self._caps_ver: str | None = None
@@ -136,6 +137,7 @@ class LegacyContact(
         self._is_friend = value
         if self._updating_info:
             return
+        self.__ensure_pk()
         assert self.contact_pk is not None
         self.xmpp.store.contacts.set_friend(self.contact_pk, value)
 
@@ -157,7 +159,10 @@ class LegacyContact(
 
     @property
     def participants(self) -> list["LegacyParticipant"]:
-        assert self.contact_pk is not None
+        if self.contact_pk is None:
+            return []
+
+        self.__ensure_pk()
         from ..group.participant import LegacyParticipant
 
         return [
@@ -171,8 +176,25 @@ class LegacyContact(
     def user_jid(self):
         return self.session.user_jid
 
+    def _set_logger_name(self):
+        self.log.name = f"{self.user_jid.bare}:contact:{self}"
+
     def __repr__(self):
-        return f"<Contact {self.jid.bare} - {self.name or self.legacy_id}'>"
+        return f"<Contact #{self.contact_pk} '{self.name}' ({self.legacy_id} - {self.jid.local})'>"
+
+    def __ensure_pk(self):
+        if self.contact_pk is not None:
+            return
+        with self.xmpp.store.session() as orm:
+            orm.commit()
+            stored = self.xmpp.store.contacts.get_by_legacy_id(
+                self.user_pk, str(self.legacy_id)
+            )
+            if stored is None:
+                self.log.error("Cannot find our primary key!", stack_info=True)
+                raise RuntimeError("Cannot find our primary key!")
+            self.contact_pk = stored.id
+        assert self.contact_pk is not None
 
     def __get_subscription_string(self):
         if self.is_friend:
@@ -234,6 +256,7 @@ class LegacyContact(
             and self.xmpp.MARK_ALL_MESSAGES
             and is_markable(stanza)
         ):
+            self.__ensure_pk()
             assert self.contact_pk is not None
             self.xmpp.store.contacts.add_to_sent(self.contact_pk, stanza["id"])
         stanza["to"] = self.user_jid
@@ -254,6 +277,7 @@ class LegacyContact(
         :param horizon_xmpp_id: The latest message
         :return: A list of XMPP ids or None if horizon_xmpp_id was not found
         """
+        self.__ensure_pk()
         assert self.contact_pk is not None
         return self.xmpp.store.contacts.pop_sent_up_to(self.contact_pk, horizon_xmpp_id)
 
@@ -269,6 +293,7 @@ class LegacyContact(
         if self._name == n:
             return
         self._name = n
+        self._set_logger_name()
         if self.is_friend and self.added_to_roster:
             self.xmpp.pubsub.broadcast_nick(
                 user_jid=self.user_jid, jid=self.jid.bare, nick=n
@@ -279,6 +304,7 @@ class LegacyContact(
             return
         for p in self.participants:
             p.nickname = n
+        self.__ensure_pk()
         assert self.contact_pk is not None
         self.xmpp.store.contacts.update_nick(self.contact_pk, n)
 
@@ -293,6 +319,7 @@ class LegacyContact(
         if self.contact_pk is None:
             # happens in LegacyRoster.fill(), the contact primary key is not
             # set yet, but this will eventually be called in LegacyRoster.__finish_init_contact
+            self.log.debug("Not setting avatar PK")
             return
         self.xmpp.store.contacts.set_avatar(self.contact_pk, self._avatar_pk)
         for p in self.participants:
@@ -430,7 +457,7 @@ class LegacyContact(
         """
         self.is_friend = True
         self.added_to_roster = True
-        assert self.contact_pk is not None
+        self.__ensure_pk()
         self.log.debug("Accepting friend request")
         presence = self._make_presence(ptype="subscribed", pstatus=text, bare=True)
         self._send(presence, nick=True)
@@ -554,8 +581,9 @@ class LegacyContact(
         contact.added_to_roster = stored.added_to_roster
         if (data := stored.extra_attributes) is not None:
             contact.deserialize_extra_attributes(data)
-        contact._set_avatar_from_store(stored)
         contact._caps_ver = stored.caps_ver
+        contact._set_logger_name()
+        contact._set_avatar_from_store(stored)
         return contact
 
 

{slidge-0.2.0a1 → slidge-0.2.0a2}/slidge/db/store.py

@@ -32,6 +32,7 @@ from .models import (
     XmppIdsMulti,
     XmppToLegacyEnum,
     XmppToLegacyIds,
+    participant_hats,
 )
 
 if TYPE_CHECKING:
@@ -935,6 +936,7 @@ class ParticipantStore(EngineMixin):
         with self.session() as session:
             session.execute(delete(Participant))
             session.execute(delete(Hat))
+            session.execute(delete(participant_hats))
             session.commit()
 
     def add(self, room_pk: int, nickname: str) -> int:

{slidge-0.2.0a1 → slidge-0.2.0a2}/slidge/group/room.py

@@ -131,7 +131,6 @@ class LegacyMUC(
     def __init__(self, session: "BaseSession", legacy_id: LegacyGroupIdType, jid: JID):
         self.session = session
         self.xmpp: "BaseGateway" = session.xmpp
-        self.log = logging.getLogger(f"{self.user_jid.bare}:muc:{jid}")
 
         self.legacy_id = legacy_id
         self.jid = jid
@@ -156,6 +155,8 @@ class LegacyMUC(
 
         self._n_participants: Optional[int] = None
 
+        self.log = logging.getLogger(self.jid.bare)
+        self._set_logger_name()
         super().__init__()
 
     @property
@@ -176,8 +177,11 @@ class LegacyMUC(
     def user_jid(self):
         return self.session.user_jid
 
+    def _set_logger_name(self):
+        self.log = logging.getLogger(f"{self.user_jid}:muc:{self}")
+
     def __repr__(self):
-        return f"<MUC {self.legacy_id}/{self.jid}/{self.name}>"
+        return f"<MUC #{self.pk} '{self.name}' ({self.legacy_id} - {self.jid.local})'>"
 
     @property
     def subject_date(self) -> Optional[datetime]:
@@ -287,6 +291,7 @@ class LegacyMUC(
         if self.DISCO_NAME == n:
             return
         self.DISCO_NAME = n
+        self._set_logger_name()
         self.__send_configuration_change((104,))
         if self._updating_info:
             return
@@ -1207,6 +1212,7 @@ class LegacyMUC(
             muc._user_resources = set(json.loads(stored.user_resources))
         muc._subject_setter = stored.subject_setter
         muc.archive = MessageArchive(muc.pk, session.xmpp.store.mam)
+        muc._set_logger_name()
         muc._set_avatar_from_store(stored)
         return muc