1 files changed, 39 insertions, 25 deletions

diff --git a/plugins/http-files/src/manager.vala b/plugins/http-files/src/manager.vala
index b1b7296c..9abf9843 100644
--- a/plugins/http-files/src/manager.vala
+++ b/plugins/http-files/src/manager.vala
@@ -4,44 +4,28 @@ using Gee;
 
 namespace Dino.Plugins.HttpFiles {
 
-public class Manager : StreamInteractionModule, Object {
+public class Manager : StreamInteractionModule, FileSender, Object {
     public static ModuleIdentity<Manager> IDENTITY = new ModuleIdentity<Manager>("http_files");
     public string id { get { return IDENTITY.id; } }
 
-    public signal void upload_available(Account account);
     public signal void uploading(FileTransfer file_transfer);
     public signal void uploaded(FileTransfer file_transfer, string url);
 
     private StreamInteractor stream_interactor;
     private HashMap<Account, long> max_file_sizes = new HashMap<Account, long>(Account.hash_func, Account.equals_func);
-
     private Manager(StreamInteractor stream_interactor) {
         this.stream_interactor = stream_interactor;
 
+        stream_interactor.get_module(FileManager.IDENTITY).add_sender(this);
         stream_interactor.stream_negotiated.connect(on_stream_negotiated);
     }
 
-    public void send(Conversation conversation, string file_uri) {
-        Xmpp.Core.XmppStream? stream = stream_interactor.get_stream(conversation.account);
+    public void send_file(Conversation conversation, FileTransfer file_transfer) {
+        Xmpp.Core.XmppStream? stream = stream_interactor.get_stream(file_transfer.account);
         if (stream != null) {
-            File file = File.new_for_path(file_uri);
-            FileInfo file_info = file.query_info("*", FileQueryInfoFlags.NONE);
-
-            FileTransfer file_transfer = new FileTransfer();
-            file_transfer.account = conversation.account;
-            file_transfer.counterpart = conversation.counterpart;
-            file_transfer.ourpart = conversation.account.bare_jid;
-            file_transfer.direction = FileTransfer.DIRECTION_SENT;
-            file_transfer.time = new DateTime.now_utc();
-            file_transfer.local_time = new DateTime.now_utc();
-            file_transfer.encryption = Encryption.NONE;
-            file_transfer.file_name = file_info.get_display_name();
-            file_transfer.input_stream = file.read();
-            file_transfer.mime_type = file_info.get_content_type();
-            file_transfer.size = (int)file_info.get_size();
+            file_transfer.provider = 0;
             uploading(file_transfer);
-
-            stream_interactor.module_manager.get_module(conversation.account, UploadStreamModule.IDENTITY).upload(stream, file_uri,
+            stream_interactor.module_manager.get_module(file_transfer.account, UploadStreamModule.IDENTITY).upload(stream, Path.build_filename(FileManager.get_storage_dir(), file_transfer.path),
                 (stream, url_down) => {
                     uploaded(file_transfer, url_down);
                     stream_interactor.get_module(MessageProcessor.IDENTITY).send_message(url_down, conversation);
@@ -50,13 +34,16 @@ public class Manager : StreamInteractionModule, Object {
                     file_transfer.state = FileTransfer.State.FAILED;
                 }
             );
-
         }
     }
 
-    public bool is_upload_available(Account account) {
+    public bool can_send(Conversation conversation, FileTransfer file_transfer) {
+        return true;
+    }
+
+    public bool is_upload_available(Conversation conversation) {
         lock (max_file_sizes) {
-            return max_file_sizes.has_key(account);
+            return max_file_sizes.has_key(conversation.account);
         }
     }
 
@@ -81,4 +68,31 @@ public class Manager : StreamInteractionModule, Object {
     }
 }
 
+public class FileMessageFilterDisplay : Plugins.MessageDisplayProvider, Object {
+    public string id { get; set; default="file_message_filter"; }
+    public double priority { get; set; default=10; }
+
+    public Database db;
+
+    public FileMessageFilterDisplay(Dino.Database db) {
+        this.db = db;
+    }
+
+    public bool can_display(Entities.Message? message) {
+        return message_is_file(message);
+    }
+
+    public Plugins.MetaConversationItem? get_item(Entities.Message message, Conversation conversation) {
+        return null;
+    }
+
+    private bool message_is_file(Entities.Message message) {
+        Qlite.QueryBuilder builder = db.file_transfer.select()
+                .with(db.file_transfer.info, "=", message.body)
+                .with(db.file_transfer.account_id, "=", message.account.id)
+                .with(db.file_transfer.counterpart_id, "=", db.get_jid_id(message.counterpart));
+        return builder.count() > 0;
+    }
+}
+
 }