Changeset 788a1af for protocols/jabber/message.c

Timestamp:

2006-10-15T20:24:01Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

d74c644

Parents:

e617b35

Message:

Proper cleanup of jabber buddy structures when removing a buddy from the
list, proper checking (and handling) of events related to buddies that
aren't "hashed" yet, limit checks on priorityto setting, renamed JEP85
to XEP85, support for more XEP85 states.

File:

• protocols/jabber/message.c (modified) (4 diffs)

protocols/jabber/message.c

@@ -30 +30 @@
         char *type = xt_find_attr( node, "type" );
         struct xt_node *body = xt_find_node( node->children, "body" );
+        char *s;
         
         if( !type )
@@ -38 +39 @@
                 struct jabber_buddy *bud = NULL;
                 
-                if( strchr( from, '/' ) == NULL )
+                if( ( s = strchr( from, '/' ) ) == NULL )
                 {
                         /* It just shouldn't happen. */
@@ -46 +47 @@
                 }
                 
-                bud = jabber_buddy_by_jid( gc, from );
-                bud->last_act = time( NULL );
+                if( ( bud = jabber_buddy_by_jid( gc, from ) ) )
+                        bud->last_act = time( NULL );
+                else
+                        *s = 0; /* We need to generate a bare JID now. */
                 
                 if( body ) /* Could be just a typing notification. */
-                        serv_got_im( gc, bud->handle, body->text, 0, 0, 0 );
+                        serv_got_im( gc, bud ? bud->handle : from, body->text, 0, 0, 0 );
                 
+                /* Handling of incoming typing notifications. */
                 if( xt_find_node( node->children, "composing" ) )
                 {
-                        bud->flags |= JBFLAG_DOES_JEP85;
-                        serv_got_typing( gc, bud->handle, 0, 1 );
+                        bud->flags |= JBFLAG_DOES_XEP85;
+                        serv_got_typing( gc, bud ? bud->handle : from, 0, 1 );
                 }
-                else if( xt_find_node( node->children, "active" ) )
+                /* No need to send a "stopped typing" signal when there's a message. */
+                else if( xt_find_node( node->children, "active" ) && ( body == NULL ) )
                 {
-                        bud->flags |= JBFLAG_DOES_JEP85;
+                        bud->flags |= JBFLAG_DOES_XEP85;
+                        serv_got_typing( gc, bud ? bud->handle : from, 0, 0 );
                 }
+                else if( xt_find_node( node->children, "paused" ) )
+                {
+                        bud->flags |= JBFLAG_DOES_XEP85;
+                        serv_got_typing( gc, bud ? bud->handle : from, 0, 2 );
+                }
+                
+                if( s )
+                        *s = '/'; /* And convert it back to a full JID. */
         }
         else
@@ -70 +84 @@
         return XT_HANDLED;
 }
-