From 5ff9fbd81091f09222235542f2cf2a707df54f7a Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sun, 24 Jan 2016 23:06:22 +0000
Subject: Tidy handling room mention and room triggers

---
 src/config/preferences.c | 30 +++++++++++-------------------
 src/config/preferences.h |  5 +++--
 2 files changed, 14 insertions(+), 21 deletions(-)

(limited to 'src/config')

diff --git a/src/config/preferences.c b/src/config/preferences.c
index f419eff4..7e798dc8 100644
--- a/src/config/preferences.c
+++ b/src/config/preferences.c
@@ -211,10 +211,11 @@ prefs_do_chat_notify(gboolean current_win, const char *const message)
     return FALSE;
 }
 
-gboolean
-prefs_message_contains_trigger(const char *const message)
+GList*
+prefs_message_get_triggers(const char *const message)
 {
-    gboolean trigger_found = FALSE;
+    GList *result = NULL;
+
     char *message_lower = g_utf8_strdown(message, -1);
     gsize len = 0;
     gchar **triggers = g_key_file_get_string_list(prefs, PREF_GROUP_NOTIFICATIONS, "room.trigger.list", &len, NULL);
@@ -222,21 +223,20 @@ prefs_message_contains_trigger(const char *const message)
     for (i = 0; i < len; i++) {
         char *trigger_lower = g_utf8_strdown(triggers[i], -1);
         if (g_strrstr(message_lower, trigger_lower)) {
-            trigger_found = TRUE;
             g_free(trigger_lower);
-            break;
+            result = g_list_append(result, strdup(triggers[i]));
         }
         g_free(trigger_lower);
     }
     g_strfreev(triggers);
     g_free(message_lower);
 
-    return trigger_found;
+    return result;
 }
 
 gboolean
-prefs_do_room_notify(gboolean current_win, const char *const roomjid, const char *const nick,
-    const char *const message)
+prefs_do_room_notify(gboolean current_win, const char *const roomjid, const char *const nick, const char *const message,
+    gboolean mention, gboolean trigger_found)
 {
     gboolean notify_current = prefs_get_boolean(PREF_NOTIFY_ROOM_CURRENT);
     gboolean notify_window = FALSE;
@@ -263,16 +263,8 @@ prefs_do_room_notify(gboolean current_win, const char *const roomjid, const char
     } else {
         notify_mention = prefs_get_boolean(PREF_NOTIFY_ROOM_MENTION);
     }
-    if (notify_mention) {
-        char *message_lower = g_utf8_strdown(message, -1);
-        char *nick_lower = g_utf8_strdown(nick, -1);
-        if (g_strrstr(message_lower, nick_lower)) {
-            g_free(message_lower);
-            g_free(nick_lower);
-            return TRUE;
-        }
-        g_free(message_lower);
-        g_free(nick_lower);
+    if (notify_mention && mention) {
+        return TRUE;
     }
 
     gboolean notify_trigger = FALSE;
@@ -281,7 +273,7 @@ prefs_do_room_notify(gboolean current_win, const char *const roomjid, const char
     } else {
         notify_trigger = prefs_get_boolean(PREF_NOTIFY_ROOM_TRIGGER);
     }
-    if (notify_trigger && prefs_message_contains_trigger(message)) {
+    if (notify_trigger && trigger_found) {
         return TRUE;
     }
 
diff --git a/src/config/preferences.h b/src/config/preferences.h
index 8c94a1e1..61ccbb11 100644
--- a/src/config/preferences.h
+++ b/src/config/preferences.h
@@ -225,8 +225,9 @@ void prefs_free_string(char *pref);
 void prefs_set_string(preference_t pref, char *value);
 
 gboolean prefs_do_chat_notify(gboolean current_win, const char *const message);
-gboolean prefs_do_room_notify(gboolean current_win, const char *const roomjid, const char *const nick, const char *const message);
-gboolean prefs_message_contains_trigger(const char *const message);
+gboolean prefs_do_room_notify(gboolean current_win, const char *const roomjid, const char *const nick,
+    const char *const message, gboolean mention, gboolean trigger_found);
+GList* prefs_message_get_triggers(const char *const message);
 
 void prefs_set_room_notify(const char *const roomjid, gboolean value);
 void prefs_set_room_notify_mention(const char *const roomjid, gboolean value);
-- 
cgit 1.4.1-2-gfad0