Changeset 3fbce97 for protocols/jabber/conference.c

Timestamp:

2016-09-24T20:14:34Z (8 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

ba52ac5

Parents:

63cad66 (diff), 82cb190 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into parson

File:

• protocols/jabber/conference.c (modified) (9 diffs)

protocols/jabber/conference.c

@@ -26 +26 @@
 
 static xt_status jabber_chat_join_failed(struct im_connection *ic, struct xt_node *node, struct xt_node *orig);
+static xt_status jabber_chat_self_message(struct im_connection *ic, struct xt_node *node, struct xt_node *orig);
 
 struct groupchat *jabber_chat_join(struct im_connection *ic, const char *room, const char *nick, const char *password)
@@ -121 +122 @@
         }
         if (bud) {
-                jabber_chat_free(jabber_chat_by_jid(ic, bud->bare_jid));
+                struct groupchat *c = jabber_chat_by_jid(ic, bud->bare_jid);
+                if (c) {
+                        jabber_chat_free(c);
+                }
         }
 
         return XT_HANDLED;
+}
+
+static xt_status jabber_chat_self_message(struct im_connection *ic, struct xt_node *node, struct xt_node *orig)
+{
+        /* This is a self message sent by this bitlbee - just drop it */
+        return XT_ABORT;
 }
 
@@ -171 +181 @@
         node = jabber_make_packet("message", "groupchat", jc->name, node);
 
-        if (!jabber_write_packet(ic, node)) {
-                xt_free_node(node);
-                return 0;
-        }
-        xt_free_node(node);
-
-        return 1;
+        jabber_cache_add(ic, node, jabber_chat_self_message);
+
+        return !jabber_write_packet(ic, node);
 }
 
@@ -299 +305 @@
                                         }
                                 }
-
-                                /* Some program-specific restrictions. */
-                                imcb_clean_handle(ic, bud->ext_jid);
                         }
                         bud->flags |= JBFLAG_IS_ANONYMOUS;
@@ -331 +334 @@
         } else if (type) { /* type can only be NULL or "unavailable" in this function */
                 if ((bud->flags & JBFLAG_IS_CHATROOM) && bud->ext_jid) {
+                        char *reason = NULL;
+                        char *status = NULL;
+                        char *status_text = NULL;
+                        
+                        if ((c = xt_find_node_by_attr(node->children, "x", "xmlns", XMLNS_MUC_USER))) {
+                                struct xt_node *c2 = c->children;
+
+                                while ((c2 = xt_find_node(c2, "status"))) {
+                                        char *code = xt_find_attr(c2, "code");
+                                        if (g_strcmp0(code, "301") == 0) {
+                                                status = "Banned";
+                                                break;
+                                        } else if (g_strcmp0(code, "303") == 0) {
+                                                /* This could be handled in a cleverer way,
+                                                 * but let's just show a literal part/join for now */
+                                                status = "Changing nicks";
+                                                break;
+                                        } else if (g_strcmp0(code, "307") == 0) {
+                                                status = "Kicked";
+                                                break;
+                                        }
+                                        c2 = c2->next;
+                                }
+
+                                /* Sometimes the status message is in presence/x/item/reason */
+                                if ((c2 = xt_find_path(c, "item/reason")) && c2->text && c2->text_len) {
+                                        status_text = c2->text;
+                                }
+                        }
+
+                        /* Sometimes the status message is right inside <presence> */
+                        if ((c = xt_find_node(node->children, "status")) && c->text && c->text_len) {
+                                status_text = c->text;
+                        }
+
+                        if (status_text && status) {
+                                reason = g_strdup_printf("%s: %s", status, status_text);
+                        } else {
+                                reason = g_strdup(status_text ? : status);
+                        }
+
                         s = strchr(bud->ext_jid, '/');
                         if (s) {
                                 *s = 0;
                         }
-                        imcb_chat_remove_buddy(chat, bud->ext_jid, NULL);
+                        imcb_chat_remove_buddy(chat, bud->ext_jid, reason);
                         if (bud != jc->me && bud->flags & JBFLAG_IS_ANONYMOUS) {
-                                imcb_remove_buddy(ic, bud->ext_jid, NULL);
+                                imcb_remove_buddy(ic, bud->ext_jid, reason);
                         }
                         if (s) {
                                 *s = '/';
                         }
+
+                        g_free(reason);
                 }
 
@@ -360 +406 @@
         char *final_from = NULL;
         char *bare_jid = NULL;
+        guint32 flags = 0;
 
         from = (bud) ? bud->full_jid : xt_find_attr(node, "from");
@@ -396 +443 @@
 
         if (subject && chat) {
-                char *subject_text = subject->text_len > 0 ? subject->text : NULL;
+                char *subject_text = subject->text_len > 0 ? subject->text : "";
                 if (g_strcmp0(chat->topic, subject_text) != 0) {
                         bare_jid = (bud) ? jabber_get_bare_jid(bud->ext_jid) : NULL;
@@ -402 +449 @@
                                         jabber_get_timestamp(node));
                         g_free(bare_jid);
+                        bare_jid = NULL;
                 }
         }
@@ -422 +470 @@
                 imcb_chat_log(chat, "From conference server: %s", body->text);
                 return;
-        } else if (jc && jc->flags & JCFLAG_MESSAGE_SENT && bud == jc->me) {
-                /* exclude self-messages since they would get filtered out
-                 * but not the ones in the backlog */
+        } else if (jc && jc->flags & JCFLAG_MESSAGE_SENT && bud == jc->me &&
+                   (jabber_cache_handle_packet(ic, node) == XT_ABORT)) {
+                /* Self message marked by this bitlbee, don't show it */
                 return;
         }
 
-        if (bud && jc && bud != jc->me) {
+        if (bud) {
                 bare_jid = jabber_get_bare_jid(bud->ext_jid ? bud->ext_jid : bud->full_jid);
                 final_from = bare_jid;
+                flags = (bud == jc->me) ? OPT_SELFMESSAGE : 0;
         } else {
                 final_from = nick;
         }
 
-        imcb_chat_msg(chat, final_from, body->text, 0, jabber_get_timestamp(node));
+        imcb_chat_msg(chat, final_from, body->text, flags, jabber_get_timestamp(node));
 
         g_free(bare_jid);