Changeset d18dee42

Timestamp:

2012-03-12T22:36:35Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

fda194f

Parents:

57a65600

Message:

Merging report-spam patch for Twitter from Flexo. #923

Files:

• doc/user-guide/commands.xml (modified) (1 diff)
• protocols/twitter/twitter.c (modified) (1 diff)
• protocols/twitter/twitter_lib.c (modified) (1 diff)
• protocols/twitter/twitter_lib.h (modified) (2 diffs)

doc/user-guide/commands.xml

@@ -845 +845 @@
                                 <varlistentry><term>rt &lt;screenname|#id&gt;</term><listitem><para>Retweet someone's last Tweet (or one with the given ID)</para></listitem></varlistentry>
                                 <varlistentry><term>reply &lt;screenname|#id&gt;</term><listitem><para>Reply to a Tweet (with a reply-to reference)</para></listitem></varlistentry>
+                                <varlistentry><term>report &lt;screenname|#id&gt;</term><listitem><para>Report the given user (or the user who posted the tweet with the given ID) for sending spam. This will also block them.</para></listitem></varlistentry>
                                 <varlistentry><term>follow &lt;screenname&gt;</term><listitem><para>Start following a person</para></listitem></varlistentry>
                                 <varlistentry><term>unfollow &lt;screenname&gt;</term><listitem><para>Stop following a person</para></listitem></varlistentry>

protocols/twitter/twitter.c

@@ -530 +530 @@
                 g_free(cmds);
                 return;
+        } else if ((g_strcasecmp(cmd[0], "report") == 0 ||
+                    g_strcasecmp(cmd[0], "spam") == 0) && cmd[1]) {
+                char * screen_name;
+                guint64 id;
+                /* Report nominally works on users but look up the user who
+                   posted the given ID if the user wants to do it that way */
+                if (g_str_has_prefix(cmd[1], "#") &&
+                    sscanf(cmd[1] + 1, "%" G_GUINT64_FORMAT, &id) == 1) {
+                        if (id < TWITTER_LOG_LENGTH && td->log) {
+                                if (g_slist_find(ic->bee->users, td->log[id].bu)) {
+                                        screen_name = td->log[id].bu->handle;
+                                }
+                        }
+                } else {
+                        screen_name = cmd[1];
+                }
+                twitter_report_spam(ic, screen_name);
+                g_free(cmds);
+                return;
         } else if (g_strcasecmp(cmd[0], "rt") == 0 && cmd[1]) {
                 struct twitter_user_data *tud;

protocols/twitter/twitter_lib.c

@@ -1062 +1062 @@
         g_free(url);
 }
+
+/**
+ * Report a user for sending spam.
+ */
+void twitter_report_spam(struct im_connection *ic, char *screen_name)
+{
+        char *args[2] = {
+                "screen_name",
+                NULL,
+        };
+        args[1] = screen_name;
+        twitter_http(ic, TWITTER_REPORT_SPAM_URL, twitter_http_post,
+                     ic, 1, args, 2);
+}

protocols/twitter/twitter_lib.h

@@ -76 +76 @@
 #define TWITTER_BLOCKS_DESTROY_URL "/blocks/destroy/"
 
+/* Report spam */
+#define TWITTER_REPORT_SPAM_URL "/report_spam.xml"
+
 void twitter_get_timeline(struct im_connection *ic, gint64 next_cursor);
 void twitter_get_friends_ids(struct im_connection *ic, gint64 next_cursor);
@@ -87 +90 @@
 void twitter_status_destroy(struct im_connection *ic, guint64 id);
 void twitter_status_retweet(struct im_connection *ic, guint64 id);
+void twitter_report_spam(struct im_connection *ic, char *screen_name);
 
 #endif //_TWITTER_LIB_H