From f74d2d555c5323f1d49e99a4313f57872d2c4a95 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Thu, 21 Jan 2016 02:10:34 +0100 Subject: [PATCH] Working on some RSVP code stuff --- classes/Notice.php | 14 +++ lib/activityhandlerplugin.php | 1 + lib/activityutils.php | 3 +- .../classes/Deleted_notice.php | 7 +- plugins/Event/EventPlugin.php | 90 ++++++------------- plugins/Event/actions/rsvp.php | 10 ++- plugins/Event/classes/Happening.php | 42 +++++++++ plugins/Event/classes/RSVP.php | 20 +++++ plugins/Event/forms/rsvp.php | 3 +- plugins/Favorite/classes/Fave.php | 2 +- 10 files changed, 126 insertions(+), 66 deletions(-) diff --git a/classes/Notice.php b/classes/Notice.php index 2a387d5539..bbf543e5a6 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -282,6 +282,11 @@ class Notice extends Managed_DataObject return ActivityUtils::resolveUri($this->verb, $make_relative); } + public function isVerb(array $verbs) + { + return ActivityUtils::compareVerbs($this->getVerb(), $verbs); + } + /* * Get the original representation URL of this notice. * @@ -314,6 +319,15 @@ class Notice extends Managed_DataObject return ActivityUtils::resolveUri($this->object_type, $canonical); } + public function isObjectType(array $types) + { + try { + return ActivityUtils::compareTypes($this->getObjectType(), $types); + } catch (NoObjectTypeException $e) { + return false; + } + } + public static function getByUri($uri) { $notice = new Notice(); diff --git a/lib/activityhandlerplugin.php b/lib/activityhandlerplugin.php index b093198703..8f28da85d6 100644 --- a/lib/activityhandlerplugin.php +++ b/lib/activityhandlerplugin.php @@ -108,6 +108,7 @@ abstract class ActivityHandlerPlugin extends Plugin } function isMyType($type) { + // Third argument to compareTypes is true, to allow for notices with empty object_type for example (verb-only) return count($this->types())===0 || ActivityUtils::compareTypes($type, $this->types()); } diff --git a/lib/activityutils.php b/lib/activityutils.php index 8a2be35022..94cf8544b1 100644 --- a/lib/activityutils.php +++ b/lib/activityutils.php @@ -350,7 +350,7 @@ class ActivityUtils static function compareTypes($type, $objects) { - $type = self::resolveUri($type); + $type = self::resolveUri($type, false); foreach ((array)$objects as $object) { if ($type === self::resolveUri($object)) { return true; @@ -367,6 +367,7 @@ class ActivityUtils static function resolveUri($uri, $make_relative=false) { if (empty($uri)) { + common_debug(_ve(debug_backtrace())); throw new ServerException('No URI to resolve in ActivityUtils::resolveUri'); } diff --git a/plugins/ActivityModeration/classes/Deleted_notice.php b/plugins/ActivityModeration/classes/Deleted_notice.php index 76674d9bec..4ffc0c895f 100644 --- a/plugins/ActivityModeration/classes/Deleted_notice.php +++ b/plugins/ActivityModeration/classes/Deleted_notice.php @@ -78,7 +78,12 @@ class Deleted_notice extends Managed_DataObject $act->actor = $actor->asActivityObject(); $act->target = new ActivityObject(); // We don't save the notice object, as it's supposed to be removed! $act->target->id = $notice->getUri(); - $act->target->type = $notice->getObjectType(); + try { + $act->target->type = $notice->getObjectType(); + } catch (NoObjectTypeException $e) { + // This could be for example an RSVP which is a verb and carries no object-type + $act->target->type = null; + } $act->objects = array(clone($act->target)); $url = $notice->getUrl(); diff --git a/plugins/Event/EventPlugin.php b/plugins/Event/EventPlugin.php index d22a5e9135..ed78b156e1 100644 --- a/plugins/Event/EventPlugin.php +++ b/plugins/Event/EventPlugin.php @@ -129,6 +129,13 @@ class EventPlugin extends ActivityVerbHandlerPlugin RSVP::POSSIBLE); } + function isMyNotice(Notice $notice) { + if (!empty($notice->object_type)) { + return parent::isMyNotice($notice); + } + return $this->isMyVerb($notice->verb); + } + public function newFormAction() { // such as 'newbookmark' or 'newevent' route return 'new'.$this->tag(); @@ -191,57 +198,22 @@ class EventPlugin extends ActivityVerbHandlerPlugin $happening = null; switch (true) { - case ActivityUtils::compareVerbs($stored->verb, array(ActivityVerb::POST)) && - ActivityUtils::compareTypes($stored->object_type, array(Happening::OBJECT_TYPE)): - $happening = Happening::fromStored($stored); + case $stored->isVerb([ActivityVerb::POST]) && $stored->isObjectType([Happening::OBJECT_TYPE]): + $obj = Happening::fromStored($stored)->asActivityObject(); break; - // FIXME: Why are these object_type?? - case ActivityUtils::compareTypes($stored->object_type, array(RSVP::POSITIVE, RSVP::NEGATIVE, RSVP::POSSIBLE)): - $rsvp = RSVP::fromNotice($stored); - $happening = $rsvp->getEvent(); + // 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.')); } - $obj = new ActivityObject(); - - $obj->id = $happening->getUri(); - $obj->type = Happening::OBJECT_TYPE; - $obj->title = $happening->title; - $obj->summary = $happening->description; - $obj->link = $happening->getStored()->getUrl(); - - $obj->extra[] = array('dtstart', - array('xmlns' => 'urn:ietf:params:xml:ns:xcal'), - common_date_iso8601($happening->start_time)); - $obj->extra[] = array('dtend', - array('xmlns' => 'urn:ietf:params:xml:ns:xcal'), - common_date_iso8601($happening->end_time)); - $obj->extra[] = array('location', false, $happening->location); - $obj->extra[] = array('url', false, $happening->url); - return $obj; } - /** - * Change the verb on RSVP notices - * - * @param Notice $notice - * - * @return ActivityObject - */ - protected function extendActivity(Notice $stored, Activity $act, Profile $scoped=null) { - switch (true) { - // FIXME: Why are these object_type?? - case ActivityUtils::compareTypes($stored->object_type, array(RSVP::POSITIVE, RSVP::NEGATIVE, RSVP::POSSIBLE)): - $act->verb = $stored->object_type; - break; - } - return true; - } - /** * Form for our app * @@ -253,33 +225,29 @@ class EventPlugin extends ActivityVerbHandlerPlugin 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..."); try { - $happening = Happening::fromStored($notice); + $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..."); } } @@ -442,9 +410,9 @@ class EventPlugin extends ActivityVerbHandlerPlugin 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; diff --git a/plugins/Event/actions/rsvp.php b/plugins/Event/actions/rsvp.php index ec0267a8fb..59cc070278 100644 --- a/plugins/Event/actions/rsvp.php +++ b/plugins/Event/actions/rsvp.php @@ -54,7 +54,12 @@ class RsvpAction extends FormAction protected function doPreparation() { - $this->event = Happening::getByKeys(['uri'=>$this->trimmed('event')]); + if ($this->trimmed('notice')) { + $stored = Notice::getByID($this->trimmed('notice')); + $this->event = Happening::fromStored($stored); + } else { + $this->event = Happening::getByKeys(['uri'=>$this->trimmed('event')]); + } $this->formOpts['event'] = $this->event; } @@ -86,6 +91,9 @@ class RsvpAction extends FormAction $act->objects = array(clone($act->target)); $act->content = RSVP::toHTML($this->scoped, $this->event, RSVP::codeFor($verb)); + $act->context = new ActivityContext(); + $act->context->replyToID = $this->event->getUri(); + $stored = Notice::saveActivity($act, $this->scoped, $options); return _m('Saved RSVP'); diff --git a/plugins/Event/classes/Happening.php b/plugins/Event/classes/Happening.php index cb04c281d9..d74ae081b4 100644 --- a/plugins/Event/classes/Happening.php +++ b/plugins/Event/classes/Happening.php @@ -211,6 +211,9 @@ class Happening extends Managed_DataObject static function fromStored(Notice $stored) { + if (!ActivityUtils::compareTypes($stored->getObjectType(), [self::OBJECT_TYPE])) { + throw new ServerException('Notice is not of type '.self::OBJECT_TYPE); + } return self::getByKeys(array('uri'=>$stored->getUri())); } @@ -224,4 +227,43 @@ class Happening extends Managed_DataObject return RSVP::pkeyGet(array('profile_id' => $profile->getID(), 'event_uri' => $this->getUri())); } + + static public function getObjectType() + { + return self::OBJECT_TYPE; + } + + public function asActivityObject() + { + $actobj = new ActivityObject(); + $actobj->id = $this->getUri(); + $actobj->type = self::getObjectType(); + $actobj->title = $this->title; + $actobj->summary = $this->description; + $actobj->extra[] = array('dtstart', + array('xmlns' => 'urn:ietf:params:xml:ns:xcal'), + common_date_iso8601($this->start_time)); + $actobj->extra[] = array('dtend', + array('xmlns' => 'urn:ietf:params:xml:ns:xcal'), + common_date_iso8601($this->end_time)); + $actobj->extra[] = array('location', + array('xmlns' => 'urn:ietf:params:xml:ns:xcal'), + $this->location); + $actobj->extra[] = array('url', + array('xmlns' => 'urn:ietf:params:xml:ns:xcal'), + $this->getUrl()); + + /* We don't use these ourselves, but we add them to be nice RSS/XML citizens */ + $actobj->extra[] = array('startdate', + array('xmlns' => 'http://purl.org/rss/1.0/modules/event/'), + common_date_iso8601($this->start_time)); + $actobj->extra[] = array('enddate', + array('xmlns' => 'http://purl.org/rss/1.0/modules/event/'), + common_date_iso8601($this->end_time)); + $actobj->extra[] = array('location', + array('xmlns' => 'http://purl.org/rss/1.0/modules/event/'), + $this->location); + + return $actobj; + } } diff --git a/plugins/Event/classes/RSVP.php b/plugins/Event/classes/RSVP.php index bda502b8d0..3eba0e95be 100644 --- a/plugins/Event/classes/RSVP.php +++ b/plugins/Event/classes/RSVP.php @@ -128,6 +128,7 @@ class RSVP extends Managed_DataObject static function saveActivityObject(Activity $act, Notice $stored) { $target = Notice::getByKeys(array('uri'=>$act->target->id)); + common_debug(_ve('TARGET: '.$target)); if (!ActivityUtils::compareTypes($target->getObjectType(), [ Happening::OBJECT_TYPE ])) { throw new ClientException('RSVP not aimed at a Happening'); } @@ -159,6 +160,25 @@ class RSVP extends Managed_DataObject return $rsvp; } + static public function getObjectType() + { + return ActivityObject::ACTIVITY; + } + + public function asActivityObject() + { + $happening = $this->getEvent(); + + $actobj = new ActivityObject(); + $actobj->id = $rsvp->getUri(); + $actobj->type = self::getObjectType(); + $actobj->title = $this->asString(); + $actobj->content = $this->asString(); + $actobj->target = array($happening->asActivityObject()); + + return $actobj; + } + static function codeFor($verb) { switch (true) { diff --git a/plugins/Event/forms/rsvp.php b/plugins/Event/forms/rsvp.php index d4769955ab..72cadc0de6 100644 --- a/plugins/Event/forms/rsvp.php +++ b/plugins/Event/forms/rsvp.php @@ -97,7 +97,8 @@ class RSVPForm extends Form // TRANS: Field label on form to RSVP ("please respond") for an event. $this->out->text(_m('RSVP:')); - $this->out->hidden('event-id', $this->event->getUri(), 'event'); + $this->out->hidden('notice', $this->event->getStored()->getID(), 'event'); + $this->out->hidden('event', $this->event->getUri(), 'event'); // not used $this->out->hidden('rsvp', ''); $this->out->elementEnd('fieldset'); diff --git a/plugins/Favorite/classes/Fave.php b/plugins/Favorite/classes/Fave.php index 67726108bb..826d34a36c 100644 --- a/plugins/Favorite/classes/Fave.php +++ b/plugins/Favorite/classes/Fave.php @@ -330,7 +330,7 @@ class Fave extends Managed_DataObject static public function getObjectType() { - return 'activity'; + return ActivityObject::ACTIVITY; } public function asActivityObject(Profile $scoped=null) -- 2.39.5