X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FEvent%2FEventPlugin.php;h=ed6a01e9b48a5c88f5e02cff11c7418c09444b6f;hb=e186ad57d07307e2c12e9080bb51fd5beedff409;hp=14dadbc247faf08fbfb07a7e4934fad45461f7a0;hpb=486a02d60db98d88552ea36aff6b163b0273465c;p=quix0rs-gnu-social.git

diff --git a/plugins/Event/EventPlugin.php b/plugins/Event/EventPlugin.php
index 14dadbc247..ed6a01e9b4 100644
--- a/plugins/Event/EventPlugin.php
+++ b/plugins/Event/EventPlugin.php
@@ -40,11 +40,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-class EventPlugin extends MicroAppPlugin
+class EventPlugin extends ActivityVerbHandlerPlugin
 {
-
-    var $oldSaveNew = true;
-
     /**
      * Set up our tables (event and rsvp)
      *
@@ -81,9 +78,10 @@ class EventPlugin extends MicroAppPlugin
         $m->connect('main/event/new',
                     array('action' => 'newevent'));
         $m->connect('main/event/rsvp',
-                    array('action' => 'newrsvp'));
-        $m->connect('main/event/rsvp/cancel',
-                    array('action' => 'cancelrsvp'));
+                    array('action' => 'rsvp'));
+        $m->connect('main/event/rsvp/:rsvp',    // this will probably change to include event notice id
+                    array('action' => 'rsvp'),
+                    array('rsvp'   => '[a-z]+'));
         $m->connect('event/:id',
                     array('action' => 'showevent'),
                     array('id' => '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'));
@@ -104,7 +102,7 @@ class EventPlugin extends MicroAppPlugin
         $versions[] = array('name' => 'Event',
                             'version' => GNUSOCIAL_VERSION,
                             'author' => 'Evan Prodromou',
-                            'homepage' => 'http://status.net/wiki/Plugin:Event',
+                            'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Event',
                             'description' =>
                             // TRANS: Plugin description.
                             _m('Event invitations and RSVPs.'));
@@ -131,120 +129,89 @@ class EventPlugin extends MicroAppPlugin
                      RSVP::POSSIBLE);
     }
 
-    protected function saveObjectFromActivity(Activity $activity, Notice $stored, array $options=array())
-    {
-        if (count($act->objects) !== 1) {
-            // TRANS: Exception thrown when there are too many activity objects.
-            throw new Exception(_m('Too many activity objects.'));
-        }
-        $actobj = $activity->objects[0];
-
-        switch ($activity->verb) {
-        case ActivityVerb::POST:
-            $actobj = $activity->objects[0];
-            if (!ActivityUtils::compareTypes($actobj->type, array(Happening::OBJECT_TYPE))) {
-                // TRANS: Exception thrown when event plugin comes across a non-event type object.
-                throw new Exception(_m('Wrong type for object.'));
-            }
-            return Happening::saveActivityObject($actobj, $stored->getProfile());
-            break;
-        case RSVP::POSITIVE:
-        case RSVP::NEGATIVE:
-        case RSVP::POSSIBLE:
-            $happening = Happening::getKV('uri', $actobj->id);
-            if (empty($happening)) {
-                // FIXME: save the event
-                // TRANS: Exception thrown when trying to RSVP for an unknown event.
-                throw new Exception(_m('RSVP for unknown event.'));
-            }
-            $object = RSVP::saveNewFromNotice($stored, $happening, $activity->verb);
-            // Our data model expects this
-            $stored->object_type = $activity->verb;
-            return $object;
-            break;
-        default:
-            common_log(LOG_ERR, 'Unknown verb for events.');
-            return NULL;
+    function isMyNotice(Notice $notice) {
+        if (!empty($notice->object_type)) {
+            return parent::isMyNotice($notice);
         }
+        return $this->isMyVerb($notice->verb);
     }
 
-    /**
-     * Turn a Notice into an activity object
-     *
-     * @param Notice $notice
-     *
-     * @return ActivityObject
-     */
-    function activityObjectFromNotice(Notice $notice)
-    {
-        $happening = null;
-
-        switch ($notice->object_type) {
-        case Happening::OBJECT_TYPE:
-            $happening = Happening::fromNotice($notice);
-            break;
-        case RSVP::POSITIVE:
-        case RSVP::NEGATIVE:
-        case RSVP::POSSIBLE:
-            $rsvp  = RSVP::fromNotice($notice);
-            $happening = $rsvp->getEvent();
-            break;
-        }
-
-        if (empty($happening)) {
-            // TRANS: Exception thrown when event plugin comes across a unknown object type.
-            throw new Exception(_m('Unknown object type.'));
-        }
+    public function newFormAction() {
+        // such as 'newbookmark' or 'newevent' route
+        return 'new'.$this->tag();
+    }
 
-        $notice = $happening->getNotice();
+    function onStartShowEntryForms(&$tabs)
+    {
+        $tabs[$this->tag()] = array('title' => $this->appTitle(),
+                                    'href'  => common_local_url($this->newFormAction()),
+                                   );
+        return true;
+    }
 
-        if (empty($notice)) {
-            // TRANS: Exception thrown when referring to a notice that is not an event an in event context.
-            throw new Exception(_m('Unknown event notice.'));
+    function onStartMakeEntryForm($tag, $out, &$form)
+    {
+        if ($tag == $this->tag()) {
+            $form = $this->entryForm($out);
+            return false;
         }
 
-        $obj = new ActivityObject();
-
-        $obj->id      = $happening->uri;
-        $obj->type    = Happening::OBJECT_TYPE;
-        $obj->title   = $happening->title;
-        $obj->summary = $happening->description;
-        $obj->link    = $notice->getUrl();
+        return true;
+    }
 
-        // XXX: how to get this stuff into JSON?!
+    protected function getActionTitle(ManagedAction $action, $verb, Notice $target, Profile $scoped)
+    {
+        return $verb;
+    }
 
-        $obj->extra[] = array('dtstart',
-                              array('xmlns' => 'urn:ietf:params:xml:ns:xcal'),
-                              common_date_iso8601($happening->start_time));
+    protected function doActionPreparation(ManagedAction $action, $verb, Notice $target, Profile $scoped)
+    {
+        return true;
+    }
 
-        $obj->extra[] = array('dtend',
-                              array('xmlns' => 'urn:ietf:params:xml:ns:xcal'),
-                              common_date_iso8601($happening->end_time));
+    protected function doActionPost(ManagedAction $action, $verb, Notice $target, Profile $scoped)
+    {
+        throw new ServerException('Event does not handle doActionPost yet', 501);
+    }
 
-        $obj->extra[] = array('location', false, $happening->location);
-        $obj->extra[] = array('url', false, $happening->url);
+    protected function getActivityForm(ManagedAction $action, $verb, Notice $target, Profile $scoped)
+    {
+        return new RSVPForm(Happening::fromStored($target), $action);
+    }
 
-        // XXX: probably need other stuff here
+    protected function saveObjectFromActivity(Activity $act, Notice $stored, array $options=array())
+    {
+        switch (true) {
+        case ActivityUtils::compareVerbs($stored->getVerb(), [ActivityVerb::POST]):
+            return Happening::saveActivityObject($act, $stored);
+            break;
 
-        return $obj;
+        case ActivityUtils::compareVerbs($stored->getVerb(), [RSVP::POSITIVE, RSVP::NEGATIVE, RSVP::POSSIBLE]):
+            return RSVP::saveActivityObject($act, $stored);
+            break;
+        }
+        return null;
     }
 
-    /**
-     * Change the verb on RSVP notices
-     *
-     * @param Notice $notice
-     *
-     * @return ActivityObject
-     */
-    protected function extendActivity(Notice $stored, Activity $act, Profile $scoped=null) {
-        switch ($stored->object_type) {
-        case RSVP::POSITIVE:
-        case RSVP::NEGATIVE:
-        case RSVP::POSSIBLE:
-            $act->verb = $stored->object_type;
+    function activityObjectFromNotice(Notice $stored)
+    {
+        $happening = null;
+
+        switch (true) {
+        case $stored->isVerb([ActivityVerb::POST]) && $stored->isObjectType([Happening::OBJECT_TYPE]):
+            $obj = Happening::fromStored($stored)->asActivityObject();
+            break;
+        // isObjectType here is because we had the verb stored in object_type previously for unknown reasons
+        case $stored->isObjectType([RSVP::POSITIVE, RSVP::NEGATIVE, RSVP::POSSIBLE]):
+        case $stored->isVerb([RSVP::POSITIVE, RSVP::NEGATIVE, RSVP::POSSIBLE]):
+            $obj = RSVP::fromStored($stored)->asActivityObject();
             break;
+        default:
+            // TRANS: Exception thrown when event plugin comes across a unknown object type.
+            throw new Exception(_m('Unknown object type.'));
         }
-        return true;
+
+        return $obj;
     }
 
     /**
@@ -258,29 +225,29 @@ class EventPlugin extends MicroAppPlugin
         return new EventForm($out);
     }
 
-    /**
-     * When a notice is deleted, clean up related tables.
-     *
-     * @param Notice $notice
-     */
-    function deleteRelated(Notice $notice)
+    function deleteRelated(Notice $stored)
     {
-        switch ($notice->object_type) {
-        case Happening::OBJECT_TYPE:
+        switch (true) {
+        case $stored->isObjectType([Happening::OBJECT_TYPE]):
             common_log(LOG_DEBUG, "Deleting event from notice...");
-            $happening = Happening::fromNotice($notice);
-            $happening->delete();
+            try {
+                $happening = Happening::fromStored($stored);
+                $happening->delete();
+            } catch (NoResultException $e) {
+                // already gone
+            }
             break;
-        case RSVP::POSITIVE:
-        case RSVP::NEGATIVE:
-        case RSVP::POSSIBLE:
+        // isObjectType here is because we had the verb stored in object_type previously for unknown reasons
+        case $stored->isObjectType([RSVP::POSITIVE, RSVP::NEGATIVE, RSVP::POSSIBLE]):
+        case $stored->isVerb([RSVP::POSITIVE, RSVP::NEGATIVE, RSVP::POSSIBLE]):
             common_log(LOG_DEBUG, "Deleting rsvp from notice...");
-            $rsvp = RSVP::fromNotice($notice);
-            common_log(LOG_DEBUG, "to delete: $rsvp->id");
-            $rsvp->delete();
+            try {
+                $rsvp = RSVP::fromStored($stored);
+                $rsvp->delete();
+            } catch (NoResultException $e) {
+                // already gone
+            }
             break;
-        default:
-            common_log(LOG_DEBUG, "Not deleting related, wtf...");
         }
     }
 
@@ -297,7 +264,6 @@ class EventPlugin extends MicroAppPlugin
 
     function onStartAddNoticeReply($nli, $parent, $child)
     {
-        // Filter out any poll responses
         if (($parent->object_type == Happening::OBJECT_TYPE) &&
             in_array($child->object_type, array(RSVP::POSITIVE, RSVP::NEGATIVE, RSVP::POSSIBLE))) {
             return false;
@@ -305,36 +271,26 @@ class EventPlugin extends MicroAppPlugin
         return true;
     }
 
-    protected function showNoticeItemNotice(NoticeListItem $nli)
-    {
-        $nli->showAuthor();
-        $nli->showContent();
-    }
-
     protected function showNoticeContent(Notice $stored, HTMLOutputter $out, Profile $scoped=null)
     {
-        switch ($stored->object_type) {
-        case Happening::OBJECT_TYPE:
+        switch (true) {
+        case ActivityUtils::compareTypes($stored->verb, array(ActivityVerb::POST)) &&
+                ActivityUtils::compareTypes($stored->object_type, array(Happening::OBJECT_TYPE)):
             $this->showEvent($stored, $out, $scoped);
             break;
-        case RSVP::POSITIVE:
-        case RSVP::NEGATIVE:
-        case RSVP::POSSIBLE:
+        case ActivityUtils::compareVerbs($stored->verb, array(RSVP::POSITIVE, RSVP::NEGATIVE, RSVP::POSSIBLE)):
             $this->showRSVP($stored, $out, $scoped);
             break;
+        default:
+            throw new ServerException('This is not an Event notice');
         }
+        return true;
     }
 
     protected function showEvent(Notice $stored, HTMLOutputter $out, Profile $scoped=null)
     {
         $profile = $stored->getProfile();
-        $event   = Happening::fromNotice($stored);
-
-        if (!$event instanceof Happening) {
-            // TRANS: Content for a deleted RSVP list item (RSVP stands for "please respond").
-            $out->element('p', null, _m('Deleted.'));
-            return;
-        }
+        $event   = Happening::fromStored($stored);
 
         $out->elementStart('div', 'h-event');
 
@@ -445,14 +401,7 @@ class EventPlugin extends MicroAppPlugin
         $out->elementEnd('div');
 
         if ($scoped instanceof Profile) {
-            $rsvp = $event->getRSVP($scoped);
-
-            if (empty($rsvp)) {
-                $form = new RSVPForm($event, $out);
-            } else {
-                $form = new CancelRSVPForm($rsvp, $out);
-            }
-
+            $form = new RSVPForm($out, array('event'=>$event, 'scoped'=>$scoped));
             $form->show();
         }
         $out->elementEnd('div');
@@ -460,9 +409,9 @@ class EventPlugin extends MicroAppPlugin
 
     protected function showRSVP(Notice $stored, HTMLOutputter $out, Profile $scoped=null)
     {
-        $rsvp = RSVP::fromNotice($stored);
-
-        if (empty($rsvp)) {
+        try {
+            $rsvp = RSVP::fromStored($stored);
+        } catch (NoResultException $e) {
             // TRANS: Content for a deleted RSVP list item (RSVP stands for "please respond").
             $out->element('p', null, _m('Deleted.'));
             return;