messenger-cli

commit 17eb90afe25208092bc878c89f68c219b8daa913
parent f72d804229f9346b745dbbbaae46997e0344dec3
Author: TheJackiMonster <thejackimonster@gmail.com>
Date:   Sat, 28 May 2022 21:45:43 +0200

Simplified filtering of messages during add process

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

Diffstat:
M
src/ui/messages.c
 | 
35
++++++++++-------------------------

1 file changed, 10 insertions(+), 25 deletions(-)
diff --git a/src/ui/messages.c b/src/ui/messages.c
@@ -27,21 +27,6 @@
 #include "../application.h"
 #include "../util.h"
 
-bool
-_messages_filter_drop(const struct GNUNET_CHAT_Message *message)
-{
-  enum GNUNET_CHAT_MessageKind kind = GNUNET_CHAT_message_get_kind(message);
-
-  switch (kind) {
-    case GNUNET_CHAT_KIND_CONTACT:
-    case GNUNET_CHAT_KIND_WHISPER:
-    case GNUNET_CHAT_KIND_DELETION:
-      return TRUE;
-    default:
-      return FALSE;
-  }
-}
-
 void
 _messages_iterate(UI_MESSAGES_Handle *messages,
 		  const struct GNUNET_CHAT_Message *message)
@@ -67,13 +52,9 @@ messages_event(UI_MESSAGES_Handle *messages,
   UI_MESSAGES_List *element = messages->head;
   while (element)
   {
-    if (_messages_filter_drop(element->message))
-      goto skip_message;
-
     _messages_iterate(messages, element->message);
     count++;
 
-  skip_message:
     element = element->next;
   }
 
@@ -285,13 +266,9 @@ messages_print(UI_MESSAGES_Handle *messages)
   UI_MESSAGES_List *element = messages->head;
   while (element)
   {
-    if (_messages_filter_drop(element->message))
-      goto skip_message;
-
     _messages_iterate_print(messages, element->message);
     count++;
 
-  skip_message:
     element = element->next;
   }
 
@@ -358,8 +335,16 @@ void
 messages_add(UI_MESSAGES_Handle *messages,
 	     const struct GNUNET_CHAT_Message *message)
 {
-  if (GNUNET_CHAT_KIND_DELETION == GNUNET_CHAT_message_get_kind(message))
-    return;
+  enum GNUNET_CHAT_MessageKind kind = GNUNET_CHAT_message_get_kind(message);
+
+  switch (kind) {
+    case GNUNET_CHAT_KIND_CONTACT:
+    case GNUNET_CHAT_KIND_WHISPER:
+    case GNUNET_CHAT_KIND_DELETION:
+      return;
+    default:
+      break;
+  }
 
   UI_MESSAGES_List *element = GNUNET_new(UI_MESSAGES_List);
   element->message = message;