Changeset 4284008 in code for cmd.c

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".

File:

• cmd.c (modified) (8 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);
+}