Implement chat filter with group msg sender for iOS #85

This commit is contained in:
KnugiHK
2024-09-15 10:55:43 +08:00
parent 75c429fe22
commit 04000c78e2
3 changed files with 54 additions and 37 deletions

View File

@@ -183,8 +183,8 @@ def messages(db, data, media_folder, timezone_offset, filter_date, filter_chat):
ON messages.key_remote_jid = jid.raw_string
WHERE 1=1
{f'AND timestamp {filter_date}' if filter_date is not None else ''}
{get_chat_condition(filter_chat[0], True, ["messages.key_remote_jid", "messages.remote_resource"], "jid")}
{get_chat_condition(filter_chat[1], False, ["messages.key_remote_jid", "messages.remote_resource"], "jid")}""")
{get_chat_condition(filter_chat[0], True, ["messages.key_remote_jid", "messages.remote_resource"], "jid", "android")}
{get_chat_condition(filter_chat[1], False, ["messages.key_remote_jid", "messages.remote_resource"], "jid", "android")}""")
except sqlite3.OperationalError:
c.execute(f"""SELECT count()
@@ -197,8 +197,8 @@ def messages(db, data, media_folder, timezone_offset, filter_date, filter_chat):
ON jid_group._id = message.sender_jid_row_id
WHERE 1=1
{f'AND timestamp {filter_date}' if filter_date is not None else ''}
{get_chat_condition(filter_chat[0], True, ["jid.raw_string", "jid_group.raw_string"], "jid")}
{get_chat_condition(filter_chat[1], False, ["jid.raw_string", "jid_group.raw_string"], "jid")}""")
{get_chat_condition(filter_chat[0], True, ["jid.raw_string", "jid_group.raw_string"], "jid", "android")}
{get_chat_condition(filter_chat[1], False, ["jid.raw_string", "jid_group.raw_string"], "jid", "android")}""")
total_row_number = c.fetchone()[0]
print(f"Processing messages...(0/{total_row_number})", end="\r")
@@ -254,8 +254,8 @@ def messages(db, data, media_folder, timezone_offset, filter_date, filter_chat):
ON receipt_user.message_row_id = messages._id
WHERE messages.key_remote_jid <> '-1'
{f'AND messages.timestamp {filter_date}' if filter_date is not None else ''}
{get_chat_condition(filter_chat[0], True, ["messages.key_remote_jid", "messages.remote_resource"], "jid_global")}
{get_chat_condition(filter_chat[1], False, ["messages.key_remote_jid", "messages.remote_resource"], "jid_global")}
{get_chat_condition(filter_chat[0], True, ["messages.key_remote_jid", "messages.remote_resource"], "jid_global", "android")}
{get_chat_condition(filter_chat[1], False, ["messages.key_remote_jid", "messages.remote_resource"], "jid_global", "android")}
GROUP BY messages._id
ORDER BY messages.timestamp ASC;"""
)
@@ -322,8 +322,8 @@ def messages(db, data, media_folder, timezone_offset, filter_date, filter_chat):
ON receipt_user.message_row_id = message._id
WHERE key_remote_jid <> '-1'
{f'AND message.timestamp {filter_date}' if filter_date is not None else ''}
{get_chat_condition(filter_chat[0], True, ["key_remote_jid", "jid_group.raw_string"], "jid_global")}
{get_chat_condition(filter_chat[1], False, ["key_remote_jid", "jid_group.raw_string"], "jid_global")}
{get_chat_condition(filter_chat[0], True, ["key_remote_jid", "jid_group.raw_string"], "jid_global", "android")}
{get_chat_condition(filter_chat[1], False, ["key_remote_jid", "jid_group.raw_string"], "jid_global", "android")}
GROUP BY message._id;"""
)
except Exception as e:
@@ -500,8 +500,8 @@ def media(db, data, media_folder, filter_date, filter_chat, separate_media=True)
ON messages.key_remote_jid = jid.raw_string
WHERE 1=1
{f'AND messages.timestamp {filter_date}' if filter_date is not None else ''}
{get_chat_condition(filter_chat[0], True, ["messages.key_remote_jid", "remote_resource"], "jid")}
{get_chat_condition(filter_chat[1], False, ["messages.key_remote_jid", "remote_resource"], "jid")}""")
{get_chat_condition(filter_chat[0], True, ["messages.key_remote_jid", "remote_resource"], "jid", "android")}
{get_chat_condition(filter_chat[1], False, ["messages.key_remote_jid", "remote_resource"], "jid", "android")}""")
except sqlite3.OperationalError:
c.execute(f"""SELECT count()
FROM message_media
@@ -515,8 +515,8 @@ def media(db, data, media_folder, filter_date, filter_chat, separate_media=True)
ON jid_group._id = message.sender_jid_row_id
WHERE 1=1
{f'AND message.timestamp {filter_date}' if filter_date is not None else ''}
{get_chat_condition(filter_chat[0], True, ["jid.raw_string", "jid_group.raw_string"], "jid")}
{get_chat_condition(filter_chat[1], False, ["jid.raw_string", "jid_group.raw_string"], "jid")}""")
{get_chat_condition(filter_chat[0], True, ["jid.raw_string", "jid_group.raw_string"], "jid", "android")}
{get_chat_condition(filter_chat[1], False, ["jid.raw_string", "jid_group.raw_string"], "jid", "android")}""")
total_row_number = c.fetchone()[0]
print(f"\nProcessing media...(0/{total_row_number})", end="\r")
i = 0
@@ -538,8 +538,8 @@ def media(db, data, media_folder, filter_date, filter_chat, separate_media=True)
ON messages.key_remote_jid = jid.raw_string
WHERE jid.type <> 7
{f'AND messages.timestamp {filter_date}' if filter_date is not None else ''}
{get_chat_condition(filter_chat[0], True, ["messages.key_remote_jid", "remote_resource"], "jid")}
{get_chat_condition(filter_chat[1], False, ["messages.key_remote_jid", "remote_resource"], "jid")}
{get_chat_condition(filter_chat[0], True, ["messages.key_remote_jid", "remote_resource"], "jid", "android")}
{get_chat_condition(filter_chat[1], False, ["messages.key_remote_jid", "remote_resource"], "jid", "android")}
ORDER BY messages.key_remote_jid ASC"""
)
except sqlite3.OperationalError:
@@ -564,8 +564,8 @@ def media(db, data, media_folder, filter_date, filter_chat, separate_media=True)
ON jid_group._id = message.sender_jid_row_id
WHERE jid.type <> 7
{f'AND message.timestamp {filter_date}' if filter_date is not None else ''}
{get_chat_condition(filter_chat[0], True, ["key_remote_jid", "jid_group.raw_string"], "jid")}
{get_chat_condition(filter_chat[1], False, ["key_remote_jid", "jid_group.raw_string"], "jid")}
{get_chat_condition(filter_chat[0], True, ["key_remote_jid", "jid_group.raw_string"], "jid", "android")}
{get_chat_condition(filter_chat[1], False, ["key_remote_jid", "jid_group.raw_string"], "jid", "android")}
ORDER BY jid.raw_string ASC"""
)
content = c.fetchone()
@@ -627,8 +627,8 @@ def vcard(db, data, media_folder, filter_date, filter_chat):
ON messages.key_remote_jid = jid.raw_string
WHERE 1=1
{f'AND messages.timestamp {filter_date}' if filter_date is not None else ''}
{get_chat_condition(filter_chat[0], True, ["messages.key_remote_jid", "remote_resource"], "jid")}
{get_chat_condition(filter_chat[1], False, ["messages.key_remote_jid", "remote_resource"], "jid")}
{get_chat_condition(filter_chat[0], True, ["messages.key_remote_jid", "remote_resource"], "jid", "android")}
{get_chat_condition(filter_chat[1], False, ["messages.key_remote_jid", "remote_resource"], "jid", "android")}
ORDER BY messages.key_remote_jid ASC;"""
)
except sqlite3.OperationalError:
@@ -647,8 +647,8 @@ def vcard(db, data, media_folder, filter_date, filter_chat):
ON jid_group._id = message.sender_jid_row_id
WHERE 1=1
{f'AND message.timestamp {filter_date}' if filter_date is not None else ''}
{get_chat_condition(filter_chat[0], True, ["key_remote_jid", "jid_group.raw_string"], "jid")}
{get_chat_condition(filter_chat[1], False, ["key_remote_jid", "jid_group.raw_string"], "jid")}
{get_chat_condition(filter_chat[0], True, ["key_remote_jid", "jid_group.raw_string"], "jid", "android")}
{get_chat_condition(filter_chat[1], False, ["key_remote_jid", "jid_group.raw_string"], "jid", "android")}
ORDER BY message.chat_row_id ASC;"""
)
@@ -684,8 +684,8 @@ def calls(db, data, timezone_offset, filter_chat):
LEFT JOIN chat
ON call_log.jid_row_id = chat.jid_row_id
WHERE 1=1
{get_chat_condition(filter_chat[0], True, ["jid.raw_string"], "jid")}
{get_chat_condition(filter_chat[1], False, ["jid.raw_string"], "jid")}""")
{get_chat_condition(filter_chat[0], True, ["jid.raw_string"])}
{get_chat_condition(filter_chat[1], False, ["jid.raw_string"])}""")
total_row_number = c.fetchone()[0]
if total_row_number == 0:
return
@@ -706,8 +706,8 @@ def calls(db, data, timezone_offset, filter_chat):
LEFT JOIN chat
ON call_log.jid_row_id = chat.jid_row_id
WHERE 1=1
{get_chat_condition(filter_chat[0], True, ["jid.raw_string"], "jid")}
{get_chat_condition(filter_chat[1], False, ["jid.raw_string"], "jid")}"""
{get_chat_condition(filter_chat[0], True, ["jid.raw_string"])}
{get_chat_condition(filter_chat[1], False, ["jid.raw_string"])}"""
)
chat = ChatStore(Device.ANDROID, "WhatsApp Calls")
content = c.fetchone()