Changeset c058ff9

Timestamp:

2007-12-09T23:19:35Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

3f2bc2d

Parents:

de03374

Message:

Added /invite support for Jabber chatrooms (and fixed the argument order
to chat_invite).

Files:

• irc_commands.c (modified) (1 diff)
• protocols/jabber/conference.c (modified) (1 diff)
• protocols/jabber/jabber.c (modified) (2 diffs)
• protocols/jabber/jabber.h (modified) (1 diff)
• protocols/msn/msn.c (modified) (1 diff)
• protocols/oscar/oscar.c (modified) (1 diff)
• protocols/yahoo/yahoo.c (modified) (1 diff)

irc_commands.c

@@ -207 +207 @@
                 if( c->ic && c->ic->acc->prpl->chat_invite )
                 {
-                        c->ic->acc->prpl->chat_invite( c, "", u->handle );
+                        c->ic->acc->prpl->chat_invite( c, u->handle, NULL );
                         irc_reply( irc, 341, "%s %s", nick, channel );
                         return;

protocols/jabber/conference.c

@@ -174 +174 @@
         
         return 1;
+}
+
+void jabber_chat_invite( struct groupchat *c, char *who, char *message )
+{
+        struct xt_node *node;
+        struct im_connection *ic = c->ic;
+        struct jabber_chat *jc = c->data;
+
+        node = xt_new_node( "reason", message, NULL ); 
+
+        node = xt_new_node( "invite", NULL, node );
+        xt_add_attr( node, "to", who ); 
+
+        node = xt_new_node( "x", NULL, node ); 
+        xt_add_attr( node, "xmlns", XMLNS_MUC_USER ); 
+        
+        node = jabber_make_packet( "message", NULL, jc->name, node ); 
+
+        jabber_write_packet( ic, node ); 
+
+        xt_free_node( node );
 }
 

protocols/jabber/jabber.c

@@ -427 +427 @@
 }
 
+static void jabber_chat_invite_( struct groupchat *c, char *who, char *msg )
+{
+        struct jabber_chat *jc = c->data;
+        gchar *msg_alt = NULL;
+
+        if( msg == NULL )
+                msg_alt = g_strdup_printf( "%s invited you to %s", c->ic->acc->user, jc->name );
+        
+        if( c && who )
+                jabber_chat_invite( c, who, msg ? msg : msg_alt );
+        
+        g_free( msg_alt );
+}
+
 static void jabber_keepalive( struct im_connection *ic )
 {
@@ -498 +512 @@
         ret->chat_msg = jabber_chat_msg_;
         ret->chat_topic = jabber_chat_topic_;
-//      ret->chat_invite = jabber_chat_invite;
+        ret->chat_invite = jabber_chat_invite_;
         ret->chat_leave = jabber_chat_leave_;
         ret->chat_join = jabber_chat_join_;

protocols/jabber/jabber.h

@@ -237 +237 @@
 void jabber_chat_pkt_presence( struct im_connection *ic, struct jabber_buddy *bud, struct xt_node *node );
 void jabber_chat_pkt_message( struct im_connection *ic, struct jabber_buddy *bud, struct xt_node *node );
+void jabber_chat_invite( struct groupchat *c, char *who, char *message );
 
 #endif

protocols/msn/msn.c

@@ -241 +241 @@
 }
 
-static void msn_chat_invite( struct groupchat *c, char *msg, char *who )
+static void msn_chat_invite( struct groupchat *c, char *who, char *message )
 {
         struct msn_switchboard *sb = msn_sb_by_chat( c );

protocols/oscar/oscar.c

@@ -2509 +2509 @@
 }
 
-void oscar_chat_invite(struct groupchat *c, char *message, char *who)
+void oscar_chat_invite(struct groupchat *c, char *who, char *message)
 {
         struct im_connection *ic = c->ic;

protocols/yahoo/yahoo.c

@@ -306 +306 @@
 }
 
-static void byahoo_chat_invite( struct groupchat *c, char *msg, char *who )
+static void byahoo_chat_invite( struct groupchat *c, char *who, char *msg )
 {
         struct byahoo_data *yd = (struct byahoo_data *) c->ic->proto_data;