Changeset bd5eee3

Timestamp:

2010-05-09T09:48:56Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e5abfd4

Parents:

75610c3 (diff), 5a599a1 (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:

Merging mainline, mostly for chatroom fixes I implemented there.

Files:

• doc/user-guide/commands.xml (modified) (1 diff)
• protocols/oscar/oscar.c (modified) (1 diff)
• protocols/twitter/twitter.c (modified) (3 diffs)
• protocols/yahoo/yahoo.c (modified) (1 diff)

doc/user-guide/commands.xml

@@ -663 +663 @@
         </bitlbee-setting>
 
+        <bitlbee-setting name="message_length" type="integer" scope="account">
+                <default>140</default>
+
+                <description>
+                        <para>
+                                Since Twitter rejects messages longer than 140 characters, BitlBee can count message length and emit a warning instead of waiting for Twitter to reject it.
+                        </para>
+
+                        <para>
+                                You can change this limit here but this won't disable length checks on Twitter's side. You can also set it to 0 to disable the check in case you believe BitlBee doesn't count the characters correctly.
+                        </para>
+                </description>
+
+        </bitlbee-setting>
+
         <bitlbee-setting name="mode" type="string" scope="account">
                 <possible-values>one, many, chat</possible-values>

protocols/oscar/oscar.c

@@ -2659 +2659 @@
         
         c = imcb_chat_new(ic, chatname);
-
         ret = oscar_chat_join(ic, chatname, NULL, NULL);
-
         aim_chat_invite(od->sess, od->conn, who, "", 4, chatname, 0x0);
 

protocols/twitter/twitter.c

@@ -144 +144 @@
 }
 
+static gboolean twitter_length_check( struct im_connection *ic, gchar *msg )
+{
+        int max = set_getint( &ic->acc->set, "message_length" ), len;
+        
+        if( max == 0 || ( len = g_utf8_strlen( msg, -1 ) ) <= max )
+                return TRUE;
+        
+        imcb_error( ic, "Maximum message length exceeded: %d > %d", len, max );
+        
+        return FALSE;
+}
+
 static void twitter_init( account_t *acc )
 {
         set_t *s;
+        
+        s = set_add( &acc->set, "message_length", "140", set_eval_int, acc );
         
         s = set_add( &acc->set, "mode", "one", set_eval_mode, acc );
@@ -231 +245 @@
                         }
                 }
-                else
+                else if( twitter_length_check(ic, message) )
                         twitter_post_status(ic, message);
         }
@@ -262 +276 @@
 static void twitter_chat_msg( struct groupchat *c, char *message, int flags )
 {
-        if( c && message )
+        if( c && message && twitter_length_check(c->ic, message))
                 twitter_post_status(c->ic, message);
 }

protocols/yahoo/yahoo.c

@@ -832 +832 @@
         YList *m;
         
+        if( g_strcasecmp( who, ic->acc->user ) == 0 )
+                /* WTF, Yahoo! seems to echo these now? */
+                return;
+        
         inv = g_malloc( sizeof( struct byahoo_conf_invitation ) );
         memset( inv, 0, sizeof( struct byahoo_conf_invitation ) );