devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 8 Actions Packages Projects 1 Releases Wiki Activity

Remove unanimous MAM display

Browse Source 
For some time users could choose to have the old way "unanimous" where
all the MUC history is just grey (or whatever was set). Now it is always
just displayed like regular new incoming MUC text.
This commit is contained in:
Michael Vetter
2020-04-25 17:13:22 +02:00
parent 570863df1b
commit 85520ecdc5
9 changed files with 18 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ui/console.c
View File

@@ -1871,10 +1871,6 @@ cons_logging_setting(void)
cons_show("Groupchat logging (/logging group) : ON");
else
cons_show("Groupchat logging (/logging group) : OFF");
char *pref = prefs_get_string(PREF_HISTORY_COLOR_MUC);
cons_show("MUC history color (/logging group color) : %s", pref);
prefs_free_string(pref);
}
void

23
src/ui/mucwin.c
View File

@@ -365,27 +365,16 @@ mucwin_history(ProfMucWin *mucwin, const ProfMessage *const message)
{
assert(mucwin != NULL);
ProfWin *window = (ProfWin*)mucwin;
char *nick = message->from_jid->resourcepart;
char *mynick = muc_nick(mucwin->roomjid);
GSList *mentions = get_mentions(prefs_get_boolean(PREF_NOTIFY_MENTION_WHOLE_WORD), prefs_get_boolean(PREF_NOTIFY_MENTION_CASE_SENSITIVE), message->plain, mynick);
GList *triggers = prefs_message_get_triggers(message->plain);
// 'unanimous' all in one color (like always was)
// 'regular' colored like new messages too
char *muc_history_color = prefs_get_string(PREF_HISTORY_COLOR_MUC);
mucwin_incoming_msg(mucwin, message, mentions, triggers, FALSE);
if (g_strcmp0(muc_history_color, "unanimous") == 0) {
win_print_history(window, message);
} else {
char *mynick = muc_nick(mucwin->roomjid);
GSList *mentions = get_mentions(prefs_get_boolean(PREF_NOTIFY_MENTION_WHOLE_WORD), prefs_get_boolean(PREF_NOTIFY_MENTION_CASE_SENSITIVE), message->plain, mynick);
GList *triggers = prefs_message_get_triggers(message->plain);
g_slist_free(mentions);
g_list_free_full(triggers, free);
mucwin_incoming_msg(mucwin, message, mentions, triggers, FALSE);
g_slist_free(mentions);
g_list_free_full(triggers, free);
}
g_free(muc_history_color);
plugins_on_room_history_message(mucwin->roomjid, nick, message->plain, message->timestamp);
}

26
src/ui/window.c
View File

@@ -1223,29 +1223,19 @@ win_print_history(ProfWin *window, const ProfMessage *const message)
{
g_date_time_ref(message->timestamp);
int flags = 0;
char *display_name;
if (message->type == PROF_MSG_TYPE_MUC) {
display_name = strdup(message->from_jid->resourcepart);
int flags = 0;
const char *jid = connection_get_fulljid();
Jid *jidp = jid_create(jid);
char *muc_history_color = prefs_get_string(PREF_HISTORY_COLOR_MUC);
if (g_strcmp0(muc_history_color, "unanimous") == 0) {
flags = NO_COLOUR_FROM;
}
g_free(muc_history_color);
if (g_strcmp0(jidp->barejid, message->from_jid->barejid) == 0) {
display_name = strdup("me");
} else {
const char *jid = connection_get_fulljid();
Jid *jidp = jid_create(jid);
if (g_strcmp0(jidp->barejid, message->from_jid->barejid) == 0) {
display_name = strdup("me");
} else {
display_name = roster_get_msg_display_name(message->from_jid->barejid, message->from_jid->resourcepart);
}
jid_destroy(jidp);
display_name = roster_get_msg_display_name(message->from_jid->barejid, message->from_jid->resourcepart);
}
jid_destroy(jidp);
buffer_append(window->layout->buffer, "-", 0, message->timestamp, flags, THEME_TEXT_HISTORY, display_name, NULL, message->plain, NULL, NULL);
_win_print_internal(window, "-", 0, message->timestamp, flags, THEME_TEXT_HISTORY, display_name, message->plain, NULL);