slidge 0.3.0b1__py3-none-any.whl → 0.3.0b2__py3-none-any.whl

slidge/contact/roster.py

@@ -95,6 +95,8 @@ class LegacyRoster(
         contact_jid = JID(contact_jid.bare)
         async with self.lock(("username", username)):
             legacy_id = await self.jid_username_to_legacy_id(username)
+            if legacy_id == self.user_legacy_id:
+                raise ContactIsUser
             if self.get_lock(("legacy_id", legacy_id)):
                 self.log.debug("Already updating %s via by_legacy_id()", contact_jid)
                 return await self.by_legacy_id(legacy_id)

slidge/core/dispatcher/message/message.py

@@ -415,7 +415,9 @@ class MessageContentMixin(DispatcherMixin):
         with self.xmpp.store.session() as orm:
             sticker = self.xmpp.store.bob.get_sticker(orm, cid)
         if sticker is None:
-            await self.xmpp.plugin["xep_0231"].get_bob(from_, cid)
+            await self.xmpp.plugin["xep_0231"].get_bob(
+                from_, cid, ifrom=self.xmpp.boundjid
+            )
             with self.xmpp.store.session() as orm:
                 sticker = self.xmpp.store.bob.get_sticker(orm, cid)
         assert sticker is not None

slidge/core/dispatcher/presence.py

@@ -3,6 +3,7 @@ import logging
 from slixmpp import JID, Presence
 from slixmpp.exceptions import XMPPError
 
+from ...contact.roster import ContactIsUser
 from ...util.util import merge_resources
 from ..session import BaseSession
 from .util import DispatcherMixin, exceptions_to_xmpp_errors
@@ -142,6 +143,10 @@ class PresenceHandlerMixin(DispatcherMixin):
                 contact = await session.contacts.by_jid(pto)
             except XMPPError:
                 contact = None
+            except ContactIsUser:
+                raise XMPPError(
+                    "bad-request", "Actions with yourself are not supported."
+                )
             if contact is not None:
                 await self.xmpp.pubsub.on_presence_available(p, contact)
                 return

slidge/core/mixins/avatar.py

@@ -4,7 +4,6 @@ from typing import TYPE_CHECKING, Optional
 
 from PIL import UnidentifiedImageError
 from slixmpp import JID
-from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm.exc import DetachedInstanceError
 
 from ...db.avatar import CachedAvatar, avatar_cache
@@ -124,25 +123,14 @@ class AvatarMixin(UpdateInfoMixin):
                 avatar.path.unlink()
 
         stored_avatar = None if cached_avatar is None else cached_avatar.stored
-        self.stored.avatar = stored_avatar
-
-        try:
-            self.commit(merge=True)
-        except IntegrityError as e:
-            with self.xmpp.store.session(expire_on_commit=False) as orm:
-                if orm.object_session(self.stored):
-                    self.log.debug(
-                        "Hit integrity error, attempting to fix by refreshing participants"
-                    )
-                    orm.refresh(self.stored, ["participants"])
-                else:
-                    self.log.debug(
-                        "Hit integrity error, attempting to fix by merging contact.stored"
-                    )
+        if not self._updating_info:
+            with self.xmpp.store.session() as orm:
+                with orm.no_autoflush:
                     self.stored = orm.merge(self.stored)
-                    self.stored.avatar = stored_avatar
-                orm.add(self.stored)
-                orm.commit()
+                    orm.refresh(self.stored)
+
+        self.stored.avatar = stored_avatar
+        self.commit(merge=True)
 
         self._post_avatar_update(cached_avatar)
 

slidge/core/session.py

@@ -133,8 +133,8 @@ class BaseSession(
         self.log.debug("Removing fut %s", fut)
         self.__tasks.remove(fut)
 
-    def create_task(self, coro) -> asyncio.Task:
-        task = self.xmpp.loop.create_task(coro)
+    def create_task(self, coro, name: str | None = None) -> asyncio.Task:
+        task = self.xmpp.loop.create_task(coro, name=name)
         self.__tasks.add(task)
         self.log.debug("Creating task %s", task)
         task.add_done_callback(lambda _: self.__remove_task(task))

slidge/group/room.py

@@ -3,6 +3,8 @@ import logging
 import re
 import string
 import warnings
+from asyncio import Lock
+from contextlib import asynccontextmanager
 from copy import copy
 from datetime import datetime, timedelta, timezone
 from typing import TYPE_CHECKING, AsyncIterator, Generic, Optional, Type, Union
@@ -18,7 +20,6 @@ from slixmpp.plugins.xep_0469.stanza import NS as PINNING_NS
 from slixmpp.plugins.xep_0492.stanza import NS as NOTIFY_NS
 from slixmpp.plugins.xep_0492.stanza import WhenLiteral
 from slixmpp.xmlstream import ET
-from sqlalchemy.exc import InvalidRequestError
 from sqlalchemy.orm import Session as OrmSession
 
 from ..contact.contact import LegacyContact
@@ -28,7 +29,6 @@ from ..core.mixins.disco import ChatterDiscoMixin
 from ..core.mixins.recipient import ReactionRecipientMixin, ThreadRecipientMixin
 from ..db.models import Participant, Room
 from ..util.jid_escaping import unescape_node
-from ..util.lock import NamedLockMixin
 from ..util.types import (
     HoleBound,
     LegacyGroupIdType,
@@ -56,7 +56,6 @@ class LegacyMUC(
         LegacyGroupIdType, LegacyMessageType, LegacyParticipantType, LegacyUserIdType
     ],
     AvatarMixin,
-    NamedLockMixin,
     ChatterDiscoMixin,
     ReactionRecipientMixin,
     ThreadRecipientMixin,
@@ -242,10 +241,22 @@ class LegacyMUC(
         )
         self.commit()
 
+    @asynccontextmanager
+    async def lock(self, id_: str) -> AsyncIterator[None]:
+        async with self.session.lock((self.legacy_id, id_)):
+            yield
+
+    def get_lock(self, id_: str) -> Lock | None:
+        return self.session.get_lock((self.legacy_id, id_))
+
     async def __fill_participants(self) -> None:
-        if self.participants_filled:
-            return
         async with self.lock("fill participants"):
+            with self.xmpp.store.session(expire_on_commit=False) as orm:
+                orm.add(self.stored)
+                with orm.no_autoflush:
+                    orm.refresh(self.stored, ["participants_filled"])
+            if self.participants_filled:
+                return
             parts: list[Participant] = []
             resources = set[str]()
             # During fill_participants(), self.get_participant*() methods may
@@ -261,17 +272,13 @@ class LegacyMUC(
                 resources.add(participant.stored.resource)
         with self.xmpp.store.session(expire_on_commit=False) as orm:
             orm.add(self.stored)
-            # because self.participants() is async, self.stored  may be out of sync at
-            # this point.
+            # because self.fill_participants() is async, self.stored may be stale at
+            # this point, and the only thing we want to update is the participant list
+            # and the participant_filled attribute.
             with orm.no_autoflush:
                 orm.refresh(self.stored)
-            for part in parts:
-                try:
-                    self.stored.participants.append(part)
-                except InvalidRequestError:
-                    # the participant was already stored in the DB. `part` may even
-                    # be out-of-sync, so it's fine to just ditch it.
-                    pass
+                for part in parts:
+                    orm.merge(part)
             self.stored.participants_filled = True
             orm.commit()
 
@@ -290,10 +297,14 @@ class LegacyMUC(
                 yield self.participant_from_store(db_participant)
 
     async def __fill_history(self) -> None:
-        if self.stored.history_filled:
-            self.log.debug("History has already been fetched.")
-            return
         async with self.lock("fill history"):
+            with self.xmpp.store.session(expire_on_commit=False) as orm:
+                orm.add(self.stored)
+                with orm.no_autoflush:
+                    orm.refresh(self.stored, ["history_filled"])
+            if self.stored.history_filled:
+                self.log.debug("History has already been fetched.")
+                return
             log.debug("Fetching history for %s", self)
             try:
                 before, after = self.archive.get_hole_bounds()
@@ -767,16 +778,15 @@ class LegacyMUC(
         """
         await self.session.contacts.ready
 
-        if not self.get_lock("fill participants"):
-            with self.xmpp.store.session() as orm:
-                self.stored = orm.merge(self.stored)
-                stored = (
-                    orm.query(Participant)
-                    .filter_by(contact=c.stored, room=self.stored)
-                    .one_or_none()
-                )
-                if stored is not None:
-                    return self.participant_from_store(stored=stored, contact=c)
+        with self.xmpp.store.session() as orm:
+            self.stored = orm.merge(self.stored)
+            stored = (
+                orm.query(Participant)
+                .filter_by(contact=c.stored, room=self.stored)
+                .one_or_none()
+            )
+            if stored is not None:
+                return self.participant_from_store(stored=stored, contact=c)
 
         nickname = c.name or unescape_node(c.jid.node)
 

slidge/main.py

@@ -166,10 +166,12 @@ def main(module_name: str | None = None) -> None:
             f"_{config.LEGACY_MODULE.split('.')[-1].upper()}_"
         )
         logging.debug("Env var prefix: %s", ConfigModule.ENV_VAR_PREFIX)
-        ConfigModule(plugin_config_obj).set_conf(unknown_argv)
-    else:
-        if unknown_argv:
-            raise RuntimeError("Some arguments have not been recognized", unknown_argv)
+        _, unknown_argv = ConfigModule(plugin_config_obj).set_conf(unknown_argv)
+
+    if unknown_argv:
+        logging.error(
+            f"These config options have not been recognized and ignored: {unknown_argv}"
+        )
 
     migrate()
 

slidge/util/conf.py

@@ -159,7 +159,10 @@ class ConfigModule:
                     upper = _argv_to_option_name(a)
                     opt = options_long.get(upper)
                     if opt and opt.type is bool:
-                        if _argv_to_option_name(aa) not in options_long:
+                        if (
+                            not aa.startswith("-")
+                            and _argv_to_option_name(aa) not in options_long
+                        ):
                             log.debug("Removing %s from argv", aa)
                             skip_next = True
 

{slidge-0.3.0b1.dist-info → slidge-0.3.0b2.dist-info}/METADATA

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

{slidge-0.3.0b1.dist-info → slidge-0.3.0b2.dist-info}/RECORD

@@ -1,6 +1,6 @@
 slidge/__init__.py,sha256=OWGOMz8wl6I6XNUT9ipE9IFD-OinS8zQGGn4U_z3IWw,1835
 slidge/__main__.py,sha256=ydjUklOoavS4YlGfjRX_8BQN2DaSbaXPMi47RkOgcFI,37
-slidge/main.py,sha256=Q2memNl050JJhUk-ZKHV2Q2lVpdMtoyLKupKswq-swM,7070
+slidge/main.py,sha256=bUdAau6TorsPpDRBPfzvUolHlXF5K-BY9aJdSmNUcyw,7109
 slidge/migration.py,sha256=Y_PJ9ahHwcgwP1gnGByIiUJSxTu2DYFpmNiPdOpVgoQ,1545
 slidge/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 slidge/command/__init__.py,sha256=UYf1mjCYbZ5G7PIgaFTWSQRAzEJkQ6dTH8Fu_e_XnO0,613
@@ -13,16 +13,16 @@ slidge/command/register.py,sha256=BduDI31Kx8CbWWEdjybimTA5Wcfhn-Jkt8sSPsySCpo,67
 slidge/command/user.py,sha256=VS7xuADXXes941OyiJbxC_C8d5hcqm-TSS4Gu82_8PQ,12173
 slidge/contact/__init__.py,sha256=WMMaHk7UW7YT9EH2LtPdkU0bHQaOp4ikBhbBQskmoc8,191
 slidge/contact/contact.py,sha256=AZSpBInijGXn5hP_eJQhdyCOcUnzM62h65ZliyFZWhg,19497
-slidge/contact/roster.py,sha256=TAPvaPWUn77CHt8la_BLfQRkZZJhlG-hn2wEQZbGzJ8,9706
+slidge/contact/roster.py,sha256=uZ3iCl8oa7kEpIptUVa9p1k51bSvbuQq1pUGnf_zru8,9791
 slidge/core/__init__.py,sha256=RG7Jj5JCJERjhqJ31lOLYV-7bH_oblClQD1KF9LsTXo,68
 slidge/core/config.py,sha256=1HxHQ5BOnYghi8V5KbCQ6sUsNnXzAZAIoFA5PrMqH4E,6060
 slidge/core/gateway.py,sha256=0nuWlig6K4urNowoEKCVkSvEVH46BhR70A52fH6O4AE,40956
 slidge/core/pubsub.py,sha256=-YK49tEdz_SLM3O8Y9zvu3p5KYhxgNpqbsD57rOIdNI,12141
-slidge/core/session.py,sha256=H6eZqjDYrQu5k26dCYH3GAWg-P2tdYin06aufuIrnWw,29464
+slidge/core/session.py,sha256=Rji81tCEVI5zpKtKpMIuclKvDR0XuHZRki8ivIhtNnQ,29500
 slidge/core/dispatcher/__init__.py,sha256=1EXcjXietUKlxEqdrCWCV3xZ3q_DSsjHoqWrPMbtYao,84
 slidge/core/dispatcher/caps.py,sha256=gISaHtFwFDXtkSrSsAkZfPiHQyXfmXg3v_YYU0w9iDg,2254
 slidge/core/dispatcher/disco.py,sha256=xVPyBFnnkON-JjjM1oydRa-dqnDbwAZER2MGQACRhVk,2309
-slidge/core/dispatcher/presence.py,sha256=XrcWGjIHofmAu_8QIOMsF6Wlg4_kyPukp73FPm8BwOg,6721
+slidge/core/dispatcher/presence.py,sha256=rxL2tDlH7a1NxfN_URDNFCHnjG_e-4Ke5UWMh8zXeOo,6928
 slidge/core/dispatcher/registration.py,sha256=Qa3fYZFJ4NaVz-FsnXorCmMQ9WyO7oZte1Zvro5f74E,3415
 slidge/core/dispatcher/search.py,sha256=bL5cwMOtsfnX5IH-t60S1PudpeMWZnF4-qksrKDuDyc,3411
 slidge/core/dispatcher/session_dispatcher.py,sha256=ysgPhns7NgUxhmkgEwRv-yDkSnUIXEdc-FsgqDqQAkE,3466
@@ -31,7 +31,7 @@ slidge/core/dispatcher/vcard.py,sha256=qHZZShq3Iyvgh1FkcAgGhdKXF5m1VUqeb4EWkY0cb
 slidge/core/dispatcher/message/__init__.py,sha256=gNeZZ0wtCI9JBqMe6tpumwV1TjY0mnPWTJc94uFTN-I,244
 slidge/core/dispatcher/message/chat_state.py,sha256=RbtM_nlZyvOHusZkDEP0TXA4wMp_N435490eE4wW8U0,2143
 slidge/core/dispatcher/message/marker.py,sha256=WZyf72_SM6sDGPMEOzhu93o2KbgxSxNF25jwsiM7h2A,2439
-slidge/core/dispatcher/message/message.py,sha256=IEXbgaErWk8L-xQhkUXdYlruzk7x84Q1BjltLGjFxXI,16146
+slidge/core/dispatcher/message/message.py,sha256=RK1sX4cBSvPZLiUGYoT-pdCB01ll1761Ryr7Tu0AuBc,16202
 slidge/core/dispatcher/muc/__init__.py,sha256=60YUr0i8PCZEPyNNTynJueRbbxF5pqzdyVf8z_XFXmM,290
 slidge/core/dispatcher/muc/admin.py,sha256=1tDZ9hHD6q5SqCjsYOpDimPB3Iyl21YO5RnK1goEGso,3284
 slidge/core/dispatcher/muc/mam.py,sha256=7vfmMI_mJOIrc9KCbtTibJSowhZTBBFwXWc84Ikpu3I,2994
@@ -40,7 +40,7 @@ slidge/core/dispatcher/muc/owner.py,sha256=dDAxpRaA8H_NJQNIyBNixck2oG4GHZeEQqPhK
 slidge/core/dispatcher/muc/ping.py,sha256=EgKKS9AvMnW-vINGcoGbtk6NdbN9A7zVaGfT5T7F6YE,1699
 slidge/core/mixins/__init__.py,sha256=Zea39CCwjJU5XfHwcYPEZ9Sin8z1BZxoV68G2RwC3nE,386
 slidge/core/mixins/attachment.py,sha256=f_8SZGyEAK00fzpwUWyIocPzdkSl5awPihR6_GCgdDo,21766
-slidge/core/mixins/avatar.py,sha256=x-PAbJFoMKZLoScVjIVzFuQvnJ4geXoAQrFHr5G_SOA,6113
+slidge/core/mixins/avatar.py,sha256=0E0mQxdTUcJQrYXlBkYqkNl4bYuga4cIC1s4XA2rED8,5559
 slidge/core/mixins/base.py,sha256=MOd-pas38_52VawQVlxWtBtmTKC6My9G0ZaCeQxOJbs,748
 slidge/core/mixins/db.py,sha256=a6idm-FgHWfDK-MJZWy5AkkBlyY8JmwOB8xAFmm0E9g,1934
 slidge/core/mixins/disco.py,sha256=jk3Z1B6zTuisHv8VKNRJodIo0ee5btYHh2ZrlflPj_Q,3670
@@ -62,7 +62,7 @@ slidge/group/__init__.py,sha256=yFt7cHqeaKIMN6f9ZyhhspOcJJvBtLedGv-iICG7lto,258
 slidge/group/archive.py,sha256=DKwyde15-Op2rXuQBvdSmFcAKhUyWuorpEFcRSmDHec,5956
 slidge/group/bookmarks.py,sha256=UWrUjZMWlDmwKFRuNEqxZSx4cvXFib4AP_l388ApJa8,7086
 slidge/group/participant.py,sha256=eMwUgbEtxGjWMmIqUfS8uSKlaStitZ3D68M_RixQeso,17676
-slidge/group/room.py,sha256=meASJZXRVM39SEzoLNjm0NAx6mLLa8dgA21tK828kik,47939
+slidge/group/room.py,sha256=_KP0jIh9f9k0yDRWCe7BsZBQesfm1lwbHpN9WYRKuzc,48391
 slidge/slixfix/__init__.py,sha256=LvaYZQYjr4l_45AYYpod1dB3MUaZye18vKF-4H8Bm20,4758
 slidge/slixfix/delivery_receipt.py,sha256=JmogxsiXYEbTmCM4fvC5wkQs0jBsaJtKl4j_B_18riE,1415
 slidge/slixfix/roster.py,sha256=DjjHQqCsKsPChUxV7S0Pm4IAgjfrwgm5tcTdJi3N_gY,1670
@@ -81,15 +81,15 @@ slidge/slixfix/xep_0292/__init__.py,sha256=_MvS9wGra6ig3P_dPAVlCPDJkiOFvUWGjaRsH
 slidge/slixfix/xep_0292/vcard4.py,sha256=I6EXdTQ51nfF5qvKh7WMAluELbFsdtnYHrsV_8PrjK4,366
 slidge/util/__init__.py,sha256=BELovoTMPcPPGz3D48esBr8A4BRRHXTvavfgnArBgEc,301
 slidge/util/archive_msg.py,sha256=hGNquu38ouSWSc-kz_oAYPXwjhUVZNSedIpwkrXHSd0,1826
-slidge/util/conf.py,sha256=uNDY6GdQyTZEV47ab9fi27wwRb0ZMvbuZ7Hbzfe_NT8,7269
+slidge/util/conf.py,sha256=Wv-xr1fQfz6jDCBpj2e5Nm-igMpdIjsYsVfoY8grJoo,7380
 slidge/util/jid_escaping.py,sha256=QJ2Yj_j1gTmiO9g2r187iVCu7kia_O5ABhRiLAO2TG4,1073
 slidge/util/lock.py,sha256=ZnUi3LGiz271-YeYKo9JzxovJCoSwlP9P65pNyHIO9o,1029
 slidge/util/test.py,sha256=_E6er2BtQlpyzTUmp4u8C9KhBYzbLrmTwSVgxGObKHU,13988
 slidge/util/types.py,sha256=xJ84ZvaUOU_VVJSjEMysgNSl05k0_O9YKbyW-JUrsMI,5635
 slidge/util/util.py,sha256=4hihLCl4SsB5S14TT3bP8tDPP_Zg9rYbSfLdLB9-G_Q,9332
-slidge-0.3.0b1.dist-info/licenses/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-slidge-0.3.0b1.dist-info/METADATA,sha256=6PmV4nthNFFylMq1FHcXwhSuEgN9mQ9EaeUWuGNNNl4,5056
-slidge-0.3.0b1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-slidge-0.3.0b1.dist-info/entry_points.txt,sha256=py3_x834fFJ2TEzPd18Wt2DnysdAfuVqJ5zzBrXbAZs,44
-slidge-0.3.0b1.dist-info/top_level.txt,sha256=2LRjDYHaGZ5ieCMF8xy58JIiabRMzX-MGMbCZwfE17c,7
-slidge-0.3.0b1.dist-info/RECORD,,
+slidge-0.3.0b2.dist-info/licenses/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
+slidge-0.3.0b2.dist-info/METADATA,sha256=_O_tp1b_KiJA94aoQQG0e0Nbg37mt-P7BFJY6Gn0xcg,5056
+slidge-0.3.0b2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+slidge-0.3.0b2.dist-info/entry_points.txt,sha256=py3_x834fFJ2TEzPd18Wt2DnysdAfuVqJ5zzBrXbAZs,44
+slidge-0.3.0b2.dist-info/top_level.txt,sha256=2LRjDYHaGZ5ieCMF8xy58JIiabRMzX-MGMbCZwfE17c,7
+slidge-0.3.0b2.dist-info/RECORD,,