Changes in protocols/jabber/message.c [b9f8b87:9624fdf]

File:

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

protocols/jabber/message.c

@@ -30 +30 @@
         char *type = xt_find_attr( node, "type" );
         struct xt_node *body = xt_find_node( node->children, "body" ), *c;
-        struct jabber_buddy *bud = NULL;
         char *s;
-        
-        if( !from )
-                return XT_HANDLED; /* Consider this packet corrupted. */
-        
-        bud = jabber_buddy_by_jid( ic, from, GET_BUDDY_EXACT );
         
         if( type && strcmp( type, "error" ) == 0 )
@@ -42 +36 @@
                 /* Handle type=error packet. */
         }
-        else if( type && from && strcmp( type, "groupchat" ) == 0 )
+        else if( type && strcmp( type, "groupchat" ) == 0 )
         {
-                jabber_chat_pkt_message( ic, bud, node );
+                /* TODO! */
         }
         else /* "chat", "normal", "headline", no-type or whatever. Should all be pretty similar. */
         {
+                struct jabber_buddy *bud = NULL;
                 GString *fullmsg = g_string_new( "" );
                 
                 if( ( s = strchr( from, '/' ) ) )
                 {
-                        if( bud )
-                        {
+                        if( ( bud = jabber_buddy_by_jid( ic, from, GET_BUDDY_EXACT ) ) )
                                 bud->last_act = time( NULL );
-                                from = bud->ext_jid ? : bud->bare_jid;
-                        }
                         else
                                 *s = 0; /* We need to generate a bare JID now. */
@@ -84 +76 @@
                 
                 if( fullmsg->len > 0 )
-                        imcb_buddy_msg( ic, from, fullmsg->str,
-                                        0, jabber_get_timestamp( node ) );
+                        imcb_buddy_msg( ic, bud ? bud->bare_jid : from, fullmsg->str, 0, 0 );
                 
                 g_string_free( fullmsg, TRUE );
@@ -93 +84 @@
                 {
                         bud->flags |= JBFLAG_DOES_XEP85;
-                        imcb_buddy_typing( ic, from, OPT_TYPING );
+                        imcb_buddy_typing( ic, bud ? bud->bare_jid : from, OPT_TYPING );
                 }
                 /* No need to send a "stopped typing" signal when there's a message. */
@@ -99 +90 @@
                 {
                         bud->flags |= JBFLAG_DOES_XEP85;
-                        imcb_buddy_typing( ic, from, 0 );
+                        imcb_buddy_typing( ic, bud ? bud->bare_jid : from, 0 );
                 }
                 else if( xt_find_node( node->children, "paused" ) )
                 {
                         bud->flags |= JBFLAG_DOES_XEP85;
-                        imcb_buddy_typing( ic, from, OPT_THINKING );
+                        imcb_buddy_typing( ic, bud ? bud->bare_jid : from, OPT_THINKING );
                 }