Changeset 7a9d968 for root_commands.c

Timestamp:

2018-03-10T11:30:39Z (6 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

5447c59

Parents:

3f44e43 (diff), 4a9c6b0 (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 branch 'master' into HEAD

File:

• root_commands.c (modified) (4 diffs)

root_commands.c

@@ -1072 +1072 @@
                 format = "%s\t%s\t%s";
         } else {
-                format = "%-16.16s  %-40.40s  %s";
+                format = "%-24.24s  %-40.40s  %s";
         }
 
@@ -1172 +1172 @@
 }
 
+static void cmd_plugins_info(irc_t *irc, char **cmd)
+{
+        GList *l;
+        struct plugin_info *info;
+
+        MIN_ARGS(2);
+
+        for (l = get_plugins(); l; l = l->next) {
+                info = l->data;
+                if (g_strcasecmp(cmd[2], info->name) == 0) {
+                        break;
+                }
+        }
+
+        if (!l) {
+                return;
+        }
+
+        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);
+        }
+}
+
 static void cmd_plugins(irc_t *irc, char **cmd)
 {
         GList *prpls;
         GString *gstr;
+
+        if (cmd[1] && g_strcasecmp(cmd[1], "info") == 0) {
+                cmd_plugins_info(irc, cmd);
+                return;
+        }
 
 #ifdef WITH_PLUGINS
         GList *l;
         struct plugin_info *info;
+        char *format;
+
+        if (strchr(irc->umode, 'b') != NULL) {
+                format = "%s\t%s";
+        } else {
+                format = "%-30s  %s";
+        }
+
+        irc_rootmsg(irc, format, "Plugin", "Version");
 
         for (l = get_plugins(); l; l = l->next) {
+                char *c;
                 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, "");
+
+                /* some purple plugins like to include several versions separated by newlines... */
+                if ((c = strchr(info->version, '\n'))) {
+                        char *version = g_strndup(info->version, c - info->version);
+                        irc_rootmsg(irc, format, info->name, version);
+                        g_free(version);
+                } else {
+                        irc_rootmsg(irc, format, info->name, info->version);
+                }
         }
 #endif
+
+        irc_rootmsg(irc, "");
 
         gstr = g_string_new(NULL);
@@ -1346 +1390 @@
         } else if (g_strcasecmp(cmd[1], "set") == 0 ||
                    g_strcasecmp(cmd[1], "del") == 0) {
-                irc_rootmsg(irc,
-                            "Warning: The \002chat\002 command was mostly replaced with the \002channel\002 command.");
-                cmd_channel(irc, cmd);
+                irc_rootmsg(irc, "Unknown command: chat %s. Did you mean \002channel %s\002?", cmd[1], cmd[1]);
         } else {
                 irc_rootmsg(irc,
@@ -1406 +1448 @@
                 topic = ci->topic ? ci->topic : "";
 
-                padded = str_pad_and_truncate(ci->title, title_len, "[...]");
+                padded = str_pad_and_truncate(ci->title ? ci->title : "", title_len, "[...]");
                 irc_rootmsg(irc, iformat, ++i, padded, topic);
                 g_free(padded);