devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-20 14:06:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add to_jid field to ProfMessage struct

Browse Source 
Is usefult in many cases if we want cleaner code.
Hope this edit didn't break anything though ;-)
This commit is contained in:
Michael Vetter
2020-04-11 17:11:53 +02:00
parent e23bc38083
commit 180ec2b474
9 changed files with 103 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ui/chatwin.c
View File

@@ -251,12 +251,12 @@ chatwin_incoming_msg(ProfChatWin *chatwin, ProfMessage *message, gboolean win_cr
assert(chatwin != NULL);
char *old_plain = message->plain;
message->plain = plugins_pre_chat_message_display(chatwin->barejid, message->jid->resourcepart, message->plain);
message->plain = plugins_pre_chat_message_display(chatwin->barejid, message->from_jid->resourcepart, message->plain);
ProfWin *window = (ProfWin*)chatwin;
int num = wins_get_num(window);
char *display_name = roster_get_msg_display_name(chatwin->barejid, message->jid->resourcepart);
char *display_name = roster_get_msg_display_name(chatwin->barejid, message->from_jid->resourcepart);
gboolean is_current = wins_is_current(window);
gboolean notify = prefs_do_chat_notify(is_current);
@@ -304,7 +304,7 @@ chatwin_incoming_msg(ProfChatWin *chatwin, ProfMessage *message, gboolean win_cr
free(display_name);
plugins_post_chat_message_display(chatwin->barejid, message->jid->resourcepart, message->plain);
plugins_post_chat_message_display(chatwin->barejid, message->from_jid->resourcepart, message->plain);
free(message->plain);
message->plain = old_plain;

6
src/ui/mucwin.c
View File

@@ -366,7 +366,7 @@ mucwin_history(ProfMucWin *mucwin, const ProfMessage *const message)
assert(mucwin != NULL);
ProfWin *window = (ProfWin*)mucwin;
char *nick = message->jid->resourcepart;
char *nick = message->from_jid->resourcepart;
// 'unanimous' all in one color (like always was)
// 'regular' colored like new messages too
@@ -570,9 +570,9 @@ mucwin_incoming_msg(ProfMucWin *mucwin, const ProfMessage *const message, GSList
win_insert_last_read_position_marker((ProfWin*)mucwin, mucwin->roomjid);
if (g_slist_length(mentions) > 0) {
_mucwin_print_mention(window, message->plain, message->jid->resourcepart, mynick, mentions, ch, flags);
_mucwin_print_mention(window, message->plain, message->from_jid->resourcepart, mynick, mentions, ch, flags);
} else if (triggers) {
win_print_them(window, THEME_ROOMTRIGGER, ch, flags, message->jid->resourcepart);
win_print_them(window, THEME_ROOMTRIGGER, ch, flags, message->from_jid->resourcepart);
_mucwin_print_triggers(window, message->plain, triggers);
} else {
win_println_incoming_muc_msg(window, ch, flags, message);

16
src/ui/window.c
View File

@@ -1150,16 +1150,16 @@ win_print_incoming(ProfWin *window, const char *const display_name_from, ProfMes
}
if (prefs_get_boolean(PREF_CORRECTION_ALLOW) && message->replace_id) {
_win_correct(window, message->plain, message->id, message->replace_id, message->jid->barejid);
_win_correct(window, message->plain, message->id, message->replace_id, message->from_jid->barejid);
} else {
_win_printf(window, enc_char, 0, message->timestamp, flags, THEME_TEXT_THEM, display_name_from, message->jid->barejid, message->id, "%s", message->plain);
_win_printf(window, enc_char, 0, message->timestamp, flags, THEME_TEXT_THEM, display_name_from, message->from_jid->barejid, message->id, "%s", message->plain);
}
free(enc_char);
break;
}
case WIN_PRIVATE:
_win_printf(window, "-", 0, message->timestamp, flags, THEME_TEXT_THEM, display_name_from, message->jid->barejid, message->id, "%s", message->plain);
_win_printf(window, "-", 0, message->timestamp, flags, THEME_TEXT_THEM, display_name_from, message->from_jid->barejid, message->id, "%s", message->plain);
break;
default:
assert(FALSE);
@@ -1177,9 +1177,9 @@ void
win_println_incoming_muc_msg(ProfWin *window, char *show_char, int flags, const ProfMessage *const message)
{
if (prefs_get_boolean(PREF_CORRECTION_ALLOW) && message->replace_id) {
_win_correct(window, message->plain, message->id, message->replace_id, message->jid->fulljid);
_win_correct(window, message->plain, message->id, message->replace_id, message->from_jid->fulljid);
} else {
_win_printf(window, show_char, 0, message->timestamp, flags | NO_ME, THEME_TEXT_THEM, message->jid->resourcepart, message->jid->fulljid, message->id, "%s", message->plain);
_win_printf(window, show_char, 0, message->timestamp, flags | NO_ME, THEME_TEXT_THEM, message->from_jid->resourcepart, message->from_jid->fulljid, message->id, "%s", message->plain);
}
inp_nonblocking(TRUE);
@@ -1226,7 +1226,7 @@ win_print_history(ProfWin *window, const ProfMessage *const message)
char *display_name;
if (message->type == PROF_MSG_TYPE_MUC) {
display_name = strdup(message->jid->resourcepart);
display_name = strdup(message->from_jid->resourcepart);
char *muc_history_color = prefs_get_string(PREF_HISTORY_COLOR_MUC);
if (g_strcmp0(muc_history_color, "unanimous") == 0) {
@@ -1237,10 +1237,10 @@ win_print_history(ProfWin *window, const ProfMessage *const message)
const char *jid = connection_get_fulljid();
Jid *jidp = jid_create(jid);
if (g_strcmp0(jidp->barejid, message->jid->barejid) == 0) {
if (g_strcmp0(jidp->barejid, message->from_jid->barejid) == 0) {
display_name = strdup("me");
} else {
display_name = roster_get_msg_display_name(message->jid->barejid, message->jid->resourcepart);
display_name = roster_get_msg_display_name(message->from_jid->barejid, message->from_jid->resourcepart);
}
jid_destroy(jidp);
}