GitLab

at 2022-05-18T19:30:01+02:00

fix: Don't fail when trying to remove chat history

A group chat from bookmarks could have no history at all,
because Gajim never joined it in the past.

Fixes #10880

         If it's a group chat, remove last MAM ID as well.

         """

         account_id = self.get_account_id(account)

-        jid_id = self.get_jid_id(jid)

+        try:

+            jid_id = self.get_jid_id(jid)

+        except ValueError:

+            log.info('No history entries for: %s', jid)

+            return

         sql = 'DELETE FROM logs WHERE account_id = ? AND jid_id = ?'

         self._con.execute(sql, (account_id, jid_id))

         log.info('Removed history for: %s', jid)

     def forget_jid_data(self, account: str, jid: JID) -> None:

-        jid_id = self.get_jid_id(jid)

+        try:

+            jid_id = self.get_jid_id(jid)

+        except ValueError:

+            log.info('No history entries for: %s', jid)

+            return

         sql = 'DELETE FROM jids WHERE jid_id = ?'

         self._con.execute(sql, (jid_id,))

Daniel Brötzmann pushed to branch master at gajim / gajim

Commits:

1 changed file:

Changes: