Merge remote-tracking branch 'upstream/master'

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

diff --git a/actions/newnotice.php b/actions/newnotice.php
index ccc3f94fd4105ce86d76140937e55aa76d6eb048..a97f439e24d24e504764269813a43f4a3501d90a 100644 (file)
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -96,7 +96,7 @@ class NewnoticeAction extends FormAction
         assert($this->scoped instanceof Profile); // XXX: maybe an error instead...
         $user = $this->scoped->getUser();
         $content = $this->trimmed('status_textarea');
-        $options = array();
+        $options = array('source' => 'web');
         Event::handle('StartSaveNewNoticeWeb', array($this, $user, &$content, &$options));
 
         if (empty($content)) {
@@ -117,43 +117,51 @@ class NewnoticeAction extends FormAction
             return;
         }
 
-        $content_shortened = $user->shortenLinks($content);
-        if (Notice::contentTooLong($content_shortened)) {
-            // TRANS: Client error displayed when the parameter "status" is missing.
-            // TRANS: %d is the maximum number of character for a notice.
-            $this->clientError(sprintf(_m('That\'s too long. Maximum notice size is %d character.',
-                                          'That\'s too long. Maximum notice size is %d characters.',
-                                          Notice::maxContent()),
-                                       Notice::maxContent()));
+        if ($this->int('inreplyto')) {
+            // Throws exception if the inreplyto Notice is given but not found.
+            $parent = Notice::getByID($this->int('inreplyto'));
+        } else {
+            $parent = null;
         }
 
-        $replyto = $this->int('inreplyto');
-        if ($replyto) {
-            $options['reply_to'] = $replyto;
-        }
+        $act = new Activity();
+        $act->verb = ActivityVerb::POST;
+        $act->time = time();
+        $act->actor = $this->scoped->asActivityObject();
 
         $upload = null;
         try {
             // throws exception on failure
             $upload = MediaFile::fromUpload('attach', $this->scoped);
-            if (Event::handle('StartSaveNewNoticeAppendAttachment', array($this, $upload, &$content_shortened, &$options))) {
-                $content_shortened .= ' ' . $upload->shortUrl();
-            }
-            Event::handle('EndSaveNewNoticeAppendAttachment', array($this, $upload, &$content_shortened, &$options));
-
-            if (Notice::contentTooLong($content_shortened)) {
-                $upload->delete();
-                // TRANS: Client error displayed exceeding the maximum notice length.
-                // TRANS: %d is the maximum length for a notice.
-                $this->clientError(sprintf(_m('Maximum notice size is %d character, including attachment URL.',
-                                              'Maximum notice size is %d characters, including attachment URL.',
-                                              Notice::maxContent()),
-                                           Notice::maxContent()));
+            if (Event::handle('StartSaveNewNoticeAppendAttachment', array($this, $upload, &$content, &$options))) {
+                $content .= ' ' . $upload->shortUrl();
             }
+            Event::handle('EndSaveNewNoticeAppendAttachment', array($this, $upload, &$content, &$options));
+
+            // We could check content length here if the URL was added, but I'll just let it slide for now...
+
+            $act->enclosures[] = $upload->getEnclosure();
         } catch (NoUploadedMediaException $e) {
             // simply no attached media to the new notice
         }
 
+        // Reject notice if it is too long (without the HTML)
+        // This is done after MediaFile::fromUpload etc. just to act the same as the ApiStatusesUpdateAction
+        if (Notice::contentTooLong($content)) {
+            // TRANS: Client error displayed when the parameter "status" is missing.
+            // TRANS: %d is the maximum number of character for a notice.
+            throw new ClientException(sprintf(_m('That\'s too long. Maximum notice size is %d character.',
+                                                 'That\'s too long. Maximum notice size is %d characters.',
+                                                 Notice::maxContent()),
+                                              Notice::maxContent()));
+        }
+
+        $act->context = new ActivityContext();
+
+        if ($parent instanceof Notice) {
+            $act->context->replyToID = $parent->getUri();
+            $act->context->replyToUrl = $parent->getUrl(true);  // maybe we don't have to send true here to force a URL?
+        }
 
         if ($this->scoped->shareLocation()) {
             // use browser data if checked; otherwise profile data
@@ -171,19 +179,26 @@ class NewnoticeAction extends FormAction
                                                       $this->scoped);
             }
 
-            $options = array_merge($options, $locOptions);
+            $act->context->location = Location::fromOptions($locOptions);
         }
 
-        $author_id = $this->scoped->id;
-        $text      = $content_shortened;
+        $content = $this->scoped->shortenLinks($content);
+
+        // FIXME: Make sure NoticeTitle plugin gets a change to add the title to our activityobject!
+        if (Event::handle('StartNoticeSaveWeb', array($this, $this->scoped, &$content, &$options))) {
 
-        // Does the heavy-lifting for getting "To:" information
+            // FIXME: We should be able to get the attentions from common_render_content!
+            // and maybe even directly save whether they're local or not!
+            $act->context->attention = common_get_attentions($content, $this->scoped, $parent);
 
-        ToSelector::fillOptions($this, $options);
+            $actobj = new ActivityObject();
+            $actobj->type = ActivityObject::NOTE;
+            $actobj->content = common_render_content($content, $this->scoped, $parent);
 
-        if (Event::handle('StartNoticeSaveWeb', array($this, &$author_id, &$text, &$options))) {
+            // Finally add the activity object to our activity
+            $act->objects[] = $actobj;
 
-            $this->stored = Notice::saveNew($this->scoped->id, $content_shortened, 'web', $options);
+            $this->stored = Notice::saveActivity($act, $this->scoped, $options);
 
             if ($upload instanceof MediaFile) {
                 $upload->attachToNotice($this->stored);
@@ -192,7 +207,7 @@ class NewnoticeAction extends FormAction
             Event::handle('EndNoticeSaveWeb', array($this, $this->stored));
         }
 
-        Event::handle('EndSaveNewNoticeWeb', array($this, $user, &$content_shortened, &$options));
+        Event::handle('EndSaveNewNoticeWeb', array($this, $user, &$content, &$options));
 
         if (!GNUsocial::isAjax()) {
             $url = common_local_url('shownotice', array('notice' => $this->stored->id));