Changeset 9f03c47

Timestamp:

2016-11-14T00:37:14Z (8 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

537d9b9, b4f496e

Parents:

ea90275

Message:

Improve support for protocols which don't require a password

This adds a prpl_options_t enum with flags, which mostly just brings
OPT_PROTO_{NO_PASSWORD,PASSWORD_OPTIONAL} from libpurple as
PRPL_OPT_{NO_PASSWORD,PASSWORD_OPTIONAL}

Files:

• otr.c (modified) (2 diffs)
• protocols/nogaim.h (modified) (1 diff)
• protocols/purple/purple.c (modified) (2 diffs)
• protocols/twitter/twitter.c (modified) (2 diffs)
• root_commands.c (modified) (2 diffs)

otr.c

@@ -429 +429 @@
 
         /* don't do OTR on certain (not classic IM) protocols, e.g. twitter */
-        if (a->prpl->options & OPT_NOOTR) {
+        if (a->prpl->options & PRPL_OPT_NOOTR) {
                 return 0;
         }
@@ -457 +457 @@
 
         /* don't do OTR on certain (not classic IM) protocols, e.g. twitter */
-        if (ic->acc->prpl->options & OPT_NOOTR ||
+        if (ic->acc->prpl->options & PRPL_OPT_NOOTR ||
             iu->bu->flags & BEE_USER_NOOTR) {
                 return msg;

protocols/nogaim.h

@@ -140 +140 @@
 };
 
+/* This enum takes a few things from libpurple and a few things from old OPT_ flags.
+ * The only flag that was used before this struct was PRPL_OPT_NOOTR.
+ *
+ * The libpurple ones only use the same values as the PurpleProtocolOptions
+ * enum for convenience, but there's no promise of direct compatibility with
+ * those values. As of libpurple 2.8.0 they use up to 0x800 (1 << 11), which is
+ * a nice coincidence.
+ */
+typedef enum {
+        /* The protocol doesn't use passwords
+         * Mirrors libpurple's OPT_PROTO_NO_PASSWORD */
+        PRPL_OPT_NO_PASSWORD = 1 << 4,
+
+        /* The protocol doesn't require passwords, but may use them
+         * Mirrors libpurple's OPT_PROTO_PASSWORD_OPTIONAL */
+        PRPL_OPT_PASSWORD_OPTIONAL = 1 << 7,
+
+        /* The protocol is not suitable for OTR, see OPT_NOOTR */
+        PRPL_OPT_NOOTR = 1 << 12,
+} prpl_options_t;
+
 struct prpl {
         int options;

protocols/purple/purple.c

@@ -1725 +1725 @@
         for (prots = purple_plugins_get_protocols(); prots; prots = prots->next) {
                 PurplePlugin *prot = prots->data;
+                PurplePluginProtocolInfo *pi = prot->info->extra_info;
                 struct prpl *ret;
 
@@ -1738 +1739 @@
                         ret->name += 5;
                 }
+
+                if (pi->options & OPT_PROTO_NO_PASSWORD) {
+                        ret->options |= PRPL_OPT_NO_PASSWORD;
+                }
+
+                if (pi->options & OPT_PROTO_PASSWORD_OPTIONAL) {
+                        ret->options |= PRPL_OPT_PASSWORD_OPTIONAL;
+                }
+
                 register_protocol(ret);
 

protocols/twitter/twitter.c

@@ -1092 +1092 @@
         struct prpl *ret = g_new0(struct prpl, 1);
 
-        ret->options = OPT_NOOTR;
+        ret->options = PRPL_OPT_NOOTR | PRPL_OPT_NO_PASSWORD;
         ret->name = "twitter";
         ret->login = twitter_login;
@@ -1119 +1119 @@
         ret = g_memdup(ret, sizeof(struct prpl));
         ret->name = "identica";
+        ret->options =  PRPL_OPT_NOOTR;
         register_protocol(ret);
 }

root_commands.c

@@ -470 +470 @@
                                 irc_rootmsg(irc, "No need to enter a password for this "
                                             "account since it's using OAuth");
+                        } else if (prpl->options & PRPL_OPT_NO_PASSWORD) {
+                                *a->pass = '\0';
+                        } else if (prpl->options & PRPL_OPT_PASSWORD_OPTIONAL) {
+                                *a->pass = '\0';
+                                irc_rootmsg(irc, "Passwords are optional for this account. "
+                                            "If you wish to enter the password with /OPER, do "
+                                            "account %s set -del password", a->tag);
                         } else {
                                 irc_rootmsg(irc, "You can now use the /OPER command to "
@@ -479 +486 @@
                                 }
                         }
+                } else if (prpl->options & PRPL_OPT_NO_PASSWORD) {
+                        irc_rootmsg(irc, "Note: this account doesn't use password for login");
                 }