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.
*
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();
}
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());
}
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;
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');
}
$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();
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();
$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
*
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...");
}
}
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;
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;
}
$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');
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()));
}
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;
+ }
}
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');
}
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) {
// 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');
static public function getObjectType()
{
- return 'activity';
+ return ActivityObject::ACTIVITY;
}
public function asActivityObject(Profile $scoped=null)
projects / quix0rs-gnu-social.git / commitdiff