Fix pinned messages being dropped by accident

Author: radare

src/pinned_messages_manager.vala

@@ -5,12 +5,15 @@ namespace Dc {
         public Gtk.Revealer revealer { get; private set; }
 
         private unowned Window? window = null;
+        private unowned RpcClient? rpc = null;
         private Gtk.Box bar_content;
         private int[] msg_ids = {};
         private int current_chat_id = 0;
         private unowned GLib.ListStore message_store;
         private unowned SettingsManager settings;
 
+        public string? self_email { get; set; default = null; }
+
         public PinnedMessagesManager (GLib.ListStore message_store,
                                       SettingsManager settings) {
             this.message_store = message_store;
@@ -25,6 +28,7 @@ namespace Dc {
         }
 
         public void set_window (Window w) { this.window = w; }
+        public void set_rpc (RpcClient r) { this.rpc = r; }
 
         public void load_for_chat (int chat_id) {
             current_chat_id = chat_id;
@@ -68,10 +72,10 @@ namespace Dc {
                 m.is_pinned = is_pinned (msg_id);
                 refresh_in_store (msg_id);
             }
-            update_bar ();
+            update_bar.begin ();
         }
 
-        public void update_bar () {
+        public async void update_bar () {
             /* Clear existing pinned entries */
             Gtk.Widget? child;
             while ((child = bar_content.get_first_child ()) != null) {
@@ -94,6 +98,18 @@ namespace Dc {
                     sender = m.is_outgoing ? "You" : (m.sender_name ?? "");
                 }
 
+                /* Fetch from RPC if not in the loaded batch */
+                if (text == null && sender == null && rpc != null) {
+                    try {
+                        var msg_obj = yield rpc.get_message (rpc.account_id, pin_id);
+                        if (msg_obj != null) {
+                            var fetched = RpcClient.parse_message (msg_obj, self_email);
+                            text = fetched.text;
+                            sender = fetched.is_outgoing ? "You" : (fetched.sender_name ?? "");
+                        }
+                    } catch (Error e) { /* skip on error */ }
+                }
+
                 if (text == null && sender == null) continue;
 
                 var row_btn = new Gtk.Button ();

src/window.vala

@@ -356,6 +356,7 @@ namespace Dc {
 
         private async void try_connect () {
             rpc = ((Dc.Application) this.application).rpc;
+            pinned.set_rpc (rpc);
 
             /* Find the RPC server binary */
             string[]? rpc_cmd = AccountFinder.find_rpc_server ();
@@ -408,11 +409,13 @@ namespace Dc {
             msg_actions = new MessageActions (this, rpc, message_store, pinned,
                                               compose_bar, settings);
             msg_actions.self_email = self_email;
+            pinned.self_email = self_email;
 
             if (rpc.account_id > 0) {
                 try {
                     self_email = yield rpc.get_config (rpc.account_id, "addr");
                     msg_actions.self_email = self_email;
+                    pinned.self_email = self_email;
                     events.self_email = self_email;
                 } catch (Error ce) {
                     self_email = null;
@@ -577,7 +580,7 @@ namespace Dc {
                     return Source.REMOVE;
                 });
 
-                pinned.update_bar ();
+                pinned.update_bar.begin ();
             } catch (Error e) {
                 show_toast ("Failed to load messages: " + e.message);
             }
@@ -1015,6 +1018,7 @@ namespace Dc {
             if (rpc.account_id <= 0) {
                 self_email = null;
                 if (msg_actions != null) msg_actions.self_email = null;
+                pinned.self_email = null;
                 content_stack.visible_child_name = "empty";
                 current_chat_id = 0;
                 return;
@@ -1025,6 +1029,7 @@ namespace Dc {
                 self_email = null;
             }
             if (msg_actions != null) msg_actions.self_email = self_email;
+            pinned.self_email = self_email;
             if (events != null) events.self_email = self_email;
             current_chat_id = 0;
             content_stack.visible_child_name = "empty";