aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Merge pull request #1232 from vague666/fix_1228

Browse Source 
Implement priority on the matched lines for /hilight
This commit is contained in:
ailin-nemui 2020-12-14 15:22:56 +01:00 committed by GitHub
commit 581c43ed1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/fe-common/core/hilight-text.c
View File

@ -244,8 +244,11 @@ HILIGHT_REC *hilight_match(SERVER_REC *server, const char *channel,
GSList *tmp;
CHANNEL_REC *chanrec;
NICK_REC *nickrec;
HILIGHT_REC *tmprec;
int priority = -1;
g_return_val_if_fail(str != NULL, NULL);
tmprec = NULL;
if ((never_hilight_level & level) == level)
return NULL;
@ -270,15 +273,17 @@ HILIGHT_REC *hilight_match(SERVER_REC *server, const char *channel,
for (tmp = hilights; tmp != NULL; tmp = tmp->next) {
HILIGHT_REC *rec = tmp->data;
if (!rec->nickmask && hilight_match_level(rec, level) &&
hilight_match_channel(rec, channel) &&
(rec->servertag == NULL ||
(server != NULL && g_ascii_strcasecmp(rec->servertag, server->tag) == 0)) &&
hilight_match_text(rec, str, match_beg, match_end))
return rec;
if (rec->priority > priority && !rec->nickmask && hilight_match_level(rec, level) &&
hilight_match_channel(rec, channel) &&
(rec->servertag == NULL ||
(server != NULL && g_ascii_strcasecmp(rec->servertag, server->tag) == 0)) &&
hilight_match_text(rec, str, match_beg, match_end)) {
tmprec = rec;
priority = rec->priority;
}
}
return NULL;
return tmprec;
}
static char *hilight_get_act_color(HILIGHT_REC *rec)
@ -670,6 +675,7 @@ static void hilight_nick_cache(GHashTable *list, CHANNEL_REC *channel,
HILIGHT_REC *match;
char *nickmask;
int len, best_match;
int priority = -1;
if (nick->host == NULL)
return; /* don't check until host is known */
@ -680,11 +686,12 @@ static void hilight_nick_cache(GHashTable *list, CHANNEL_REC *channel,
for (tmp = hilights; tmp != NULL; tmp = tmp->next) {
HILIGHT_REC *rec = tmp->data;
if (rec->nickmask &&
hilight_match_channel(rec, channel->name) &&
match_wildcards(rec->text, nickmask)) {
if (rec->priority > priority && rec->nickmask &&
hilight_match_channel(rec, channel->name) &&
match_wildcards(rec->text, nickmask)) {
len = strlen(rec->text);
if (best_match < len) {
priority = rec->priority;
best_match = len;
match = rec;
}