Changeset 3592b95

Timestamp:

2012-11-25T20:21:24Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

f97b8e9

Parents:

9ed0081

Message:

To address #991, adding a strict commands mode, where one has to use "post"
to post tweets.

Files:

• doc/user-guide/commands.xml (modified) (2 diffs)
• protocols/twitter/twitter.c (modified) (6 diffs)

doc/user-guide/commands.xml

@@ -835 +835 @@
         <bitlbee-setting name="commands" type="boolean" scope="account">
                 <default>true</default>
+                <possible-values>true, false, strict</possible-values>
 
                 <description>
@@ -853 +854 @@
 
                         <para>
-                                Anything that doesn't look like a command will be treated as a tweet. Watch out for typos! :-)
+                                Anything that doesn't look like a command will be treated as a tweet. Watch out for typos, or to avoid this behaviour, you can set this setting to <emphasis>strict</emphasis>, which causes the <emphasis>post</emphasis> command to become mandatory for posting a tweet.
                         </para>
                 </description>

protocols/twitter/twitter.c

@@ -219 +219 @@
 }
 
-
-static char *set_eval_mode(set_t * set, char *value)
-{
-        if (g_strcasecmp(value, "one") == 0 ||
-            g_strcasecmp(value, "many") == 0 || g_strcasecmp(value, "chat") == 0)
-                return value;
-        else
-                return NULL;
-}
-
 int twitter_url_len_diff(gchar *msg, unsigned int target_len)
 {
@@ -270 +260 @@
 }
 
+static char *set_eval_commands(set_t * set, char *value)
+{
+        if (g_strcasecmp(value, "strict") == 0 )
+                return value;
+        else
+                return set_eval_bool(set, value);
+}
+
+static char *set_eval_mode(set_t * set, char *value)
+{
+        if (g_strcasecmp(value, "one") == 0 ||
+            g_strcasecmp(value, "many") == 0 || g_strcasecmp(value, "chat") == 0)
+                return value;
+        else
+                return NULL;
+}
+
 static void twitter_init(account_t * acc)
 {
@@ -289 +296 @@
         s->flags |= ACC_SET_OFFLINE_ONLY;
 
-        s = set_add(&acc->set, "commands", "true", set_eval_bool, acc);
+        s = set_add(&acc->set, "commands", "true", set_eval_commands, acc);
 
         s = set_add(&acc->set, "fetch_interval", "60", set_eval_int, acc);
@@ -569 +576 @@
         char *cmds, **cmd, *new = NULL;
         guint64 in_reply_to = 0;
+        gboolean strict_commands =
+                g_strcasecmp(set_getstr(&ic->acc->set, "commands"), "strict") == 0;
 
         cmds = g_strdup(message);
@@ -576 +585 @@
                 g_free(cmds);
                 return;
-        } else if (!set_getbool(&ic->acc->set, "commands")) {
+        } else if (!(strict_commands || set_getbool(&ic->acc->set, "commands"))) {
                 /* Not supporting commands. */
         } else if (g_strcasecmp(cmd[0], "undo") == 0) {
@@ -675 +684 @@
         } else if (g_strcasecmp(cmd[0], "post") == 0) {
                 message += 5;
-        }
-
-        {
+                strict_commands = FALSE;
+        }
+
+        if (strict_commands) {
+                twitter_log(ic, "Unknown command: %s", cmd[0]);
+        } else {
                 char *s;
                 bee_user_t *bu;