diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/common.c | 72 | ||||
| -rw-r--r-- | src/common.h | 3 | ||||
| -rw-r--r-- | src/config/preferences.c | 8 | ||||
| -rw-r--r-- | src/config/preferences.h | 2 | ||||
| -rw-r--r-- | src/event/server_events.c | 12 |
5 files changed, 75 insertions, 22 deletions
diff --git a/src/common.c b/src/common.c index ad66015f..c6ead0ba 100644 --- a/src/common.c +++ b/src/common.c @@ -199,18 +199,6 @@ str_replace(const char *string, const char *substr, return newstr; } -gboolean -str_contains_str(const char *const searchstr, const char *const substr) -{ - if (!searchstr) { - return FALSE; - } - if (!substr) { - return FALSE; - } - return g_strrstr(searchstr, substr) != NULL; -} - int str_contains(const char str[], int size, char ch) { @@ -669,3 +657,63 @@ is_notify_enabled(void) return notify_enabled; } + +gboolean +prof_strstr(const char *const needle, const char *const haystack, gboolean case_sensitive, gboolean whole_word) +{ + if (needle == NULL || haystack == NULL) { + return FALSE; + } + + char *needle_str = case_sensitive ? strdup(needle) : g_utf8_strdown(needle, -1); + char *haystack_str = case_sensitive ? strdup(haystack) : g_utf8_strdown(haystack, -1); + + if (whole_word) { + if (g_strcmp0(needle_str, haystack_str) == 0) { + free(needle_str); + free(haystack_str); + return TRUE; + } + + char *pos = g_strrstr(haystack_str, needle_str); + if (pos == NULL) { + free(needle_str); + free(haystack_str); + return FALSE; + } + + gboolean at_start = g_str_has_prefix(haystack_str, needle_str); + gboolean at_end = g_str_has_suffix(haystack_str, needle_str); + + if (at_start) { + char *next = g_utf8_next_char(pos + strlen(needle_str) - 1); + gunichar nextu = g_utf8_get_char(next); + gboolean result = g_unichar_isalnum(nextu) ? FALSE : TRUE; + free(needle_str); + free(haystack_str); + return result; + } else if (at_end) { + char *prev = g_utf8_prev_char(pos); + gunichar prevu = g_utf8_get_char(prev); + gboolean result = g_unichar_isalnum(prevu) ? FALSE : TRUE; + free(needle_str); + free(haystack_str); + return result; + } else { + char *prev = g_utf8_prev_char(pos); + char *next = g_utf8_next_char(pos + strlen(needle_str) - 1); + gunichar prevu = g_utf8_get_char(prev); + gunichar nextu = g_utf8_get_char(next); + gboolean result = g_unichar_isalnum(prevu) || g_unichar_isalnum(nextu) ? FALSE : TRUE; + free(needle_str); + free(haystack_str); + return result; + } + } else { + gboolean result = g_strrstr(haystack_str, needle_str) != NULL ? TRUE : FALSE; + free(needle_str); + free(haystack_str); + return result; + } +} + diff --git a/src/common.h b/src/common.h index 21e9c4e2..284a096e 100644 --- a/src/common.h +++ b/src/common.h @@ -103,7 +103,6 @@ gboolean p_hash_table_contains(GHashTable *hash_table, gconstpointer key); gboolean create_dir(char *name); gboolean mkdir_recursive(const char *dir); char* str_replace(const char *string, const char *substr, const char *replacement); -gboolean str_contains_str(const char *const searchstr, const char *const substr); int str_contains(const char str[], int size, char ch); gboolean strtoi_range(char *str, int *saveptr, int min, int max, char **err_msg); int utf8_display_len(const char *const str); @@ -129,4 +128,6 @@ char* get_file_or_linked(char *loc, char *basedir); char* strip_arg_quotes(const char *const input); gboolean is_notify_enabled(void); +gboolean prof_strstr(const char *const needle, const char *const haystack, gboolean case_sensitive, gboolean whole_word); + #endif diff --git a/src/config/preferences.c b/src/config/preferences.c index 968787e3..ce40a321 100644 --- a/src/config/preferences.c +++ b/src/config/preferences.c @@ -1230,6 +1230,8 @@ _get_group(preference_t pref) case PREF_NOTIFY_ROOM_TEXT: case PREF_NOTIFY_INVITE: case PREF_NOTIFY_SUB: + case PREF_MENTION_CASE_SENSITIVE: + case PREF_MENTION_WHOLE_WORD: return PREF_GROUP_NOTIFICATIONS; case PREF_CHLOG: case PREF_GRLOG: @@ -1332,6 +1334,10 @@ _get_key(preference_t pref) return "invite"; case PREF_NOTIFY_SUB: return "sub"; + case PREF_MENTION_CASE_SENSITIVE: + return "room.mention.casesensitive"; + case PREF_MENTION_WHOLE_WORD: + return "room.mention.wholeword"; case PREF_CHLOG: return "chlog"; case PREF_GRLOG: @@ -1488,6 +1494,8 @@ _get_default_boolean(preference_t pref) case PREF_ROSTER_ROOMS: case PREF_TLS_SHOW: case PREF_LASTACTIVITY: + case PREF_MENTION_CASE_SENSITIVE: + case PREF_MENTION_WHOLE_WORD: return TRUE; default: return FALSE; diff --git a/src/config/preferences.h b/src/config/preferences.h index 1ab18d31..7165079b 100644 --- a/src/config/preferences.h +++ b/src/config/preferences.h @@ -113,6 +113,8 @@ typedef enum { PREF_NOTIFY_ROOM_TEXT, PREF_NOTIFY_INVITE, PREF_NOTIFY_SUB, + PREF_MENTION_CASE_SENSITIVE, + PREF_MENTION_WHOLE_WORD, PREF_CHLOG, PREF_GRLOG, PREF_AUTOAWAY_CHECK, diff --git a/src/event/server_events.c b/src/event/server_events.c index 48e79d3b..11252dab 100644 --- a/src/event/server_events.c +++ b/src/event/server_events.c @@ -251,15 +251,9 @@ sv_ev_room_message(const char *const room_jid, const char *const nick, const cha char *new_message = plugins_pre_room_message_display(room_jid, nick, message); char *mynick = muc_nick(mucwin->roomjid); - gboolean mention = FALSE; - char *message_lower = g_utf8_strdown(new_message, -1); - char *mynick_lower = g_utf8_strdown(mynick, -1); - if (g_strrstr(message_lower, mynick_lower)) { - mention = TRUE; - } - g_free(message_lower); - g_free(mynick_lower); - + gboolean case_sensitive = prefs_get_boolean(PREF_MENTION_CASE_SENSITIVE); + gboolean whole_word = prefs_get_boolean(PREF_MENTION_WHOLE_WORD); + gboolean mention = prof_strstr(mynick, new_message, case_sensitive, whole_word); GList *triggers = prefs_message_get_triggers(new_message); mucwin_message(mucwin, nick, new_message, mention, triggers); |