From fa1ba2f83dcbfbd009b61a6139be2233d729cb89 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Thu, 9 Dec 2021 15:46:16 +0100 Subject: [PATCH] Remove ContentFilters fixes #1129 #573 --- libdino/src/service/content_item_store.vala | 34 ++++----------------- libdino/src/service/message_correction.vala | 1 - libdino/src/service/message_processor.vala | 6 ++-- plugins/http-files/CMakeLists.txt | 1 - plugins/http-files/src/file_provider.vala | 13 +++----- plugins/http-files/src/file_sender.vala | 14 ++------- plugins/http-files/src/message_filter.vala | 23 -------------- plugins/http-files/src/plugin.vala | 5 +-- 8 files changed, 18 insertions(+), 79 deletions(-) delete mode 100644 plugins/http-files/src/message_filter.vala diff --git a/libdino/src/service/content_item_store.vala b/libdino/src/service/content_item_store.vala index ddb6571a..87244a23 100644 --- a/libdino/src/service/content_item_store.vala +++ b/libdino/src/service/content_item_store.vala @@ -14,7 +14,6 @@ public class ContentItemStore : StreamInteractionModule, Object { private StreamInteractor stream_interactor; private Database db; - private Gee.List filters = new ArrayList(); private HashMap collection_conversations = new HashMap(Conversation.hash_func, Conversation.equals_func); public static void start(StreamInteractor stream_interactor, Database db) { @@ -149,10 +148,6 @@ public class ContentItemStore : StreamInteractionModule, Object { return get_items_from_query(select, conversation); } - public void add_filter(ContentFilter content_filter) { - filters.add(content_filter); - } - public void insert_message(Message message, Conversation conversation, bool hide = false) { MessageItem item = new MessageItem(message, conversation, -1); item.id = db.add_content_item(conversation, message.time, message.local_time, 1, message.id, hide); @@ -165,12 +160,10 @@ public class ContentItemStore : StreamInteractionModule, Object { select.with(db.content_item.hide, "=", false); foreach (Row row in select) { MessageItem item = new MessageItem(message, conversation, row[db.content_item.id]); - if (!discard(item)) { - if (collection_conversations.has_key(conversation)) { - collection_conversations.get(conversation).insert_item(item); - } - new_item(item, conversation); + if (collection_conversations.has_key(conversation)) { + collection_conversations.get(conversation).insert_item(item); } + new_item(item, conversation); break; } } @@ -178,12 +171,10 @@ public class ContentItemStore : StreamInteractionModule, Object { private void insert_file_transfer(FileTransfer file_transfer, Conversation conversation) { FileItem item = new FileItem(file_transfer, conversation, -1); item.id = db.add_content_item(conversation, file_transfer.time, file_transfer.local_time, 2, file_transfer.id, false); - if (!discard(item)) { - if (collection_conversations.has_key(conversation)) { - collection_conversations.get(conversation).insert_item(item); - } - new_item(item, conversation); + if (collection_conversations.has_key(conversation)) { + collection_conversations.get(conversation).insert_item(item); } + new_item(item, conversation); } private void insert_call(Call call, Conversation conversation) { @@ -205,15 +196,6 @@ public class ContentItemStore : StreamInteractionModule, Object { .set(db.content_item.hide, hide) .perform(); } - - private bool discard(ContentItem content_item) { - foreach (ContentFilter filter in filters) { - if (filter.discard(content_item)) { - return true; - } - } - return false; - } } public interface ContentItemCollection : Object { @@ -221,10 +203,6 @@ public interface ContentItemCollection : Object { public abstract void remove_item(ContentItem item); } -public interface ContentFilter : Object { - public abstract bool discard(ContentItem content_item); -} - public abstract class ContentItem : Object { public int id { get; set; } public string type_ { get; set; } diff --git a/libdino/src/service/message_correction.vala b/libdino/src/service/message_correction.vala index 1374621a..322fa1c1 100644 --- a/libdino/src/service/message_correction.vala +++ b/libdino/src/service/message_correction.vala @@ -45,7 +45,6 @@ public class MessageCorrection : StreamInteractionModule, MessageListener { Message out_message = stream_interactor.get_module(MessageProcessor.IDENTITY).create_out_message(correction_text, conversation); out_message.edit_to = stanza_id; outstanding_correction_nodes[out_message.stanza_id] = stanza_id; - stream_interactor.get_module(MessageStorage.IDENTITY).add_message(out_message, conversation); stream_interactor.get_module(MessageProcessor.IDENTITY).send_xmpp_message(out_message, conversation); db.message_correction.insert() diff --git a/libdino/src/service/message_processor.vala b/libdino/src/service/message_processor.vala index fcabeba6..4fe1f6c3 100644 --- a/libdino/src/service/message_processor.vala +++ b/libdino/src/service/message_processor.vala @@ -60,7 +60,6 @@ public class MessageProcessor : StreamInteractionModule, Object { } public Entities.Message send_message(Entities.Message message, Conversation conversation) { - stream_interactor.get_module(MessageStorage.IDENTITY).add_message(message, conversation); stream_interactor.get_module(ContentItemStore.IDENTITY).insert_message(message, conversation); send_xmpp_message(message, conversation); message_sent(message, conversation); @@ -575,7 +574,7 @@ public class MessageProcessor : StreamInteractionModule, Object { private class StoreContentItemListener : MessageListener { - public string[] after_actions_const = new string[]{ "DEDUPLICATE", "DECRYPT", "FILTER_EMPTY", "STORE", "CORRECTION" }; + public string[] after_actions_const = new string[]{ "DEDUPLICATE", "DECRYPT", "FILTER_EMPTY", "STORE", "CORRECTION", "MESSAGE_REINTERPRETING" }; public override string action_group { get { return "STORE_CONTENT_ITEM"; } } public override string[] after_actions { get { return after_actions_const; } } @@ -634,6 +633,9 @@ public class MessageProcessor : StreamInteractionModule, Object { } message.marked = Entities.Message.Marked.UNSENT; message.encryption = conversation.encryption; + + stream_interactor.get_module(MessageStorage.IDENTITY).add_message(message, conversation); + return message; } diff --git a/plugins/http-files/CMakeLists.txt b/plugins/http-files/CMakeLists.txt index 625c215f..77579fdb 100644 --- a/plugins/http-files/CMakeLists.txt +++ b/plugins/http-files/CMakeLists.txt @@ -11,7 +11,6 @@ vala_precompile(HTTP_FILES_VALA_C SOURCES src/file_provider.vala src/file_sender.vala - src/message_filter.vala src/plugin.vala src/register_plugin.vala CUSTOM_VAPIS diff --git a/plugins/http-files/src/file_provider.vala b/plugins/http-files/src/file_provider.vala index cd7b25b7..e3382439 100644 --- a/plugins/http-files/src/file_provider.vala +++ b/plugins/http-files/src/file_provider.vala @@ -23,7 +23,7 @@ public class FileProvider : Dino.FileProvider, Object { private class ReceivedMessageListener : MessageListener { public string[] after_actions_const = new string[]{ "STORE" }; - public override string action_group { get { return ""; } } + public override string action_group { get { return "MESSAGE_REINTERPRETING"; } } public override string[] after_actions { get { return after_actions_const; } } private FileProvider outer; @@ -39,19 +39,14 @@ public class FileProvider : Dino.FileProvider, Object { bool normal_file = oob_url != null && oob_url == message.body && FileProvider.http_url_regex.match(message.body); bool omemo_file = FileProvider.omemo_url_regex.match(message.body); if (normal_file || omemo_file) { - yield outer.on_file_message(message, conversation); + outer.on_file_message(message, conversation); + return true; } return false; } } - private async void on_file_message(Entities.Message message, Conversation conversation) { - // Hide message - ContentItem? content_item = stream_interactor.get_module(ContentItemStore.IDENTITY).get_item(conversation, 1, message.id); - if (content_item != null) { - stream_interactor.get_module(ContentItemStore.IDENTITY).set_item_hide(content_item, true); - } - + private void on_file_message(Entities.Message message, Conversation conversation) { var additional_info = message.id.to_string(); var receive_data = new HttpFileReceiveData(); diff --git a/plugins/http-files/src/file_sender.vala b/plugins/http-files/src/file_sender.vala index a038e70f..e005b8c5 100644 --- a/plugins/http-files/src/file_sender.vala +++ b/plugins/http-files/src/file_sender.vala @@ -42,19 +42,11 @@ public class HttpFileSender : FileSender, Object { yield upload(file_transfer, send_data, file_meta); - file_transfer.info = send_data.url_down; // store the message content temporarily so the message gets filtered out - Entities.Message message = stream_interactor.get_module(MessageProcessor.IDENTITY).create_out_message(send_data.url_down, conversation); - - message.encryption = send_data.encrypt_message ? conversation.encryption : Encryption.NONE; - stream_interactor.get_module(MessageProcessor.IDENTITY).send_message(message, conversation); - file_transfer.info = message.id.to_string(); - ContentItem? content_item = stream_interactor.get_module(ContentItemStore.IDENTITY).get_item(conversation, 1, message.id); - if (content_item != null) { - stream_interactor.get_module(ContentItemStore.IDENTITY).set_item_hide(content_item, true); - } + message.encryption = send_data.encrypt_message ? conversation.encryption : Encryption.NONE; + stream_interactor.get_module(MessageProcessor.IDENTITY).send_xmpp_message(message, conversation); } public async bool can_send(Conversation conversation, FileTransfer file_transfer) { @@ -126,7 +118,7 @@ public class HttpFileSender : FileSender, Object { } private void check_add_oob(Entities.Message message, Xmpp.MessageStanza message_stanza, Conversation conversation) { - if (message.encryption == Encryption.NONE && message_is_file(db, message) && message.body.has_prefix("http")) { + if (message.encryption == Encryption.NONE && message.body.has_prefix("http") && message_is_file(db, message)) { Xep.OutOfBandData.add_url_to_message(message_stanza, message_stanza.body); } } diff --git a/plugins/http-files/src/message_filter.vala b/plugins/http-files/src/message_filter.vala deleted file mode 100644 index 01035c4c..00000000 --- a/plugins/http-files/src/message_filter.vala +++ /dev/null @@ -1,23 +0,0 @@ -using Dino.Entities; -using Xmpp; -using Gee; - -namespace Dino.Plugins.HttpFiles { - -public class FileMessageFilter : ContentFilter, Object { - public Database db; - - public FileMessageFilter(Dino.Database db) { - this.db = db; - } - - public bool discard(ContentItem content_item) { - if (content_item.type_ == MessageItem.TYPE) { - MessageItem message_item = content_item as MessageItem; - return message_is_file(db, message_item.message); - } - return false; - } -} - -} diff --git a/plugins/http-files/src/plugin.vala b/plugins/http-files/src/plugin.vala index bdf48770..67b32f65 100644 --- a/plugins/http-files/src/plugin.vala +++ b/plugins/http-files/src/plugin.vala @@ -17,8 +17,6 @@ public class Plugin : RootInterface, Object { app.stream_interactor.get_module(FileManager.IDENTITY).add_provider(file_provider); app.stream_interactor.get_module(FileManager.IDENTITY).add_sender(file_sender); - - app.stream_interactor.get_module(ContentItemStore.IDENTITY).add_filter(new FileMessageFilter(app.db)); } public void shutdown() { @@ -28,8 +26,7 @@ public class Plugin : RootInterface, Object { private bool message_is_file(Database db, Entities.Message message) { Qlite.QueryBuilder builder = db.file_transfer.select({db.file_transfer.id}).with(db.file_transfer.info, "=", message.id.to_string()); - Qlite.QueryBuilder builder2 = db.file_transfer.select({db.file_transfer.id}).with(db.file_transfer.info, "=", message.body); - return builder.count() > 0 || builder2.count() > 0; + return builder.count() > 0; } }