Changeset f5c0d8e

Timestamp:

2010-08-31T20:06:14Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

0c85c08

Parents:

8358691 (diff), 31dbb90a (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 mainline stuff.

Files:

• .bzrignore (modified) (1 diff)
• Makefile (modified) (3 diffs)
• configure (modified) (1 diff)
• doc/user-guide/commands.xml (modified) (7 diffs)
• irc.h (modified) (1 diff)
• irc_commands.c (modified) (2 diffs)
• irc_im.c (modified) (4 diffs)
• irc_send.c (modified) (3 diffs)
• lib/Makefile (modified) (2 diffs)
• protocols/Makefile (modified) (2 diffs)
• protocols/bee.h (modified) (2 diffs)
• protocols/bee_chat.c (modified) (1 diff)
• protocols/jabber/Makefile (modified) (2 diffs)
• protocols/jabber/jabber.h (modified) (1 diff)
• protocols/jabber/message.c (modified) (4 diffs)
• protocols/jabber/si.c (modified) (1 diff)
• protocols/msn/Makefile (modified) (2 diffs)
• protocols/oscar/Makefile (modified) (2 diffs)
• protocols/oscar/oscar.c (modified) (1 diff)
• protocols/purple/Makefile (modified) (2 diffs)
• protocols/twitter/Makefile (modified) (2 diffs)
• protocols/twitter/twitter.c (modified) (1 diff)
• protocols/yahoo/Makefile (modified) (2 diffs)
• protocols/yahoo/libyahoo2.c (modified) (2 diffs)
• root_commands.c (modified) (2 diffs)
• utils/README (modified) (1 diff)
• utils/centericq2bitlbee.sh (deleted)
• utils/convert_gnomeicu.txt (deleted)
• utils/convert_purple.py (added)
• utils/create_nicksfile.pl (deleted)

.bzrignore

@@ -20 +20 @@
 bitlbee.info
 bitlbee.exe
+.depend

Makefile

@@ -52 +52 @@
 
 distclean: clean $(subdirs)
+        rm -rf .depend
         rm -f Makefile.settings config.h bitlbee.pc
         find . -name 'DEADJOE' -o -name '*.orig' -o -name '*.rej' -o -name '*~' -exec rm -f {} \;
+        @# May still be present in dirs of disabled protocols.
+        find . -name .depend | xargs -r rmdir
         $(MAKE) -C tests distclean
 
@@ -105 +108 @@
         x=$$(basename $$(pwd)); \
         cd ..; \
-        tar czf $$x.tar.gz --exclude=debian --exclude=.bzr* $$x
+        tar czf $$x.tar.gz --exclude=debian --exclude=.bzr* --exclude=.depend $$x
 
 $(subdirs):
@@ -131 +134 @@
 helloworld:
         @echo Hello World
+
+-include .depend/*.d

configure

@@ -595 +595 @@
 fi
 
+case "$CC" in
+*gcc* )
+        echo CFLAGS+=-MD -MF .depend/\$@.d >> Makefile.settings
+        for i in . lib protocols protocols/*/; do
+                mkdir -p $i/.depend
+        done
+esac
+
 if [ "$msn" = 0 ]; then
         echo '#undef WITH_MSN' >> config.h

doc/user-guide/commands.xml

@@ -73 +73 @@
                                         
                                         <para>
-                                                By default all your Twitter contacts will come from a contact called twitter_(yourusername). You can change this behaviour using the <emphasis>mode</emphasis> setting (see <emphasis>help set mode</emphasis>).
+                                                By default all your Twitter contacts will appear in a new channel called #twitter_yourusername. You can change this behaviour using the <emphasis>mode</emphasis> setting (see <emphasis>help set mode</emphasis>).
                                         </para>
                                         
@@ -970 +970 @@
         <bitlbee-setting name="mode" type="string" scope="account">
                 <possible-values>one, many, chat</possible-values>
-                <default>one</default>
-
-                <description>
-                        <para>
-                                By default, everything from the Twitter module will come from one nick, twitter_(yourusername). If you prefer to have individual nicks for everyone, you can set this setting to "many" instead.
-                        </para>
-                        
-                        <para>
-                                If you prefer to have all your Twitter things in a separate channel, you can set this setting to "chat".
-                        </para>
-                        
-                        <para>
-                                In the last two modes, you can send direct messages by /msg'ing your contacts directly. Note, however, that incoming DMs are not fetched yet.
+                <default>chat</default>
+
+                <description>
+                        <para>
+                                By default, BitlBee will create a separate channel (called #twitter_yourusername) for all your Twitter contacts/messages.
+                        </para>
+
+                        <para>
+                                If you don't want an extra channel, you can set this setting to "one" (everything will come from one nick, twitter_yourusername), or to "many" (individual nicks for everyone).
+                        </para>
+                        
+                        <para>
+                                With modes "chat" and "many", you can send direct messages by /msg'ing your contacts directly. Note, however, that incoming DMs are not fetched yet.
+                        </para>
+                        
+                        <para>
+                                With modes "many" and "one", you can post tweets by /msg'ing the twitter_yourusername contact. In mode "chat", messages posted in the Twitter channel will also be posted as tweets.
                         </para>
                 </description>
@@ -1637 +1641 @@
         </bitlbee-command>
         
-        <bitlbee-command name="transfers">
+        <bitlbee-command name="transfer">
                 <short-description>Monitor, cancel, or reject file transfers</short-description>
-                <syntax>transfers [&lt;cancel&gt; id | &lt;reject&gt;]</syntax>
+                <syntax>transfer [&lt;cancel&gt; id | &lt;reject&gt;]</syntax>
                 
                 <description>
                         <para>
-                                Without parameters the currently pending file transfers and their status will be listed. Available actions are <emphasis>cancel</emphasis> and <emphasis>reject</emphasis>. See <emphasis>help transfers &lt;action&gt;</emphasis> for more information.
+                                Without parameters the currently pending file transfers and their status will be listed. Available actions are <emphasis>cancel</emphasis> and <emphasis>reject</emphasis>. See <emphasis>help transfer &lt;action&gt;</emphasis> for more information.
                         </para>
 
                         <ircexample>
-                                <ircline nick="ulim">transfers</ircline>
+                                <ircline nick="ulim">transfer</ircline>
                         </ircexample>
                 </description>
@@ -1653 +1657 @@
                 <bitlbee-command name="cancel">
                         <short-description>Cancels the file transfer with the given id</short-description>
-                        <syntax>transfers &lt;cancel&gt; id</syntax>
+                        <syntax>transfer &lt;cancel&gt; id</syntax>
 
                         <description>
@@ -1660 +1664 @@
 
                         <ircexample>
-                                <ircline nick="ulim">transfers cancel 1</ircline>
+                                <ircline nick="ulim">transfer cancel 1</ircline>
                                 <ircline nick="root">Canceling file transfer for test</ircline>
                         </ircexample>
@@ -1667 +1671 @@
                 <bitlbee-command name="reject">
                         <short-description>Rejects all incoming transfers</short-description>
-                        <syntax>transfers &lt;reject&gt;</syntax>
+                        <syntax>transfer &lt;reject&gt;</syntax>
 
                         <description>
@@ -1674 +1678 @@
 
                         <ircexample>
-                                <ircline nick="ulim">transfers reject</ircline>
+                                <ircline nick="ulim">transfer reject</ircline>
                         </ircexample>
                 </bitlbee-command>

irc.h

@@ -289 +289 @@
 void irc_send_channel_user_mode_diff( irc_channel_t *ic, irc_user_t *iu,
                                       irc_channel_user_flags_t old, irc_channel_user_flags_t new );
+void irc_send_invite( irc_user_t *iu, irc_channel_t *ic );
 
 /* irc_user.c */

irc_commands.c

@@ -302 +302 @@
         char *channel = cmd[1];
         irc_channel_t *ic;
+        irc_user_t *iu;
         
         if( !channel || *channel == '0' || *channel == '*' || !*channel )
@@ -307 +308 @@
         else if( ( ic = irc_channel_by_name( irc, channel ) ) )
                 irc_send_who( irc, ic->users, channel );
+        else if( ( iu = irc_user_by_name( irc, channel ) ) )
+        {
+                /* Tiny hack! */
+                GSList *l = g_slist_append( NULL, iu );
+                irc_send_who( irc, l, channel );
+                g_slist_free( l );
+        }
         else
                 irc_send_num( irc, 403, "%s :No such channel", channel );

irc_im.c

@@ -252 +252 @@
 {
         irc_user_t *iu = (irc_user_t *) bu->ui_data;
-        irc_t *irc = (irc_t *) bee->ui_data;
         char *s;
         
@@ -266 +265 @@
         if( ( bu->ic->flags & OPT_LOGGED_IN ) && set_getbool( &bee->set, "display_namechanges" ) )
         {
+                /* People don't like this /NOTICE. Meh, let's go back to the old one.
                 char *msg = g_strdup_printf( "<< \002BitlBee\002 - Changed name to `%s' >>", iu->fullname );
                 irc_send_msg( iu, "NOTICE", irc->user->nick, msg, NULL );
+                */
+                imcb_log( bu->ic, "User `%s' changed name to `%s'", iu->nick, iu->fullname );
         }
         
@@ -613 +615 @@
 }
 
+static gboolean bee_irc_chat_invite( bee_t *bee, bee_user_t *bu, const char *name, const char *msg )
+{
+        char *channel, *s;
+        irc_t *irc = bee->ui_data;
+        irc_user_t *iu = bu->ui_data;
+        irc_channel_t *chan;
+        
+        if( strchr( CTYPES, name[0] ) )
+                channel = g_strdup( name );
+        else
+                channel = g_strdup_printf( "#%s", name );
+        
+        if( ( s = strchr( channel, '@' ) ) )
+                *s = '\0';
+        
+        if( strlen( channel ) > MAX_NICK_LENGTH )
+        {
+                /* If the channel name is very long (like those insane GTalk
+                   UUID names), try if we can use the inviter's nick. */
+                s = g_strdup_printf( "#%s", iu->nick );
+                if( irc_channel_by_name( irc, s ) == NULL )
+                {
+                        g_free( channel );
+                        channel = s;
+                }
+        }
+        
+        if( ( chan = irc_channel_new( irc, channel ) ) &&
+            set_setstr( &chan->set, "type", "chat" ) &&
+            set_setstr( &chan->set, "chat_type", "room" ) &&
+            set_setstr( &chan->set, "account", bu->ic->acc->tag ) &&
+            set_setstr( &chan->set, "room", (char*) name ) )
+        {
+                /* I'm assuming that if the user didn't "chat add" the room
+                   himself but got invited, it's temporary, so make this a
+                   temporary mapping that is removed as soon as we /PART. */
+                chan->flags |= IRC_CHANNEL_TEMP;
+        }
+        else
+        {
+                irc_channel_free( chan );
+                chan = NULL;
+        }
+        g_free( channel );
+        
+        irc_send_msg_f( iu, "PRIVMSG", irc->user->nick, "<< \002BitlBee\002 - Invitation to chatroom %s >>", name );
+        if( msg )
+                irc_send_msg( iu, "PRIVMSG", irc->user->nick, msg, NULL );
+        if( chan )
+        {
+                irc_send_msg_f( iu, "PRIVMSG", irc->user->nick, "To join the room, just /join %s", chan->name );
+                irc_send_invite( iu, chan );
+        }
+        
+        return TRUE;
+}
+
 /* IRC->IM */
 static gboolean bee_irc_channel_chat_privmsg_cb( gpointer data, gint fd, b_input_condition cond );
@@ -909 +968 @@
         bee_irc_chat_topic,
         bee_irc_chat_name_hint,
+        bee_irc_chat_invite,
         
         bee_irc_ft_in_start,

irc_send.c

@@ -264 +264 @@
 void irc_send_who( irc_t *irc, GSList *l, const char *channel )
 {
-        gboolean is_channel = strcmp( channel, "**" ) != 0;
+        gboolean is_channel = strchr( CTYPES, channel[0] ) != NULL;
         
         while( l )
@@ -273 +273 @@
                 /* TODO(wilmer): Restore away/channel information here */
                 irc_send_num( irc, 352, "%s %s %s %s %s %c :0 %s",
-                              channel ? : "*", iu->user, iu->host, irc->root->host,
+                              is_channel ? channel : "*", iu->user, iu->host, irc->root->host,
                               iu->nick, iu->flags & IRC_USER_AWAY ? 'G' : 'H',
                               iu->fullname );
@@ -398 +398 @@
                 irc_write( ic->irc, ":%s MODE %s %s", from, ic->name, changes );
 }
+
+void irc_send_invite( irc_user_t *iu, irc_channel_t *ic )
+{
+        irc_t *irc = iu->irc;
+        
+        irc_write( iu->irc, ":%s!%s@%s INVITE %s :%s",
+                   iu->nick, iu->user, iu->host, irc->user->nick, ic->name );
+}

lib/Makefile

@@ -30 +30 @@
 
 distclean: clean $(subdirs)
+        rm -rf .depend
 
 ### MAIN PROGRAM
@@ -42 +43 @@
         @echo '*' Compiling $<
         @$(CC) -c $(CFLAGS) $< -o $@
+
+-include .depend/*.d

protocols/Makefile

@@ -40 +40 @@
 
 distclean: clean $(subdirs)
+        rm -rf .depend
 
 $(subdirs):
@@ -55 +56 @@
         @echo '*' Compiling $<
         @$(CC) -c $(CFLAGS) $< -o $@
+
+-include .depend/*.d

protocols/bee.h

@@ -123 +123 @@
         gboolean (*chat_topic)( bee_t *bee, struct groupchat *c, const char *new, bee_user_t *bu );
         gboolean (*chat_name_hint)( bee_t *bee, struct groupchat *c, const char *name );
+        gboolean (*chat_invite)( bee_t *bee, bee_user_t *bu, const char *name, const char *msg );
         
         struct file_transfer* (*ft_in_start)( bee_t *bee, bee_user_t *bu, const char *file_name, size_t file_size );
@@ -175 +176 @@
 G_MODULE_EXPORT int bee_chat_msg( bee_t *bee, struct groupchat *c, const char *msg, int flags );
 G_MODULE_EXPORT struct groupchat *bee_chat_by_title( bee_t *bee, struct im_connection *ic, const char *title );
+G_MODULE_EXPORT void imcb_chat_invite( struct im_connection *ic, const char *name, const char *who, const char *msg );
 
 #endif /* __BEE_H__ */

protocols/bee_chat.c

@@ -233 +233 @@
         return NULL;
 }
+
+void imcb_chat_invite( struct im_connection *ic, const char *name, const char *who, const char *msg )
+{
+        bee_user_t *bu = bee_user_by_handle( ic->bee, ic, who );
+        
+        if( bu && ic->bee->ui->chat_invite )
+                ic->bee->ui->chat_invite( ic->bee, bu, name, msg );
+}

protocols/jabber/Makefile

@@ -30 +30 @@
 
 distclean: clean
+        rm -rf .depend
 
 ### MAIN PROGRAM
@@ -42 +43 @@
         @echo '*' Linking jabber_mod.o
         @$(LD) $(LFLAGS) $(objects) -o jabber_mod.o
+
+-include .depend/*.d

protocols/jabber/jabber.h

@@ -59 +59 @@
         JBFLAG_IS_ANONYMOUS = 8,        /* For anonymous chatrooms, when we don't have
                                            have a real JID. */
+        JBFLAG_HIDE_SUBJECT = 16,       /* Hide the subject field since we probably
+                                           showed it already. */
 } jabber_buddy_flags_t;
 

protocols/jabber/message.c

@@ -31 +31 @@
         struct xt_node *body = xt_find_node( node->children, "body" ), *c;
         struct jabber_buddy *bud = NULL;
-        char *s;
+        char *s, *room = NULL, *reason = NULL;
         
         if( !from )
@@ -52 +52 @@
                 for( c = node->children; ( c = xt_find_node( c, "x" ) ); c = c->next )
                 {
-                        char *ns = xt_find_attr( c, "xmlns" ), *room;
-                        struct xt_node *inv, *reason;
+                        char *ns = xt_find_attr( c, "xmlns" );
+                        struct xt_node *inv;
                         
                         if( ns && strcmp( ns, XMLNS_MUC_USER ) == 0 &&
                             ( inv = xt_find_node( c->children, "invite" ) ) )
                         {
+                                /* This is an invitation. Set some vars which
+                                   will be passed to imcb_chat_invite() below. */
                                 room = from;
                                 if( ( from = xt_find_attr( inv, "from" ) ) == NULL )
                                         from = room;
-
-                                g_string_append_printf( fullmsg, "<< \002BitlBee\002 - Invitation to chatroom %s >>\n", room );
-                                if( ( reason = xt_find_node( inv->children, "reason" ) ) && reason->text_len > 0 )
-                                        g_string_append( fullmsg, reason->text );
+                                if( ( inv = xt_find_node( inv->children, "reason" ) ) && inv->text_len > 0 )
+                                        reason = inv->text;
                         }
                 }
@@ -93 +93 @@
                         }
                 }
-                else if( ( c = xt_find_node( node->children, "subject" ) ) && c->text_len > 0 )
+                else if( ( c = xt_find_node( node->children, "subject" ) ) && c->text_len > 0 &&
+                         ( !bud || !( bud->flags & JBFLAG_HIDE_SUBJECT ) ) )
                 {
                         g_string_append_printf( fullmsg, "<< \002BitlBee\002 - Message with subject: %s >>\n", c->text );
+                        if( bud )
+                                bud->flags |= JBFLAG_HIDE_SUBJECT;
+                }
+                else if( bud && !c )
+                {
+                        /* Yeah, possibly we're hiding changes to this field now. But nobody uses
+                           this for anything useful anyway, except GMail when people reply to an
+                           e-mail via chat, repeating the same subject all the time. I don't want
+                           to have to remember full subject strings for everyone. */
+                        bud->flags &= ~JBFLAG_HIDE_SUBJECT;
                 }
                 
@@ -104 +115 @@
                         imcb_buddy_msg( ic, from, fullmsg->str,
                                         0, jabber_get_timestamp( node ) );
+                if( room )
+                        imcb_chat_invite( ic, room, from, reason );
                 
                 g_string_free( fullmsg, TRUE );

protocols/jabber/si.c

@@ -262 +262 @@
                                 break;
                         }
+                        else
+                        {
+                                c = c->next;
+                        }
 
                 if ( !requestok )

protocols/msn/Makefile

@@ -30 +30 @@
 
 distclean: clean
+        rm -rf .depend
 
 ### MAIN PROGRAM
@@ -42 +43 @@
         @echo '*' Linking msn_mod.o
         @$(LD) $(LFLAGS) $(objects) -o msn_mod.o
-        
 
+-include .depend/*.d

protocols/oscar/Makefile

@@ -31 +31 @@
 
 distclean: clean
+        rm -rf .depend
 
 ### MAIN PROGRAM
@@ -43 +44 @@
         @echo '*' Linking oscar_mod.o
         @$(LD) $(LFLAGS) $(objects) -o oscar_mod.o
+
+-include .depend/*.d

protocols/oscar/oscar.c

@@ -517 +517 @@
                         /* Incorrect nick/password */
                         imcb_error(ic, _("Incorrect nickname or password."));
+                        {
+                                int max = od->icq ? 8 : 16;
+                                if (strlen(ic->acc->pass) > max)
+                                        imcb_log(ic, "Note that the maximum password "
+                                                 "length supported by this protocol is "
+                                                 "%d characters, try logging in using "
+                                                 "a shorter password.", max);
+                        }
 //                      plugin_event(event_error, (void *)980, 0, 0, 0);
                         break;

protocols/purple/Makefile

@@ -31 +31 @@
 
 distclean: clean
+        rm -rf .depend
 
 ### MAIN PROGRAM
@@ -43 +44 @@
         @echo '*' Linking purple_mod.o
         $(LD) $(LFLAGS) $(objects) -o purple_mod.o
+
+-include .depend/*.d

protocols/twitter/Makefile

@@ -30 +30 @@
 
 distclean: clean
+        rm -rf .depend
 
 ### MAIN PROGRAM
@@ -43 +44 @@
         @$(LD) $(LFLAGS) $(objects) -o twitter_mod.o
         
-
+-include .depend/*.d

protocols/twitter/twitter.c

@@ -195 +195 @@
         s = set_add( &acc->set, "message_length", "140", set_eval_int, acc );
         
-        s = set_add( &acc->set, "mode", "one", set_eval_mode, acc );
+        s = set_add( &acc->set, "mode", "chat", set_eval_mode, acc );
         s->flags |= ACC_SET_OFFLINE_ONLY;
         

protocols/yahoo/Makefile

@@ -31 +31 @@
 
 distclean: clean
+        rm -rf .depend
 
 ### MAIN PROGRAM
@@ -43 +44 @@
         @echo '*' Linking yahoo_mod.o
         @$(LD) $(LFLAGS) $(objects) -o yahoo_mod.o
+
+-include .depend/*.d

protocols/yahoo/libyahoo2.c

@@ -2169 +2169 @@
         yd->buddies = y_list_append(yd->buddies, bud);
 
+#if 0
+        /* BitlBee: This seems to be wrong in my experience. I think:
+           status = 0: Success
+           status = 2: Already on list
+           status = 3: Doesn't exist
+           status = 42: Invalid handle (possibly banned/reserved, I get it for
+                        handles like joe or jjjjjj)
+           Haven't seen others yet. But whenever the add is successful, there
+           will be a separate "went online" packet when the auth. request is
+           accepted. Couldn't find any test account that doesn't require auth.
+           unfortunately (if there is even such a thing?) */
+           
         /* A non-zero status (i've seen 2) seems to mean the buddy is already 
          * added and is online */
@@ -2176 +2188 @@
                 YAHOO_CALLBACK(ext_yahoo_status_changed) (yd->client_id, who,
                         YAHOO_STATUS_AVAILABLE, NULL, 0, 0, 0);
+        }
+#endif
+        /* BitlBee: Need ACK of added buddy, if it was successful. */
+        if (status == 0) {
+                YList *tmp = y_list_append(NULL, bud);
+                YAHOO_CALLBACK(ext_yahoo_got_buddies) (yd->client_id, tmp);
+                y_list_free(tmp);
         }
 }

root_commands.c

@@ -1284 +1284 @@
 }
 
+static void cmd_nick( irc_t *irc, char **cmd )
+{
+        irc_usermsg( irc, "This command is deprecated. Try: account %s set display_name", cmd[1] );
+}
+
 /* Maybe this should be a stand-alone command as well? */
 static void bitlbee_whatsnew( irc_t *irc )
@@ -1338 +1343 @@
         { "identify",       1, cmd_identify,       0 },
         { "info",           1, cmd_info,           0 },
+        { "nick",           1, cmd_nick,           0 },
         { "no",             0, cmd_yesno,          0 },
         { "qlist",          0, cmd_qlist,          0 },

utils/README

@@ -18 +18 @@
 
 
-* create_nicksfile.pl (Christian Friedl <christian.friedl@chello.at>)
+* convert_purple.py
 
-This program reads your ~/.licq/ configuration data and convert it to a
-correct .nicks file. This program can be extended to read other contact
-list file formats as well.
-
-
-* centericq2bitlbee.sh (geno <geno@xenyon.com>)
-
-Converter script for CenterICQ ICQ contact lists. See the documentation
-for more information.
-
-
-* convert_gnomeicu.txt
-
-Not a program, but this one contains a regex which should correctly
-convert GnomeICU configuration files into the BitlBee format.
-
-
-* Dynamic MOTD for BitlBee (Geert Hauwaerts <geert@hauwaerts.be>)
-
-Originally, I wanted to put this program here, but Geert put it online
-on his own server, with docs and stuff, so I guess it's better to put
-a link here. dmotd is a little script which generates a motd with some
-nice statistics, especially nice for servers with many people on it.
-
-See http://dmotd.hauwaerts.be/ for more information.
+Converts libpurple configs into something BitlBee can use, so you don't
+have to re-add all your accounts by hand.