slidge 0.3.0b4__tar.gz → 0.3.1__tar.gz

{slidge-0.3.0b4 → slidge-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: slidge
-Version: 0.3.0b4
+Version: 0.3.1
 Summary: XMPP bridging framework
 Author-email: Nicolas Cedilnik <nicoco@nicoco.fr>
 License-Expression: AGPL-3.0-or-later

{slidge-0.3.0b4 → slidge-0.3.1}/slidge/__init__.py

@@ -4,7 +4,6 @@ The main slidge package.
 Contains importable classes for a minimal function :term:`Legacy Module`.
 """
 
-import sys
 import warnings
 from importlib.metadata import PackageNotFoundError, version
 from typing import Any

{slidge-0.3.0b4 → slidge-0.3.1}/slidge/command/user.py

@@ -34,8 +34,9 @@ class Search(Command):
     async def run(
         self, session: Optional[AnyBaseSession], _ifrom: JID, *args: str
     ) -> Union[Form, SearchResult, None]:
+        assert session is not None
+        await session.ready
         if args:
-            assert session is not None
             return await session.on_search(
                 {self.xmpp.SEARCH_FIELDS[0].var: " ".join(args)}
             )
@@ -70,6 +71,8 @@ class SyncContacts(Command):
     CATEGORY = CONTACTS
 
     async def run(self, session: Optional[AnyBaseSession], _ifrom, *_) -> Confirmation:
+        assert session is not None
+        await session.ready
         return Confirmation(
             prompt="Are you sure you want to sync your roster?",
             success=None,
@@ -133,6 +136,7 @@ class ListContacts(Command):
         self, session: Optional[AnyBaseSession], _ifrom: JID, *_
     ) -> TableResult:
         assert session is not None
+        await session.ready
         contacts = sorted(
             session.contacts, key=lambda c: c.name.casefold() if c.name else ""
         )
@@ -152,7 +156,7 @@ class ListGroups(Command):
 
     async def run(self, session, _ifrom, *_):
         assert session is not None
-        await session.bookmarks.fill()
+        await session.ready
         groups = sorted(session.bookmarks, key=lambda g: g.DISCO_NAME.casefold())
         return TableResult(
             description="Your groups",
@@ -201,6 +205,7 @@ class CreateGroup(Command):
 
     async def run(self, session: Optional[AnyBaseSession], _ifrom, *_):
         assert session is not None
+        await session.ready
         contacts = session.contacts.known_contacts(only_friends=True)
         return Form(
             title="Create a new group",
@@ -260,20 +265,34 @@ class Preferences(Command):
             instructions=self.HELP,
             fields=fields,
             handler=self.finish,  # type:ignore
+            handler_kwargs={"previous": current},
         )
 
     async def finish(
-        self, form_values: UserPreferences, session: Optional[AnyBaseSession], *_
+        self,
+        form_values: UserPreferences,
+        session: Optional[AnyBaseSession],
+        *_,
+        previous,
     ) -> str:
         assert session is not None
+        if previous == form_values:
+            return "No preference was changed"
+
         user = session.user
         user.preferences.update(form_values)  # type:ignore
-        if form_values["sync_avatar"]:
+        self.xmpp.store.users.update(user)
+
+        try:
+            await session.on_preferences(previous, form_values)  # type:ignore[arg-type]
+        except NotImplementedError:
+            pass
+
+        if not previous["sync_avatar"] and form_values["sync_avatar"]:
             await self.xmpp.fetch_user_avatar(session)
         else:
             user.avatar_hash = None
 
-        self.xmpp.store.users.update(user)
         return "Your preferences have been updated."
 
 
@@ -308,7 +327,7 @@ class LeaveGroup(Command):
 
     async def run(self, session, _ifrom, *_):
         assert session is not None
-        await session.bookmarks.fill()
+        await session.ready
         groups = sorted(session.bookmarks, key=lambda g: g.DISCO_NAME.casefold())
         return Form(
             title="Leave a group",

{slidge-0.3.0b4 → slidge-0.3.1}/slidge/contact/contact.py

@@ -325,6 +325,7 @@ class LegacyContact(
         email: Optional[str] = None,
         country: Optional[str] = None,
         locality: Optional[str] = None,
+        pronouns: Optional[str] = None,
     ) -> None:
         vcard = VCard4()
         vcard.add_impp(f"xmpp:{self.jid.bare}")
@@ -357,6 +358,8 @@ class LegacyContact(
             vcard.add_address(country, locality)
         elif country:
             vcard.add_address(country, locality)
+        if pronouns:
+            vcard["pronouns"]["text"] = pronouns
 
         self.stored.vcard = str(vcard)
         self.stored.vcard_fetched = True

{slidge-0.3.0b4 → slidge-0.3.1}/slidge/core/dispatcher/muc/misc.py

@@ -1,6 +1,14 @@
 import logging
 
-from slixmpp import JID, CoroutineCallback, Iq, Message, Presence, StanzaPath
+from slixmpp import (
+    JID,
+    CoroutineCallback,
+    Iq,
+    MatchXMLMask,
+    Message,
+    Presence,
+    StanzaPath,
+)
 from slixmpp.exceptions import XMPPError
 
 from ..util import DispatcherMixin, exceptions_to_xmpp_errors
@@ -23,6 +31,15 @@ class MucMiscMixin(DispatcherMixin):
         )
         xmpp.add_event_handler("groupchat_subject", self.on_groupchat_subject)
         xmpp.add_event_handler("groupchat_message_error", self.__on_group_chat_error)
+        xmpp.register_handler(
+            CoroutineCallback(
+                "muc_thread_subject",
+                MatchXMLMask(
+                    "<message xmlns='jabber:component:accept' type='groupchat'><subject/><thread/></message>"
+                ),
+                self.on_thread_subject,
+            )
+        )
 
     async def __on_group_chat_error(self, msg: Message) -> None:
         condition = msg["error"].get_condition()
@@ -43,7 +60,7 @@ class MucMiscMixin(DispatcherMixin):
             # (not sure why?), but is of no consequence
             log.debug("%s was not in the resources of %s", resource, muc)
         else:
-            log.info(
+            log.debug(
                 "Removed %s from the resources of %s because of error", resource, muc
             )
 
@@ -106,6 +123,14 @@ class MucMiscMixin(DispatcherMixin):
             )
         await muc.on_set_subject(msg["subject"])
 
+    @exceptions_to_xmpp_errors
+    async def on_thread_subject(self, msg: Message):
+        if msg["body"]:
+            return
+        session, muc, thread = await self._get_session_recipient_thread(msg)
+        assert thread is not None
+        await muc.on_set_thread_subject(thread, msg["subject"])  # type:ignore[union-attr]
+
 
 KICKABLE_ERRORS = {
     "gone",

{slidge-0.3.0b4 → slidge-0.3.1}/slidge/core/dispatcher/presence.py

@@ -4,6 +4,7 @@ from slixmpp import JID, Presence
 from slixmpp.exceptions import XMPPError
 
 from ...contact.roster import ContactIsUser
+from ...util.types import AnyBaseSession
 from ...util.util import merge_resources
 from ..session import BaseSession
 from .util import DispatcherMixin, exceptions_to_xmpp_errors
@@ -98,7 +99,7 @@ class PresenceHandlerMixin(DispatcherMixin):
             reply.send()
 
     @exceptions_to_xmpp_errors
-    async def on_presence(self, p: Presence):
+    async def on_presence(self, p: Presence) -> None:
         if p.get_plugin("muc_join", check=True):
             # handled in on_groupchat_join
             # without this early return, since we switch from and to in this
@@ -112,31 +113,8 @@ class PresenceHandlerMixin(DispatcherMixin):
 
         pto = p.get_to()
         if pto == self.xmpp.boundjid.bare:
-            session.log.debug("Received a presence from %s", p.get_from())
-            if (ptype := p.get_type()) not in _USEFUL_PRESENCES:
-                return
-            if not session.user.preferences.get("sync_presence", False):
-                session.log.debug("User does not want to sync their presence")
-                return
-            # NB: get_type() returns either a proper presence type or
-            #     a presence show if available. Weird, weird, weird slix.
-            resources = self.xmpp.roster[self.xmpp.boundjid.bare][
-                p.get_from()
-            ].resources
-            try:
-                await session.on_presence(
-                    p.get_from().resource,
-                    ptype,  # type: ignore
-                    p["status"],
-                    resources,
-                    merge_resources(resources),
-                )
-            except NotImplementedError:
-                pass
-            if p.get_type() == "available":
-                await self.xmpp.pubsub.on_presence_available(p, None)
-                for contact in session.contacts:
-                    await self.xmpp.pubsub.on_presence_available(p, contact)
+            await self._on_presence_to_component(session, p)
+            return
 
         if p.get_type() == "available":
             try:
@@ -181,6 +159,33 @@ class PresenceHandlerMixin(DispatcherMixin):
         )
         error_stanza.send()
 
+    async def _on_presence_to_component(
+        self, session: AnyBaseSession, p: Presence
+    ) -> None:
+        session.log.debug("Received a presence from %s", p.get_from())
+        if (ptype := p.get_type()) not in _USEFUL_PRESENCES:
+            return
+        if not session.user.preferences.get("sync_presence", False):
+            session.log.debug("User does not want to sync their presence")
+            return
+        # NB: get_type() returns either a proper presence type or
+        #     a presence show if available. Weird, weird, weird slix.
+        resources = self.xmpp.roster[self.xmpp.boundjid.bare][p.get_from()].resources
+        try:
+            await session.on_presence(
+                p.get_from().resource,
+                ptype,  # type: ignore
+                p["status"],
+                resources,
+                merge_resources(resources),
+            )
+        except NotImplementedError:
+            pass
+        if p.get_type() == "available":
+            await self.xmpp.pubsub.on_presence_available(p, None)
+            for contact in session.contacts:
+                await self.xmpp.pubsub.on_presence_available(p, contact)
+
 
 _USEFUL_PRESENCES = {"available", "unavailable", "away", "chat", "dnd", "xa"}
 

{slidge-0.3.0b4 → slidge-0.3.1}/slidge/core/mixins/db.py

@@ -2,7 +2,7 @@ import logging
 import typing
 from contextlib import contextmanager
 
-from ...db.models import Base, Contact, Participant, Room
+from ...db.models import Base, Contact, Room
 
 if typing.TYPE_CHECKING:
     from slidge import BaseGateway
@@ -41,13 +41,35 @@ class UpdateInfoMixin(DBMixin):
     def __init__(self, *args, **kwargs) -> None:
         super().__init__(*args, **kwargs)
         self._updating_info = False
+        self.__deserialize()
+
+    def __deserialize(self):
         if self.stored.extra_attributes is not None:
             self.deserialize_extra_attributes(self.stored.extra_attributes)
 
+    def refresh(self) -> None:
+        with self.xmpp.store.session(expire_on_commit=False) as orm:
+            orm.add(self.stored)
+            orm.refresh(self.stored)
+            self.__deserialize()
+
     def serialize_extra_attributes(self) -> dict | None:
+        """
+        If you want custom attributes of your instance to be stored persistently
+        to the DB, here is where you have to return them as a dict to be used in
+        `deserialize_extra_attributes()`.
+
+        """
         return None
 
     def deserialize_extra_attributes(self, data: dict) -> None:
+        """
+        This is where you get the dict that you passed in
+        `serialize_extra_attributes()`.
+
+        ⚠ Since it is serialized as json, dictionary keys are converted to strings!
+        Be sure to convert to other types if necessary.
+        """
         pass
 
     @contextmanager

{slidge-0.3.0b4 → slidge-0.3.1}/slidge/core/mixins/message_maker.py

@@ -1,7 +1,7 @@
+import uuid
 import warnings
 from datetime import datetime, timezone
 from typing import TYPE_CHECKING, Iterable, Optional, cast
-from uuid import uuid4
 
 from slixmpp import JID, Message
 from slixmpp.types import MessageTypes
@@ -95,7 +95,7 @@ class MessageMaker(BaseSender):
                 msg["stanza_id"]["id"] = i
                 msg["stanza_id"]["by"] = self.muc.jid  # type: ignore
         elif self.USE_STANZA_ID:
-            msg["stanza_id"]["id"] = str(uuid4())
+            msg["stanza_id"]["id"] = str(uuid.uuid4())
             msg["stanza_id"]["by"] = self.muc.jid  # type: ignore
 
     def _legacy_to_xmpp(self, legacy_id: LegacyMessageType) -> str:

{slidge-0.3.0b4 → slidge-0.3.1}/slidge/core/mixins/presence.py

@@ -279,9 +279,9 @@ class PresenceMixin(BaseSender, DBMixin):
             pass
 
 
-def get_last_seen_fallback(last_seen: datetime):
+def get_last_seen_fallback(last_seen: datetime) -> tuple[str, bool]:
     now = datetime.now(tz=timezone.utc)
     if now - last_seen < timedelta(days=7):
-        return f"Last seen {last_seen:%A %H:%M GMT}", True
+        return f"Last seen {last_seen:%A %H:%M %p GMT}", True
     else:
         return f"Last seen {last_seen:%b %-d %Y}", False

{slidge-0.3.0b4 → slidge-0.3.1}/slidge/core/pubsub.py

@@ -120,7 +120,7 @@ class PubSubComponent(NamedLockMixin, BasePlugin):
                 try:
                     iq = await self.xmpp.plugin["xep_0030"].get_info(from_)
                 except (IqError, IqTimeout):
-                    log.debug("Could get disco#info of %s, ignoring", from_)
+                    log.debug("Could not get disco#info of %s, ignoring", from_)
                     return []
             info = iq["disco_info"]
         return info["features"]

{slidge-0.3.0b4 → slidge-0.3.1}/slidge/core/session.py

@@ -539,6 +539,17 @@ class BaseSession(
         """
         raise NotImplementedError
 
+    async def on_preferences(
+        self, previous: dict[str, Any], new: dict[str, Any]
+    ) -> None:
+        """
+        This is called when the user updates their preferences.
+
+        Override this if you need set custom preferences field and need to trigger
+        something when a preference has changed.
+        """
+        raise NotImplementedError
+
     def __reset_ready(self) -> None:
         self.ready = self.xmpp.loop.create_future()
 

{slidge-0.3.0b4 → slidge-0.3.1}/slidge/group/archive.py

@@ -181,6 +181,9 @@ def archivable(msg: Message) -> bool:
     if msg.get_plugin("displayed", check=True):
         return True
 
+    if msg["thread"] and msg["subject"]:
+        return True
+
     return False
 
 

{slidge-0.3.0b4 → slidge-0.3.1}/slidge/group/participant.py

@@ -22,6 +22,7 @@ from ..util.types import (
     CachedPresence,
     Hat,
     LegacyMessageType,
+    LegacyThreadType,
     MessageOrPresenceTypeVar,
     MucAffiliation,
     MucRole,
@@ -526,6 +527,24 @@ class LegacyParticipant(
             msg.xml.append(ET.Element(f"{{{msg.namespace}}}subject"))
         self._send(msg, full_jid)
 
+    def set_thread_subject(
+        self,
+        thread: LegacyThreadType,
+        subject: str | None,
+        when: Optional[datetime] = None,
+    ) -> None:
+        msg = self._make_message()
+        msg["thread"] = str(thread)
+        if when is not None:
+            msg["delay"].set_stamp(when)
+            msg["delay"]["from"] = self.muc.jid
+        if subject:
+            msg["subject"] = subject
+        else:
+            # may be simplified if slixmpp lets it do it more easily some day
+            msg.xml.append(ET.Element(f"{{{msg.namespace}}}subject"))
+        self._send(msg)
+
 
 def escape_nickname(muc_jid: JID, nickname: str) -> tuple[str, JID]:
     nickname = nickname_no_illegal = strip_illegal_chars(nickname)

{slidge-0.3.0b4 → slidge-0.3.1}/slidge/group/room.py

@@ -43,6 +43,7 @@ from ..util.types import (
     LegacyGroupIdType,
     LegacyMessageType,
     LegacyParticipantType,
+    LegacyThreadType,
     LegacyUserIdType,
     Mention,
     MucAffiliation,
@@ -1335,6 +1336,17 @@ class LegacyMUC(
         """
         raise NotImplementedError
 
+    async def on_set_thread_subject(
+        self, thread: LegacyThreadType, subject: str
+    ) -> None:
+        """
+        Triggered when the user requests changing the subject of a specific thread.
+
+        :param thread: Legacy identifier of the thread
+        :param subject: The new subject for this thread.
+        """
+        raise NotImplementedError
+
     @property
     def participants_filled(self) -> bool:
         return self.stored.participants_filled

slidge-0.3.1/slidge/slixfix/xep_0292/vcard4.py

@@ -0,0 +1,24 @@
+from slixmpp import register_stanza_plugin, __version_info__
+from slixmpp.plugins.base import BasePlugin, register_plugin
+from slixmpp.plugins.xep_0292.stanza import NS, _VCardTextElementBase, VCard4
+
+
+class VCard4Provider(BasePlugin):
+    name = "xep_0292_provider"
+    description = "VCard4 Provider"
+    dependencies = {"xep_0030"}
+
+    def plugin_init(self) -> None:
+        self.xmpp.plugin["xep_0030"].add_feature(NS)
+
+
+
+
+register_plugin(VCard4Provider)
+
+
+if __version_info__[0] <= 1 and __version_info__[1] <= 11:
+    class Pronouns(_VCardTextElementBase):
+        name = plugin_attrib = "pronouns"
+
+    register_stanza_plugin(VCard4, Pronouns)

{slidge-0.3.0b4 → slidge-0.3.1}/slidge.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: slidge
-Version: 0.3.0b4
+Version: 0.3.1
 Summary: XMPP bridging framework
 Author-email: Nicolas Cedilnik <nicoco@nicoco.fr>
 License-Expression: AGPL-3.0-or-later

{slidge-0.3.0b4 → slidge-0.3.1}/slidge.egg-info/SOURCES.txt

@@ -164,11 +164,11 @@ tests/test_avatar.py
 tests/test_backfill.py
 tests/test_chat_commands.py
 tests/test_config.py
-tests/test_empty_subject.py
 tests/test_feature_restriction.py
 tests/test_mam_archivable.py
 tests/test_mds.py
 tests/test_muc.py
+tests/test_muc_subject.py
 tests/test_resourceprep.py
 tests/test_session.py
 tests/test_session_2.py

{slidge-0.3.0b4 → slidge-0.3.1}/tests/test_avatar.py

@@ -205,7 +205,7 @@ class BaseMUC(BaseNoMUC):
 
     def setUp(self):
         self.patch = unittest.mock.patch(
-            "slidge.core.mixins.message_maker.uuid4", return_value="uuid4"
+            "uuid.uuid4", return_value="uuid4"
         )
         self.patch.start()
         super().setUp()

{slidge-0.3.0b4 → slidge-0.3.1}/tests/test_muc.py

@@ -268,9 +268,6 @@ class Base(ClearSessionMixin, SlidgeTest):
         cls.patches = [
             unittest.mock.patch("uuid.uuid4", return_value="uuid"),
             unittest.mock.patch("slidge.group.room.uuid4", return_value="uuid"),
-            unittest.mock.patch(
-                "slidge.core.mixins.message_maker.uuid4", return_value="uuid"
-            ),
         ]
         for p in cls.patches:
             p.start()
@@ -2903,7 +2900,7 @@ class TestMuc(Base):
                       from="room-private@aim.shakespeare.lit/firstwitch"
                       to="romeo@montague.lit/movim">
               <show>away</show>
-              <status>blabla -- Last seen {last_seen:%A %H:%M GMT}</status>
+              <status>blabla -- Last seen {last_seen:%A %H:%M %p GMT}</status>
               <idle xmlns="urn:xmpp:idle:1"
                     since="{dt}" />
               <x xmlns="http://jabber.org/protocol/muc#user">
@@ -2922,7 +2919,7 @@ class TestMuc(Base):
                       from="firstwitch@aim.shakespeare.lit/slidge"
                       to="romeo@montague.lit">
               <show>away</show>
-              <status>blabla -- Last seen {last_seen:%A %H:%M GMT}</status>
+              <status>blabla -- Last seen {last_seen:%A %H:%M %p GMT}</status>
               <idle xmlns="urn:xmpp:idle:1"
                     since="{dt}" />
               <c xmlns="http://jabber.org/protocol/caps"

slidge-0.3.0b4/tests/test_empty_subject.py → slidge-0.3.1/tests/test_muc_subject.py

@@ -40,7 +40,7 @@ class MUC(LegacyMUC):
         self.type = MucType.GROUP
 
 @pytest.mark.usefixtures("avatar")
-class TestEmptySubject(AvatarFixtureMixin, SlidgeTest):
+class TestMUCSubject(AvatarFixtureMixin, SlidgeTest):
     plugin = globals()
     xmpp: Gateway
 
@@ -97,7 +97,7 @@ class TestEmptySubject(AvatarFixtureMixin, SlidgeTest):
 
     def test_empty_subject(self):
         muc = self.run_coro(self.romeo_session.bookmarks.by_legacy_id("group"))
-        with unittest.mock.patch("slidge.core.mixins.message_maker.uuid4", return_value="uuid"), unittest.mock.patch("uuid.uuid4", return_value="uuid"):
+        with unittest.mock.patch("uuid.uuid4", return_value="uuid"):
             self.recv(  # language=XML
                 f"""
             <presence from="romeo@montague.lit/movim"
@@ -137,3 +137,71 @@ class TestEmptySubject(AvatarFixtureMixin, SlidgeTest):
             """,
             use_values=False,
             )
+
+    def test_set_thread_subject(self):
+        muc: MUC = self.run_coro(self.romeo_session.bookmarks.by_legacy_id("group"))
+        muc.add_user_resource("movim")
+        with unittest.mock.patch("uuid.uuid4", return_value="uuid"):
+            juliet_participant = self.run_coro(muc.get_participant("juliet"))
+            juliet_participant.set_thread_subject("legacy-thread-id", "some-subject")
+            self.send(  # language=XML
+                """
+            <message xmlns="jabber:component:accept"
+                     type="groupchat"
+                     from="group@aim.shakespeare.lit/juliet"
+                     to="romeo@montague.lit/movim">
+              <stanza-id xmlns="urn:xmpp:sid:0"
+                         id="uuid"
+                         by="group@aim.shakespeare.lit" />
+              <thread>legacy-thread-id</thread>
+              <subject>some-subject</subject>
+              <occupant-id xmlns="urn:xmpp:occupant-id:0"
+                           id="uuid" />
+            </message>
+            """
+            )
+
+    def test_user_set_thread_subject(self):
+        muc: MUC = self.run_coro(self.romeo_session.bookmarks.by_legacy_id("group"))
+        muc.add_user_resource("movim")
+        with unittest.mock.patch("slidge.group.room.LegacyMUC.on_set_subject") as on_set_subject, unittest.mock.patch("slidge.group.room.LegacyMUC.on_set_thread_subject") as on_set_thread_subject:
+            self.recv(  # language=XML
+                """
+            <message xmlns="jabber:component:accept"
+                     type="groupchat"
+                     from="romeo@montague.lit/movim"
+                     to="group@aim.shakespeare.lit">
+              <stanza-id xmlns="urn:xmpp:sid:0"
+                         id="uuid"
+                         by="group@aim.shakespeare.lit" />
+              <thread>thread-id</thread>
+              <subject>some-subject</subject>
+              <occupant-id xmlns="urn:xmpp:occupant-id:0"
+                           id="uuid" />
+            </message>
+            """
+            )
+            on_set_subject.assert_not_called()
+            on_set_thread_subject.assert_awaited_once()
+            assert on_set_thread_subject.call_args[0] == ("thread-id", "some-subject")
+
+        with unittest.mock.patch("slidge.group.room.LegacyMUC.on_set_subject") as on_set_subject, unittest.mock.patch("slidge.group.room.LegacyMUC.on_set_thread_subject") as on_set_thread_subject:
+            self.recv(  # language=XML
+                """
+            <message xmlns="jabber:component:accept"
+                     type="groupchat"
+                     from="romeo@montague.lit/movim"
+                     to="group@aim.shakespeare.lit">
+              <stanza-id xmlns="urn:xmpp:sid:0"
+                         id="uuid"
+                         by="group@aim.shakespeare.lit" />
+              <thread>thread-id</thread>
+              <subject>some-subject</subject>
+              <body>some-body</body>
+              <occupant-id xmlns="urn:xmpp:occupant-id:0"
+                           id="uuid" />
+            </message>
+            """
+            )
+            on_set_subject.assert_not_called()
+            on_set_thread_subject.assert_not_called()

{slidge-0.3.0b4 → slidge-0.3.1}/tests/test_session_2.py

@@ -639,7 +639,7 @@ class TestSession2(AvatarFixtureMixin, SlidgeTest):
             """,
             use_values=False,
         )
-        with unittest.mock.patch("slidge.core.mixins.message_maker.uuid4", return_value="uuid"):
+        with unittest.mock.patch("uuid.uuid4", return_value="uuid"):
             part.react("msg-id", "♥")
             self.send(  # language=XML
                 """

{slidge-0.3.0b4 → slidge-0.3.1}/tests/test_shakespeare.py

@@ -1639,7 +1639,7 @@ class TestContact(ClearSessionMixin, SlidgeTest):
         juliet.away(status="Bye bye", last_seen=now)
 
         p = self.next_sent()
-        assert p["status"] == f"Bye bye -- Last seen {now:%A %H:%M GMT}"
+        assert p["status"] == f"Bye bye -- Last seen {now:%A %H:%M %p GMT}"
         assert p["idle"]["since"] == now
         assert p["show"] == "away"
 
@@ -1651,7 +1651,7 @@ class TestContact(ClearSessionMixin, SlidgeTest):
 
         juliet.busy(last_seen=now)
         p = self.next_sent()
-        assert p["status"] == f"Last seen {now:%A %H:%M GMT}"
+        assert p["status"] == f"Last seen {now:%A %H:%M %p GMT}"
         assert p["idle"]["since"] == now
         assert p["show"] == "dnd"