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

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
@@ -19,7 +21,6 @@ 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.orm import Session as OrmSession
-from sqlalchemy.orm.exc import DetachedInstanceError
 
 from ..contact.contact import LegacyContact
 from ..contact.roster import ContactIsUser
@@ -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,53 +241,46 @@ 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] = set()
+            resources = set[str]()
+            # During fill_participants(), self.get_participant*() methods may
+            # return a participant with a conflicting nick/resource.
             async for participant in self.fill_participants():
-                if participant.stored.id is not None:
+                if participant.stored.resource in resources:
+                    self.log.warning(
+                        "Participant '%s' was yielded more than once by fill_participants()",
+                        participant.stored.resource,
+                    )
                     continue
-                # During fill_participants(), self.get_participant*() methods may
-                # return a participant with a conflicting nick/resource. There is
-                # a better way to fix this than the logic below, but this better way
-                # has not been found yet.
-                if participant.jid.resource in resources:
-                    if participant.contact is None:
-                        self.log.warning(
-                            "Ditching participant %s", participant.nickname
-                        )
-                        del participant
-                        continue
-                    else:
-                        nickname = (
-                            f"{participant.nickname} ({participant.contact.jid.node})"
-                        )
-                        participant = self._participant_cls(
-                            self,
-                            Participant(nickname=nickname, room=self.stored),
-                            contact=participant.contact,
-                        )
-                resources.add(participant.jid.resource)
                 parts.append(participant.stored)
+                resources.add(participant.stored.resource)
         with self.xmpp.store.session(expire_on_commit=False) as orm:
-            # FIXME: something must be wrong with all these refreshes and merge,
-            #        but I did not manage to get rid of them without getting various
-            #        sqlalchemy exceptions raised everywhere
             orm.add(self.stored)
-            orm.refresh(self.stored)
-            known = {p.resource for p in self.stored.participants}
+            # 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:
+                    orm.merge(part)
             self.stored.participants_filled = True
-            for part in parts:
-                if part.resource in known:
-                    continue
-                part = orm.merge(part)
-                orm.add(part)
-                self.stored.participants.append(part)
             orm.commit()
-            orm.refresh(self.stored)
 
     async def get_participants(
         self, affiliation: Optional[MucAffiliation] = None
@@ -305,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()
@@ -642,6 +638,10 @@ class LegacyMUC(
 
         if user_participant is None:
             user_participant = await self.get_user_participant()
+            with self.xmpp.store.session() as orm:
+                orm.add(self.stored)
+                with orm.no_autoflush:
+                    orm.refresh(self.stored, ["participants"])
         if not user_participant.is_user:
             self.log.warning("is_user flag not set participant on user_participant")
             user_participant.is_user = True  # type:ignore
@@ -778,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/migration.py

@@ -1,16 +1,13 @@
 import logging
 import shutil
 import sys
+import traceback
 from pathlib import Path
 
 from alembic import command
 from alembic.config import Config
-from slixmpp import JID
 
 from .core import config
-from .db.meta import get_engine
-from .db.models import GatewayUser
-from .db.store import SlidgeStore
 
 
 def remove_avatar_cache_v1() -> None:
@@ -32,7 +29,15 @@ def get_alembic_cfg() -> Config:
 
 def migrate() -> None:
     remove_avatar_cache_v1()
-    command.upgrade(get_alembic_cfg(), "head")
+    try:
+        command.upgrade(get_alembic_cfg(), "head")
+    except Exception as e:
+        traceback.print_exception(e)
+        print(
+            "Something went wrong during the migration. "
+            "This is expected if you upgrade from slidge 0.2, in this case you need to start from a fresh database."
+        )
+        exit(1)
 
 
 def main() -> None:
@@ -41,6 +46,10 @@ def main() -> None:
 
     Usage: python -m slidge.migration "Revision message blah blah blah"
     """
+    dev_db = Path(".") / "dev" / "slidge.sqlite"
+    if dev_db.exists():
+        # always start from a clean state
+        dev_db.unlink()
     alembic_cfg = get_alembic_cfg()
     command.upgrade(alembic_cfg, "head")
     command.revision(alembic_cfg, sys.argv[1], autogenerate=True)

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.0a3.dist-info → slidge-0.3.0b2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: slidge
-Version: 0.3.0a3
+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.0a3.dist-info → slidge-0.3.0b2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 slidge/__init__.py,sha256=OWGOMz8wl6I6XNUT9ipE9IFD-OinS8zQGGn4U_z3IWw,1835
 slidge/__main__.py,sha256=ydjUklOoavS4YlGfjRX_8BQN2DaSbaXPMi47RkOgcFI,37
-slidge/main.py,sha256=Q2memNl050JJhUk-ZKHV2Q2lVpdMtoyLKupKswq-swM,7070
-slidge/migration.py,sha256=gq14UVm0zGP7VankizT3jy9Q9zu7hJeTYpVlInrswf8,1221
+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
 slidge/command/adhoc.py,sha256=NCHammJdl30eHniiYukYQZKp1IeI-5qv5u9NncLNSNM,10760
@@ -12,17 +12,17 @@ slidge/command/chat_command.py,sha256=r_qalygOCsEoS-OgWw8IIlAzTufhXNjduONbeoepUI
 slidge/command/register.py,sha256=BduDI31Kx8CbWWEdjybimTA5Wcfhn-Jkt8sSPsySCpo,6724
 slidge/command/user.py,sha256=VS7xuADXXes941OyiJbxC_C8d5hcqm-TSS4Gu82_8PQ,12173
 slidge/contact/__init__.py,sha256=WMMaHk7UW7YT9EH2LtPdkU0bHQaOp4ikBhbBQskmoc8,191
-slidge/contact/contact.py,sha256=ubqd3aH-TOcv5hsHGPSlDGyojQXn3wjalrO7l_LfZk8,19449
-slidge/contact/roster.py,sha256=TAPvaPWUn77CHt8la_BLfQRkZZJhlG-hn2wEQZbGzJ8,9706
+slidge/contact/contact.py,sha256=AZSpBInijGXn5hP_eJQhdyCOcUnzM62h65ZliyFZWhg,19497
+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=yQMMWQL-VTVNOecSQ18frroTd6brWbaiDqEQBUI9cAE,40931
+slidge/core/gateway.py,sha256=0nuWlig6K4urNowoEKCVkSvEVH46BhR70A52fH6O4AE,40956
 slidge/core/pubsub.py,sha256=-YK49tEdz_SLM3O8Y9zvu3p5KYhxgNpqbsD57rOIdNI,12141
-slidge/core/session.py,sha256=bVvSpLOrT7aj36gXtQV6fNZRG556V_Vc55mA_f9bEWI,29373
+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
@@ -39,8 +39,8 @@ slidge/core/dispatcher/muc/misc.py,sha256=FYo5FdmzksEuUCfCLLOOm8_8plXtZFQP8IzvzV
 slidge/core/dispatcher/muc/owner.py,sha256=dDAxpRaA8H_NJQNIyBNixck2oG4GHZeEQqPhKd7MmDQ,3359
 slidge/core/dispatcher/muc/ping.py,sha256=EgKKS9AvMnW-vINGcoGbtk6NdbN9A7zVaGfT5T7F6YE,1699
 slidge/core/mixins/__init__.py,sha256=Zea39CCwjJU5XfHwcYPEZ9Sin8z1BZxoV68G2RwC3nE,386
-slidge/core/mixins/attachment.py,sha256=kCEZzEozujHQP5Eq_Y2g3RL67dUSe0WOLIcoQ0s17pk,20632
-slidge/core/mixins/avatar.py,sha256=L6uMTHa4e9GLu3EXQWoc8Cu3k8fnSKTC2rvSDl5n1qE,5714
+slidge/core/mixins/attachment.py,sha256=f_8SZGyEAK00fzpwUWyIocPzdkSl5awPihR6_GCgdDo,21766
+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
@@ -57,35 +57,12 @@ slidge/db/store.py,sha256=shgBqGutbAeMD6T3sqH7Qo4IKs9TWwjwfH5-NDpj-kY,19399
 slidge/db/alembic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 slidge/db/alembic/env.py,sha256=hsBlRNs0zF5diSHGRSa8Fi3qRVQDA2rJdR41AEIdvxc,1642
 slidge/db/alembic/script.py.mako,sha256=MEqL-2qATlST9TAOeYgscMn1uy6HUS9NFvDgl93dMj8,635
-slidge/db/alembic/versions/0337c90c0b96_unify_legacy_xmpp_id_mappings.py,sha256=51Z7jCMEKtSeex4FUikEy2g-KQggW0kB-qxpBFKQh-0,6832
-slidge/db/alembic/versions/04cf35e3cf85_add_participant_nickname_no_illegal.py,sha256=Dwz_azOXr7Tsw7Wnj0L8mknITIPXO9ewEsRn169EUNA,904
-slidge/db/alembic/versions/09f27f098baa_add_missing_attributes_in_room.py,sha256=mUL-0Io6ZPd_QbnKfwGYyjdMcM2uxQ0Wg72H23-2t_E,1033
-slidge/db/alembic/versions/15b0bd83407a_remove_bogus_unique_constraints_on_room_.py,sha256=kzHuHGhzey5CY0p_OsKf5a-3zSk2649wqg2ToLiSD1I,2927
-slidge/db/alembic/versions/2461390c0af2_store_contacts_caps_verstring_in_db.py,sha256=CLB-kOP9Rc0FJIKDLef912L5sYkjpTIPC8fhrIdrC7k,1084
-slidge/db/alembic/versions/29f5280c61aa_store_subject_setter_in_room.py,sha256=f8TFS28CXjGhvIn41UYMoHYeODfqhKfo4O7gk-JwA1E,1134
-slidge/db/alembic/versions/2b1f45ab7379_store_room_subject_setter_by_nickname.py,sha256=CMVP2wFz6s7t57eWdSaGtck8BXzfVPJhHE5AoWi34tI,1359
-slidge/db/alembic/versions/3071e0fa69d4_add_contact_client_type.py,sha256=jCdwCOnX9VDgnqIFFHGKaPA7w87Hm9nvR1rMY0LrA30,1394
-slidge/db/alembic/versions/3231d2c623bc_add_unique_contraint_for_attachment_.py,sha256=eWO-j092aqrcYxUQwAGXNY7OMpgGi-a9zlg3Q9IB-Hk,926
-slidge/db/alembic/versions/45c24cc73c91_add_bob.py,sha256=UjMySZ5LaInyPt0KbAxx0rF4GQhZh8CwBeqHtNPdG1c,1249
-slidge/db/alembic/versions/4dbd23a3f868_new_avatar_store.py,sha256=JhT83RJfXlKu2y8iB4twtuINGfa9YKNh6jURXVedHOc,4002
-slidge/db/alembic/versions/54ce3cde350c_use_hash_for_avatar_filenames.py,sha256=aNwlpXCHI_TEnVt2w-C8OrdH02-FhgrKbZkEqt40ay4,1495
-slidge/db/alembic/versions/58b98dacf819_refactor.py,sha256=bQG57V7b0UK6of4MdDpoBNDtPQH5AYHqAkt3RL9OmaI,5001
-slidge/db/alembic/versions/5bd48bfdffa2_lift_room_legacy_id_constraint.py,sha256=m3USa76h0O2Xut-NePXIOZfkXl0bx0d5FyjOYpd34Jo,1977
-slidge/db/alembic/versions/75a62b74b239_ditch_hats_table.py,sha256=INKDe7Y5iMETpyFmwMyQm-RrnGjP9gbcC_pWKuXoi2I,2388
-slidge/db/alembic/versions/82a4af84b679_add_muc_history_filled.py,sha256=g37po0ydp8ZmzJrE5oFV7GscnploxjCtPDpw28SqVGk,1429
-slidge/db/alembic/versions/8b993243a536_add_vcard_content_to_contact_table.py,sha256=18tG8B03Kq8Qz_-mMd28Beed6jow8XNTtrz7gT5QY3g,1210
-slidge/db/alembic/versions/8d2ced764698_rely_on_db_to_store_contacts_rooms_and_.py,sha256=ikoAlRV3_BJcDcFRANF-9HTB--0xpY0C5XdGuMuW9c0,4866
-slidge/db/alembic/versions/aa9d82a7f6ef_db_creation.py,sha256=eFlfn-LiDph05yyCc8gmtJwVKzgrSHwyWJ6nuVfEpQA,1391
-slidge/db/alembic/versions/abba1ae0edb3_store_avatar_legacy_id_in_the_contact_.py,sha256=VprqEVHipYuM-ea-CIM4_ubOD5zJ9inLTbhXc869n3A,2779
-slidge/db/alembic/versions/b33993e87db3_move_everything_to_persistent_db.py,sha256=2tiRxoC9PYOQn6XQrwK0JTEsb45Pzp2PsKoZSS4rcIA,7564
-slidge/db/alembic/versions/b64b1a793483_add_source_and_legacy_id_for_archived_.py,sha256=r2sOgR5HcfueJyc3cWNDRmlZzdHOSX6nl2gef54wDbk,1559
-slidge/db/alembic/versions/c4a8ec35a0e8_per_room_user_nick.py,sha256=jjQmlRv6nqdm5q6LbwVpSUSkTBj1c76Hiq8e8q77q3g,933
-slidge/db/alembic/versions/e91195719c2c_store_users_avatars_persistently.py,sha256=8Ga3VFgKrzMs_-B8OPtfP-0rey_MFaDg-QGtSbaft3o,640
+slidge/db/alembic/versions/cef02a8b1451_initial_schema.py,sha256=D1K-flfTM9Vkk0YFzg6HbmoDyEb2u5c751aXk2YzVVg,14881
 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=6atjdHEgbfhPjPAkOVAQFFuCv5b8TO279HPHq-qpqIE,17651
-slidge/group/room.py,sha256=p6qtDVJMFFrpPzYrBob6yC2Ct_boMVUViNs5N3CJwCI,48519
+slidge/group/participant.py,sha256=eMwUgbEtxGjWMmIqUfS8uSKlaStitZ3D68M_RixQeso,17676
+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
@@ -104,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.0a3.dist-info/licenses/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-slidge-0.3.0a3.dist-info/METADATA,sha256=JxQ19ez_SI8I7ycRYJd7M107KolTsrZH3wdgFyDPBmY,5056
-slidge-0.3.0a3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-slidge-0.3.0a3.dist-info/entry_points.txt,sha256=py3_x834fFJ2TEzPd18Wt2DnysdAfuVqJ5zzBrXbAZs,44
-slidge-0.3.0a3.dist-info/top_level.txt,sha256=2LRjDYHaGZ5ieCMF8xy58JIiabRMzX-MGMbCZwfE17c,7
-slidge-0.3.0a3.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,,

slidge/db/alembic/versions/0337c90c0b96_unify_legacy_xmpp_id_mappings.py

@@ -1,183 +0,0 @@
-"""Unify legacy/XMPP id mappings
-
-Revision ID: 0337c90c0b96
-Revises: 58b98dacf819
-Create Date: 2025-04-25 20:22:47.612652
-
-"""
-
-from typing import Sequence, Union
-
-import sqlalchemy as sa
-from alembic import op
-
-# revision identifiers, used by Alembic.
-revision: str = "0337c90c0b96"
-down_revision: Union[str, None] = "58b98dacf819"
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table(
-        "direct_msg",
-        sa.Column("foreign_key", sa.Integer(), nullable=False),
-        sa.Column("id", sa.Integer(), nullable=False),
-        sa.Column("legacy_id", sa.String(), nullable=False),
-        sa.Column("xmpp_id", sa.String(), nullable=False),
-        sa.ForeignKeyConstraint(
-            ["foreign_key"],
-            ["contact.id"],
-            name=op.f("fk_direct_msg_foreign_key_contact"),
-        ),
-        sa.PrimaryKeyConstraint("id", name=op.f("pk_direct_msg")),
-    )
-    with op.batch_alter_table("direct_msg", schema=None) as batch_op:
-        batch_op.create_index(
-            "ix_direct_msg_legacy_id", ["legacy_id", "foreign_key"], unique=False
-        )
-
-    op.create_table(
-        "direct_thread",
-        sa.Column("foreign_key", sa.Integer(), nullable=False),
-        sa.Column("id", sa.Integer(), nullable=False),
-        sa.Column("legacy_id", sa.String(), nullable=False),
-        sa.Column("xmpp_id", sa.String(), nullable=False),
-        sa.ForeignKeyConstraint(
-            ["foreign_key"],
-            ["contact.id"],
-            name=op.f("fk_direct_thread_foreign_key_contact"),
-        ),
-        sa.PrimaryKeyConstraint("id", name=op.f("pk_direct_thread")),
-    )
-    with op.batch_alter_table("direct_thread", schema=None) as batch_op:
-        batch_op.create_index(
-            "ix_direct_direct_thread_id", ["legacy_id", "foreign_key"], unique=False
-        )
-
-    op.create_table(
-        "group_msg",
-        sa.Column("foreign_key", sa.Integer(), nullable=False),
-        sa.Column("id", sa.Integer(), nullable=False),
-        sa.Column("legacy_id", sa.String(), nullable=False),
-        sa.Column("xmpp_id", sa.String(), nullable=False),
-        sa.ForeignKeyConstraint(
-            ["foreign_key"], ["room.id"], name=op.f("fk_group_msg_foreign_key_room")
-        ),
-        sa.PrimaryKeyConstraint("id", name=op.f("pk_group_msg")),
-    )
-    with op.batch_alter_table("group_msg", schema=None) as batch_op:
-        batch_op.create_index(
-            "ix_group_msg_legacy_id", ["legacy_id", "foreign_key"], unique=False
-        )
-
-    op.create_table(
-        "group_thread",
-        sa.Column("foreign_key", sa.Integer(), nullable=False),
-        sa.Column("id", sa.Integer(), nullable=False),
-        sa.Column("legacy_id", sa.String(), nullable=False),
-        sa.Column("xmpp_id", sa.String(), nullable=False),
-        sa.ForeignKeyConstraint(
-            ["foreign_key"], ["room.id"], name=op.f("fk_group_thread_foreign_key_room")
-        ),
-        sa.PrimaryKeyConstraint("id", name=op.f("pk_group_thread")),
-    )
-    with op.batch_alter_table("group_thread", schema=None) as batch_op:
-        batch_op.create_index(
-            "ix_direct_group_thread_id", ["legacy_id", "foreign_key"], unique=False
-        )
-
-    with op.batch_alter_table("xmpp_ids_multi", schema=None) as batch_op:
-        batch_op.drop_index("legacy_ids_multi_user_account_id_xmpp_id")
-
-    op.drop_table("xmpp_ids_multi")
-    with op.batch_alter_table("xmpp_to_legacy_ids", schema=None) as batch_op:
-        batch_op.drop_index("xmpp_legacy")
-
-    op.drop_table("xmpp_to_legacy_ids")
-    with op.batch_alter_table("legacy_ids_multi", schema=None) as batch_op:
-        batch_op.drop_index("legacy_ids_multi_user_account_id_legacy_id")
-
-    op.drop_table("legacy_ids_multi")
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table(
-        "legacy_ids_multi",
-        sa.Column("id", sa.INTEGER(), nullable=False),
-        sa.Column("user_account_id", sa.INTEGER(), nullable=False),
-        sa.Column("legacy_id", sa.VARCHAR(), nullable=False),
-        sa.ForeignKeyConstraint(
-            ["user_account_id"],
-            ["user_account.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    with op.batch_alter_table("legacy_ids_multi", schema=None) as batch_op:
-        batch_op.create_index(
-            "legacy_ids_multi_user_account_id_legacy_id",
-            ["user_account_id", "legacy_id"],
-            unique=1,
-        )
-
-    op.create_table(
-        "xmpp_to_legacy_ids",
-        sa.Column("id", sa.INTEGER(), nullable=False),
-        sa.Column("user_account_id", sa.INTEGER(), nullable=False),
-        sa.Column("xmpp_id", sa.VARCHAR(), nullable=False),
-        sa.Column("legacy_id", sa.VARCHAR(), nullable=False),
-        sa.Column("type", sa.VARCHAR(length=10), nullable=False),
-        sa.ForeignKeyConstraint(
-            ["user_account_id"],
-            ["user_account.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    with op.batch_alter_table("xmpp_to_legacy_ids", schema=None) as batch_op:
-        batch_op.create_index(
-            "xmpp_legacy", ["user_account_id", "xmpp_id", "legacy_id"], unique=1
-        )
-
-    op.create_table(
-        "xmpp_ids_multi",
-        sa.Column("id", sa.INTEGER(), nullable=False),
-        sa.Column("user_account_id", sa.INTEGER(), nullable=False),
-        sa.Column("xmpp_id", sa.VARCHAR(), nullable=False),
-        sa.Column("legacy_ids_multi_id", sa.INTEGER(), nullable=False),
-        sa.ForeignKeyConstraint(
-            ["legacy_ids_multi_id"],
-            ["legacy_ids_multi.id"],
-        ),
-        sa.ForeignKeyConstraint(
-            ["user_account_id"],
-            ["user_account.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    with op.batch_alter_table("xmpp_ids_multi", schema=None) as batch_op:
-        batch_op.create_index(
-            "legacy_ids_multi_user_account_id_xmpp_id",
-            ["user_account_id", "xmpp_id"],
-            unique=1,
-        )
-
-    with op.batch_alter_table("group_thread", schema=None) as batch_op:
-        batch_op.drop_index("ix_direct_group_thread_id")
-
-    op.drop_table("group_thread")
-    with op.batch_alter_table("group_msg", schema=None) as batch_op:
-        batch_op.drop_index("ix_group_msg_legacy_id")
-
-    op.drop_table("group_msg")
-    with op.batch_alter_table("direct_thread", schema=None) as batch_op:
-        batch_op.drop_index("ix_direct_direct_thread_id")
-
-    op.drop_table("direct_thread")
-    with op.batch_alter_table("direct_msg", schema=None) as batch_op:
-        batch_op.drop_index("ix_direct_msg_legacy_id")
-
-    op.drop_table("direct_msg")
-    # ### end Alembic commands ###

slidge/db/alembic/versions/04cf35e3cf85_add_participant_nickname_no_illegal.py

@@ -1,33 +0,0 @@
-"""Add Participant.nickname_no_illegal
-
-Revision ID: 04cf35e3cf85
-Revises: 15b0bd83407a
-Create Date: 2025-02-22 06:57:45.491326
-
-"""
-
-from typing import Sequence, Union
-
-import sqlalchemy as sa
-from alembic import op
-
-# revision identifiers, used by Alembic.
-revision: str = "04cf35e3cf85"
-down_revision: Union[str, None] = "15b0bd83407a"
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
-    with op.batch_alter_table("participant", schema=None) as batch_op:
-        batch_op.add_column(
-            sa.Column("nickname_no_illegal", sa.String(), nullable=True)
-        )
-
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    with op.batch_alter_table("participant", schema=None) as batch_op:
-        batch_op.drop_column("nickname_no_illegal")

slidge/db/alembic/versions/09f27f098baa_add_missing_attributes_in_room.py

@@ -1,36 +0,0 @@
-"""Add n_participants attributes to Room
-
-Should have been part of another commit, but I messed up some rebase
-
-Revision ID: 09f27f098baa
-Revises: 29f5280c61aa
-Create Date: 2024-07-11 10:54:21.155871
-
-"""
-
-from typing import Sequence, Union
-
-import sqlalchemy as sa
-from alembic import op
-
-# revision identifiers, used by Alembic.
-revision: str = "09f27f098baa"
-down_revision: Union[str, None] = "29f5280c61aa"
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
-    with op.batch_alter_table("room", schema=None) as batch_op:
-        batch_op.add_column(sa.Column("n_participants", sa.Integer(), nullable=True))
-
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
-    with op.batch_alter_table("room", schema=None) as batch_op:
-        batch_op.drop_column("n_participants")
-
-    # ### end Alembic commands ###