Changeset 0ca1d79 for protocols

Timestamp:

2015-02-20T22:47:33Z (10 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

af359b4

Parents:

34afea7

Message:

Revert "Twitter format strings"

This reverts commit ce402b20d82ec323e6bd5e306de934773590742d.

See discussion in PR #10 for more details.

Location:

protocols/twitter

Files:

• twitter.c (modified) (1 diff)
• twitter_lib.c (modified) (5 diffs)

protocols/twitter/twitter.c

@@ -539 +539 @@
 
         s = set_add(&acc->set, "strip_newlines", "false", set_eval_bool, acc);
-
-        s = set_add(&acc->set, "format_string", "\002[\002%i\002]\002 %c", NULL, acc);
-        s = set_add(&acc->set, "retweet_format_string", "\002[\002%i\002]\002 RT @%a: %c", NULL, acc);
-        s = set_add(&acc->set, "reply_format_string", "\002[\002%i->%r\002]\002 %c", NULL, acc);
         
         s = set_add(&acc->set, "_last_tweet", "0", NULL, acc);

protocols/twitter/twitter_lib.c

@@ -63 +63 @@
         guint64 reply_to;
         gboolean from_filter;
-        struct twitter_xml_status *rt;
 };
 
@@ -89 +88 @@
         g_free(txs->text);
         txu_free(txs->user);
-        txs_free(txs->rt);
         g_free(txs);
 }
@@ -491 +489 @@
                 if (rtxs) {
                         g_free(txs->text);
-                        txs->text = g_strdup(rtxs->text);
+                        txs->text = g_strdup_printf("RT @%s: %s", rtxs->user->screen_name, rtxs->text);
                         txs->id = rtxs->id;
-                        txs->rt = rtxs;
+                        txs_free(rtxs);
                 }
         } else if (entities) {
@@ -611 +609 @@
 }
 
-/**
- * Function to properly format a tweet as per the users configuration.
- */
-static char *twitter_msg_get_text(struct im_connection *ic, int log_id, int reply_to,
-                                struct twitter_xml_status *txs, const char *prefix) {
-        gchar * format = set_getstr(&ic->acc->set, "format_string");
-        GString * text = g_string_new(NULL);
-
-        gchar *c;
-        if (reply_to != -1)
-                format = set_getstr(&ic->acc->set, "reply_format_string");
-        if (txs->rt)
-                format = set_getstr(&ic->acc->set, "retweet_format_string");
-
-        for (c = format; *c ; c++) {
-                if (!(*c == '%' && *(c+1))) {
-                        text = g_string_append_c(text, *c);
-                        continue;
-                }
-                c++; // Move past the %
-                switch (*c) {
-                        case 'i':
-                                g_string_append_printf(text, "%02x", log_id);
-                                break;
-                        case 'r':
-                                if (reply_to != -1) // In case someone does put %r in the wrong format_string
-                                g_string_append_printf(text, "%02x", reply_to);
-                                break;
-                        case 'a':
-                                if (txs->rt) // In case someone does put %a in the wrong format_string
-                                        text = g_string_append(text, txs->rt->user->screen_name);
-                                break;
-                        case 'c':
-                                text = g_string_append(text, txs->text);
-                                break;
-                        default:
-                                text = g_string_append_c(text, *c);
-                }
-        }
-        text = g_string_prepend(text, prefix);
-        return g_string_free(text, FALSE);
-}
-
 /* Will log messages either way. Need to keep track of IDs for stream deduping.
    Plus, show_ids is on by default and I don't see why anyone would disable it. */
@@ -692 +647 @@
                 td->log[td->log_id].id = txs->rt_id;
         
-        return twitter_msg_get_text(ic, td->log_id, reply_to, txs, prefix);
+        if (set_getbool(&ic->acc->set, "show_ids")) {
+                if (reply_to != -1)
+                        return g_strdup_printf("\002[\002%02x->%02x\002]\002 %s%s",
+                                               td->log_id, reply_to, prefix, txs->text);
+                else
+                        return g_strdup_printf("\002[\002%02x\002]\002 %s%s",
+                                               td->log_id, prefix, txs->text);
+        } else {
+                if (*prefix)
+                        return g_strconcat(prefix, txs->text, NULL);
+                else
+                        return NULL;
+        }
 }