aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

Don't handle /me in the middle of a message with mentions

Browse Source
This commit is contained in:
Dmitry Podgorny 2021-07-17 19:36:31 +03:00
parent a5d15e224c
commit c0ea27f2f0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ui/mucwin.c
View File

@ -386,12 +386,14 @@ _mucwin_print_mention(ProfWin* window, const char* const message, const char* co
int last_pos = 0; int last_pos = 0;
int pos; int pos;
GSList* curr = mentions; GSList* curr = mentions;
glong mynick_len = g_utf8_strlen(mynick, -1);
while (curr) { while (curr) {
pos = GPOINTER_TO_INT(curr->data); pos = GPOINTER_TO_INT(curr->data);
char *before_str = g_utf8_substring(message, last_pos, pos); char *before_str = g_utf8_substring(message, last_pos, pos);
if (strncmp(before_str, "/me ", 4) == 0) { if (last_pos == 0 && strncmp(before_str, "/me ", 4) == 0) {
win_print_them(window, THEME_ROOMMENTION, ch, flags, ""); win_print_them(window, THEME_ROOMMENTION, ch, flags, "");
win_append_highlight(window, THEME_ROOMMENTION, "*%s ", from); win_append_highlight(window, THEME_ROOMMENTION, "*%s ", from);
win_append_highlight(window, THEME_ROOMMENTION, "%s", before_str + 4); win_append_highlight(window, THEME_ROOMMENTION, "%s", before_str + 4);
@ -404,7 +406,6 @@ _mucwin_print_mention(ProfWin* window, const char* const message, const char* co
} }
g_free(before_str); g_free(before_str);
glong mynick_len = g_utf8_strlen(mynick, -1);
char* mynick_str = g_utf8_substring(message, pos, pos + mynick_len); char* mynick_str = g_utf8_substring(message, pos, pos + mynick_len);
win_append_highlight(window, THEME_ROOMMENTION_TERM, "%s", mynick_str); win_append_highlight(window, THEME_ROOMMENTION_TERM, "%s", mynick_str);
g_free(mynick_str); g_free(mynick_str);