slidge 0.3.0a0__py3-none-any.whl → 0.3.0a2__py3-none-any.whl

slidge/db/alembic/versions/4dbd23a3f868_new_avatar_store.py

@@ -19,6 +19,11 @@ depends_on: Union[str, Sequence[str], None] = None
 
 
 def upgrade() -> None:
+    # a bug in slidge v0.3.0alpha0 lead to a crash during this migration which ended up with
+    # this temporary  tables in here
+    op.execute("DROP TABLE IF EXISTS _alembic_tmp_avatar;")
+    op.execute("DROP TABLE IF EXISTS _alembic_tmp_contact;")
+
     with op.batch_alter_table("avatar", schema=None) as batch_op:
         batch_op.add_column(sa.Column("legacy_id", sa.String(), nullable=True))
         batch_op.create_unique_constraint("avatar_unique_legacy_id", ["legacy_id"])
@@ -37,6 +42,50 @@ def upgrade() -> None:
         WHERE avatar.id = room.avatar_id
     """)
 
+    # the following 4 OPs have been added manually because somewhere before, we messed up
+    # and the client_type server side default value was pc (no quote) instead of "pc"
+    op.execute(
+        """
+        CREATE TABLE contact_new (
+            id INTEGER NOT NULL,
+            user_account_id INTEGER NOT NULL,
+            legacy_id VARCHAR NOT NULL,
+            jid TEXT NOT NULL,
+            avatar_id INTEGER,
+            nick VARCHAR,
+            cached_presence BOOLEAN NOT NULL,
+            last_seen DATETIME,
+            ptype VARCHAR,
+            pstatus VARCHAR,
+            pshow VARCHAR,
+            is_friend BOOLEAN NOT NULL,
+            added_to_roster BOOLEAN NOT NULL,
+            extra_attributes VARCHAR,
+            updated BOOLEAN NOT NULL,
+            caps_ver VARCHAR,
+            vcard VARCHAR,
+            vcard_fetched BOOLEAN DEFAULT 1 NOT NULL,
+            avatar_legacy_id VARCHAR,
+            client_type VARCHAR(8) DEFAULT 'pc' NOT NULL,
+            PRIMARY KEY (id),
+            FOREIGN KEY(user_account_id) REFERENCES user_account (id),
+            FOREIGN KEY(avatar_id) REFERENCES avatar (id),
+            UNIQUE (user_account_id, legacy_id) CONSTRAINT uq_user_account_legacy_id,
+            UNIQUE (user_account_id, jid) CONSTRAINT uq_user_account_jid
+        );
+        """
+    )
+
+    op.execute(
+        """
+        INSERT INTO contact_new (id, user_account_id, legacy_id, jid, avatar_id, nick, cached_presence, last_seen, ptype, pstatus, pshow, is_friend, added_to_roster, extra_attributes, updated, caps_ver, vcard, vcard_fetched, avatar_legacy_id, client_type)
+        SELECT id, user_account_id, legacy_id, jid, avatar_id, nick, cached_presence, last_seen, ptype, pstatus, pshow, is_friend, added_to_roster, extra_attributes, updated, caps_ver, vcard, vcard_fetched, avatar_legacy_id, client_type
+        FROM contact;
+        """
+    )
+    op.execute("DROP TABLE contact;")
+    op.execute("ALTER TABLE contact_new RENAME TO contact;")
+
     with op.batch_alter_table("contact", schema=None) as batch_op:
         batch_op.drop_column("avatar_legacy_id")
 

slidge/db/store.py

@@ -324,9 +324,10 @@ class MAMStore:
         if before_id is not None:
             stamp = session.execute(
                 select(ArchivedMessage.timestamp).where(
-                    ArchivedMessage.stanza_id == before_id
+                    ArchivedMessage.stanza_id == before_id,
+                    ArchivedMessage.room_id == room_pk,
                 )
-            ).scalar()
+            ).scalar_one_or_none()
             if stamp is None:
                 raise XMPPError(
                     "item-not-found",
@@ -336,9 +337,10 @@ class MAMStore:
         if after_id is not None:
             stamp = session.execute(
                 select(ArchivedMessage.timestamp).where(
-                    ArchivedMessage.stanza_id == after_id
+                    ArchivedMessage.stanza_id == after_id,
+                    ArchivedMessage.room_id == room_pk,
                 )
-            ).scalar()
+            ).scalar_one_or_none()
             if stamp is None:
                 raise XMPPError(
                     "item-not-found",

{slidge-0.3.0a0.dist-info → slidge-0.3.0a2.dist-info}/METADATA

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

{slidge-0.3.0a0.dist-info → slidge-0.3.0a2.dist-info}/RECORD

@@ -53,7 +53,7 @@ slidge/db/__init__.py,sha256=EBDH1JSEhgqYcli2Bw11CRC749wJk8AOucgBzmhDSvU,105
 slidge/db/avatar.py,sha256=MXFd1oe0eL5CCUYbc5CpsIcbio3cY3xVoKt39RAoj9I,8240
 slidge/db/meta.py,sha256=NtjGWcqPfG7uPfwR_cC6_23zyo8ftqgKX8CbP9IBq6U,2185
 slidge/db/models.py,sha256=xkTveglIbJDwcm1YEF7urEC1LTlwyXYrxgT4Vppdmmg,12763
-slidge/db/store.py,sha256=nRR0oAAHg16YX8zffavFh0i8d2QnZgyf0Zexev3M3sM,19261
+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
@@ -66,7 +66,7 @@ slidge/db/alembic/versions/29f5280c61aa_store_subject_setter_in_room.py,sha256=f
 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/45c24cc73c91_add_bob.py,sha256=UjMySZ5LaInyPt0KbAxx0rF4GQhZh8CwBeqHtNPdG1c,1249
-slidge/db/alembic/versions/4dbd23a3f868_new_avatar_store.py,sha256=t4kuly8UBqz-Vv6nMhJLZ834eCXZbziGjCotkenJIag,1764
+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
@@ -109,9 +109,9 @@ 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.0a0.dist-info/licenses/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-slidge-0.3.0a0.dist-info/METADATA,sha256=-zxaahvP72dUIyyg9A2DEygBURS_rRqAJp2WBLoYcMw,5056
-slidge-0.3.0a0.dist-info/WHEEL,sha256=wXxTzcEDnjrTwFYjLPcsW_7_XihufBwmpiBeiXNBGEA,91
-slidge-0.3.0a0.dist-info/entry_points.txt,sha256=py3_x834fFJ2TEzPd18Wt2DnysdAfuVqJ5zzBrXbAZs,44
-slidge-0.3.0a0.dist-info/top_level.txt,sha256=2LRjDYHaGZ5ieCMF8xy58JIiabRMzX-MGMbCZwfE17c,7
-slidge-0.3.0a0.dist-info/RECORD,,
+slidge-0.3.0a2.dist-info/licenses/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
+slidge-0.3.0a2.dist-info/METADATA,sha256=CZbiWq5Y-njBhLaMQb03Io2iLLL6RiRkPLVh4mAEE4E,5056
+slidge-0.3.0a2.dist-info/WHEEL,sha256=GHB6lJx2juba1wDgXDNlMTyM13ckjBMKf-OnwgKOCtA,91
+slidge-0.3.0a2.dist-info/entry_points.txt,sha256=py3_x834fFJ2TEzPd18Wt2DnysdAfuVqJ5zzBrXbAZs,44
+slidge-0.3.0a2.dist-info/top_level.txt,sha256=2LRjDYHaGZ5ieCMF8xy58JIiabRMzX-MGMbCZwfE17c,7
+slidge-0.3.0a2.dist-info/RECORD,,

{slidge-0.3.0a0.dist-info → slidge-0.3.0a2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.1.0)
+Generator: setuptools (80.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any