Changeset 631ec80

Timestamp:

2012-11-25T14:26:23Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

7f557d5

Parents:

96dd574

Message:

Changed mode/room management a little bit.

Location:

protocols/twitter

Files:

• twitter.c (modified) (4 diffs)
• twitter.h (modified) (1 diff)
• twitter_lib.c (modified) (9 diffs)

protocols/twitter/twitter.c

@@ -53 +53 @@
         struct twitter_data *td = ic->proto_data;
 
+        /* Create the room now that we "logged in". */
+        if (td->flags & TWITTER_MODE_CHAT)
+                twitter_groupchat_init(ic);
+
         imcb_log(ic, "Getting initial statuses");
 
@@ -76 +80 @@
 }
 
+struct groupchat *twitter_groupchat_init(struct im_connection *ic)
+{
+        char *name_hint;
+        struct groupchat *gc;
+        struct twitter_data *td = ic->proto_data;
+        GSList *l;
+
+        if (td->timeline_gc)
+                return td->timeline_gc;
+
+        td->timeline_gc = gc = imcb_chat_new(ic, "twitter/timeline");
+
+        name_hint = g_strdup_printf("%s_%s", td->prefix, ic->acc->user);
+        imcb_chat_name_hint(gc, name_hint);
+        g_free(name_hint);
+
+        for (l = ic->bee->users; l; l = l->next) {
+                bee_user_t *bu = l->data;
+                if (bu->ic == ic)
+                        imcb_chat_add_buddy(td->timeline_gc, bu->handle);
+        }
+        imcb_chat_add_buddy(gc, ic->acc->user);
+        
+        return gc;
+}
+
 static void twitter_oauth_start(struct im_connection *ic);
 
@@ -86 +116 @@
         if (set_getbool(&ic->acc->set, "oauth") && !td->oauth_info)
                 twitter_oauth_start(ic);
-        else if (g_strcasecmp(set_getstr(&ic->acc->set, "mode"), "one") != 0 &&
-                 !(td->flags & TWITTER_HAVE_FRIENDS)) {
+        else if ((td->flags & TWITTER_MODE_ONE) &&
+                 !(td->flags & TWITTER_HAVE_FRIENDS)) {
                 imcb_log(ic, "Getting contact list");
                 twitter_get_friends_ids(ic, -1);
@@ -354 +384 @@
         td->log = g_new0(struct twitter_log_data, TWITTER_LOG_LENGTH);
         td->log_id = -1;
+        
+        s = set_getstr(&ic->acc->set, "mode");
+        if (g_strcasecmp(s, "one") == 0)
+                td->flags |= TWITTER_MODE_ONE;
+        else if (g_strcasecmp(s, "many") == 0)
+                td->flags |= TWITTER_MODE_MANY;
+        else
+                td->flags |= TWITTER_MODE_CHAT;
 
         twitter_login_finish(ic);

protocols/twitter/twitter.h

@@ -105 +105 @@
 
 void twitter_log(struct im_connection *ic, char *format, ... );
+struct groupchat *twitter_groupchat_init(struct im_connection *ic);
 
 #endif //_TWITTER_H

protocols/twitter/twitter_lib.c

@@ -70 +70 @@
 };
 
-static void twitter_groupchat_init(struct im_connection *ic);
-
 /**
  * Frees a twitter_xml_user struct.
@@ -148 +146 @@
         // Check if the buddy is already in the buddy list.
         if (!bee_user_by_handle(ic->bee, ic, name)) {
-                char *mode = set_getstr(&ic->acc->set, "mode");
-
                 // The buddy is not in the list, add the buddy and set the status to logged in.
                 imcb_add_buddy(ic, name, NULL);
                 imcb_rename_buddy(ic, name, fullname);
-                if (g_strcasecmp(mode, "chat") == 0) {
+                if (td->flags & TWITTER_MODE_CHAT) {
                         /* Necessary so that nicks always get translated to the
                            exact Twitter username. */
                         imcb_buddy_nick_hint(ic, name, name);
                         imcb_chat_add_buddy(td->timeline_gc, name);
-                } else if (g_strcasecmp(mode, "many") == 0)
+                } else if (td->flags & TWITTER_MODE_MANY)
                         imcb_buddy_status(ic, name, OPT_LOGGED_IN, NULL, NULL);
         }
@@ -305 +301 @@
 
         td = ic->proto_data;
-
-        /* Create the room now that we "logged in". */
-        if (!td->timeline_gc && g_strcasecmp(set_getstr(&ic->acc->set, "mode"), "chat") == 0)
-                twitter_groupchat_init(ic);
 
         txl = g_new0(struct twitter_xml_list, 1);
@@ -663 +655 @@
 }
 
-static void twitter_groupchat_init(struct im_connection *ic)
-{
-        char *name_hint;
-        struct groupchat *gc;
-        struct twitter_data *td = ic->proto_data;
-        GSList *l;
-
-        td->timeline_gc = gc = imcb_chat_new(ic, "twitter/timeline");
-
-        name_hint = g_strdup_printf("%s_%s", td->prefix, ic->acc->user);
-        imcb_chat_name_hint(gc, name_hint);
-        g_free(name_hint);
-
-        for (l = ic->bee->users; l; l = l->next) {
-                bee_user_t *bu = l->data;
-                if (bu->ic == ic)
-                        imcb_chat_add_buddy(td->timeline_gc, bu->handle);
-        }
-}
-
 /**
  * Function that is called to see the statuses in a groupchat window.
@@ -695 +667 @@
 
         // Create a new groupchat if it does not exsist.
-        if (!td->timeline_gc)
-                twitter_groupchat_init(ic);
-
-        gc = td->timeline_gc;
-        if (!gc->joined)
-                imcb_chat_add_buddy(gc, ic->acc->user);
+        gc = twitter_groupchat_init(ic);
 
         for (l = list; l; l = g_slist_next(l)) {
@@ -744 +711 @@
         GSList *l = NULL;
         struct twitter_xml_status *status;
-        char from[MAX_STRING];
-        gboolean mode_one;
+        char from[MAX_STRING] = "";
         guint64 last_id = 0;
 
-        mode_one = g_strcasecmp(set_getstr(&ic->acc->set, "mode"), "one") == 0;
-
-        if (mode_one) {
+        if (td->flags & TWITTER_MODE_ONE) {
                 g_snprintf(from, sizeof(from) - 1, "%s_%s", td->prefix, ic->acc->user);
                 from[MAX_STRING - 1] = '\0';
@@ -765 +729 @@
 
                 strip_html(status->text);
-                if (mode_one)
+                if (td->flags & TWITTER_MODE_ONE)
                         prefix = g_strdup_printf("\002<\002%s\002>\002 ",
-                                                 status->user->screen_name);
+                                                 status->user->screen_name);
                 else
                         twitter_add_buddy(ic, status->user->screen_name, status->user->name);
@@ -774 +738 @@
 
                 imcb_buddy_msg(ic,
-                               mode_one ? from : status->user->screen_name,
-                               text ? text : status->text, 0, status->created_at);
+                               *from ? from : status->user->screen_name,
+                               text ? text : status->text, 0, status->created_at);
 
                 // Update the timeline_id to hold the highest id, so that by the next request
@@ -1017 +981 @@
 
         // See if the user wants to see the messages in a groupchat window or as private messages.
-        if (g_strcasecmp(set_getstr(&ic->acc->set, "mode"), "chat") == 0)
+        if (td->flags & TWITTER_MODE_CHAT)
                 twitter_groupchat(ic, output);
         else