Changeset ce81acd

Timestamp:

2011-03-28T23:28:46Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

4f50ea5

Parents:

f01bc6f

Message:

For #721, add the numbers in front of tweets if show_ids is enabled. Left
to do: Document the feature and allow using the numbers in rt/replies.

Location:

protocols/twitter

Files:

• twitter.c (modified) (3 diffs)
• twitter.h (modified) (3 diffs)
• twitter_lib.c (modified) (7 diffs)

protocols/twitter/twitter.c

@@ -245 +245 @@
         s->flags |= ACC_SET_OFFLINE_ONLY;
         
+        s = set_add( &acc->set, "show_ids", "false", set_eval_bool, acc );
+        s->flags |= ACC_SET_OFFLINE_ONLY;
+        
         s = set_add( &acc->set, "oauth", def_oauth, set_eval_bool, acc );
 }
@@ -291 +294 @@
         imcb_buddy_status( ic, name, OPT_LOGGED_IN, NULL, NULL );
         
+        if( set_getbool( &acc->set, "show_ids" ) )
+                td->log = g_new0( struct twitter_log_data, TWITTER_LOG_LENGTH );
+        
         imcb_log( ic, "Connecting" );
         
@@ -319 +325 @@
                 g_free( td->url_path );
                 g_free( td->pass );
+                g_free( td->log );
                 g_free( td );
         }

protocols/twitter/twitter.h

@@ -38 +38 @@
 } twitter_flags_t;
 
+struct twitter_log_data;
+
 struct twitter_data
 {
@@ -56 +58 @@
 
         char *prefix; /* Used to generate contact + channel name. */
+        
+        struct twitter_log_data *log;
+        int log_id;
 };
 
@@ -62 +67 @@
         guint64 last_id;
         time_t last_time;
+};
+
+#define TWITTER_LOG_LENGTH 100
+struct twitter_log_data
+{
+        guint64 id;
+        struct bee_user *bu;
 };
 

protocols/twitter/twitter_lib.c

@@ -67 +67 @@
         char *text;
         struct twitter_xml_user *user;
-        guint64 id;
+        guint64 id, reply_to;
 };
 
@@ -409 +409 @@
                 {
                         txs->id = g_ascii_strtoull (child->text, NULL, 10);
+                }
+                else if (g_strcasecmp( "in_reply_to_status_id", child->name ) == 0)
+                {
+                        txs->reply_to = g_ascii_strtoull (child->text, NULL, 10);
                 }
         }
@@ -502 +506 @@
 }
 
+static char *twitter_msg_add_id(struct im_connection *ic,
+    struct twitter_xml_status *txs, const char *prefix)
+{
+        struct twitter_data *td = ic->proto_data;
+        char *ret = NULL;
+        
+        if (!set_getbool(&ic->acc->set, "show_ids"))
+        {
+                if (*prefix)
+                        return g_strconcat(prefix, txs->text, NULL);
+                else
+                        return NULL;
+        }
+        
+        td->log[td->log_id].id = txs->id;
+        td->log[td->log_id].bu = bee_user_by_handle(ic->bee, ic, txs->user->screen_name);
+        if (txs->reply_to)
+        {
+                int i;
+                for (i = 0; i < TWITTER_LOG_LENGTH; i ++)
+                        if (td->log[i].id == txs->reply_to)
+                        {
+                                ret = g_strdup_printf( "\002[\002%02d->%02d\002]\002 %s%s",
+                                                       td->log_id, i, prefix, txs->text);
+                                break;
+                        }
+        }
+        if (ret == NULL)
+                ret = g_strdup_printf( "\002[\002%02d\002]\002 %s%s",
+                                       td->log_id, prefix, txs->text);
+        td->log_id = (td->log_id + 1) % TWITTER_LOG_LENGTH;
+        
+        return ret;
+}
+
 static void twitter_groupchat_init(struct im_connection *ic)
 {
@@ -543 +582 @@
         for ( l = list; l ; l = g_slist_next(l) )
         {
+                char *msg;
+                
                 status = l->data;
                 if (status->user == NULL || status->text == NULL)
@@ -550 +591 @@
                 
                 strip_html(status->text);
+                msg = twitter_msg_add_id(ic, status, "");
                 
                 // Say it!
                 if (g_strcasecmp(td->user, status->user->screen_name) == 0)
-                        imcb_chat_log (gc, "You: %s", status->text);
+                        imcb_chat_log(gc, "You: %s", msg ? msg : status->text);
                 else
-                        imcb_chat_msg (gc, status->user->screen_name, status->text, 0, status->created_at );
+                        imcb_chat_msg(gc, status->user->screen_name,
+                                      msg ? msg : status->text, 0, status->created_at );
+                
+                g_free(msg);
                 
                 // Update the home_timeline_id to hold the highest id, so that by the next request
-                // we won't pick up the updates allready in the list.
-                td->home_timeline_id = td->home_timeline_id < status->id ? status->id : td->home_timeline_id;
+                // we won't pick up the updates already in the list.
+                td->home_timeline_id = MAX(td->home_timeline_id, status->id);
         }
 }
@@ -584 +629 @@
         for ( l = list; l ; l = g_slist_next(l) )
         {
-                char *text = NULL;
+                char *prefix = NULL, *text = NULL;
                 
                 status = l->data;
@@ -590 +635 @@
                 strip_html( status->text );
                 if( mode_one )
-                        text = g_strdup_printf( "\002<\002%s\002>\002 %s",
-                                                status->user->screen_name, status->text );
+                        prefix = g_strdup_printf("\002<\002%s\002>\002 ",
+                                                 status->user->screen_name);
                 else
                         twitter_add_buddy(ic, status->user->screen_name, status->user->name);
                 
+                text = twitter_msg_add_id(ic, status, prefix ? prefix : "");
+                
                 imcb_buddy_msg( ic,
                                 mode_one ? from : status->user->screen_name,
-                                mode_one ? text : status->text,
+                                text ? text : status->text,
                                 0, status->created_at );
                 
                 // Update the home_timeline_id to hold the highest id, so that by the next request
-                // we won't pick up the updates allready in the list.
-                td->home_timeline_id = td->home_timeline_id < status->id ? status->id : td->home_timeline_id;
+                // we won't pick up the updates already in the list.
+                td->home_timeline_id = MAX(td->home_timeline_id,  status->id);
                 
                 g_free( text );
+                g_free( prefix );
         }
 }