Philipp Hörist pushed to branch storage at gajim / gajim
Commits:
3f100abf by Philipp Hörist at 2024-04-07T15:52:05+02:00
imprv: Message: Don’t fail on duplicated message error
- - - - -
53aa7cf4 by Philipp Hörist at 2024-04-07T15:53:00+02:00
imprv: Remove obsolete test
- - - - -
2 changed files:
- gajim/common/modules/message.py
- test/database/test_messages.py
Changes:
=====================================
gajim/common/modules/message.py
=====================================
@@ -338,7 +338,13 @@ def _message_error_received(self,
condition_text=properties.error.condition_data,
timestamp=timestamp,
)
- app.storage.archive.insert_row(error_data)
+
+ pk = app.storage.archive.insert_row(
+ error_data, ignore_on_conflict=True)
+ if pk == -1:
+ self._log.warning('Received error with already known message id',
+ message_id)
+ return
app.ged.raise_event(
MessageError(account=self._account,
=====================================
test/database/test_messages.py
=====================================
@@ -61,28 +61,6 @@ def test_stanza_id_index(self) -> None:
message_data = self._create_base_message(message_id='2',
stanza_id='s1')
self._archive.insert_object(message_data, ignore_on_conflict=False)
- def test_message_id_outgoing_index(self) -> None:
- message_data = self._create_base_message(
- message_id='1', stanza_id='s1', direction=ChatDirection.OUTGOING
- )
- self._archive.insert_object(message_data, ignore_on_conflict=False)
-
- with self.assertRaises(sqlalchemy.exc.IntegrityError):
- message_data = self._create_base_message(
- message_id='1', stanza_id='s2',
direction=ChatDirection.OUTGOING
- )
- self._archive.insert_object(message_data, ignore_on_conflict=False)
-
- message_data = self._create_base_message(
- message_id='1', stanza_id='s3', direction=ChatDirection.INCOMING
- )
- self._archive.insert_object(message_data, ignore_on_conflict=False)
-
- message_data = self._create_base_message(
- message_id='1', stanza_id='s4', direction=ChatDirection.INCOMING
- )
- self._archive.insert_object(message_data, ignore_on_conflict=False)
-
if __name__ == '__main__':
unittest.main()
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/e1b434416dd685f0f098d69c18a63993e5d0a016...53aa7cf4e95cc5e7f029a92c44732f6fc2800a36
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/e1b434416dd685f0f098d69c18a63993e5d0a016...53aa7cf4e95cc5e7f029a92c44732f6fc2800a36
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
