Changes in protocols/nogaim.c [3e57660:1b221e0]

File:

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

protocols/nogaim.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2010 Wilmer van der Gaast and others                *
+  * Copyright 2002-2006 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -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;
@@ -99 +98 @@
 void register_protocol (struct prpl *p)
 {
-        int i;
-        gboolean refused = global.conf->protocols != NULL;
- 
-        for (i = 0; global.conf->protocols && global.conf->protocols[i]; i++)
-        {
-                if (g_strcasecmp(p->name, global.conf->protocols[i]) == 0)
-                        refused = FALSE;
-        }
-
-        if (refused)
-                log_message(LOGLVL_WARNING, "Protocol %s disabled\n", p->name);
-        else
-                protocols = g_list_append(protocols, p);
+        protocols = g_list_append(protocols, p);
 }
 
@@ -133 +120 @@
         extern void byahoo_initmodule();
         extern void jabber_initmodule();
+        extern void twitter_initmodule();
 
 #ifdef WITH_MSN
@@ -148 +136 @@
 #ifdef WITH_JABBER
         jabber_initmodule();
+#endif
+
+#ifdef WITH_TWITTER
+        twitter_initmodule();
 #endif
 
@@ -281 +273 @@
         ic->flags |= OPT_LOGGED_IN;
         
-        /* Necessary to send initial presence status, even if we're not away. */
-        imc_away_send_update( ic );
+        /* Also necessary when we're not away, at least for some of the
+           protocols. */
+        imc_set_away( ic, u->away );
         
         /* Apparently we're connected successfully, so reset the
@@ -384 +377 @@
 /* list.c */
 
-void imcb_add_buddy( struct im_connection *ic, const char *handle, const char *group )
+void imcb_add_buddy( struct im_connection *ic, char *handle, char *group )
 {
         user_t *u;
@@ -458 +451 @@
 }
 
-void imcb_rename_buddy( struct im_connection *ic, const char *handle, const char *realname )
+void imcb_rename_buddy( struct im_connection *ic, char *handle, char *realname )
 {
         user_t *u = user_findhandle( ic, handle );
-        char *set;
         
         if( !u || !realname ) return;
@@ -474 +466 @@
                         imcb_log( ic, "User `%s' changed name to `%s'", u->nick, u->realname );
         }
-        
-        set = set_getstr( &ic->acc->set, "nick_source" );
-        if( strcmp( set, "handle" ) != 0 )
-        {
-                char *name = g_strdup( realname );
-                
-                if( strcmp( set, "first_name" ) == 0 )
-                {
-                        int i;
-                        for( i = 0; name[i] && !isspace( name[i] ); i ++ ) {}
-                        name[i] = '\0';
-                }
-                
-                imcb_buddy_nick_hint( ic, handle, name );
-                
-                g_free( name );
-        }
-}
-
-void imcb_remove_buddy( struct im_connection *ic, const char *handle, char *group )
+}
+
+void imcb_remove_buddy( struct im_connection *ic, char *handle, char *group )
 {
         user_t *u;
@@ -503 +478 @@
 /* Mainly meant for ICQ (and now also for Jabber conferences) to allow IM
    modules to suggest a nickname for a handle. */
-void imcb_buddy_nick_hint( struct im_connection *ic, const char *handle, const char *nick )
+void imcb_buddy_nick_hint( struct im_connection *ic, char *handle, char *nick )
 {
         user_t *u = user_findhandle( ic, handle );
@@ -648 +623 @@
         oo = u->online;
         
-        g_free( u->away );
-        g_free( u->status_msg );
-        u->away = u->status_msg = NULL;
+        if( u->away )
+        {
+                g_free( u->away );
+                u->away = NULL;
+        }
         
         if( ( flags & OPT_LOGGED_IN ) && !u->online )
@@ -688 +665 @@
                 }
         }
-        else
-        {
-                u->status_msg = g_strdup( message );
-        }
+        /* else waste_any_state_information_for_now(); */
         
         /* LISPy... */
@@ -716 +690 @@
 }
 
-void imcb_buddy_msg( struct im_connection *ic, const char *handle, char *msg, uint32_t flags, time_t sent_at )
+void imcb_buddy_msg( struct im_connection *ic, char *handle, char *msg, uint32_t flags, time_t sent_at )
 {
         irc_t *irc = ic->irc;
-        char *wrapped, *ts;
+        char *wrapped;
         user_t *u;
         
@@ -761 +735 @@
             ( ( ic->flags & OPT_DOES_HTML ) && set_getbool( &ic->irc->set, "strip_html" ) ) )
                 strip_html( msg );
-        
-        if( ( 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( ts );
 }
 
@@ -857 +823 @@
 }
 
-void imcb_chat_msg( struct groupchat *c, const char *who, char *msg, uint32_t flags, time_t sent_at )
+void imcb_chat_msg( struct groupchat *c, char *who, char *msg, uint32_t flags, time_t sent_at )
 {
         struct im_connection *ic = c->ic;
@@ -876 +842 @@
         if( c && u )
         {
-                char *ts = format_timestamp( ic->irc, sent_at );
-                irc_privmsg( ic->irc, u, "PRIVMSG", c->channel, ts ? : "", wrapped );
-                g_free( ts );
+                irc_privmsg( ic->irc, u, "PRIVMSG", c->channel, "", wrapped );
         }
         else
@@ -931 +895 @@
 /* buddy_chat.c */
 
-void imcb_chat_add_buddy( struct groupchat *b, const char *handle )
+void imcb_chat_add_buddy( struct groupchat *b, char *handle )
 {
         user_t *u = user_findhandle( b->ic, handle );
@@ -966 +930 @@
 
 /* This function is one BIG hack... :-( EREWRITE */
-void imcb_chat_remove_buddy( struct groupchat *b, const char *handle, const char *reason )
+void imcb_chat_remove_buddy( struct groupchat *b, char *handle, char *reason )
 {
         user_t *u;
@@ -1072 +1036 @@
 }
 
-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
@@ -1197 +1075 @@
 }
 
-static char *imc_away_state_find( GList *gcm, char *away, char **message );
-
-int imc_away_send_update( struct im_connection *ic )
-{
-        char *away, *msg = NULL;
-        
-        away = set_getstr( &ic->acc->set, "away" ) ?
-             : set_getstr( &ic->irc->set, "away" );
-        if( away && *away )
-        {
-                GList *m = ic->acc->prpl->away_states( ic );
-                msg = ic->acc->flags & ACC_FLAG_AWAY_MESSAGE ? away : NULL;
-                away = imc_away_state_find( m, away, &msg ) ? : m->data;
-        }
-        else if( ic->acc->flags & ACC_FLAG_STATUS_MESSAGE )
-        {
-                away = NULL;
-                msg = set_getstr( &ic->acc->set, "status" ) ?
-                    : set_getstr( &ic->irc->set, "status" );
-        }
-        
-        ic->acc->prpl->set_away( ic, away, msg );
-        
-        return 1;
+static char *imc_away_alias_find( GList *gcm, char *away );
+
+int imc_set_away( struct im_connection *ic, char *away )
+{
+        GList *m, *ms;
+        char *s;
+        
+        if( !away ) away = "";
+        ms = m = ic->acc->prpl->away_states( ic );
+        
+        while( m )
+        {
+                if( *away )
+                {
+                        if( g_strncasecmp( m->data, away, strlen( m->data ) ) == 0 )
+                                break;
+                }
+                else
+                {
+                        if( g_strcasecmp( m->data, "Available" ) == 0 )
+                                break;
+                        if( g_strcasecmp( m->data, "Online" ) == 0 )
+                                break;
+                }
+                m = m->next;
+        }
+        
+        if( m )
+        {
+                ic->acc->prpl->set_away( ic, m->data, *away ? away : NULL );
+        }
+        else
+        {
+                s = imc_away_alias_find( ms, away );
+                if( s )
+                {
+                        ic->acc->prpl->set_away( ic, s, away );
+                        if( set_getbool( &ic->irc->set, "debug" ) )
+                                imcb_log( ic, "Setting away state to %s", s );
+                }
+                else
+                        ic->acc->prpl->set_away( ic, GAIM_AWAY_CUSTOM, away );
+        }
+        
+        return( 1 );
 }
 
@@ -1235 +1134 @@
 };
 
-static char *imc_away_state_find( GList *gcm, char *away, char **message )
+static char *imc_away_alias_find( GList *gcm, char *away )
 {
         GList *m;
         int i, j;
         
-        for( m = gcm; m; m = m->next )
-                if( g_strncasecmp( m->data, away, strlen( m->data ) ) == 0 )
-                {
-                        /* At least the Yahoo! module works better if message
-                           contains no data unless it adds something to what
-                           we have in state already. */
-                        if( strlen( m->data ) == strlen( away ) )
-                                *message = NULL;
-                        
-                        return m->data;
-                }
-        
         for( i = 0; *imc_away_alias_list[i]; i ++ )
         {
-                int keep_message;
-                
                 for( j = 0; imc_away_alias_list[i][j]; j ++ )
                         if( g_strncasecmp( away, imc_away_alias_list[i][j], strlen( imc_away_alias_list[i][j] ) ) == 0 )
-                        {
-                                keep_message = strlen( away ) != strlen( imc_away_alias_list[i][j] );
                                 break;
-                        }
                 
                 if( !imc_away_alias_list[i][j] )        /* If we reach the end, this row */
@@ -1269 +1151 @@
                 for( j = 0; imc_away_alias_list[i][j]; j ++ )
                 {
-                        for( m = gcm; m; m = m->next )
+                        m = gcm;
+                        while( m )
+                        {
                                 if( g_strcasecmp( imc_away_alias_list[i][j], m->data ) == 0 )
-                                {
-                                        if( !keep_message )
-                                                *message = NULL;
-                                        
-                                        return imc_away_alias_list[i][j];
-                                }
-                }
-                
-                /* No need to look further, apparently this state doesn't
-                   have any good alias for this protocol. */
-                break;
-        }
-        
-        return NULL;
+                                        return( imc_away_alias_list[i][j] );
+                                m = m->next;
+                        }
+                }
+        }
+        
+        return( NULL );
 }