Tidy handling room mention and room triggers

2 files changed, 5 insertions, 4 deletions

diff --git a/src/ui/mucwin.c b/src/ui/mucwin.c
index 37da10dd..a24daa59 100644
--- a/src/ui/mucwin.c
+++ b/src/ui/mucwin.c
@@ -356,7 +356,8 @@ mucwin_history(ProfMucWin *mucwin, const char *const nick, GDateTime *timestamp,
 }
 
 void
-mucwin_message(ProfMucWin *mucwin, const char *const nick, const char *const message)
+mucwin_message(ProfMucWin *mucwin, const char *const nick, const char *const message, gboolean mention,
+    gboolean trigger_found)
 {
     assert(mucwin != NULL);
 
@@ -364,9 +365,9 @@ mucwin_message(ProfMucWin *mucwin, const char *const nick, const char *const mes
     char *my_nick = muc_nick(mucwin->roomjid);
 
     if (g_strcmp0(nick, my_nick) != 0) {
-        if (g_strrstr(message, my_nick)) {
+        if (mention) {
             win_print(window, '-', 0, NULL, NO_ME, THEME_ROOMMENTION, nick, message);
-        } else if (prefs_message_contains_trigger(message)) {
+        } else if (trigger_found) {
             win_print(window, '-', 0, NULL, NO_ME, THEME_ROOMTRIGGER, nick, message);
         } else {
             win_print(window, '-', 0, NULL, NO_ME, THEME_TEXT_THEM, nick, message);
diff --git a/src/ui/ui.h b/src/ui/ui.h
index 8fea6eb1..86f68d3c 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -158,7 +158,7 @@ void mucwin_occupant_role_and_affiliation_change(ProfMucWin *mucwin, const char
     const char *const role, const char *const affiliation, const char *const actor, const char *const reason);
 void mucwin_roster(ProfMucWin *mucwin, GList *occupants, const char *const presence);
 void mucwin_history(ProfMucWin *mucwin, const char *const nick, GDateTime *timestamp, const char *const message);
-void mucwin_message(ProfMucWin *mucwin, const char *const nick, const char *const message);
+void mucwin_message(ProfMucWin *mucwin, const char *const nick, const char *const message, gboolean mention, gboolean trigger_found);
 void mucwin_subject(ProfMucWin *mucwin, const char *const nick, const char *const subject);
 void mucwin_requires_config(ProfMucWin *mucwin);
 void mucwin_info(ProfMucWin *mucwin);