*/
function isMyNotice($notice) {
$types = $this->types();
- return in_array($notice->object_type, $types);
+ return ($notice->verb == ActivityVerb::POST) && in_array($notice->object_type, $types);
}
/**
function isMyActivity($activity) {
$types = $this->types();
return (count($activity->objects) == 1 &&
+ ($activity->objects[0] instanceof ActivityObject) &&
+ ($activity->verb == ActivityVerb::POST) &&
in_array($activity->objects[0]->type, $types));
}
*
* @return boolean hook value
*/
- function onStartHandleFeedEntryWithProfile($activity, $oprofile)
+ function onStartHandleFeedEntryWithProfile($activity, $oprofile, &$notice)
{
if ($this->isMyActivity($activity)) {
$actor = $oprofile->checkAuthorship($activity);
- if (empty($actor)) {
+ if (!$actor instanceof Ostatus_profile) {
// TRANS: Client exception thrown when no author for an activity was found.
throw new ClientException(_('Cannot get author for activity.'));
}
'source' => 'ostatus');
// $actor is an ostatus_profile
- $this->saveNoticeFromActivity($activity, $actor->localProfile(), $options);
+ $notice = $this->saveNoticeFromActivity($activity, $actor->localProfile(), $options);
return false;
}
if ($target instanceof User_group) {
$uri = $target->getUri();
- if (!in_array($uri, $activity->context->attention)) {
+ if (!array_key_exists($uri, $activity->context->attention)) {
// @todo FIXME: please document (i18n).
// TRANS: Client exception thrown when ...
- throw new ClientException(_('Bookmark not posted to this group.'));
+ throw new ClientException(_('Object not posted to this group.'));
}
} else if ($target instanceof User) {
$uri = $target->uri;
$original = null;
if (!empty($activity->context->replyToID)) {
- $original = Notice::staticGet('uri',
+ $original = Notice::getKV('uri',
$activity->context->replyToID);
}
- if (!in_array($uri, $activity->context->attention) &&
+ if (!array_key_exists($uri, $activity->context->attention) &&
(empty($original) ||
$original->profile_id != $target->id)) {
// @todo FIXME: Please document (i18n).
$options = array('source' => 'atompub');
// $user->getProfile() is a Profile
- $this->saveNoticeFromActivity($activity,
- $user->getProfile(),
- $options);
+ $notice = $this->saveNoticeFromActivity($activity,
+ $user->getProfile(),
+ $options);
return false;
}