Merge branch '1.0.x' into people_tags_rebase

[quix0rs-gnu-social.git] / lib / commandinterpreter.php

diff --git a/lib/commandinterpreter.php b/lib/commandinterpreter.php
index 6b1b70055e06c5c9ed29b87acd075009fb450deb..1e8114701d1d3120e73f1dcfbc751048e961051b 100644 (file)
--- a/lib/commandinterpreter.php
+++ b/lib/commandinterpreter.php
@@ -274,6 +274,32 @@ class CommandInterpreter
                     }
                 }
                 break;
+             case 'list':
+             case 'tag':
+                if (!$arg) {
+                    $result = null;
+                    break;
+                }
+                list($other, $tags) = $this->split_arg($arg);
+                if (!$tags) {
+                    $result = null;
+                } else {
+                    $result = new TagCommand($user, $other, $tags);
+                }
+                break;
+             case 'unlist':
+             case 'untag':
+                if (!$arg) {
+                    $result = null;
+                    break;
+                }
+                list($other, $tags) = $this->split_arg($arg);
+                if (!$tags) {
+                    $result = null;
+                } else {
+                    $result = new UntagCommand($user, $other, $tags);
+                }
+                break;
             case 'track':
                 if (!$arg) {
                     $result = null;