return $this->content;
}
+ public function getRendered()
+ {
+ return $this->rendered;
+ }
+
/*
* Get the original representation URL of this notice.
*
}
}
- public function get_object_type($canonical=false) {
- return $canonical
- ? ActivityObject::canonicalType($this->object_type)
- : $this->object_type;
- }
-
- // activity plugins tend to use this function instead, but it's the same
- public function getObjectType()
- {
- return $this->get_object_type();
+ public function getObjectType($canonical=false) {
+ return ActivityUtils::resolveUri($this->object_type, $canonical);
}
public static function getByUri($uri)
$defaults = array(
'groups' => array(),
- 'is_local' => self::LOCAL_PUBLIC,
+ 'is_local' => $actor->isLocal() ? self::LOCAL_PUBLIC : self::REMOTE,
'mentions' => array(),
'reply_to' => null,
'repeat_of' => null,
}
extract($options, EXTR_SKIP);
+ // dupe check
$stored = new Notice();
- if (!empty($uri)) {
+ if (!empty($uri) && !ActivityUtils::compareVerbs($act->verb, array(ActivityVerb::DELETE))) {
$stored->uri = $uri;
if ($stored->find()) {
common_debug('cannot create duplicate Notice URI: '.$stored->uri);
- throw new Exception('Notice URI already exists');
+ // I _assume_ saving a Notice with a colliding URI means we're really trying to
+ // save the same notice again...
+ throw new AlreadyFulfilledException('Notice URI already exists');
+ }
+ }
+
+ $autosource = common_config('public', 'autosource');
+
+ // Sandboxed are non-false, but not 1, either
+ if (!$actor->hasRight(Right::PUBLICNOTICE) ||
+ ($source && $autosource && in_array($source, $autosource))) {
+ // FIXME: ...what about remote nonpublic? Hmmm. That is, if we sandbox remote profiles...
+ $stored->is_local = Notice::LOCAL_NONPUBLIC;
+ } else {
+ $stored->is_local = intval($is_local);
+ }
+
+ if (!$stored->isLocal()) {
+ // Only do these checks for non-local notices. Local notices will generate these values later.
+ if (!common_valid_http_url($url)) {
+ common_debug('Bad notice URL: ['.$url.'], URI: ['.$uri.']. Cannot link back to original! This is normal for shared notices etc.');
+ }
+ if (empty($uri)) {
+ throw new ServerException('No URI for remote notice. Cannot accept that.');
}
}
// Use the local user's shortening preferences, if applicable.
$stored->rendered = $actor->isLocal()
? $actor->shortenLinks($act->content)
- : $act->content;
+ : common_purify($act->content);
$stored->content = common_strip_html($stored->rendered);
- $autosource = common_config('public', 'autosource');
-
- // Sandboxed are non-false, but not 1, either
- if (!$actor->hasRight(Right::PUBLICNOTICE) ||
- ($source && $autosource && in_array($source, $autosource))) {
- $stored->is_local = Notice::LOCAL_NONPUBLIC;
- } else {
- $stored->is_local = $is_local;
- }
-
// Maybe a missing act-time should be fatal if the actor is not local?
if (!empty($act->time)) {
$stored->created = common_sql_date($act->time);
// If the original is private to a group, and notice has no group specified,
// make it to the same group(s)
if (empty($groups) && ($reply->scope & Notice::GROUP_SCOPE)) {
- $groups = array();
$replyGroups = $reply->getGroups();
foreach ($replyGroups as $group) {
if ($actor->isMember($group)) {
$urls[] = $href;
}
+ if (ActivityUtils::compareVerbs($stored->verb, array(ActivityVerb::POST))) {
+ if (empty($act->objects[0]->type)) {
+ // Default type for the post verb is 'note', but we know it's
+ // a 'comment' if it is in reply to something.
+ $stored->object_type = empty($stored->reply_to) ? ActivityObject::NOTE : ActivityObject::COMMENT;
+ } else {
+ //TODO: Is it safe to always return a relative URI? The
+ // JSON version of ActivityStreams always use it, so we
+ // should definitely be able to handle it...
+ $stored->object_type = ActivityUtils::resolveUri($act->objects[0]->type, true);
+ }
+ }
+
if (Event::handle('StartNoticeSave', array(&$stored))) {
// XXX: some of these functions write to the DB
try {
- $stored->insert(); // throws exception on error
+ $result = $stored->insert(); // throws exception on error
if ($notloc instanceof Notice_location) {
$notloc->notice_id = $stored->getID();
$object = null;
Event::handle('StoreActivityObject', array($act, $stored, $options, &$object));
if (empty($object)) {
- throw new ServerException('Unsuccessful call to StoreActivityObject '.$stored->uri . ': '.$act->asString());
+ throw new ServerException('Unsuccessful call to StoreActivityObject '.$stored->getUri() . ': '.$act->asString());
}
// If it's not part of a conversation, it's the beginning
// Save per-notice metadata...
$mentions = array();
- $groups = array();
+ $group_ids = array();
// This event lets plugins filter out non-local recipients (attentions we don't care about)
// Used primarily for OStatus (and if we don't federate, all attentions would be local anyway)
- Event::handle('GetLocalAttentions', array($actor, $act->context->attention, &$mentions, &$groups));
+ Event::handle('GetLocalAttentions', array($actor, $act->context->attention, &$mentions, &$group_ids));
if (!empty($mentions)) {
$stored->saveKnownReplies($mentions);
// to avoid errors on duplicates.
// Note: groups should always be set.
- $stored->saveKnownGroups($groups);
+ $stored->saveKnownGroups($group_ids);
if (!empty($urls)) {
$stored->saveKnownUrls($urls);
}
static public function figureOutScope(Profile $actor, array $groups, $scope=null) {
- if (is_null($scope)) {
- $scope = self::defaultScope();
- }
+ $scope = is_null($scope) ? self::defaultScope() : intval($scope);
// For private streams
try {
$user = $actor->getUser();
// FIXME: We can't do bit comparison with == (Legacy StatusNet thing. Let's keep it for now.)
- if ($user->private_stream && ($scope == Notice::PUBLIC_SCOPE || $scope == Notice::SITE_SCOPE)) {
+ if ($user->private_stream && ($scope === Notice::PUBLIC_SCOPE || $scope === Notice::SITE_SCOPE)) {
$scope |= Notice::FOLLOWER_SCOPE;
}
} catch (NoSuchUserException $e) {
* best with generalizations on user_group to support
* remote groups better.
*/
- function saveKnownGroups($group_ids)
+ function saveKnownGroups(array $group_ids)
{
- if (!is_array($group_ids)) {
- // TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
- throw new ServerException(_('Bad type provided to saveKnownGroups.'));
- }
-
$groups = array();
foreach (array_unique($group_ids) as $id) {
$group = User_group::getKV('id', $id);
return;
}
- $sender = Profile::getKV($this->profile_id);
+ $sender = $this->getProfile();
foreach (array_unique($uris) as $uri) {
try {
continue;
}
- $this->saveReply($profile->id);
- self::blow('reply:stream:%d', $profile->id);
+ $this->saveReply($profile->getID());
+ self::blow('reply:stream:%d', $profile->getID());
}
-
- return;
}
/**
function sendReplyNotifications()
{
// Don't send reply notifications for repeats
-
if ($this->isRepeat()) {
return array();
}
require_once INSTALLDIR.'/lib/mail.php';
foreach ($recipientIds as $recipientId) {
- $user = User::getKV('id', $recipientId);
- if ($user instanceof User) {
+ try {
+ $user = User::getByID($recipientId);
mail_notify_attn($user, $this);
+ } catch (NoResultException $e) {
+ // No such user
}
}
Event::handle('EndNotifyMentioned', array($this, $recipientIds));
$this->uri = sprintf('%s%s=%d:%s=%s',
TagURI::mint(),
'noticeId', $this->id,
- 'objectType', $this->get_object_type(true));
+ 'objectType', $this->getObjectType(true));
$changed = true;
}
public function isLocal()
{
- return ($this->is_local == Notice::LOCAL_PUBLIC ||
- $this->is_local == Notice::LOCAL_NONPUBLIC);
+ $is_local = intval($this->is_local);
+ return ($is_local === self::LOCAL_PUBLIC || $is_local === self::LOCAL_NONPUBLIC);
+ }
+
+ public function getScope()
+ {
+ return intval($this->scope);
}
public function isRepeat()
protected function _inScope($profile)
{
- if (!is_null($this->scope)) {
- $scope = $this->scope;
- } else {
- $scope = self::defaultScope();
- }
+ $scope = is_null($this->scope) ? self::defaultScope() : $this->getScope();
- if ($scope == 0 && !$this->getProfile()->isPrivateStream()) { // Not scoping, so it is public.
+ if ($scope === 0 && !$this->getProfile()->isPrivateStream()) { // Not scoping, so it is public.
return !$this->isHiddenSpam($profile);
}
public function getParent()
{
+ $reply_to_id = null;
+
if (empty($this->reply_to)) {
throw new NoParentNoticeException($this);
}
- return self::getByID($this->reply_to);
+
+ // The reply_to ID in the table Notice could exist with a number
+ // however, the replied to notice might not exist in the database.
+ // Thus we need to catch the exception and throw the NoParentNoticeException else
+ // the timeline will not display correctly.
+ try {
+ $reply_to_id = self::getByID($this->reply_to);
+ } catch(Exception $e){
+ throw new NoParentNoticeException($this);
+ }
+
+
+ return $reply_to_id;
}
/**
projects / quix0rs-gnu-social.git / blobdiff