Changeset 63075d7

Timestamp:

2008-02-03T23:33:18Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

69ac78c

Parents:

8ff0a61

Message:

Messages from the user are also included in backlogs when joining a Jabber
chatroom. Until now they were ignored, which might make backlogs a little
bit confusing.

Location:

protocols/jabber

Files:

• conference.c (modified) (3 diffs)
• jabber.h (modified) (1 diff)

protocols/jabber/conference.c

@@ -122 +122 @@
         struct jabber_chat *jc = c->data;
         struct xt_node *node;
+        
+        jc->flags |= JCFLAG_MESSAGE_SENT;
         
         node = xt_new_node( "body", message, NULL );
@@ -295 +297 @@
         struct xt_node *subject = xt_find_node( node->children, "subject" );
         struct xt_node *body = xt_find_node( node->children, "body" );
-        struct groupchat *chat = NULL;
+        struct groupchat *chat = bud ? jabber_chat_by_jid( ic, bud->bare_jid ) : NULL;
+        struct jabber_chat *jc = chat ? chat->data : NULL;
         char *s;
         
-        if( bud == NULL )
+        if( bud == NULL || ( jc && ~jc->flags & JCFLAG_MESSAGE_SENT && bud == jc->me ) )
         {
                 char *nick;
@@ -346 +349 @@
                 return;
         }
-        else if( ( chat = jabber_chat_by_jid( ic, bud->bare_jid ) ) == NULL )
+        else if( chat == NULL )
         {
                 /* How could this happen?? We could do kill( self, 11 )

protocols/jabber/jabber.h

@@ -49 +49 @@
 typedef enum
 {
-        JBFLAG_PROBED_XEP85 = 1,        /* Set this when we sent our probe packet to make
+        JBFLAG_PROBED_XEP85 = 1,        /* Set this when we sent our probe packet to make
                                            sure it gets sent only once. */
-        JBFLAG_DOES_XEP85 = 2,          /* Set this when the resource seems to support
+        JBFLAG_DOES_XEP85 = 2,          /* Set this when the resource seems to support
                                            XEP85 (typing notification shite). */
-        JBFLAG_IS_CHATROOM = 4,         /* It's convenient to use this JID thingy for
+        JBFLAG_IS_CHATROOM = 4,         /* It's convenient to use this JID thingy for
                                            groupchat state info too. */
-        JBFLAG_IS_ANONYMOUS = 8,        /* For anonymous chatrooms, when we don't have
+        JBFLAG_IS_ANONYMOUS = 8,        /* For anonymous chatrooms, when we don't have
                                            have a real JID. */
 } jabber_buddy_flags_t;
+
+typedef enum
+{
+        JCFLAG_MESSAGE_SENT = 1,        /* Set this after sending the first message, so
+                                           we can detect echoes/backlogs. */
+} jabber_chat_flags_t;
 
 struct jabber_data