}
$upload = null;
-
try {
$upload = MediaFile::fromUpload('media', $this->scoped);
- } catch (Exception $e) {
- $this->clientError($e->getMessage(), $e->getCode());
- }
-
- if (isset($upload)) {
$this->status .= ' ' . $upload->shortUrl();
-
/* Do not call shortenlinks until the whole notice has been build */
+ } catch (NoUploadedMediaException $e) {
+ // There was no uploaded media for us today.
}
/* Do call shortenlinks here & check notice length since notice is about to be saved & sent */
$status_shortened = $this->auth_user->shortenlinks($this->status);
if (Notice::contentTooLong($status_shortened)) {
- if (isset($upload)) {
+ if ($upload instanceof MediaFile) {
$upload->delete();
}
// TRANS: Client error displayed exceeding the maximum notice length.
*/
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;
}
}