Implemented roster grouped by presence

src/roster_list.c

@@ -265,6 +265,26 @@ roster_barejid_from_name(const char * const name)
     return g_hash_table_lookup(name_to_barejid, name);
 }
 
+GSList *
+roster_get_contacts_by_presence(const char * const presence)
+{
+    GSList *result = NULL;
+    GHashTableIter iter;
+    gpointer key;
+    gpointer value;
+
+    g_hash_table_iter_init(&iter, contacts);
+    while (g_hash_table_iter_next(&iter, &key, &value)) {
+        PContact contact = (PContact)value;
+        if (g_strcmp0(p_contact_presence(contact), presence) == 0) {
+            result = g_slist_insert_sorted(result, value, (GCompareFunc)_compare_contacts);
+        }
+    }
+
+    // resturn all contact structs
+    return result;
+}
+
 GSList *
 roster_get_contacts(void)
 {

src/roster_list.h

@@ -64,5 +64,6 @@ GSList * roster_get_group(const char * const group);
 GSList * roster_get_groups(void);
 char * roster_find_group(char *search_str);
 char * roster_find_jid(char *search_str);
+GSList * roster_get_contacts_by_presence(const char * const presence);
 
 #endif

src/ui/core.c

@@ -84,6 +84,7 @@ static void _win_handle_page(const wint_t * const ch, const int result);
 static void _win_show_history(WINDOW *win, int win_index,
     const char * const contact);
 static void _ui_draw_term_title(void);
+static void _ui_roster_contact(PContact contact);
 
 static void
 _ui_init(void)
@@ -2805,20 +2806,10 @@ _ui_show_lines(ProfWin *window, const gchar** lines)
 }
 
 static void
-_ui_roster(void)
+_ui_roster_contact(PContact contact)
 {
-    ProfWin *window = wins_get_console();
-    if (window) {
-        GSList *contacts = roster_get_contacts();
-        if (contacts) {
-            werase(window->subwin);
-            wattron(window->subwin, COLOUR_ROOMINFO);
-            win_printline_nowrap(window->subwin, " -Roster");
-            wattroff(window->subwin, COLOUR_ROOMINFO);
-            GSList *curr_contact = contacts;
-            while (curr_contact) {
-                PContact contact = curr_contact->data;
     if (p_contact_subscribed(contact)) {
+        ProfWin *window = wins_get_console();
         const char *name = p_contact_name_or_jid(contact);
         const char *presence = p_contact_presence(contact);
 
@@ -2867,10 +2858,58 @@ _ui_roster(void)
             }
         }
     }
+}
+
+static void
+_ui_roster_contacts_by_presence(const char * const presence, char *title)
+{
+    ProfWin *window = wins_get_console();
+    GSList *contacts = roster_get_contacts_by_presence(presence);
+    wattron(window->subwin, COLOUR_ROOMINFO);
+    win_printline_nowrap(window->subwin, title);
+    wattroff(window->subwin, COLOUR_ROOMINFO);
+    if (contacts) {
+        GSList *curr_contact = contacts;
+        while (curr_contact) {
+            PContact contact = curr_contact->data;
+            _ui_roster_contact(contact);
             curr_contact = g_slist_next(curr_contact);
         }
     }
     g_slist_free(contacts);
+}
+
+static void
+_ui_roster(void)
+{
+    ProfWin *window = wins_get_console();
+    if (window) {
+        if (g_strcmp0(prefs_get_string(PREF_ROSTER_BY), "presence") == 0) {
+            werase(window->subwin);
+            _ui_roster_contacts_by_presence("chat", " -Available for chat");
+            _ui_roster_contacts_by_presence("online", " -Online");
+            _ui_roster_contacts_by_presence("away", " -Away");
+            _ui_roster_contacts_by_presence("xa", " -Extended Away");
+            _ui_roster_contacts_by_presence("dnd", " -Do not disturb");
+            if (prefs_get_boolean(PREF_ROSTER_OFFLINE)) {
+                _ui_roster_contacts_by_presence("offline", " -Offline");
+            }
+        } else {
+            GSList *contacts = roster_get_contacts();
+            if (contacts) {
+                werase(window->subwin);
+                wattron(window->subwin, COLOUR_ROOMINFO);
+                win_printline_nowrap(window->subwin, " -Roster");
+                wattroff(window->subwin, COLOUR_ROOMINFO);
+                GSList *curr_contact = contacts;
+                while (curr_contact) {
+                    PContact contact = curr_contact->data;
+                    _ui_roster_contact(contact);
+                    curr_contact = g_slist_next(curr_contact);
+                }
+            }
+            g_slist_free(contacts);
+        }
     }
 }
 

themes/boothj5

@@ -17,9 +17,9 @@ main.splash=red
 online=green
 away=cyan
 chat=white
-dnd=red
-xa=cyan
-offline=blue
+dnd=magenta
+xa=blue
+offline=red
 typing=yellow
 gone=red
 error=red