function isMyVerb($verb) {
$verb = $verb ?: ActivityVerb::POST; // post is the default verb
- return ActivityUtils::compareTypes($verb, $this->verbs());
+ return ActivityUtils::compareVerbs($verb, $this->verbs());
}
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());
}
* @fixme are there any standard options?
*
* @param Activity $activity
- * @param Profile $actor
+ * @param Notice $stored The notice in our database for this certain object
* @param array $options=array()
*
- * @return Notice the resulting notice
+ * @return object If the verb handling plugin creates an object, it can be returned here (otherwise true)
+ * @throws exception On any error.
*/
protected function saveObjectFromActivity(Activity $activity, Notice $stored, array $options=array())
{
* This usually gets called from Notice::saveActivity after a Notice object has been created,
* so it contains a proper id and a uri for the object to be saved.
*/
- public function onStoreActivityObject(Activity $act, Notice $stored, array $options=array(), &$object) {
+ public function onStoreActivityObject(Activity $act, Notice $stored, array $options, &$object) {
// $this->oldSaveNew is there during a migration period of plugins, to start using
// Notice::saveActivity instead of Notice::saveNew
if (!$this->isMyActivity($act) || isset($this->oldSaveNew)) {
return true;
}
$object = $this->saveObjectFromActivity($act, $stored, $options);
- try {
- $act->context->attention = array_merge($act->context->attention, $object->getAttentionArray());
- } catch (Exception $e) {
- common_debug('WARNING: Could not get attention list from object '.get_class($object).'!');
- }
return false;
}
protected function notifyMentioned(Notice $stored, array &$mentioned_ids)
{
// pass through silently by default
+
+ // If we want to stop any other plugin from notifying based on this activity, return false instead.
+ return true;
}
/**
*
* @return boolean hook value
*/
- function onNoticeDeleteRelated(Notice $notice)
+ public function onNoticeDeleteRelated(Notice $notice)
{
if ($this->isMyNotice($notice)) {
- $this->deleteRelated($notice);
+ try {
+ $this->deleteRelated($notice);
+ } catch (AlreadyFulfilledException $e) {
+ // Nothing to see here, it's obviously already gone...
+ }
}
// Always continue this event in our activity handling plugins.
return true;
}
- $this->notifyMentioned($stored, $mentioned_ids);
-
- // If it was _our_ notice, only we should do anything with the mentions.
- return false;
+ return $this->notifyMentioned($stored, $mentioned_ids);
}
/**
return true;
}
- try {
- $object = $this->activityObjectFromNotice($notice);
- } catch (NoResultException $e) {
- $object = null; // because getKV returns null on failure
- }
+ $object = $this->activityObjectFromNotice($notice);
return false;
}
if (!$this->isMyActivity($activity)) {
return true;
}
+ if (!isset($this->oldSaveNew)) {
+ // Handle saveActivity in OStatus class for incoming salmon, remove this event
+ // handler when all plugins have gotten rid of "oldSaveNew".
+ return true;
+ }
- $this->log(LOG_INFO, "Checking {$activity->id} as a valid Salmon slap.");
+ $this->log(LOG_INFO, get_called_class()." checking {$activity->id} as a valid Salmon slap.");
if ($target instanceof User_group || $target->isGroup()) {
$uri = $target->getUri();
} elseif ($target instanceof Profile && $target->isLocal()) {
$original = null;
// FIXME: Shouldn't favorites show up with a 'target' activityobject?
- if (!ActivityUtils::compareTypes($activity->verb, array(ActivityVerb::POST)) && isset($activity->objects[0])) {
+ if (!ActivityUtils::compareVerbs($activity->verb, array(ActivityVerb::POST)) && isset($activity->objects[0])) {
// If this is not a post, it's a verb targeted at something (such as a Favorite attached to a note)
if (!empty($activity->objects[0]->id)) {
$activity->context->replyToID = $activity->objects[0]->id;
$actor = $oactor->localProfile();
// FIXME: will this work in all cases? I made it work for Favorite...
- if (ActivityUtils::compareTypes($activity->verb, array(ActivityVerb::POST))) {
+ if (ActivityUtils::compareVerbs($activity->verb, array(ActivityVerb::POST))) {
$object = $activity->objects[0];
} else {
$object = $activity;
'is_local' => Notice::REMOTE,
'source' => 'ostatus');
- if (!isset($this->oldSaveNew)) {
- $notice = Notice::saveActivity($activity, $actor, $options);
- } else {
- $notice = $this->saveNoticeFromActivity($activity, $actor, $options);
- }
+ $notice = $this->saveNoticeFromActivity($activity, $actor, $options);
return false;
}
/**
* Handle object posted via AtomPub
*
- * @param Activity &$activity Activity that was posted
- * @param User $user User that posted it
+ * @param Activity $activity Activity that was posted
+ * @param Profile $scoped Profile of user posting
* @param Notice &$notice Resulting notice
*
* @return boolean hook value
*/
- function onStartAtomPubNewActivity(Activity &$activity, $user, &$notice)
+ public function onStartAtomPubNewActivity(Activity $activity, Profile $scoped, Notice &$notice=null)
{
if (!$this->isMyActivity($activity)) {
return true;
$options = array('source' => 'atompub');
- // $user->getProfile() is a Profile
- $notice = $this->saveNoticeFromActivity($activity,
- $user->getProfile(),
- $options);
+ $notice = $this->saveNoticeFromActivity($activity, $scoped, $options);
return false;
}
try {
$this->showNoticeListItem($nli);
} catch (Exception $e) {
- $nli->out->element('p', 'error', 'Error showing notice: '.htmlspecialchars($e->getMessage()));
+ common_log(LOG_ERR, 'Error showing notice '.$nli->getNotice()->getID().': ' . $e->getMessage());
+ $nli->out->element('p', 'error', sprintf(_('Error showing notice: %s'), $e->getMessage()));
}
Event::handle('EndShowNoticeItem', array($nli));
protected function showNoticeListItem(NoticeListItem $nli)
{
- $nli->showNotice();
- $nli->showNoticeAttachments();
- $nli->showNoticeInfo();
- $nli->showNoticeOptions();
-
- $nli->showNoticeLink();
- $nli->showNoticeSource();
- $nli->showNoticeLocation();
- $nli->showContext();
- $nli->showRepeat();
-
- $nli->showNoticeOptions();
+ $nli->showNoticeHeaders();
+ $nli->showContent();
+ $nli->showNoticeFooter();
+ }
+
+ public function onStartShowNoticeItemNotice(NoticeListItem $nli)
+ {
+ if (!$this->isMyNotice($nli->notice)) {
+ return true;
+ }
+
+ $this->showNoticeItemNotice($nli);
+
+ Event::handle('EndShowNoticeItemNotice', array($nli));
+ return false;
+ }
+
+ protected function showNoticeItemNotice(NoticeListItem $nli)
+ {
+ $nli->showNoticeTitle();
+ $nli->showAuthor();
+ $nli->showAddressees();
+ $nli->showContent();
}
public function onStartShowNoticeContent(Notice $stored, HTMLOutputter $out, Profile $scoped=null)
return true;
}
- $out->text($stored->getContent());
+ try {
+ $this->showNoticeContent($stored, $out, $scoped);
+ } catch (Exception $e) {
+ $out->element('div', 'error', $e->getMessage());
+ }
return false;
}
+
+ protected function showNoticeContent(Notice $stored, HTMLOutputter $out, Profile $scoped=null)
+ {
+ $out->text($stored->getContent());
+ }
}
projects / quix0rs-gnu-social.git / blobdiff