Changeset 814aa52 for protocols/nogaim.c

Timestamp:

2010-06-03T11:00:45Z (14 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

a6b2f13

Parents:

5f8ab6a9 (diff), f4bcc22 (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 in bitlbee 1.2.6

File:

• protocols/nogaim.c (modified) (9 diffs)

protocols/nogaim.c

@@ -39 +39 @@
 
 static int remove_chat_buddy_silent( struct groupchat *b, const char *handle );
+static char *format_timestamp( irc_t *irc, time_t msg_ts );
 
 GSList *connections;
@@ -132 +133 @@
         extern void byahoo_initmodule();
         extern void jabber_initmodule();
+        extern void twitter_initmodule();
 
 #ifdef WITH_MSN
@@ -147 +149 @@
 #ifdef WITH_JABBER
         jabber_initmodule();
+#endif
+
+#ifdef WITH_TWITTER
+        twitter_initmodule();
 #endif
 
@@ -727 +733 @@
 {
         irc_t *irc = ic->irc;
-        char *wrapped;
+        char *wrapped, *ts = NULL;
         user_t *u;
 
@@ -776 +782 @@
             ( ( ic->flags & OPT_DOES_HTML ) && set_getbool( &ic->irc->set, "strip_html" ) ) )
                 strip_html( msg );
-
+        
+        if( set_getbool( &ic->irc->set, "display_timestamps" ) &&
+            ( ts = format_timestamp( irc, sent_at ) ) )
+        {
+                char *new = g_strconcat( ts, msg, NULL );
+                g_free( ts );
+                ts = msg = new;
+        }
+        
         wrapped = word_wrap( msg, 425 );
         irc_msgfrom( irc, u->nick, wrapped );
         g_free( wrapped );
         g_free( msg );
+        g_free( ts );
 }
 
@@ -822 +837 @@
         
         return c;
+}
+
+void imcb_chat_name_hint( struct groupchat *c, const char *name )
+{
+        if( !c->joined )
+        {
+                struct im_connection *ic = c->ic;
+                char stripped[MAX_NICK_LENGTH+1], *full_name;
+                
+                strncpy( stripped, name, MAX_NICK_LENGTH );
+                stripped[MAX_NICK_LENGTH] = '\0';
+                nick_strip( stripped );
+                if( set_getbool( &ic->irc->set, "lcnicks" ) )
+                        nick_lc( stripped );
+                
+                full_name = g_strdup_printf( "&%s", stripped );
+                
+                if( stripped[0] &&
+                    nick_cmp( stripped, ic->irc->channel + 1 ) != 0 &&
+                    irc_chat_by_channel( ic->irc, full_name ) == NULL )
+                {
+                        g_free( c->channel );
+                        c->channel = full_name;
+                }
+                else
+                {
+                        g_free( full_name );
+                }
+        }
 }
 
@@ -884 +928 @@
         if( c && u )
         {
-                irc_privmsg( ic->irc, u, "PRIVMSG", c->channel, "", wrapped );
+                char *ts = NULL;
+                if( set_getbool( &ic->irc->set, "display_timestamps" ) )
+                        ts = format_timestamp( ic->irc, sent_at );
+                irc_privmsg( ic->irc, u, "PRIVMSG", c->channel, ts ? : "", wrapped );
+                g_free( ts );
         }
         else
@@ -1021 +1069 @@
 
 
+/* Misc. BitlBee stuff which shouldn't really be here */
+
+char *set_eval_timezone( set_t *set, char *value )
+{
+        char *s;
+        
+        if( strcmp( value, "local" ) == 0 ||
+            strcmp( value, "gmt" ) == 0 || strcmp( value, "utc" ) == 0 )
+                return value;
+        
+        /* Otherwise: +/- at the beginning optional, then one or more numbers,
+           possibly followed by a colon and more numbers. Don't bother bound-
+           checking them since users are free to shoot themselves in the foot. */
+        s = value;
+        if( *s == '+' || *s == '-' )
+                s ++;
+        
+        /* \d+ */
+        if( !isdigit( *s ) )
+                return SET_INVALID;
+        while( *s && isdigit( *s ) ) s ++;
+        
+        /* EOS? */
+        if( *s == '\0' )
+                return value;
+        
+        /* Otherwise, colon */
+        if( *s != ':' )
+                return SET_INVALID;
+        s ++;
+        
+        /* \d+ */
+        if( !isdigit( *s ) )
+                return SET_INVALID;
+        while( *s && isdigit( *s ) ) s ++;
+        
+        /* EOS */
+        return *s == '\0' ? value : SET_INVALID;
+}
+
+static char *format_timestamp( irc_t *irc, time_t msg_ts )
+{
+        time_t now_ts = time( NULL );
+        struct tm now, msg;
+        char *set;
+        
+        /* If the timestamp is <= 0 or less than a minute ago, discard it as
+           it doesn't seem to add to much useful info and/or might be noise. */
+        if( msg_ts <= 0 || msg_ts > now_ts - 60 )
+                return NULL;
+        
+        set = set_getstr( &irc->set, "timezone" );
+        if( strcmp( set, "local" ) == 0 )
+        {
+                localtime_r( &now_ts, &now );
+                localtime_r( &msg_ts, &msg );
+        }
+        else
+        {
+                int hr, min = 0, sign = 60;
+                
+                if( set[0] == '-' )
+                {
+                        sign *= -1;
+                        set ++;
+                }
+                else if( set[0] == '+' )
+                {
+                        set ++;
+                }
+                
+                if( sscanf( set, "%d:%d", &hr, &min ) >= 1 )
+                {
+                        msg_ts += sign * ( hr * 60 + min );
+                        now_ts += sign * ( hr * 60 + min );
+                }
+                
+                gmtime_r( &now_ts, &now );
+                gmtime_r( &msg_ts, &msg );
+        }
+        
+        if( msg.tm_year == now.tm_year && msg.tm_yday == now.tm_yday )
+                return g_strdup_printf( "\x02[\x02\x02\x02%02d:%02d:%02d\x02]\x02 ",
+                                        msg.tm_hour, msg.tm_min, msg.tm_sec );
+        else
+                return g_strdup_printf( "\x02[\x02\x02\x02%04d-%02d-%02d "
+                                        "%02d:%02d:%02d\x02]\x02 ",
+                                        msg.tm_year + 1900, msg.tm_mon, msg.tm_mday,
+                                        msg.tm_hour, msg.tm_min, msg.tm_sec );
+}
+
 /* The plan is to not allow straight calls to prpl functions anymore, but do
    them all from some wrappers. We'll start to define some down here: */
@@ -1063 +1202 @@
 {
         char *away, *msg = NULL;
+        
+        if( ic->acc->prpl->away_states == NULL ||
+            ic->acc->prpl->set_away == NULL )
+                return 0;
         
         away = set_getstr( &ic->acc->set, "away" ) ?