Changeset 4284008 in code

Timestamp:

Mar 2, 2014, 1:50:39 AM (11 years ago)

Author:

Mike Belopuhov <mike@…>

Branches:

master

Children:

2e37e9f

Parents:

9195a6a

git-author:

Mike Belopuhov <mike@…> (03/02/14 01:45:33)

git-committer:

Mike Belopuhov <mike@…> (03/02/14 01:50:39)

Message:

Revamp "who" command handling; rename "moder" to "mod".

Files:

• cmd.c (modified) (8 diffs)
• icb.c (modified) (9 diffs)
• icb.h (modified) (3 diffs)

cmd.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2009, 2010 Mike Belopuhov
+ * Copyright (c) 2009, 2010, 2013 Mike Belopuhov
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -113 +113 @@
         /* to boot or not to boot, that is the question */
         ig = is->group;
-        if (!icb_ismoder(ig, is)) {
+        if (!icb_ismod(ig, is)) {
                 icb_status(is, STATUS_NOTIFY, "Sorry, booting is a privilege "
                     "you don't possess");
@@ -180 +180 @@
         if (is->group) {
                 changing = 1;
-                if (icb_ismoder(is->group, is))
+                if (icb_ismod(is->group, is))
                         (void)icb_pass(is->group, is, NULL);
                 LIST_REMOVE(is, entry);
@@ -196 +196 @@
         /* acknowledge successful join */
         icb_status(is, STATUS_STATUS, "You are now in group %s%s", ig->name,
-            icb_ismoder(ig, is) ? " as moderator" : "");
+            icb_ismod(ig, is) ? " as moderator" : "");
 
         /* send user a topic name */
@@ -285 +285 @@
         struct icb_session *s;
 
-        if (!ig->moder)         /* if there is no mod, let anyone grab it */
-                (void)icb_pass(ig, ig->moder, is);
-        else if (icb_ismoder(ig, is)) {
+        if (!ig->mod)           /* if there is no mod, let anyone grab it */
+                (void)icb_pass(ig, ig->mod, is);
+        else if (icb_ismod(ig, is)) {
                 LIST_FOREACH(s, &ig->sess, entry) {
                         if (strcmp(s->nick, arg) == 0)
@@ -296 +296 @@
                         return;
                 }
-                (void)icb_pass(ig, ig->moder, s);
+                (void)icb_pass(ig, ig->mod, s);
         }
 }
@@ -312 +312 @@
                         icb_status(is, STATUS_TOPIC, "The topic is not set.");
         } else {                /* setting the topic */
-                if (!icb_ismoder(ig, is)) {
+                if (!icb_ismod(ig, is)) {
                         icb_status(is, STATUS_NOTIFY, "Setting the topic is "
                             "only for moderators.");
@@ -324 +324 @@
 
 void
-icb_cmd_who(struct icb_session *is, char *arg __attribute__((unused)))
-{
-        icb_who(is, NULL);
-}
+icb_cmd_who(struct icb_session *is, char *arg)
+{
+        struct icb_group *ig;
+
+        if (strlen(arg) == 0)
+                return icb_who(is, NULL);
+
+        LIST_FOREACH(ig, &groups, entry) {
+                if (strcmp(ig->name, arg) == 0)
+                        break;
+        }
+        if (ig == NULL) {
+                icb_error(is, "The group %s doesn't exist.", arg);
+                return;
+        }
+        icb_who(is, ig);
+}

icb.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2009, 2010 Mike Belopuhov
+ * Copyright (c) 2009, 2010, 2013 Mike Belopuhov
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -34 +34 @@
 void   icb_groupmsg(struct icb_session *, char *);
 void   icb_login(struct icb_session *, char *, char *, char *);
+int    icb_dowho(struct icb_session *, struct icb_group *);
 char  *icb_nextfield(char **);
 
@@ -199 +200 @@
         /* notify user */
         icb_status(is, STATUS_STATUS, "You are now in group %s%s", ig->name,
-            icb_ismoder(ig, is) ? " as moderator" : "");
+            icb_ismod(ig, is) ? " as moderator" : "");
 
         /* send user a topic name */
@@ -285 +286 @@
                 otype = "ec";
                 break;
+        case CMDOUT_WG:
+                otype = "wg";
+                break;
+        case CMDOUT_WH:
+                otype = "wh";
+                break;
         case CMDOUT_WL:
                 otype = "wl";
                 break;
-        case CMDOUT_WG:
-                otype = "wg";
-                break;
         default:
                 icb_log(is, LOG_ERR, "unknown cmdout type");
                 return;
         }
-        icb_sendfmt(is, "%c%s%c%s", ICB_M_CMDOUT, otype, ICB_M_SEP, outmsg);
+        if (outmsg)
+                icb_sendfmt(is, "%c%s%c%s", ICB_M_CMDOUT, otype, ICB_M_SEP,
+                    outmsg);
+        else
+                icb_sendfmt(is, "%c%s", ICB_M_CMDOUT, otype);
 }
 
@@ -386 +394 @@
 {
         if (is->group) {
-                if (icb_ismoder(is->group, is))
+                if (icb_ismod(is->group, is))
                         (void)icb_pass(is->group, is, NULL);
                 LIST_REMOVE(is, entry);
@@ -414 +422 @@
                 strlcpy(ig->mpass, mpass, sizeof ig->mpass);
         if (is)
-                ig->moder = is;
+                ig->mod = is;
         LIST_INIT(&ig->sess);
         LIST_INSERT_HEAD(&groups, ig, entry);
@@ -441 +449 @@
 
 /*
- *  icb_who: sends a list of users of the specified group (or the current
- *           one otherwise) in the "wl" format
- */
-void
-icb_who(struct icb_session *is, struct icb_group *ig)
+ *  icb_dowho: a helper function that sends out a group header as a command
+ *             output and user information in the "wl" format
+ */
+int
+icb_dowho(struct icb_session *is, struct icb_group *ig)
 {
         char buf[ICB_MSGSIZE];
         struct icb_session *s;
-
-        if (!ig)
-                ig = is->group;
+        int nusers = 0;
+
+        icb_cmdout(is, CMDOUT_CO, " ");
+        snprintf(buf, sizeof buf, "Group: %-8s (%cvl) Mod: %-13s Topic: %s",
+            ig->name, ig->mod ? 'm' : 'p', ig->mod ? ig->mod->nick : "(None)",
+            strlen(ig->topic) > 0 ? ig->topic : "(None)");
+        icb_cmdout(is, CMDOUT_CO, buf);
         LIST_FOREACH(s, &ig->sess, entry) {
                 (void)snprintf(buf, sizeof buf,
                     "%c%c%s%c%lld%c0%c%lld%c%s%c%s%c%s",
-                    icb_ismoder(ig, s) ? '*' : ' ', ICB_M_SEP,
+                    icb_ismod(ig, s) ? 'm' : ' ', ICB_M_SEP,
                     s->nick, ICB_M_SEP, getmonotime() - s->last,
                     ICB_M_SEP, ICB_M_SEP, s->login, ICB_M_SEP,
                     s->client, ICB_M_SEP, s->host, ICB_M_SEP, " ");
                 icb_cmdout(is, CMDOUT_WL, buf);
-        }
-}
-
-/*
- *  icb_ismoder: checks whether group is moderated by "is"
+                nusers++;
+        }
+        return (nusers);
+}
+
+/*
+ *  icb_who: sends a list of users of either the specified group or all
+ *           groups found on the server
+ */
+void
+icb_who(struct icb_session *is, struct icb_group *ig)
+{
+        char buf[ICB_MSGSIZE];
+        struct icb_group *g;
+
+        if (!ig) {
+                int nusers = 0, ngroups = 0;
+
+                LIST_FOREACH(g, &groups, entry) {
+                        nusers += icb_dowho(is, g);
+                        ngroups++;
+                }
+                if (nusers > 0) {
+                        (void)snprintf(buf, sizeof buf,
+                            "Total: %d %s in %d %s",
+                            nusers, nusers > 1 ? "users" : "user",
+                            ngroups, ngroups > 1 ? "groups" : "group");
+                } else
+                        (void)snprintf(buf, sizeof buf, "No users found.");
+                icb_cmdout(is, CMDOUT_CO, buf);
+        } else
+                (void)icb_dowho(is, ig);
+}
+
+/*
+ *  icb_ismod: checks whether group is moderated by "is"
  */
 int
-icb_ismoder(struct icb_group *ig, struct icb_session *is)
-{
-        if (ig->moder && ig->moder == is)
+icb_ismod(struct icb_group *ig, struct icb_session *is)
+{
+        if (ig->mod && ig->mod == is)
                 return (1);
         return (0);
@@ -484 +527 @@
     struct icb_session *to)
 {
-        if (ig->moder && ig->moder != from)
+        if (ig->mod && ig->mod != from)
                 return (-1);
         if (!from && !to)
                 return (-1);
-        ig->moder = to;
+        ig->mod = to;
         if (to)
                 icb_status(to, STATUS_NOTIFY, "%s just passed you moderation"
@@ -498 +541 @@
 
 /*
- *  icb_nextfield: advances through a given buffer returning pointer to
- *                 the beginning of the icb field or an empty string otherwise
+ *  icb_nextfield: advances through a given buffer returning pointer to the
+ *                 beginning of the icb field or an empty string otherwise
  */
 char *

icb.h

@@ -50 +50 @@
          CMDOUT_CO,
          CMDOUT_EC,
+         CMDOUT_WG,
+         CMDOUT_WH,
          CMDOUT_WL,
-         CMDOUT_WG,
 };
 #define ICB_M_PROTO              'j'
@@ -93 +94 @@
         LIST_ENTRY(icb_group)    entry;
         LIST_HEAD(, icb_session) sess;
-        struct icb_session      *moder;
+        struct icb_session      *mod;
 };
 
@@ -118 +119 @@
 void icb_init(struct icbd_callbacks *);
 void icb_input(struct icb_session *);
-int  icb_ismoder(struct icb_group *, struct icb_session *);
+int  icb_ismod(struct icb_group *, struct icb_session *);
 int  icb_pass(struct icb_group *, struct icb_session *, struct icb_session *);
 void icb_privmsg(struct icb_session *, char *, char *);