improve sidebar UI

- only display messages that are content items
- only display messages for active accounts
- "fix" textview issue
- add empty states (no search, no results)

1 files changed, 13 insertions, 5 deletions

diff --git a/libdino/src/service/message_storage.vala b/libdino/src/service/message_storage.vala
index 9fb6ab19..50fc94b3 100644
--- a/libdino/src/service/message_storage.vala
+++ b/libdino/src/service/message_storage.vala
@@ -52,7 +52,7 @@ public class MessageStorage : StreamInteractionModule, Object {
         return null;
     }
 
-    public Gee.List<Message>? get_messages_before_message(Conversation? conversation, DateTime before, int id, int count = 20) {
+    public Gee.List<MessageItem> get_messages_before_message(Conversation? conversation, DateTime before, int id, int count = 20) {
 //        SortedSet<Message>? before = messages[conversation].head_set(message);
 //        if (before != null && before.size >= count) {
 //            Gee.List<Message> ret = new ArrayList<Message>(Message.equals_func);
@@ -66,14 +66,22 @@ public class MessageStorage : StreamInteractionModule, Object {
 //            }
 //            return ret;
 //        } else {
-            Gee.List<Message> db_messages = db.get_messages(conversation.counterpart, conversation.account, Util.get_message_type_for_conversation(conversation), count, before, null, id);
-            return db_messages;
+        Gee.List<Message> db_messages = db.get_messages(conversation.counterpart, conversation.account, Util.get_message_type_for_conversation(conversation), count, before, null, id);
+        Gee.List<MessageItem> ret = new ArrayList<MessageItem>();
+        foreach (Message message in db_messages) {
+            ret.add(new MessageItem(message, conversation, -1));
+        }
+        return ret;
 //        }
     }
 
-    public Gee.List<Message>? get_messages_after_message(Conversation? conversation, DateTime after, int id, int count = 20) {
+    public Gee.List<MessageItem> get_messages_after_message(Conversation? conversation, DateTime after, int id, int count = 20) {
         Gee.List<Message> db_messages = db.get_messages(conversation.counterpart, conversation.account, Util.get_message_type_for_conversation(conversation), count, null, after, id);
-        return db_messages;
+        Gee.List<MessageItem> ret = new ArrayList<MessageItem>();
+        foreach (Message message in db_messages) {
+            ret.add(new MessageItem(message, conversation, -1));
+        }
+        return ret;
     }
 
     public Message? get_message_by_id(int id, Conversation conversation) {