From f04dbc8fa21d86bae5c34ece2637c3c345e29927 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Mon, 16 Nov 2009 00:19:47 -0500
Subject: Add "followers" and "following" commands

---
 lib/commandinterpreter.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'lib/commandinterpreter.php')

diff --git a/lib/commandinterpreter.php b/lib/commandinterpreter.php
index d878fe268..ecc08f101 100644
--- a/lib/commandinterpreter.php
+++ b/lib/commandinterpreter.php
@@ -47,6 +47,18 @@ class CommandInterpreter
             } else {
                 return new LoginCommand($user);
             }
+         case 'followers':
+            if ($arg) {
+                return null;
+            } else {
+                return new FollowersCommand($user);
+            }
+         case 'following':
+            if ($arg) {
+                return null;
+            } else {
+                return new FollowingCommand($user);
+            }
          case 'on':
             if ($arg) {
                 list($other, $extra) = $this->split_arg($arg);
-- 
cgit v1.2.3-54-g00ecf


From 73b4d770a2551018ea17d115d980972dc5f0865a Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Mon, 16 Nov 2009 11:17:14 -0500
Subject: Changed to StatusNet consistent terminology

---
 lib/command.php            | 8 ++++----
 lib/commandinterpreter.php | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'lib/commandinterpreter.php')

diff --git a/lib/command.php b/lib/command.php
index c4a4f7cf4..247ea4475 100644
--- a/lib/command.php
+++ b/lib/command.php
@@ -605,7 +605,7 @@ class LoginCommand extends Command
     }
 }
 
-class FollowingCommand extends Command
+class SubscriptionsCommand extends Command
 {
     function execute($channel)
     {
@@ -624,7 +624,7 @@ class FollowingCommand extends Command
     }
 }
 
-class FollowersCommand extends Command
+class SubscribersCommand extends Command
 {
     function execute($channel)
     {
@@ -653,8 +653,8 @@ class HelpCommand extends Command
                            "off - turn off notifications\n".
                            "help - show this help\n".
                            "follow <nickname> - subscribe to user\n".
-                           "following - list the people you follow\n".
-                           "followers - list the people that follow you\n".
+                           "subscriptions - list the people you follow\n".
+                           "subscribers - list the people that follow you\n".
                            "leave <nickname> - unsubscribe from user\n".
                            "d <nickname> <text> - direct message to user\n".
                            "get <nickname> - get last notice from user\n".
diff --git a/lib/commandinterpreter.php b/lib/commandinterpreter.php
index ecc08f101..c39fafb62 100644
--- a/lib/commandinterpreter.php
+++ b/lib/commandinterpreter.php
@@ -47,17 +47,17 @@ class CommandInterpreter
             } else {
                 return new LoginCommand($user);
             }
-         case 'followers':
+         case 'subscribers':
             if ($arg) {
                 return null;
             } else {
-                return new FollowersCommand($user);
+                return new SubscribersCommand($user);
             }
-         case 'following':
+         case 'subscriptions':
             if ($arg) {
                 return null;
             } else {
-                return new FollowingCommand($user);
+                return new SubscriptionsCommand($user);
             }
          case 'on':
             if ($arg) {
-- 
cgit v1.2.3-54-g00ecf


From 0e7dd81a6cf38c879f24f476411104d67b9eb177 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Mon, 16 Nov 2009 11:23:00 -0500
Subject: Added a "groups" command

---
 lib/command.php            | 20 ++++++++++++++++++++
 lib/commandinterpreter.php |  6 ++++++
 2 files changed, 26 insertions(+)

(limited to 'lib/commandinterpreter.php')

diff --git a/lib/command.php b/lib/command.php
index 247ea4475..0c98c94ac 100644
--- a/lib/command.php
+++ b/lib/command.php
@@ -643,6 +643,25 @@ class SubscribersCommand extends Command
     }
 }
 
+class GroupsCommand extends Command
+{
+    function execute($channel)
+    {
+        $group = $this->user->getGroups();
+        $groups=array();
+        while ($group->fetch()) {
+            $groups[]=$group->nickname;
+        }
+        if(count($groups)==0){
+            $out=_('You are not a member of any groups.');
+        }else{
+            $out=_('You are a member of these groups: ');
+            $out.=implode(', ',$groups);
+        }
+        $channel->output($this->user,$out);
+    }
+}
+
 class HelpCommand extends Command
 {
     function execute($channel)
@@ -653,6 +672,7 @@ class HelpCommand extends Command
                            "off - turn off notifications\n".
                            "help - show this help\n".
                            "follow <nickname> - subscribe to user\n".
+                           "groups - lists the groups you have joined\n".
                            "subscriptions - list the people you follow\n".
                            "subscribers - list the people that follow you\n".
                            "leave <nickname> - unsubscribe from user\n".
diff --git a/lib/commandinterpreter.php b/lib/commandinterpreter.php
index c39fafb62..665015afc 100644
--- a/lib/commandinterpreter.php
+++ b/lib/commandinterpreter.php
@@ -59,6 +59,12 @@ class CommandInterpreter
             } else {
                 return new SubscriptionsCommand($user);
             }
+         case 'groups':
+            if ($arg) {
+                return null;
+            } else {
+                return new GroupsCommand($user);
+            }
          case 'on':
             if ($arg) {
                 list($other, $extra) = $this->split_arg($arg);
-- 
cgit v1.2.3-54-g00ecf