Changeset 537d9b9 for root_commands.c

Timestamp:

2016-11-20T08:40:36Z (8 years ago)

Author:

dequis <dx@…>

Children:

3f44e43

Parents:

ba52ac5 (diff), 9f03c47 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge master up to commit '9f03c47' into parson

File:

• root_commands.c (modified) (19 diffs)

root_commands.c

@@ -143 +143 @@
         }
 
-        if (load) {
+        status = auth_check_pass(irc, irc->user->nick, password);
+        if (load && (status == STORAGE_OK)) {
                 status = storage_load(irc, password);
-        } else {
-                status = storage_check_pass(irc->user->nick, password);
         }
 
@@ -159 +158 @@
                 irc_rootmsg(irc, "Password accepted%s",
                             load ? ", settings and accounts loaded" : "");
-                irc_setpass(irc, password);
                 irc->status |= USTATUS_IDENTIFIED;
                 irc_umode_set(irc, "+R", 1);
@@ -268 +266 @@
         storage_status_t status;
 
-        status = storage_remove(irc->user->nick, cmd[1]);
+        status = auth_check_pass(irc, irc->user->nick, cmd[1]);
+        if (status == STORAGE_OK) {
+                status = storage_remove(irc->user->nick);
+        }
+
         switch (status) {
         case STORAGE_NO_SUCH_USER:
@@ -340 +342 @@
                 int st;
 
+                if (s && s->flags & SET_LOCKED) {
+                        irc_rootmsg(irc, "This setting can not be changed");
+                        return 0;
+                }
                 if (s && checkflags && checkflags(irc, s) == 0) {
                         return 0;
@@ -388 +394 @@
                 irc_rootmsg(irc, "This setting can only be changed when the account is %s-line", "on");
                 return 0;
+        } else if (a->flags & ACC_FLAG_LOCKED && s && s->flags & ACC_SET_LOCKABLE) {
+                irc_rootmsg(irc, "This setting can not be changed for locked accounts");
+                return 0;
         }
 
@@ -409 +418 @@
 
                 MIN_ARGS(3);
+
+                if (!global.conf->allow_account_add) {
+                        irc_rootmsg(irc, "This server does not allow adding new accounts");
+                        return;
+                }
 
                 if (cmd[4] == NULL) {
@@ -456 +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 "
@@ -465 +486 @@
                                 }
                         }
+                } else if (prpl->options & PRPL_OPT_NO_PASSWORD) {
+                        irc_rootmsg(irc, "Note: this account doesn't use password for login");
                 }
 
@@ -553 +576 @@
 
         if (len >= 1 && g_strncasecmp(cmd[2], "del", len) == 0) {
-                if (a->ic) {
+                if (a->flags & ACC_FLAG_LOCKED) {
+                        irc_rootmsg(irc, "Account is locked, can't delete");
+                }
+                else if (a->ic) {
                         irc_rootmsg(irc, "Account is still logged in, can't delete");
                 } else {
@@ -1108 +1134 @@
 }
 
+static gint prplcmp(gconstpointer a, gconstpointer b)
+{
+        const struct prpl *pa = a;
+        const struct prpl *pb = b;
+
+        return g_strcasecmp(pa->name, pb->name);
+}
+
+static void prplstr(GList *prpls, GString *gstr)
+{
+        const char *last = NULL;
+        GList *l;
+        struct prpl *p;
+
+        prpls = g_list_copy(prpls);
+        prpls = g_list_sort(prpls, prplcmp);
+
+        for (l = prpls; l; l = l->next) {
+                p = l->data;
+
+                if (last && g_strcasecmp(p->name, last) == 0) {
+                        /* Ignore duplicates (mainly for libpurple) */
+                        continue;
+                }
+
+                if (gstr->len != 0) {
+                        g_string_append(gstr, ", ");
+                }
+
+                g_string_append(gstr, p->name);
+                last = p->name;
+        }
+
+        g_list_free(prpls);
+}
+
+static void cmd_plugins(irc_t *irc, char **cmd)
+{
+        GList *prpls;
+        GString *gstr;
+
+#ifdef WITH_PLUGINS
+        GList *l;
+        struct plugin_info *info;
+
+        for (l = get_plugins(); l; l = l->next) {
+                info = l->data;
+                irc_rootmsg(irc, "%s:", info->name);
+                irc_rootmsg(irc, "  Version: %s", info->version);
+
+                if (info->description) {
+                        irc_rootmsg(irc, "  Description: %s", info->description);
+                }
+
+                if (info->author) {
+                        irc_rootmsg(irc, "  Author: %s", info->author);
+                }
+
+                if (info->url) {
+                        irc_rootmsg(irc, "  URL: %s", info->url);
+                }
+
+                irc_rootmsg(irc, "");
+        }
+#endif
+
+        gstr = g_string_new(NULL);
+        prpls = get_protocols();
+
+        if (prpls) {
+                prplstr(prpls, gstr);
+                irc_rootmsg(irc, "Enabled Protocols: %s", gstr->str);
+                g_string_truncate(gstr, 0);
+        }
+
+        prpls = get_protocols_disabled();
+
+        if (prpls) {
+                prplstr(prpls, gstr);
+                irc_rootmsg(irc, "Disabled Protocols: %s", gstr->str);
+        }
+
+        g_string_free(gstr, TRUE);
+}
+
 static void cmd_qlist(irc_t *irc, char **cmd)
 {
@@ -1134 +1245 @@
 
         if (g_strcasecmp(cmd[1], "add") == 0) {
-                char *channel, *s;
+                bee_chat_info_t *ci;
+                char *channel, *room, *s;
                 struct irc_channel *ic;
+                guint i;
 
                 MIN_ARGS(3);
@@ -1147 +1260 @@
                 }
 
+                if (cmd[3][0] == '!') {
+                        if (!acc->ic || !(acc->ic->flags & OPT_LOGGED_IN)) {
+                                irc_rootmsg(irc, "Not logged in to account.");
+                                return;
+                        } else if (!acc->prpl->chat_list) {
+                                irc_rootmsg(irc, "Listing chatrooms not supported on that account.");
+                                return;
+                        }
+
+                        i = g_ascii_strtoull(cmd[3] + 1, NULL, 10);
+                        ci = g_slist_nth_data(acc->ic->chatlist, i - 1);
+
+                        if (ci == NULL) {
+                                irc_rootmsg(irc, "Invalid chatroom index");
+                                return;
+                        }
+
+                        room = ci->title;
+                } else {
+                        room = cmd[3];
+                }
+
                 if (cmd[4] == NULL) {
-                        channel = g_strdup(cmd[3]);
+                        channel = g_strdup(room);
                         if ((s = strchr(channel, '@'))) {
                                 *s = 0;
@@ -1168 +1303 @@
                     set_setstr(&ic->set, "chat_type", "room") &&
                     set_setstr(&ic->set, "account", cmd[2]) &&
-                    set_setstr(&ic->set, "room", cmd[3])) {
+                    set_setstr(&ic->set, "room", room)) {
                         irc_rootmsg(irc, "Chatroom successfully added.");
                 } else {
@@ -1178 +1313 @@
                 }
                 g_free(channel);
+        } else if (g_strcasecmp(cmd[1], "list") == 0) {
+                MIN_ARGS(2);
+
+                if (!(acc = account_get(irc->b, cmd[2]))) {
+                        irc_rootmsg(irc, "Invalid account");
+                        return;
+                } else if (!acc->ic || !(acc->ic->flags & OPT_LOGGED_IN)) {
+                        irc_rootmsg(irc, "Not logged in to account.");
+                        return;
+                } else if (!acc->prpl->chat_list) {
+                        irc_rootmsg(irc, "Listing chatrooms not supported on that account.");
+                        return;
+                }
+
+                acc->prpl->chat_list(acc->ic, cmd[3]);
         } else if (g_strcasecmp(cmd[1], "with") == 0) {
                 irc_user_t *iu;
@@ -1192 +1342 @@
                         irc_rootmsg(irc, "Can't open a groupchat with %s.", cmd[2]);
                 }
-        } else if (g_strcasecmp(cmd[1], "list") == 0 ||
-                   g_strcasecmp(cmd[1], "set") == 0 ||
+        } else if (g_strcasecmp(cmd[1], "set") == 0 ||
                    g_strcasecmp(cmd[1], "del") == 0) {
                 irc_rootmsg(irc,
@@ -1203 +1352 @@
                             cmd[1]);
         }
+}
+
+/* some arbitrary numbers */
+#define CHAT_TITLE_LEN_MIN 20
+#define CHAT_TITLE_LEN_MAX 100
+
+void cmd_chat_list_finish(struct im_connection *ic)
+{
+        account_t *acc = ic->acc;
+        bee_chat_info_t *ci;
+        char *hformat, *iformat, *topic, *padded;
+        GSList *l;
+        guint i = 0;
+        long title_len, new_len;
+        irc_t *irc = ic->bee->ui_data;
+
+        if (ic->chatlist == NULL) {
+                irc_rootmsg(irc, "No existing chatrooms");
+                return;
+        }
+
+        /* find a reasonable width for the table */
+        title_len = CHAT_TITLE_LEN_MIN;
+
+        for (l = ic->chatlist; l; l = l->next) {
+                ci = l->data;
+                new_len = g_utf8_strlen(ci->title, -1);
+
+                if (new_len >= CHAT_TITLE_LEN_MAX) {
+                        title_len = CHAT_TITLE_LEN_MAX;
+                        break;
+                } else if (title_len < new_len) {
+                        title_len = new_len;
+                }
+        }
+
+        if (strchr(irc->umode, 'b') != NULL) {
+                hformat = "%s\t%s\t%s";
+                iformat = "%u\t%s\t%s";
+        } else {
+                hformat = "%s  %s  %s";
+                iformat = "%5u  %s  %s";
+        }
+
+        padded = str_pad_and_truncate("Title", title_len, NULL);
+        irc_rootmsg(irc, hformat, "Index", padded, "Topic");
+        g_free(padded);
+
+        for (l = ic->chatlist; l; l = l->next) {
+                ci = l->data;
+                topic = ci->topic ? ci->topic : "";
+
+                padded = str_pad_and_truncate(ci->title, title_len, "[...]");
+                irc_rootmsg(irc, iformat, ++i, padded, topic);
+                g_free(padded);
+        }
+
+        irc_rootmsg(irc, "%u %s chatrooms", i, acc->tag);
 }
 
@@ -1256 +1463 @@
 {
         GSList *files = irc->file_transfers;
+        GSList *next;
 
         enum { LIST, REJECT, CANCEL };
@@ -1273 +1481 @@
         }
 
-        for (; files; files = g_slist_next(files)) {
+        for (; files; files = next) {
+                next = files->next;
                 file_transfer_t *file = files->data;
 
@@ -1357 +1566 @@
         { "nick",           1, cmd_nick,           0 },
         { "no",             0, cmd_yesno,          0 },
+        { "plugins",        0, cmd_plugins,        0 },
         { "qlist",          0, cmd_qlist,          0 },
         { "register",       0, cmd_register,       0 },