Always display reaction+reply buttons, disable if not possible

6 files changed, 44 insertions, 36 deletions

diff --git a/libdino/src/plugin/interfaces.vala b/libdino/src/plugin/interfaces.vala
index 0fef0134..a73cb5f7 100644
--- a/libdino/src/plugin/interfaces.vala
+++ b/libdino/src/plugin/interfaces.vala
@@ -153,6 +153,7 @@ public interface ConversationItemWidgetInterface: Object {
 
 public delegate void MessageActionEvoked(Object button, Plugins.MetaConversationItem evoked_on, Object widget);
 public class MessageAction : Object {
+    public bool sensitive = true;
     public string icon_name;
     public string? tooltip;
     public Object? popover;
diff --git a/libdino/src/service/entity_info.vala b/libdino/src/service/entity_info.vala
index d7d0bc9e..d1217e81 100644
--- a/libdino/src/service/entity_info.vala
+++ b/libdino/src/service/entity_info.vala
@@ -79,22 +79,34 @@ public class EntityInfo : StreamInteractionModule, Object {
     }
 
     public async bool has_feature(Account account, Jid jid, string feature) {
+        int has_feature_cached = has_feature_cached_int(account, jid, feature);
+        if (has_feature_cached != -1) {
+            return has_feature_cached == 1;
+        }
+
+        ServiceDiscovery.InfoResult? info_result = yield get_info_result(account, jid, entity_caps_hashes[jid]);
+        if (info_result == null) return false;
+
+        return info_result.features.contains(feature);
+    }
+
+    public bool has_feature_cached(Account account, Jid jid, string feature) {
+        return has_feature_cached_int(account, jid, feature) == 1;
+    }
+
+    private int has_feature_cached_int(Account account, Jid jid, string feature) {
         if (jid_features.has_key(jid)) {
-            return jid_features[jid].contains(feature);
+            return jid_features[jid].contains(feature) ? 1 : 0;
         }
 
         string? hash = entity_caps_hashes[jid];
         if (hash != null) {
             Gee.List<string>? features = get_stored_features(hash);
             if (features != null) {
-                return features.contains(feature);
+                return features.contains(feature) ? 1 : 0;
             }
         }
-
-        ServiceDiscovery.InfoResult? info_result = yield get_info_result(account, jid, hash);
-        if (info_result == null) return false;
-
-        return info_result.features.contains(feature);
+        return -1;
     }
 
     private void on_received_available_presence(Account account, Presence.Stanza presence) {
diff --git a/libdino/src/service/fallback_body.vala b/libdino/src/service/fallback_body.vala
index cc9ba9a6..13323427 100644
--- a/libdino/src/service/fallback_body.vala
+++ b/libdino/src/service/fallback_body.vala
@@ -64,4 +64,20 @@ public class Dino.FallbackBody : StreamInteractionModule, Object {
             return false;
         }
     }
+
+    public static string get_quoted_fallback_body(ContentItem content_item) {
+        string fallback = "> ";
+
+        if (content_item.type_ == MessageItem.TYPE) {
+            Message? quoted_message = ((MessageItem) content_item).message;
+            fallback += Dino.message_body_without_reply_fallback(quoted_message);
+            fallback = fallback.replace("\n", "\n> ");
+        } else if (content_item.type_ == FileItem.TYPE) {
+            FileTransfer? quoted_file = ((FileItem) content_item).file_transfer;
+            fallback += quoted_file.file_name;
+        }
+        fallback += "\n";
+
+        return fallback;
+    }
 }
\ No newline at end of file
diff --git a/libdino/src/service/message_processor.vala b/libdino/src/service/message_processor.vala
index 770ae0a6..247206f3 100644
--- a/libdino/src/service/message_processor.vala
+++ b/libdino/src/service/message_processor.vala
@@ -484,17 +484,7 @@ public class MessageProcessor : StreamInteractionModule, Object {
             Xep.Replies.set_reply_to(new_stanza, new Xep.Replies.ReplyTo(quoted_sender, quoted_stanza_id));
         }
 
-        string fallback = "> ";
-
-        if (content_item.type_ == MessageItem.TYPE) {
-            Message? quoted_message = ((MessageItem) content_item).message;
-            fallback += Dino.message_body_without_reply_fallback(quoted_message);
-            fallback = fallback.replace("\n", "\n> ");
-        } else if (content_item.type_ == FileItem.TYPE) {
-            FileTransfer? quoted_file = ((FileItem) content_item).file_transfer;
-            fallback += quoted_file.file_name;
-        }
-        fallback += "\n";
+        string fallback = FallbackBody.get_quoted_fallback_body(content_item);
 
         long fallback_length = fallback.length;
         var fallback_location = new Xep.FallbackIndication.FallbackLocation(0, (int)fallback_length);
diff --git a/libdino/src/service/reactions.vala b/libdino/src/service/reactions.vala
index be98293f..5deaabac 100644
--- a/libdino/src/service/reactions.vala
+++ b/libdino/src/service/reactions.vala
@@ -57,30 +57,21 @@ public class Dino.Reactions : StreamInteractionModule, Object {
         }
     }
 
-    public async bool conversation_supports_reactions(Conversation conversation) {
+    public bool conversation_supports_reactions(Conversation conversation) {
         if (conversation.type_ == Conversation.Type.CHAT) {
-            Gee.List<Jid>? resources = stream_interactor.get_module(PresenceManager.IDENTITY).get_full_jids(conversation.counterpart, conversation.account);
-            if (resources == null) return false;
-
-            foreach (Jid full_jid in resources) {
-                bool? has_feature = yield stream_interactor.get_module(EntityInfo.IDENTITY).has_feature(conversation.account, full_jid, Xep.Reactions.NS_URI);
-                if (has_feature == true) {
-                    return true;
-                }
-            }
+            return true;
         } else {
             // The MUC server needs to 1) support stable stanza ids 2) either support occupant ids or be a private room (where we know real jids)
             var entity_info = stream_interactor.get_module(EntityInfo.IDENTITY);
-            bool server_supports_sid = (yield entity_info.has_feature(conversation.account, conversation.counterpart.bare_jid, Xep.UniqueStableStanzaIDs.NS_URI)) ||
-                    (yield entity_info.has_feature(conversation.account, conversation.counterpart.bare_jid, Xmpp.MessageArchiveManagement.NS_URI_2));
+            bool server_supports_sid = (entity_info.has_feature_cached(conversation.account, conversation.counterpart.bare_jid, Xep.UniqueStableStanzaIDs.NS_URI)) ||
+                    (entity_info.has_feature_cached(conversation.account, conversation.counterpart.bare_jid, Xmpp.MessageArchiveManagement.NS_URI_2));
             if (!server_supports_sid) return false;
 
-            bool? supports_occupant_ids = yield entity_info.has_feature(conversation.account, conversation.counterpart, Xep.OccupantIds.NS_URI);
+            bool? supports_occupant_ids = entity_info.has_feature_cached(conversation.account, conversation.counterpart, Xep.OccupantIds.NS_URI);
             if (supports_occupant_ids) return true;
 
             return stream_interactor.get_module(MucManager.IDENTITY).is_private_room(conversation.account, conversation.counterpart);
         }
-        return false;
     }
 
     private void send_reactions(Conversation conversation, ContentItem content_item, Gee.List<string> reactions) throws SendError {
@@ -96,7 +87,7 @@ public class Dino.Reactions : StreamInteractionModule, Object {
             reactions_module.send_reaction.begin(stream, conversation.counterpart, "groupchat", message_id, reactions);
             // We save the reaction when it gets reflected back to us
         } else if (conversation.type_ == Conversation.Type.GROUPCHAT_PM) {
-            reactions_module.send_reaction(stream, conversation.counterpart, "chat", message_id, reactions);
+            reactions_module.send_reaction.begin(stream, conversation.counterpart, "chat", message_id, reactions);
         } else if (conversation.type_ == Conversation.Type.CHAT) {
             int64 now_millis = GLib.get_real_time () / 1000;
             reactions_module.send_reaction.begin(stream, conversation.counterpart, "chat", message_id, reactions, (_, res) => {
@@ -240,7 +231,7 @@ public class Dino.Reactions : StreamInteractionModule, Object {
         if (stanza.type_ == MessageStanza.TYPE_GROUPCHAT) {
             // Apply the same restrictions for incoming reactions as we do on sending them
             Conversation muc_conversation = stream_interactor.get_module(ConversationManager.IDENTITY).approx_conversation_for_stanza(from_jid, account.bare_jid, account, MessageStanza.TYPE_GROUPCHAT);
-            bool muc_supports_reactions = yield conversation_supports_reactions(muc_conversation);
+            bool muc_supports_reactions = conversation_supports_reactions(muc_conversation);
             if (!muc_supports_reactions) return;
         }
 
diff --git a/libdino/src/service/replies.vala b/libdino/src/service/replies.vala
index 97db70ee..2bb10e0b 100644
--- a/libdino/src/service/replies.vala
+++ b/libdino/src/service/replies.vala
@@ -51,8 +51,6 @@ public class Dino.Replies : StreamInteractionModule, Object {
 
     private void on_incoming_message(Entities.Message message, Xmpp.MessageStanza stanza, Conversation conversation) {
         // Check if a previous message was in reply to this one
-        string relevant_id = conversation.type_ == Conversation.Type.GROUPCHAT ? message.server_id : message.stanza_id;
-
         var reply_qry = db.reply.select();
         if (conversation.type_ == Conversation.Type.GROUPCHAT) {
             reply_qry.with(db.reply.quoted_message_stanza_id, "=", message.server_id);