Better test to see if uploaded media exists

[quix0rs-gnu-social.git] / actions / apistatusesupdate.php

diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php
index 73b87cac988de4f596433441fe6d5819ddb3b9f8..d5fc7c994589bec48bf6ddf7e83d66dace56a7f6 100644 (file)
--- a/actions/apistatusesupdate.php
+++ b/actions/apistatusesupdate.php
@@ -252,7 +252,7 @@ class ApiStatusesUpdateAction extends ApiAuthAction
                 $this->clientError($e->getMessage(), $e->getCode());
             }
 
-            if (isset($upload)) {
+            if ($upload instanceof MediaFile) {
                 $this->status .= ' ' . $upload->shortUrl();
 
                 /* Do not call shortenlinks until the whole notice has been build */
@@ -336,13 +336,15 @@ class ApiStatusesUpdateAction extends ApiAuthAction
      */
     function supported($cmd)
     {
-        static $cmdlist = array('MessageCommand', 'SubCommand', 'UnsubCommand',
-            'FavCommand', 'OnCommand', 'OffCommand', 'JoinCommand', 'LeaveCommand');
+        static $cmdlist = array('SubCommand', 'UnsubCommand',
+            'OnCommand', 'OffCommand', 'JoinCommand', 'LeaveCommand');
+
+        $supported = null;
 
-        if (in_array(get_class($cmd), $cmdlist)) {
-            return true;
+        if (Event::handle('CommandSupportedAPI', array($cmd, &$supported))) {
+            $supported = $supported || in_array(get_class($cmd), $cmdlist);
         }
 
-        return false;
+        return $supported;
     }
 }