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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: slidge
-Version: 0.3.0a1
+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.0a1.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
@@ -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.0a1.dist-info/licenses/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-slidge-0.3.0a1.dist-info/METADATA,sha256=8jkX8qNCMMIHufnOQRQk4Sd0_Z-pvC6iqOYsOd95RPc,5056
-slidge-0.3.0a1.dist-info/WHEEL,sha256=GHB6lJx2juba1wDgXDNlMTyM13ckjBMKf-OnwgKOCtA,91
-slidge-0.3.0a1.dist-info/entry_points.txt,sha256=py3_x834fFJ2TEzPd18Wt2DnysdAfuVqJ5zzBrXbAZs,44
-slidge-0.3.0a1.dist-info/top_level.txt,sha256=2LRjDYHaGZ5ieCMF8xy58JIiabRMzX-MGMbCZwfE17c,7
-slidge-0.3.0a1.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,,