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

Refactor handle_muc_occupant_online

Browse Source
This commit is contained in:
James Booth
2014-10-07 00:57:51 +01:00
parent d6a4af9992
commit d8eb97eec8
1 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/server_events.c
View File

@@ -719,35 +719,33 @@ void
handle_muc_occupant_online(const char * const room, const char * const nick, const char * const jid, handle_muc_occupant_online(const char * const room, const char * const nick, const char * const jid,
const char * const role, const char * const affiliation, const char * const show, const char * const status) const char * const role, const char * const affiliation, const char * const show, const char * const status)
{ {
gboolean updated = muc_roster_add(room, nick, jid, role, affiliation, show, status);
if (!muc_roster_complete(room)) { if (!muc_roster_complete(room)) {
muc_roster_add(room, nick, jid, role, affiliation, show, status); return;
} else { }
char *old_nick = muc_roster_nick_change_complete(room, nick);
if (old_nick) { char *old_nick = muc_roster_nick_change_complete(room, nick);
muc_roster_add(room, nick, jid, role, affiliation, show, status); if (old_nick) {
ui_room_member_nick_change(room, old_nick, nick); ui_room_member_nick_change(room, old_nick, nick);
free(old_nick); free(old_nick);
} else { return;
if (!muc_roster_contains_nick(room, nick)) { }
muc_roster_add(room, nick, jid, role, affiliation, show, status);
char *muc_status_pref = prefs_get_string(PREF_STATUSES_MUC); if (!muc_roster_contains_nick(room, nick)) {
if (g_strcmp0(muc_status_pref, "none") != 0) { char *muc_status_pref = prefs_get_string(PREF_STATUSES_MUC);
ui_room_member_online(room, nick, show, status); if (g_strcmp0(muc_status_pref, "none") != 0) {
} ui_room_member_online(room, nick, show, status);
prefs_free_string(muc_status_pref);
} else {
gboolean updated = muc_roster_add(room, nick, jid, role, affiliation, show, status);
if (updated) {
char *muc_status_pref = prefs_get_string(PREF_STATUSES_MUC);
if (g_strcmp0(muc_status_pref, "all") == 0) {
ui_room_member_presence(room, nick, show, status);
}
prefs_free_string(muc_status_pref);
}
}
} }
prefs_free_string(muc_status_pref);
return;
}
if (updated) {
char *muc_status_pref = prefs_get_string(PREF_STATUSES_MUC);
if (g_strcmp0(muc_status_pref, "all") == 0) {
ui_room_member_presence(room, nick, show, status);
}
prefs_free_string(muc_status_pref);
} }
} }