Philipp Hörist pushed to branch storage at gajim / gajim
Commits:
a86af625 by Philipp Hörist at 2023-07-16T14:40:55+02:00
search view query
- - - - -
1 changed file:
- gajim/common/storage/archive/storage.py
Changes:
=====================================
gajim/common/storage/archive/storage.py
=====================================
@@ -524,7 +524,7 @@ def search_archive(self,
if from_users is None:
users_query_stmt = ''
else:
- users_query_stmt = 'UPPER(contact_name) IN (?) AND' # TODO
+ users_query_stmt = 'UPPER(message.resource) IN (?) AND'
stmt = f'''
{GET_CONVERSATION_STMT}
@@ -538,8 +538,12 @@ def search_archive(self,
cursor = self._get_cursor(_messages_factory)
if from_users is None:
if contact_stmt:
+ assert account is not None
+ assert jid is not None
+ account_ek = self._get_account_ek(account)
+ jid_ek = self._get_jid_ek(jid)
cursor.execute(
- stmt, (account, jid, query, after_ts, before_ts))
+ stmt, (jid_ek, account_ek, query, after_ts, before_ts))
else:
cursor.execute(
stmt, (query, after_ts, before_ts))
@@ -561,7 +565,7 @@ def search_archive(self,
stmt, (jid_ek, account_ek, users, query, after_ts, before_ts))
else:
cursor.execute(
- stmt, (query, users, after_ts, before_ts))
+ stmt, (users, query, after_ts, before_ts))
while True:
results = cursor.fetchmany(25)
if not results:
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/a86af6259a5bf4da36ce4f0da348eedfcb9d1d79
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/a86af6259a5bf4da36ce4f0da348eedfcb9d1d79
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]
