From 424f52c3fa0665babd9550cff75e7384ae3a369c Mon Sep 17 00:00:00 2001 From: James Booth Date: Sun, 19 Apr 2015 16:54:16 +0100 Subject: Moved server_events to event/ --- Makefile.am | 4 +- src/event/server_events.c | 825 +++++++++++++++++++++++++++++++++++++++++++++ src/event/server_events.h | 129 +++++++ src/server_events.c | 825 --------------------------------------------- src/server_events.h | 129 ------- src/xmpp/bookmark.c | 2 +- src/xmpp/connection.c | 4 +- src/xmpp/iq.c | 2 +- src/xmpp/message.c | 2 +- src/xmpp/presence.c | 2 +- src/xmpp/roster.c | 2 +- tests/test_server_events.c | 2 +- 12 files changed, 964 insertions(+), 964 deletions(-) create mode 100644 src/event/server_events.c create mode 100644 src/event/server_events.h delete mode 100644 src/server_events.c delete mode 100644 src/server_events.h diff --git a/Makefile.am b/Makefile.am index cd708a13..c5449a2b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,7 +13,7 @@ core_sources = \ src/xmpp/roster.c src/xmpp/roster.h \ src/xmpp/bookmark.c src/xmpp/bookmark.h \ src/xmpp/form.c src/xmpp/form.h \ - src/server_events.c src/server_events.h \ + src/event/server_events.c src/event/server_events.h \ src/ui/ui.h src/ui/window.c src/ui/window.h src/ui/core.c \ src/ui/titlebar.c src/ui/statusbar.c src/ui/inputwin.c \ src/ui/titlebar.h src/ui/statusbar.h src/ui/inputwin.h \ @@ -60,7 +60,7 @@ tests_sources = \ src/ui/buffer.c \ src/ui/titlebar.c src/ui/statusbar.c src/ui/inputwin.c \ src/ui/titlebar.h src/ui/statusbar.h src/ui/inputwin.h \ - src/server_events.c src/server_events.h \ + src/event/server_events.c src/event/server_events.h \ tests/xmpp/stub_xmpp.c \ tests/ui/stub_ui.c \ tests/log/stub_log.c \ diff --git a/src/event/server_events.c b/src/event/server_events.c new file mode 100644 index 00000000..fe942680 --- /dev/null +++ b/src/event/server_events.c @@ -0,0 +1,825 @@ +/* + * server_events.c + * + * Copyright (C) 2012 - 2015 James Booth + * + * This file is part of Profanity. + * + * Profanity is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Profanity is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Profanity. If not, see . + * + * In addition, as a special exception, the copyright holders give permission to + * link the code of portions of this program with the OpenSSL library under + * certain conditions as described in each individual source file, and + * distribute linked combinations including the two. + * + * You must obey the GNU General Public License in all respects for all of the + * code used other than OpenSSL. If you modify file(s) with this exception, you + * may extend this exception to your version of the file(s), but you are not + * obligated to do so. If you do not wish to do so, delete this exception + * statement from your version. If you delete this exception statement from all + * source files in the program, then also delete it here. + * + */ + +#include +#include + +#include "config.h" + +#include "chat_session.h" +#include "log.h" +#include "muc.h" +#include "config/preferences.h" +#include "config/account.h" +#include "roster_list.h" + +#ifdef HAVE_LIBOTR +#include "otr/otr.h" +#include +#endif + +#include "ui/ui.h" + +void +handle_room_join_error(const char * const room, const char * const err) +{ + if (muc_active(room)) { + muc_leave(room); + } + ui_handle_room_join_error(room, err); +} + +// handle presence stanza errors +void +handle_presence_error(const char *from, const char * const type, + const char *err_msg) +{ + // handle error from recipient + if (from != NULL) { + ui_handle_recipient_error(from, err_msg); + + // handle errors from no recipient + } else { + ui_handle_error(err_msg); + } +} + +// handle message stanza errors +void +handle_message_error(const char * const jid, const char * const type, + const char * const err_msg) +{ + // handle errors from no recipient + if (jid == NULL) { + ui_handle_error(err_msg); + + // handle recipient not found ('from' contains a value and type is 'cancel') + } else if (type != NULL && (strcmp(type, "cancel") == 0)) { + log_info("Recipient %s not found: %s", jid, err_msg); + Jid *jidp = jid_create(jid); + chat_session_remove(jidp->barejid); + + // handle any other error from recipient + } else { + ui_handle_recipient_error(jid, err_msg); + } +} + +void +handle_login_account_success(char *account_name) +{ + ProfAccount *account = accounts_get_account(account_name); + +#ifdef HAVE_LIBOTR + otr_on_connect(account); +#endif + + ui_handle_login_account_success(account); + + // attempt to rejoin rooms with passwords + GList *curr = muc_rooms(); + while (curr != NULL) { + char *password = muc_password(curr->data); + if (password != NULL) { + char *nick = muc_nick(curr->data); + presence_join_room(curr->data, nick, password); + } + curr = g_list_next(curr); + } + g_list_free(curr); + + log_info("%s logged in successfully", account->jid); + account_free(account); +} + +void +handle_roster_received(void) +{ + if (prefs_get_boolean(PREF_ROSTER)) { + ui_show_roster(); + } +} + +void +handle_lost_connection(void) +{ + cons_show_error("Lost connection."); + roster_clear(); + muc_invites_clear(); + chat_sessions_clear(); + ui_disconnected(); +} + +void +handle_failed_login(void) +{ + cons_show_error("Login failed."); + log_info("Login failed"); +} + +void +handle_software_version_result(const char * const jid, const char * const presence, + const char * const name, const char * const version, const char * const os) +{ + cons_show_software_version(jid, presence, name, version, os); +} + +void +handle_disco_info(const char *from, GSList *identities, GSList *features) +{ + cons_show_disco_info(from, identities, features); +} + +void +handle_room_disco_info(const char * const room, GSList *identities, GSList *features, gboolean display) +{ + muc_set_features(room, features); + if (display) { + ui_show_room_disco_info(room, identities, features); + } +} + +void +handle_disco_info_error(const char * const from, const char * const error) +{ + if (from) { + cons_show_error("Service discovery failed for %s: %s", from, error); + } else { + cons_show_error("Service discovery failed: %s", error); + } +} + +void +handle_enable_carbons_error(const char * const error) +{ + cons_show_error("Server error enabling message carbons: %s", error); +} + +void +handle_disable_carbons_error(const char * const error) +{ + cons_show_error("Server error disabling message carbons: %s", error); +} + +void +handle_room_info_error(const char * const room, const char * const error) +{ + ui_handle_room_info_error(room, error); +} + +void +handle_room_list(GSList *rooms, const char *conference_node) +{ + cons_show_room_list(rooms, conference_node); +} + +void +handle_room_affiliation_list_result_error(const char * const room, const char * const affiliation, + const char * const error) +{ + log_debug("Error retrieving %s list for room %s: %s", affiliation, room, error); + ui_handle_room_affiliation_list_error(room, affiliation, error); +} + +void +handle_room_affiliation_list(const char * const room, const char * const affiliation, GSList *jids) +{ + muc_jid_autocomplete_add_all(room, jids); + ui_handle_room_affiliation_list(room, affiliation, jids); +} + +void +handle_room_role_set_error(const char * const room, const char * const nick, const char * const role, + const char * const error) +{ + log_debug("Error setting role %s list for room %s, user %s: %s", role, room, nick, error); + ui_handle_room_role_set_error(room, nick, role, error); +} + +void +handle_room_role_list_result_error(const char * const room, const char * const role, const char * const error) +{ + log_debug("Error retrieving %s list for room %s: %s", role, room, error); + ui_handle_room_role_list_error(room, role, error); +} + +void +handle_room_role_list(const char * const room, const char * const role, GSList *nicks) +{ + ui_handle_room_role_list(room, role, nicks); +} + +void +handle_room_affiliation_set_error(const char * const room, const char * const jid, const char * const affiliation, + const char * const error) +{ + log_debug("Error setting affiliation %s list for room %s, user %s: %s", affiliation, room, jid, error); + ui_handle_room_affiliation_set_error(room, jid, affiliation, error); +} + +void +handle_disco_items(GSList *items, const char *jid) +{ + cons_show_disco_items(items, jid); +} + +void +handle_room_invite(jabber_invite_t invite_type, + const char * const invitor, const char * const room, + const char * const reason, const char * const password) +{ + if (!muc_active(room) && !muc_invites_contain(room)) { + cons_show_room_invite(invitor, room, reason); + muc_invites_add(room, password); + } +} + +void +handle_room_broadcast(const char *const room_jid, + const char * const message) +{ + if (muc_roster_complete(room_jid)) { + ui_room_broadcast(room_jid, message); + } else { + muc_pending_broadcasts_add(room_jid, message); + } +} + +void +handle_room_subject(const char * const room, const char * const nick, const char * const subject) +{ + muc_set_subject(room, subject); + if (muc_roster_complete(room)) { + ui_room_subject(room, nick, subject); + } +} + +void +handle_room_history(const char * const room_jid, const char * const nick, + GTimeVal tv_stamp, const char * const message) +{ + ui_room_history(room_jid, nick, tv_stamp, message); +} + +void +handle_room_message(const char * const room_jid, const char * const nick, + const char * const message) +{ + ui_room_message(room_jid, nick, message); + + if (prefs_get_boolean(PREF_GRLOG)) { + Jid *jid = jid_create(jabber_get_fulljid()); + groupchat_log_chat(jid->barejid, room_jid, nick, message); + jid_destroy(jid); + } +} + +void +handle_incoming_private_message(char *fulljid, char *message) +{ + ui_incoming_private_msg(fulljid, message, NULL); +} + +void +handle_carbon(char *barejid, char *message) +{ + ui_outgoing_chat_msg_carbon(barejid, message); +} + +void +handle_incoming_message(char *barejid, char *resource, char *message) +{ +#ifdef HAVE_LIBOTR + gboolean was_decrypted = FALSE; + char *newmessage; + + prof_otrpolicy_t policy = otr_get_policy(barejid); + char *whitespace_base = strstr(message,OTRL_MESSAGE_TAG_BASE); + + //check for OTR whitespace (opportunistic or always) + if (policy == PROF_OTRPOLICY_OPPORTUNISTIC || policy == PROF_OTRPOLICY_ALWAYS) { + if (whitespace_base) { + if (strstr(message, OTRL_MESSAGE_TAG_V2) || strstr(message, OTRL_MESSAGE_TAG_V1)) { + // Remove whitespace pattern for proper display in UI + // Handle both BASE+TAGV1/2(16+8) and BASE+TAGV1+TAGV2(16+8+8) + int tag_length = 24; + if (strstr(message, OTRL_MESSAGE_TAG_V2) && strstr(message, OTRL_MESSAGE_TAG_V1)) { + tag_length = 32; + } + memmove(whitespace_base, whitespace_base+tag_length, tag_length); + char *otr_query_message = otr_start_query(); + cons_show("OTR Whitespace pattern detected. Attempting to start OTR session..."); + message_send_chat_encrypted(barejid, otr_query_message); + } + } + } + newmessage = otr_decrypt_message(barejid, message, &was_decrypted); + + // internal OTR message + if (newmessage == NULL) { + return; + } + + if (policy == PROF_OTRPOLICY_ALWAYS && !was_decrypted && !whitespace_base) { + char *otr_query_message = otr_start_query(); + cons_show("Attempting to start OTR session..."); + message_send_chat_encrypted(barejid, otr_query_message); + } + + ui_incoming_msg(barejid, resource, newmessage, NULL); + chat_log_otr_msg_in(barejid, newmessage, was_decrypted); + otr_free_message(newmessage); +#else + ui_incoming_msg(barejid, resource, message, NULL); + chat_log_msg_in(barejid, message); +#endif +} + +void +handle_delayed_private_message(char *fulljid, char *message, GTimeVal tv_stamp) +{ + ui_incoming_private_msg(fulljid, message, &tv_stamp); +} + +void +handle_delayed_message(char *barejid, char *message, GTimeVal tv_stamp) +{ + ui_incoming_msg(barejid, NULL, message, &tv_stamp); + chat_log_msg_in_delayed(barejid, message, &tv_stamp); +} + +void +handle_message_receipt(char *barejid, char *id) +{ + ui_message_receipt(barejid, id); +} + +void +handle_typing(char *barejid, char *resource) +{ + ui_contact_typing(barejid, resource); + if (ui_chat_win_exists(barejid)) { + chat_session_recipient_typing(barejid, resource); + } +} + +void +handle_paused(char *barejid, char *resource) +{ + if (ui_chat_win_exists(barejid)) { + chat_session_recipient_paused(barejid, resource); + } +} + +void +handle_inactive(char *barejid, char *resource) +{ + if (ui_chat_win_exists(barejid)) { + chat_session_recipient_inactive(barejid, resource); + } +} + +void +handle_gone(const char * const barejid, const char * const resource) +{ + ui_recipient_gone(barejid, resource); + if (ui_chat_win_exists(barejid)) { + chat_session_recipient_gone(barejid, resource); + } +} + +void +handle_activity(const char * const barejid, const char * const resource, gboolean send_states) +{ + if (ui_chat_win_exists(barejid)) { + chat_session_recipient_active(barejid, resource, send_states); + } +} + +void +handle_subscription(const char *barejid, jabber_subscr_t type) +{ + switch (type) { + case PRESENCE_SUBSCRIBE: + /* TODO: auto-subscribe if needed */ + cons_show("Received authorization request from %s", barejid); + log_info("Received authorization request from %s", barejid); + ui_print_system_msg_from_recipient(barejid, "Authorization request, type '/sub allow' to accept or '/sub deny' to reject"); + if (prefs_get_boolean(PREF_NOTIFY_SUB)) { + notify_subscription(barejid); + } + break; + case PRESENCE_SUBSCRIBED: + cons_show("Subscription received from %s", barejid); + log_info("Subscription received from %s", barejid); + ui_print_system_msg_from_recipient(barejid, "Subscribed"); + break; + case PRESENCE_UNSUBSCRIBED: + cons_show("%s deleted subscription", barejid); + log_info("%s deleted subscription", barejid); + ui_print_system_msg_from_recipient(barejid, "Unsubscribed"); + break; + default: + /* unknown type */ + break; + } +} + +void +handle_contact_offline(char *barejid, char *resource, char *status) +{ + gboolean updated = roster_contact_offline(barejid, resource, status); + + if (resource != NULL && updated) { + ui_contact_offline(barejid, resource, status); + } + + rosterwin_roster(); + chat_session_remove(barejid); +} + +void +handle_contact_online(char *barejid, Resource *resource, + GDateTime *last_activity) +{ + gboolean updated = roster_update_presence(barejid, resource, last_activity); + + if (updated) { + char *show_console = prefs_get_string(PREF_STATUSES_CONSOLE); + char *show_chat_win = prefs_get_string(PREF_STATUSES_CHAT); + PContact contact = roster_get_contact(barejid); + if (p_contact_subscription(contact) != NULL) { + if (strcmp(p_contact_subscription(contact), "none") != 0) { + + // show in console if "all" + if (g_strcmp0(show_console, "all") == 0) { + cons_show_contact_online(contact, resource, last_activity); + + // show in console of "online" and presence online + } else if (g_strcmp0(show_console, "online") == 0 && + resource->presence == RESOURCE_ONLINE) { + cons_show_contact_online(contact, resource, last_activity); + + } + + // show in chat win if "all" + if (g_strcmp0(show_chat_win, "all") == 0) { + ui_chat_win_contact_online(contact, resource, last_activity); + + // show in char win if "online" and presence online + } else if (g_strcmp0(show_chat_win, "online") == 0 && + resource->presence == RESOURCE_ONLINE) { + ui_chat_win_contact_online(contact, resource, last_activity); + } + } + } + prefs_free_string(show_console); + prefs_free_string(show_chat_win); + } + + rosterwin_roster(); + chat_session_remove(barejid); +} + +void +handle_leave_room(const char * const room) +{ + muc_leave(room); + ui_leave_room(room); +} + +void +handle_room_destroy(const char * const room) +{ + muc_leave(room); + ui_room_destroy(room); +} + +void +handle_room_destroyed(const char * const room, const char * const new_jid, const char * const password, + const char * const reason) +{ + muc_leave(room); + ui_room_destroyed(room, reason, new_jid, password); +} + +void +handle_room_kicked(const char * const room, const char * const actor, const char * const reason) +{ + muc_leave(room); + ui_room_kicked(room, actor, reason); +} + +void +handle_room_banned(const char * const room, const char * const actor, const char * const reason) +{ + muc_leave(room); + ui_room_banned(room, actor, reason); +} + +void +handle_room_configure(const char * const room, DataForm *form) +{ + ui_handle_room_configuration(room, form); +} + +void +handle_room_configuration_form_error(const char * const room, const char * const message) +{ + ui_handle_room_configuration_form_error(room, message); +} + +void +handle_room_config_submit_result(const char * const room) +{ + ui_handle_room_config_submit_result(room); +} + +void +handle_room_config_submit_result_error(const char * const room, const char * const message) +{ + ui_handle_room_config_submit_result_error(room, message); +} + +void +handle_room_kick_result_error(const char * const room, const char * const nick, const char * const error) +{ + ui_handle_room_kick_error(room, nick, error); +} + +void +handle_room_occupant_offline(const char * const room, const char * const nick, + const char * const show, const char * const status) +{ + muc_roster_remove(room, nick); + + char *muc_status_pref = prefs_get_string(PREF_STATUSES_MUC); + if (g_strcmp0(muc_status_pref, "none") != 0) { + ui_room_member_offline(room, nick); + } + prefs_free_string(muc_status_pref); + occupantswin_occupants(room); +} + +void +handle_room_occupent_kicked(const char * const room, const char * const nick, const char * const actor, + const char * const reason) +{ + muc_roster_remove(room, nick); + ui_room_member_kicked(room, nick, actor, reason); + occupantswin_occupants(room); +} + +void +handle_room_occupent_banned(const char * const room, const char * const nick, const char * const actor, + const char * const reason) +{ + muc_roster_remove(room, nick); + ui_room_member_banned(room, nick, actor, reason); + occupantswin_occupants(room); +} + +void +handle_group_add(const char * const contact, + const char * const group) +{ + ui_group_added(contact, group); +} + +void +handle_group_remove(const char * const contact, + const char * const group) +{ + ui_group_removed(contact, group); +} + +void +handle_roster_remove(const char * const barejid) +{ + ui_roster_remove(barejid); +} + +void +handle_roster_add(const char * const barejid, const char * const name) +{ + ui_roster_add(barejid, name); +} + +void +handle_roster_update(const char * const barejid, const char * const name, + GSList *groups, const char * const subscription, gboolean pending_out) +{ + roster_update(barejid, name, groups, subscription, pending_out); + rosterwin_roster(); +} + +void +handle_autoping_cancel(void) +{ + prefs_set_autoping(0); + cons_show_error("Server ping not supported, autoping disabled."); +} + +void +handle_xmpp_stanza(const char * const msg) +{ + ui_handle_stanza(msg); +} + +void +handle_ping_result(const char * const from, int millis) +{ + if (from == NULL) { + cons_show("Ping response from server: %dms.", millis); + } else { + cons_show("Ping response from %s: %dms.", from, millis); + } +} + +void +handle_ping_error_result(const char * const from, const char * const error) +{ + if (error == NULL) { + cons_show_error("Error returned from pinging %s.", from); + } else { + cons_show_error("Error returned from pinging %s: %s.", from, error); + } +} + +void +handle_muc_self_online(const char * const room, const char * const nick, gboolean config_required, + const char * const role, const char * const affiliation, const char * const actor, const char * const reason, + const char * const jid, const char * const show, const char * const status) +{ + muc_roster_add(room, nick, jid, role, affiliation, show, status); + char *old_role = muc_role_str(room); + char *old_affiliation = muc_affiliation_str(room); + muc_set_role(room, role); + muc_set_affiliation(room, affiliation); + + // handle self nick change + if (muc_nick_change_pending(room)) { + muc_nick_change_complete(room, nick); + ui_room_nick_change(room, nick); + + // handle roster complete + } else if (!muc_roster_complete(room)) { + if (muc_autojoin(room)) { + ui_room_join(room, FALSE); + } else { + ui_room_join(room, TRUE); + } + + iq_room_info_request(room, FALSE); + + muc_invites_remove(room); + muc_roster_set_complete(room); + + // show roster if occupants list disabled by default + if (!prefs_get_boolean(PREF_OCCUPANTS)) { + GList *occupants = muc_roster(room); + ui_room_roster(room, occupants, NULL); + g_list_free(occupants); + } + + char *subject = muc_subject(room); + if (subject != NULL) { + ui_room_subject(room, NULL, subject); + } + + GList *pending_broadcasts = muc_pending_broadcasts(room); + if (pending_broadcasts != NULL) { + GList *curr = pending_broadcasts; + while (curr != NULL) { + ui_room_broadcast(room, curr->data); + curr = g_list_next(curr); + } + } + + // room configuration required + if (config_required) { + muc_set_requires_config(room, TRUE); + ui_room_requires_config(room); + } + + // check for change in role/affiliation + } else { + if (prefs_get_boolean(PREF_MUC_PRIVILEGES)) { + // both changed + if ((g_strcmp0(role, old_role) != 0) && (g_strcmp0(affiliation, old_affiliation) != 0)) { + ui_room_role_and_affiliation_change(room, role, affiliation, actor, reason); + + // role changed + } else if (g_strcmp0(role, old_role) != 0) { + ui_room_role_change(room, role, actor, reason); + + // affiliation changed + } else if (g_strcmp0(affiliation, old_affiliation) != 0) { + ui_room_affiliation_change(room, affiliation, actor, reason); + } + } + } + + occupantswin_occupants(room); +} + +void +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 actor, const char * const reason, + const char * const show, const char * const status) +{ + Occupant *occupant = muc_roster_item(room, nick); + + const char *old_role = NULL; + const char *old_affiliation = NULL; + if (occupant) { + old_role = muc_occupant_role_str(occupant); + old_affiliation = muc_occupant_affiliation_str(occupant); + } + + gboolean updated = muc_roster_add(room, nick, jid, role, affiliation, show, status); + + // not yet finished joining room + if (!muc_roster_complete(room)) { + return; + } + + // handle nickname change + char *old_nick = muc_roster_nick_change_complete(room, nick); + if (old_nick) { + ui_room_member_nick_change(room, old_nick, nick); + free(old_nick); + occupantswin_occupants(room); + return; + } + + // joined room + if (!occupant) { + char *muc_status_pref = prefs_get_string(PREF_STATUSES_MUC); + if (g_strcmp0(muc_status_pref, "none") != 0) { + ui_room_member_online(room, nick, role, affiliation, show, status); + } + prefs_free_string(muc_status_pref); + occupantswin_occupants(room); + return; + } + + // presence updated + 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); + occupantswin_occupants(room); + + // presence unchanged, check for role/affiliation change + } else { + if (prefs_get_boolean(PREF_MUC_PRIVILEGES)) { + // both changed + if ((g_strcmp0(role, old_role) != 0) && (g_strcmp0(affiliation, old_affiliation) != 0)) { + ui_room_occupant_role_and_affiliation_change(room, nick, role, affiliation, actor, reason); + + // role changed + } else if (g_strcmp0(role, old_role) != 0) { + ui_room_occupant_role_change(room, nick, role, actor, reason); + + // affiliation changed + } else if (g_strcmp0(affiliation, old_affiliation) != 0) { + ui_room_occupant_affiliation_change(room, nick, affiliation, actor, reason); + } + } + occupantswin_occupants(room); + } +} diff --git a/src/event/server_events.h b/src/event/server_events.h new file mode 100644 index 00000000..85d75ac3 --- /dev/null +++ b/src/event/server_events.h @@ -0,0 +1,129 @@ +/* + * server_events.h + * + * Copyright (C) 2012 - 2015 James Booth + * + * This file is part of Profanity. + * + * Profanity is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Profanity is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Profanity. If not, see . + * + * In addition, as a special exception, the copyright holders give permission to + * link the code of portions of this program with the OpenSSL library under + * certain conditions as described in each individual source file, and + * distribute linked combinations including the two. + * + * You must obey the GNU General Public License in all respects for all of the + * code used other than OpenSSL. If you modify file(s) with this exception, you + * may extend this exception to your version of the file(s), but you are not + * obligated to do so. If you do not wish to do so, delete this exception + * statement from your version. If you delete this exception statement from all + * source files in the program, then also delete it here. + * + */ + +#ifndef SERVER_EVENTS_H +#define SERVER_EVENTS_H + +#include "xmpp/xmpp.h" + +void handle_login_account_success(char *account_name); +void handle_lost_connection(void); +void handle_failed_login(void); +void handle_software_version_result(const char * const jid, const char * const presence, + const char * const name, const char * const version, const char * const os); +void handle_disco_info(const char *from, GSList *identities, GSList *features); +void handle_disco_info_error(const char * const from, const char * const error); +void handle_room_list(GSList *rooms, const char *conference_node); +void handle_disco_items(GSList *items, const char *jid); +void handle_room_invite(jabber_invite_t invite_type, + const char * const invitor, const char * const room, + const char * const reason, const char * const password); +void handle_room_broadcast(const char *const room_jid, + const char * const message); +void handle_room_subject(const char * const room, const char * const nick, const char * const subject); +void handle_room_history(const char * const room_jid, const char * const nick, + GTimeVal tv_stamp, const char * const message); +void handle_room_message(const char * const room_jid, const char * const nick, + const char * const message); +void handle_room_join_error(const char * const room, const char * const err); +void handle_room_info_error(const char * const room, const char * const error); +void handle_room_disco_info(const char * const room, GSList *identities, GSList *features, gboolean display); +void handle_room_affiliation_list_result_error(const char * const room, const char * const affiliation, + const char * const error); +void handle_room_affiliation_list(const char * const room, const char * const affiliation, GSList *jids); +void handle_room_affiliation_set_error(const char * const room, const char * const jid, const char * const affiliation, + const char * const error); +void handle_room_role_list_result_error(const char * const from, const char * const role, const char * const error); +void handle_room_role_list(const char * const from, const char * const role, GSList *nicks); +void handle_room_role_set_error(const char * const room, const char * const nick, const char * const role, + const char * const error); +void handle_room_kick_result_error(const char * const room, const char * const nick, const char * const error); +void handle_incoming_message(char *barejid, char *resource, char *message); +void handle_incoming_private_message(char *fulljid, char *message); +void handle_delayed_message(char *fulljid, char *message, GTimeVal tv_stamp); +void handle_delayed_private_message(char *fulljid, char *message, GTimeVal tv_stamp); +void handle_typing(char *barejid, char *resource); +void handle_paused(char *barejid, char *resource); +void handle_inactive(char *barejid, char *resource); +void handle_activity(char *barejid, char *resource, gboolean send_states); +void handle_gone(const char * const barejid, const char * const resource); +void handle_subscription(const char *from, jabber_subscr_t type); +void handle_message_receipt(char *barejid, char *id); +void handle_contact_offline(char *contact, char *resource, char *status); +void handle_contact_online(char *contact, Resource *resource, + GDateTime *last_activity); +void handle_leave_room(const char * const room); +void handle_room_destroy(const char * const room); +void handle_room_occupant_offline(const char * const room, const char * const nick, + const char * const show, const char * const status); +void handle_room_destroyed(const char * const room, const char * const new_jid, const char * const password, + const char * const reason); +void handle_room_kicked(const char * const room, const char * const actor, const char * const reason); +void handle_room_occupent_kicked(const char * const room, const char * const nick, const char * const actor, + const char * const reason); +void handle_room_banned(const char * const room, const char * const actor, const char * const reason); +void handle_room_occupent_banned(const char * const room, const char * const nick, const char * const actor, + const char * const reason); +void handle_group_add(const char * const contact, + const char * const group); +void handle_group_remove(const char * const contact, + const char * const group); +void handle_roster_remove(const char * const barejid); +void handle_roster_add(const char * const barejid, const char * const name); +void handle_autoping_cancel(void); +void handle_carbon(char *barejid, char *message); +void handle_message_error(const char * const from, const char * const type, + const char * const err_msg); +void handle_presence_error(const char *from, const char * const type, + const char *err_msg); +void handle_xmpp_stanza(const char * const msg); +void handle_ping_result(const char * const from, int millis); +void handle_ping_error_result(const char * const from, const char * const error); +void handle_room_configure(const char * const room, DataForm *form); +void handle_room_configuration_form_error(const char * const from, const char * const message); +void handle_room_config_submit_result(const char * const room); +void handle_room_config_submit_result_error(const char * const room, const char * const message); +void handle_muc_self_online(const char * const room, const char * const nick, gboolean config_required, + const char * const role, const char * const affiliation, const char * const actor, const char * const reason, + const char * const jid, const char * const show, const char * const status); +void 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 actor, const char * const reason, + const char * const show_str, const char * const status_str); +void handle_roster_update(const char * const barejid, const char * const name, + GSList *groups, const char * const subscription, gboolean pending_out); +void handle_roster_received(void); +void handle_enable_carbons_error(const char * const error); +void handle_disable_carbons_error(const char * const error); + +#endif diff --git a/src/server_events.c b/src/server_events.c deleted file mode 100644 index fe942680..00000000 --- a/src/server_events.c +++ /dev/null @@ -1,825 +0,0 @@ -/* - * server_events.c - * - * Copyright (C) 2012 - 2015 James Booth - * - * This file is part of Profanity. - * - * Profanity is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Profanity is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Profanity. If not, see . - * - * In addition, as a special exception, the copyright holders give permission to - * link the code of portions of this program with the OpenSSL library under - * certain conditions as described in each individual source file, and - * distribute linked combinations including the two. - * - * You must obey the GNU General Public License in all respects for all of the - * code used other than OpenSSL. If you modify file(s) with this exception, you - * may extend this exception to your version of the file(s), but you are not - * obligated to do so. If you do not wish to do so, delete this exception - * statement from your version. If you delete this exception statement from all - * source files in the program, then also delete it here. - * - */ - -#include -#include - -#include "config.h" - -#include "chat_session.h" -#include "log.h" -#include "muc.h" -#include "config/preferences.h" -#include "config/account.h" -#include "roster_list.h" - -#ifdef HAVE_LIBOTR -#include "otr/otr.h" -#include -#endif - -#include "ui/ui.h" - -void -handle_room_join_error(const char * const room, const char * const err) -{ - if (muc_active(room)) { - muc_leave(room); - } - ui_handle_room_join_error(room, err); -} - -// handle presence stanza errors -void -handle_presence_error(const char *from, const char * const type, - const char *err_msg) -{ - // handle error from recipient - if (from != NULL) { - ui_handle_recipient_error(from, err_msg); - - // handle errors from no recipient - } else { - ui_handle_error(err_msg); - } -} - -// handle message stanza errors -void -handle_message_error(const char * const jid, const char * const type, - const char * const err_msg) -{ - // handle errors from no recipient - if (jid == NULL) { - ui_handle_error(err_msg); - - // handle recipient not found ('from' contains a value and type is 'cancel') - } else if (type != NULL && (strcmp(type, "cancel") == 0)) { - log_info("Recipient %s not found: %s", jid, err_msg); - Jid *jidp = jid_create(jid); - chat_session_remove(jidp->barejid); - - // handle any other error from recipient - } else { - ui_handle_recipient_error(jid, err_msg); - } -} - -void -handle_login_account_success(char *account_name) -{ - ProfAccount *account = accounts_get_account(account_name); - -#ifdef HAVE_LIBOTR - otr_on_connect(account); -#endif - - ui_handle_login_account_success(account); - - // attempt to rejoin rooms with passwords - GList *curr = muc_rooms(); - while (curr != NULL) { - char *password = muc_password(curr->data); - if (password != NULL) { - char *nick = muc_nick(curr->data); - presence_join_room(curr->data, nick, password); - } - curr = g_list_next(curr); - } - g_list_free(curr); - - log_info("%s logged in successfully", account->jid); - account_free(account); -} - -void -handle_roster_received(void) -{ - if (prefs_get_boolean(PREF_ROSTER)) { - ui_show_roster(); - } -} - -void -handle_lost_connection(void) -{ - cons_show_error("Lost connection."); - roster_clear(); - muc_invites_clear(); - chat_sessions_clear(); - ui_disconnected(); -} - -void -handle_failed_login(void) -{ - cons_show_error("Login failed."); - log_info("Login failed"); -} - -void -handle_software_version_result(const char * const jid, const char * const presence, - const char * const name, const char * const version, const char * const os) -{ - cons_show_software_version(jid, presence, name, version, os); -} - -void -handle_disco_info(const char *from, GSList *identities, GSList *features) -{ - cons_show_disco_info(from, identities, features); -} - -void -handle_room_disco_info(const char * const room, GSList *identities, GSList *features, gboolean display) -{ - muc_set_features(room, features); - if (display) { - ui_show_room_disco_info(room, identities, features); - } -} - -void -handle_disco_info_error(const char * const from, const char * const error) -{ - if (from) { - cons_show_error("Service discovery failed for %s: %s", from, error); - } else { - cons_show_error("Service discovery failed: %s", error); - } -} - -void -handle_enable_carbons_error(const char * const error) -{ - cons_show_error("Server error enabling message carbons: %s", error); -} - -void -handle_disable_carbons_error(const char * const error) -{ - cons_show_error("Server error disabling message carbons: %s", error); -} - -void -handle_room_info_error(const char * const room, const char * const error) -{ - ui_handle_room_info_error(room, error); -} - -void -handle_room_list(GSList *rooms, const char *conference_node) -{ - cons_show_room_list(rooms, conference_node); -} - -void -handle_room_affiliation_list_result_error(const char * const room, const char * const affiliation, - const char * const error) -{ - log_debug("Error retrieving %s list for room %s: %s", affiliation, room, error); - ui_handle_room_affiliation_list_error(room, affiliation, error); -} - -void -handle_room_affiliation_list(const char * const room, const char * const affiliation, GSList *jids) -{ - muc_jid_autocomplete_add_all(room, jids); - ui_handle_room_affiliation_list(room, affiliation, jids); -} - -void -handle_room_role_set_error(const char * const room, const char * const nick, const char * const role, - const char * const error) -{ - log_debug("Error setting role %s list for room %s, user %s: %s", role, room, nick, error); - ui_handle_room_role_set_error(room, nick, role, error); -} - -void -handle_room_role_list_result_error(const char * const room, const char * const role, const char * const error) -{ - log_debug("Error retrieving %s list for room %s: %s", role, room, error); - ui_handle_room_role_list_error(room, role, error); -} - -void -handle_room_role_list(const char * const room, const char * const role, GSList *nicks) -{ - ui_handle_room_role_list(room, role, nicks); -} - -void -handle_room_affiliation_set_error(const char * const room, const char * const jid, const char * const affiliation, - const char * const error) -{ - log_debug("Error setting affiliation %s list for room %s, user %s: %s", affiliation, room, jid, error); - ui_handle_room_affiliation_set_error(room, jid, affiliation, error); -} - -void -handle_disco_items(GSList *items, const char *jid) -{ - cons_show_disco_items(items, jid); -} - -void -handle_room_invite(jabber_invite_t invite_type, - const char * const invitor, const char * const room, - const char * const reason, const char * const password) -{ - if (!muc_active(room) && !muc_invites_contain(room)) { - cons_show_room_invite(invitor, room, reason); - muc_invites_add(room, password); - } -} - -void -handle_room_broadcast(const char *const room_jid, - const char * const message) -{ - if (muc_roster_complete(room_jid)) { - ui_room_broadcast(room_jid, message); - } else { - muc_pending_broadcasts_add(room_jid, message); - } -} - -void -handle_room_subject(const char * const room, const char * const nick, const char * const subject) -{ - muc_set_subject(room, subject); - if (muc_roster_complete(room)) { - ui_room_subject(room, nick, subject); - } -} - -void -handle_room_history(const char * const room_jid, const char * const nick, - GTimeVal tv_stamp, const char * const message) -{ - ui_room_history(room_jid, nick, tv_stamp, message); -} - -void -handle_room_message(const char * const room_jid, const char * const nick, - const char * const message) -{ - ui_room_message(room_jid, nick, message); - - if (prefs_get_boolean(PREF_GRLOG)) { - Jid *jid = jid_create(jabber_get_fulljid()); - groupchat_log_chat(jid->barejid, room_jid, nick, message); - jid_destroy(jid); - } -} - -void -handle_incoming_private_message(char *fulljid, char *message) -{ - ui_incoming_private_msg(fulljid, message, NULL); -} - -void -handle_carbon(char *barejid, char *message) -{ - ui_outgoing_chat_msg_carbon(barejid, message); -} - -void -handle_incoming_message(char *barejid, char *resource, char *message) -{ -#ifdef HAVE_LIBOTR - gboolean was_decrypted = FALSE; - char *newmessage; - - prof_otrpolicy_t policy = otr_get_policy(barejid); - char *whitespace_base = strstr(message,OTRL_MESSAGE_TAG_BASE); - - //check for OTR whitespace (opportunistic or always) - if (policy == PROF_OTRPOLICY_OPPORTUNISTIC || policy == PROF_OTRPOLICY_ALWAYS) { - if (whitespace_base) { - if (strstr(message, OTRL_MESSAGE_TAG_V2) || strstr(message, OTRL_MESSAGE_TAG_V1)) { - // Remove whitespace pattern for proper display in UI - // Handle both BASE+TAGV1/2(16+8) and BASE+TAGV1+TAGV2(16+8+8) - int tag_length = 24; - if (strstr(message, OTRL_MESSAGE_TAG_V2) && strstr(message, OTRL_MESSAGE_TAG_V1)) { - tag_length = 32; - } - memmove(whitespace_base, whitespace_base+tag_length, tag_length); - char *otr_query_message = otr_start_query(); - cons_show("OTR Whitespace pattern detected. Attempting to start OTR session..."); - message_send_chat_encrypted(barejid, otr_query_message); - } - } - } - newmessage = otr_decrypt_message(barejid, message, &was_decrypted); - - // internal OTR message - if (newmessage == NULL) { - return; - } - - if (policy == PROF_OTRPOLICY_ALWAYS && !was_decrypted && !whitespace_base) { - char *otr_query_message = otr_start_query(); - cons_show("Attempting to start OTR session..."); - message_send_chat_encrypted(barejid, otr_query_message); - } - - ui_incoming_msg(barejid, resource, newmessage, NULL); - chat_log_otr_msg_in(barejid, newmessage, was_decrypted); - otr_free_message(newmessage); -#else - ui_incoming_msg(barejid, resource, message, NULL); - chat_log_msg_in(barejid, message); -#endif -} - -void -handle_delayed_private_message(char *fulljid, char *message, GTimeVal tv_stamp) -{ - ui_incoming_private_msg(fulljid, message, &tv_stamp); -} - -void -handle_delayed_message(char *barejid, char *message, GTimeVal tv_stamp) -{ - ui_incoming_msg(barejid, NULL, message, &tv_stamp); - chat_log_msg_in_delayed(barejid, message, &tv_stamp); -} - -void -handle_message_receipt(char *barejid, char *id) -{ - ui_message_receipt(barejid, id); -} - -void -handle_typing(char *barejid, char *resource) -{ - ui_contact_typing(barejid, resource); - if (ui_chat_win_exists(barejid)) { - chat_session_recipient_typing(barejid, resource); - } -} - -void -handle_paused(char *barejid, char *resource) -{ - if (ui_chat_win_exists(barejid)) { - chat_session_recipient_paused(barejid, resource); - } -} - -void -handle_inactive(char *barejid, char *resource) -{ - if (ui_chat_win_exists(barejid)) { - chat_session_recipient_inactive(barejid, resource); - } -} - -void -handle_gone(const char * const barejid, const char * const resource) -{ - ui_recipient_gone(barejid, resource); - if (ui_chat_win_exists(barejid)) { - chat_session_recipient_gone(barejid, resource); - } -} - -void -handle_activity(const char * const barejid, const char * const resource, gboolean send_states) -{ - if (ui_chat_win_exists(barejid)) { - chat_session_recipient_active(barejid, resource, send_states); - } -} - -void -handle_subscription(const char *barejid, jabber_subscr_t type) -{ - switch (type) { - case PRESENCE_SUBSCRIBE: - /* TODO: auto-subscribe if needed */ - cons_show("Received authorization request from %s", barejid); - log_info("Received authorization request from %s", barejid); - ui_print_system_msg_from_recipient(barejid, "Authorization request, type '/sub allow' to accept or '/sub deny' to reject"); - if (prefs_get_boolean(PREF_NOTIFY_SUB)) { - notify_subscription(barejid); - } - break; - case PRESENCE_SUBSCRIBED: - cons_show("Subscription received from %s", barejid); - log_info("Subscription received from %s", barejid); - ui_print_system_msg_from_recipient(barejid, "Subscribed"); - break; - case PRESENCE_UNSUBSCRIBED: - cons_show("%s deleted subscription", barejid); - log_info("%s deleted subscription", barejid); - ui_print_system_msg_from_recipient(barejid, "Unsubscribed"); - break; - default: - /* unknown type */ - break; - } -} - -void -handle_contact_offline(char *barejid, char *resource, char *status) -{ - gboolean updated = roster_contact_offline(barejid, resource, status); - - if (resource != NULL && updated) { - ui_contact_offline(barejid, resource, status); - } - - rosterwin_roster(); - chat_session_remove(barejid); -} - -void -handle_contact_online(char *barejid, Resource *resource, - GDateTime *last_activity) -{ - gboolean updated = roster_update_presence(barejid, resource, last_activity); - - if (updated) { - char *show_console = prefs_get_string(PREF_STATUSES_CONSOLE); - char *show_chat_win = prefs_get_string(PREF_STATUSES_CHAT); - PContact contact = roster_get_contact(barejid); - if (p_contact_subscription(contact) != NULL) { - if (strcmp(p_contact_subscription(contact), "none") != 0) { - - // show in console if "all" - if (g_strcmp0(show_console, "all") == 0) { - cons_show_contact_online(contact, resource, last_activity); - - // show in console of "online" and presence online - } else if (g_strcmp0(show_console, "online") == 0 && - resource->presence == RESOURCE_ONLINE) { - cons_show_contact_online(contact, resource, last_activity); - - } - - // show in chat win if "all" - if (g_strcmp0(show_chat_win, "all") == 0) { - ui_chat_win_contact_online(contact, resource, last_activity); - - // show in char win if "online" and presence online - } else if (g_strcmp0(show_chat_win, "online") == 0 && - resource->presence == RESOURCE_ONLINE) { - ui_chat_win_contact_online(contact, resource, last_activity); - } - } - } - prefs_free_string(show_console); - prefs_free_string(show_chat_win); - } - - rosterwin_roster(); - chat_session_remove(barejid); -} - -void -handle_leave_room(const char * const room) -{ - muc_leave(room); - ui_leave_room(room); -} - -void -handle_room_destroy(const char * const room) -{ - muc_leave(room); - ui_room_destroy(room); -} - -void -handle_room_destroyed(const char * const room, const char * const new_jid, const char * const password, - const char * const reason) -{ - muc_leave(room); - ui_room_destroyed(room, reason, new_jid, password); -} - -void -handle_room_kicked(const char * const room, const char * const actor, const char * const reason) -{ - muc_leave(room); - ui_room_kicked(room, actor, reason); -} - -void -handle_room_banned(const char * const room, const char * const actor, const char * const reason) -{ - muc_leave(room); - ui_room_banned(room, actor, reason); -} - -void -handle_room_configure(const char * const room, DataForm *form) -{ - ui_handle_room_configuration(room, form); -} - -void -handle_room_configuration_form_error(const char * const room, const char * const message) -{ - ui_handle_room_configuration_form_error(room, message); -} - -void -handle_room_config_submit_result(const char * const room) -{ - ui_handle_room_config_submit_result(room); -} - -void -handle_room_config_submit_result_error(const char * const room, const char * const message) -{ - ui_handle_room_config_submit_result_error(room, message); -} - -void -handle_room_kick_result_error(const char * const room, const char * const nick, const char * const error) -{ - ui_handle_room_kick_error(room, nick, error); -} - -void -handle_room_occupant_offline(const char * const room, const char * const nick, - const char * const show, const char * const status) -{ - muc_roster_remove(room, nick); - - char *muc_status_pref = prefs_get_string(PREF_STATUSES_MUC); - if (g_strcmp0(muc_status_pref, "none") != 0) { - ui_room_member_offline(room, nick); - } - prefs_free_string(muc_status_pref); - occupantswin_occupants(room); -} - -void -handle_room_occupent_kicked(const char * const room, const char * const nick, const char * const actor, - const char * const reason) -{ - muc_roster_remove(room, nick); - ui_room_member_kicked(room, nick, actor, reason); - occupantswin_occupants(room); -} - -void -handle_room_occupent_banned(const char * const room, const char * const nick, const char * const actor, - const char * const reason) -{ - muc_roster_remove(room, nick); - ui_room_member_banned(room, nick, actor, reason); - occupantswin_occupants(room); -} - -void -handle_group_add(const char * const contact, - const char * const group) -{ - ui_group_added(contact, group); -} - -void -handle_group_remove(const char * const contact, - const char * const group) -{ - ui_group_removed(contact, group); -} - -void -handle_roster_remove(const char * const barejid) -{ - ui_roster_remove(barejid); -} - -void -handle_roster_add(const char * const barejid, const char * const name) -{ - ui_roster_add(barejid, name); -} - -void -handle_roster_update(const char * const barejid, const char * const name, - GSList *groups, const char * const subscription, gboolean pending_out) -{ - roster_update(barejid, name, groups, subscription, pending_out); - rosterwin_roster(); -} - -void -handle_autoping_cancel(void) -{ - prefs_set_autoping(0); - cons_show_error("Server ping not supported, autoping disabled."); -} - -void -handle_xmpp_stanza(const char * const msg) -{ - ui_handle_stanza(msg); -} - -void -handle_ping_result(const char * const from, int millis) -{ - if (from == NULL) { - cons_show("Ping response from server: %dms.", millis); - } else { - cons_show("Ping response from %s: %dms.", from, millis); - } -} - -void -handle_ping_error_result(const char * const from, const char * const error) -{ - if (error == NULL) { - cons_show_error("Error returned from pinging %s.", from); - } else { - cons_show_error("Error returned from pinging %s: %s.", from, error); - } -} - -void -handle_muc_self_online(const char * const room, const char * const nick, gboolean config_required, - const char * const role, const char * const affiliation, const char * const actor, const char * const reason, - const char * const jid, const char * const show, const char * const status) -{ - muc_roster_add(room, nick, jid, role, affiliation, show, status); - char *old_role = muc_role_str(room); - char *old_affiliation = muc_affiliation_str(room); - muc_set_role(room, role); - muc_set_affiliation(room, affiliation); - - // handle self nick change - if (muc_nick_change_pending(room)) { - muc_nick_change_complete(room, nick); - ui_room_nick_change(room, nick); - - // handle roster complete - } else if (!muc_roster_complete(room)) { - if (muc_autojoin(room)) { - ui_room_join(room, FALSE); - } else { - ui_room_join(room, TRUE); - } - - iq_room_info_request(room, FALSE); - - muc_invites_remove(room); - muc_roster_set_complete(room); - - // show roster if occupants list disabled by default - if (!prefs_get_boolean(PREF_OCCUPANTS)) { - GList *occupants = muc_roster(room); - ui_room_roster(room, occupants, NULL); - g_list_free(occupants); - } - - char *subject = muc_subject(room); - if (subject != NULL) { - ui_room_subject(room, NULL, subject); - } - - GList *pending_broadcasts = muc_pending_broadcasts(room); - if (pending_broadcasts != NULL) { - GList *curr = pending_broadcasts; - while (curr != NULL) { - ui_room_broadcast(room, curr->data); - curr = g_list_next(curr); - } - } - - // room configuration required - if (config_required) { - muc_set_requires_config(room, TRUE); - ui_room_requires_config(room); - } - - // check for change in role/affiliation - } else { - if (prefs_get_boolean(PREF_MUC_PRIVILEGES)) { - // both changed - if ((g_strcmp0(role, old_role) != 0) && (g_strcmp0(affiliation, old_affiliation) != 0)) { - ui_room_role_and_affiliation_change(room, role, affiliation, actor, reason); - - // role changed - } else if (g_strcmp0(role, old_role) != 0) { - ui_room_role_change(room, role, actor, reason); - - // affiliation changed - } else if (g_strcmp0(affiliation, old_affiliation) != 0) { - ui_room_affiliation_change(room, affiliation, actor, reason); - } - } - } - - occupantswin_occupants(room); -} - -void -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 actor, const char * const reason, - const char * const show, const char * const status) -{ - Occupant *occupant = muc_roster_item(room, nick); - - const char *old_role = NULL; - const char *old_affiliation = NULL; - if (occupant) { - old_role = muc_occupant_role_str(occupant); - old_affiliation = muc_occupant_affiliation_str(occupant); - } - - gboolean updated = muc_roster_add(room, nick, jid, role, affiliation, show, status); - - // not yet finished joining room - if (!muc_roster_complete(room)) { - return; - } - - // handle nickname change - char *old_nick = muc_roster_nick_change_complete(room, nick); - if (old_nick) { - ui_room_member_nick_change(room, old_nick, nick); - free(old_nick); - occupantswin_occupants(room); - return; - } - - // joined room - if (!occupant) { - char *muc_status_pref = prefs_get_string(PREF_STATUSES_MUC); - if (g_strcmp0(muc_status_pref, "none") != 0) { - ui_room_member_online(room, nick, role, affiliation, show, status); - } - prefs_free_string(muc_status_pref); - occupantswin_occupants(room); - return; - } - - // presence updated - 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); - occupantswin_occupants(room); - - // presence unchanged, check for role/affiliation change - } else { - if (prefs_get_boolean(PREF_MUC_PRIVILEGES)) { - // both changed - if ((g_strcmp0(role, old_role) != 0) && (g_strcmp0(affiliation, old_affiliation) != 0)) { - ui_room_occupant_role_and_affiliation_change(room, nick, role, affiliation, actor, reason); - - // role changed - } else if (g_strcmp0(role, old_role) != 0) { - ui_room_occupant_role_change(room, nick, role, actor, reason); - - // affiliation changed - } else if (g_strcmp0(affiliation, old_affiliation) != 0) { - ui_room_occupant_affiliation_change(room, nick, affiliation, actor, reason); - } - } - occupantswin_occupants(room); - } -} diff --git a/src/server_events.h b/src/server_events.h deleted file mode 100644 index 85d75ac3..00000000 --- a/src/server_events.h +++ /dev/null @@ -1,129 +0,0 @@ -/* - * server_events.h - * - * Copyright (C) 2012 - 2015 James Booth - * - * This file is part of Profanity. - * - * Profanity is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Profanity is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Profanity. If not, see . - * - * In addition, as a special exception, the copyright holders give permission to - * link the code of portions of this program with the OpenSSL library under - * certain conditions as described in each individual source file, and - * distribute linked combinations including the two. - * - * You must obey the GNU General Public License in all respects for all of the - * code used other than OpenSSL. If you modify file(s) with this exception, you - * may extend this exception to your version of the file(s), but you are not - * obligated to do so. If you do not wish to do so, delete this exception - * statement from your version. If you delete this exception statement from all - * source files in the program, then also delete it here. - * - */ - -#ifndef SERVER_EVENTS_H -#define SERVER_EVENTS_H - -#include "xmpp/xmpp.h" - -void handle_login_account_success(char *account_name); -void handle_lost_connection(void); -void handle_failed_login(void); -void handle_software_version_result(const char * const jid, const char * const presence, - const char * const name, const char * const version, const char * const os); -void handle_disco_info(const char *from, GSList *identities, GSList *features); -void handle_disco_info_error(const char * const from, const char * const error); -void handle_room_list(GSList *rooms, const char *conference_node); -void handle_disco_items(GSList *items, const char *jid); -void handle_room_invite(jabber_invite_t invite_type, - const char * const invitor, const char * const room, - const char * const reason, const char * const password); -void handle_room_broadcast(const char *const room_jid, - const char * const message); -void handle_room_subject(const char * const room, const char * const nick, const char * const subject); -void handle_room_history(const char * const room_jid, const char * const nick, - GTimeVal tv_stamp, const char * const message); -void handle_room_message(const char * const room_jid, const char * const nick, - const char * const message); -void handle_room_join_error(const char * const room, const char * const err); -void handle_room_info_error(const char * const room, const char * const error); -void handle_room_disco_info(const char * const room, GSList *identities, GSList *features, gboolean display); -void handle_room_affiliation_list_result_error(const char * const room, const char * const affiliation, - const char * const error); -void handle_room_affiliation_list(const char * const room, const char * const affiliation, GSList *jids); -void handle_room_affiliation_set_error(const char * const room, const char * const jid, const char * const affiliation, - const char * const error); -void handle_room_role_list_result_error(const char * const from, const char * const role, const char * const error); -void handle_room_role_list(const char * const from, const char * const role, GSList *nicks); -void handle_room_role_set_error(const char * const room, const char * const nick, const char * const role, - const char * const error); -void handle_room_kick_result_error(const char * const room, const char * const nick, const char * const error); -void handle_incoming_message(char *barejid, char *resource, char *message); -void handle_incoming_private_message(char *fulljid, char *message); -void handle_delayed_message(char *fulljid, char *message, GTimeVal tv_stamp); -void handle_delayed_private_message(char *fulljid, char *message, GTimeVal tv_stamp); -void handle_typing(char *barejid, char *resource); -void handle_paused(char *barejid, char *resource); -void handle_inactive(char *barejid, char *resource); -void handle_activity(char *barejid, char *resource, gboolean send_states); -void handle_gone(const char * const barejid, const char * const resource); -void handle_subscription(const char *from, jabber_subscr_t type); -void handle_message_receipt(char *barejid, char *id); -void handle_contact_offline(char *contact, char *resource, char *status); -void handle_contact_online(char *contact, Resource *resource, - GDateTime *last_activity); -void handle_leave_room(const char * const room); -void handle_room_destroy(const char * const room); -void handle_room_occupant_offline(const char * const room, const char * const nick, - const char * const show, const char * const status); -void handle_room_destroyed(const char * const room, const char * const new_jid, const char * const password, - const char * const reason); -void handle_room_kicked(const char * const room, const char * const actor, const char * const reason); -void handle_room_occupent_kicked(const char * const room, const char * const nick, const char * const actor, - const char * const reason); -void handle_room_banned(const char * const room, const char * const actor, const char * const reason); -void handle_room_occupent_banned(const char * const room, const char * const nick, const char * const actor, - const char * const reason); -void handle_group_add(const char * const contact, - const char * const group); -void handle_group_remove(const char * const contact, - const char * const group); -void handle_roster_remove(const char * const barejid); -void handle_roster_add(const char * const barejid, const char * const name); -void handle_autoping_cancel(void); -void handle_carbon(char *barejid, char *message); -void handle_message_error(const char * const from, const char * const type, - const char * const err_msg); -void handle_presence_error(const char *from, const char * const type, - const char *err_msg); -void handle_xmpp_stanza(const char * const msg); -void handle_ping_result(const char * const from, int millis); -void handle_ping_error_result(const char * const from, const char * const error); -void handle_room_configure(const char * const room, DataForm *form); -void handle_room_configuration_form_error(const char * const from, const char * const message); -void handle_room_config_submit_result(const char * const room); -void handle_room_config_submit_result_error(const char * const room, const char * const message); -void handle_muc_self_online(const char * const room, const char * const nick, gboolean config_required, - const char * const role, const char * const affiliation, const char * const actor, const char * const reason, - const char * const jid, const char * const show, const char * const status); -void 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 actor, const char * const reason, - const char * const show_str, const char * const status_str); -void handle_roster_update(const char * const barejid, const char * const name, - GSList *groups, const char * const subscription, gboolean pending_out); -void handle_roster_received(void); -void handle_enable_carbons_error(const char * const error); -void handle_disable_carbons_error(const char * const error); - -#endif diff --git a/src/xmpp/bookmark.c b/src/xmpp/bookmark.c index 1cf11f93..9e7bf62b 100644 --- a/src/xmpp/bookmark.c +++ b/src/xmpp/bookmark.c @@ -42,7 +42,7 @@ #include "common.h" #include "log.h" #include "muc.h" -#include "server_events.h" +#include "event/server_events.h" #include "xmpp/connection.h" #include "xmpp/stanza.h" #include "xmpp/xmpp.h" diff --git a/src/xmpp/connection.c b/src/xmpp/connection.c index d6a492ab..c51652fa 100644 --- a/src/xmpp/connection.c +++ b/src/xmpp/connection.c @@ -45,7 +45,7 @@ #include "log.h" #include "muc.h" #include "profanity.h" -#include "server_events.h" +#include "event/server_events.h" #include "xmpp/bookmark.h" #include "xmpp/capabilities.h" #include "xmpp/connection.h" @@ -470,7 +470,7 @@ _connection_handler(xmpp_conn_t * const conn, if (prefs_get_boolean(PREF_CARBONS)){ iq_enable_carbons(); } - + jabber_conn.conn_status = JABBER_CONNECTED; if (prefs_get_reconnect() != 0) { diff --git a/src/xmpp/iq.c b/src/xmpp/iq.c index 2cbed0dd..adee07b8 100644 --- a/src/xmpp/iq.c +++ b/src/xmpp/iq.c @@ -48,7 +48,7 @@ #include "muc.h" #include "profanity.h" #include "config/preferences.h" -#include "server_events.h" +#include "event/server_events.h" #include "xmpp/capabilities.h" #include "xmpp/connection.h" #include "xmpp/stanza.h" diff --git a/src/xmpp/message.c b/src/xmpp/message.c index 323c653c..ac20cbaf 100644 --- a/src/xmpp/message.c +++ b/src/xmpp/message.c @@ -42,7 +42,7 @@ #include "log.h" #include "muc.h" #include "profanity.h" -#include "server_events.h" +#include "event/server_events.h" #include "xmpp/connection.h" #include "xmpp/message.h" #include "xmpp/roster.h" diff --git a/src/xmpp/presence.c b/src/xmpp/presence.c index f4c45318..2be9780a 100644 --- a/src/xmpp/presence.c +++ b/src/xmpp/presence.c @@ -44,7 +44,7 @@ #include "log.h" #include "muc.h" #include "profanity.h" -#include "server_events.h" +#include "event/server_events.h" #include "xmpp/capabilities.h" #include "xmpp/connection.h" #include "xmpp/stanza.h" diff --git a/src/xmpp/roster.c b/src/xmpp/roster.c index 6de370aa..2e9d461b 100644 --- a/src/xmpp/roster.c +++ b/src/xmpp/roster.c @@ -41,7 +41,7 @@ #include "log.h" #include "profanity.h" -#include "server_events.h" +#include "event/server_events.h" #include "tools/autocomplete.h" #include "xmpp/connection.h" #include "xmpp/roster.h" diff --git a/tests/test_server_events.c b/tests/test_server_events.c index ce54b4f2..5df7c243 100644 --- a/tests/test_server_events.c +++ b/tests/test_server_events.c @@ -6,7 +6,7 @@ #include #include -#include "server_events.h" +#include "event/server_events.h" #include "roster_list.h" #include "chat_session.h" #include "config/preferences.h" -- cgit 1.4.1-2-gfad0