From 1b188e22aa0c6cbbb13cd761f99c866fa02c084a Mon Sep 17 00:00:00 2001
From: wurstsalat <mailtrash@posteo.de>
Date: Sun, 29 May 2022 17:06:36 +0200
Subject: [PATCH] =?UTF-8?q?fix:=20History:=20Don=E2=80=99t=20remove=20JID?=
=?UTF-8?q?=20IDs=20from=20database?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
A JID ID can be used by more than one account
---
gajim/common/storage/archive.py | 15 ---------------
gajim/gtk/application.py | 1 -
2 files changed, 16 deletions(-)
diff --git a/gajim/common/storage/archive.py b/gajim/common/storage/archive.py
index 589fb5bc51..bc71da7f8a 100644
--- a/gajim/common/storage/archive.py
+++ b/gajim/common/storage/archive.py
@@ -1379,21 +1379,6 @@ def remove_history(self, account: str, jid: JID) -> None:
self._delayed_commit()
log.info('Removed history for: %s', jid)
- def forget_jid_data(self, account: str, jid: JID) -> None:
- 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,))
-
- sql = 'DELETE FROM last_archive_message WHERE jid_id = ?'
- self._con.execute(sql, (jid_id,))
-
- self._delayed_commit()
- log.info('Forgot data for: %s', jid)
-
def remove_all_history(self) -> None:
"""
Remove all messages for all accounts
diff --git a/gajim/gtk/application.py b/gajim/gtk/application.py
index d01a609aea..0b3fd7d768 100644
--- a/gajim/gtk/application.py
+++ b/gajim/gtk/application.py
@@ -806,7 +806,6 @@ def _on_forget_groupchat_action(_action: Gio.SimpleAction,
client.get_module('Bookmarks').remove(params.jid)
app.storage.archive.remove_history(params.account, params.jid)
- app.storage.archive.forget_jid_data(params.account, params.jid)
@staticmethod
def _on_groupchat_join_action(_action: Gio.SimpleAction,
--
GitLab