$notice->uri = $uri;
$notice->url = $url;
+ // Get the groups here so we can figure out replies and such
+
+ if (!isset($groups)) {
+ $groups = self::groupsFromText($notice->content, $profile);
+ }
+
+ $reply = null;
+
// Handle repeat case
if (isset($repeat_of)) {
$repeat = Notice::staticGet('id', $repeat_of);
if (empty($repeat)) {
+ // TRANS: Client exception thrown in notice when trying to repeat a missing or deleted notice.
throw new ClientException(_('Cannot repeat; original notice is missing or deleted.'));
}
$notice->repeat_of = $repeat_of;
} else {
- $notice->reply_to = self::getReplyTo($reply_to, $profile_id, $source, $final);
- }
+ $reply = self::getReplyTo($reply_to, $profile_id, $source, $final);
+
+ if (!empty($reply)) {
+
+ if (!$reply->inScope($profile)) {
+ // TRANS: Client error displayed when trying to reply to a notice a the target has no access to.
+ // TRANS: %1$s is a user nickname, %2$d is a notice ID (number).
+ throw new ClientException(sprintf(_('%1$s has no access to notice %2$d.'),
+ $profile->nickname, $reply->id), 403);
+ }
+
+ $notice->reply_to = $reply->id;
+ $notice->conversation = $reply->conversation;
- if (!empty($notice->reply_to)) {
- $reply = Notice::staticGet('id', $notice->reply_to);
- if (!$reply->inScope($profile)) {
- // TRANS: Client error displayed when trying to reply to a notice a the target has no access to.
- // TRANS: %1$s is a user nickname, %2$d is a notice ID (number).
- throw new ClientException(sprintf(_('%1$s has no access to notice %2$d.'),
- $profile->nickname, $reply->id), 403);
+ // 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 ($profile->isMember($group)) {
+ $groups[] = $group->id;
+ }
+ }
+ }
+
+ // Scope set below
}
- $notice->conversation = $reply->conversation;
}
if (!empty($lat) && !empty($lon)) {
}
if (is_null($scope)) { // 0 is a valid value
- $notice->scope = common_config('notice', 'defaultscope');
+ if (!empty($reply)) {
+ $notice->scope = $reply->scope;
+ } else {
+ $notice->scope = common_config('notice', 'defaultscope');
+ }
} else {
$notice->scope = $scope;
}
+ // For private streams
+
+ $user = $profile->getUser();
+
+ if (!empty($user)) {
+ if ($user->private_stream &&
+ ($notice->scope == Notice::PUBLIC_SCOPE ||
+ $notice->scope == Notice::SITE_SCOPE)) {
+ $notice->scope |= Notice::FOLLOWER_SCOPE;
+ }
+ }
+
+ // Force the scope for private groups
+
+ foreach ($groups as $groupId) {
+ $group = User_group::staticGet('id', $groupId);
+ if (!empty($group)) {
+ if ($group->force_scope) {
+ $notice->scope |= Notice::GROUP_SCOPE;
+ break;
+ }
+ }
+ }
+
if (Event::handle('StartNoticeSave', array(&$notice))) {
// XXX: some of these functions write to the DB
// Note: groups may save tags, so must be run after tags are saved
// to avoid errors on duplicates.
- if (isset($groups)) {
- $notice->saveKnownGroups($groups);
+ // Note: groups should always be set.
+
+ $notice->saveKnownGroups($groups);
+
+ if (isset($peopletags)) {
+ $notice->saveProfileTags($peopletags);
} else {
- $notice->saveGroups();
+ $notice->saveProfileTags();
}
if (isset($urls)) {
}
$users = $this->getSubscribedUsers();
+ $ptags = $this->getProfileTags();
// FIXME: kind of ignoring 'transitional'...
// we'll probably stop supporting inboxless mode
}
}
+ foreach ($ptags as $ptag) {
+ $users = $ptag->getUserSubscribers();
+ foreach ($users as $id) {
+ if (!array_key_exists($id, $ni)) {
+ $user = User::staticGet('id', $id);
+ if (!$user->hasBlocked($profile)) {
+ $ni[$id] = NOTICE_INBOX_SOURCE_PROFILE_TAG;
+ }
+ }
+ }
+ }
+
foreach ($recipients as $recipient) {
if (!array_key_exists($recipient, $ni)) {
$ni[$recipient] = NOTICE_INBOX_SOURCE_REPLY;
}
- }
- // Exclude any deleted, non-local, or blocking recipients.
- $profile = $this->getProfile();
- $originalProfile = null;
- if ($this->repeat_of) {
- // Check blocks against the original notice's poster as well.
- $original = Notice::staticGet('id', $this->repeat_of);
- if ($original) {
- $originalProfile = $original->getProfile();
+ // Exclude any deleted, non-local, or blocking recipients.
+ $profile = $this->getProfile();
+ $originalProfile = null;
+ if ($this->repeat_of) {
+ // Check blocks against the original notice's poster as well.
+ $original = Notice::staticGet('id', $this->repeat_of);
+ if ($original) {
+ $originalProfile = $original->getProfile();
+ }
}
- }
- foreach ($ni as $id => $source) {
- $user = User::staticGet('id', $id);
- if (empty($user) || $user->hasBlocked($profile) ||
- ($originalProfile && $user->hasBlocked($originalProfile))) {
- unset($ni[$id]);
+ foreach ($ni as $id => $source) {
+ $user = User::staticGet('id', $id);
+ if (empty($user) || $user->hasBlocked($profile) ||
+ ($originalProfile && $user->hasBlocked($originalProfile))) {
+ unset($ni[$id]);
+ }
}
}
return $ids;
}
+ function getProfileTags()
+ {
+ // Don't save ptags for repeats, for now.
+
+ if (!empty($this->repeat_of)) {
+ return array();
+ }
+
+ // XXX: cache me
+
+ $ptags = array();
+
+ $ptagi = new Profile_tag_inbox();
+
+ $ptagi->selectAdd();
+ $ptagi->selectAdd('profile_tag_id');
+
+ $ptagi->notice_id = $this->id;
+
+ if ($ptagi->find()) {
+ while ($ptagi->fetch()) {
+ $profile_list = Profile_list::staticGet('id', $ptagi->profile_tag_id);
+ if ($profile_list) {
+ $ptags[] = $profile_list;
+ }
+ }
+ }
+
+ $ptagi->free();
+
+ return $ptags;
+ }
+
/**
* Record this notice to the given group inboxes for delivery.
* Overrides the regular parsing of !group markup.
common_log_db_error($gi, 'INSERT', __FILE__);
}
- // @fixme should we save the tags here or not?
+ // we automatically add a tag for every group name, too
+
+ $tag = Notice_tag::pkeyGet(array('tag' => common_canonical_tag($group->nickname),
+ 'notice_id' => $this->id));
+
+ if (is_null($tag)) {
+ $this->saveTag($group->nickname);
+ }
+
$groups[] = clone($group);
} else {
common_log(LOG_ERR, "Local delivery to group id $id skipped, doesn't exist");
return array();
}
- $groups = array();
-
- /* extract all !group */
- $count = preg_match_all('/(?:^|\s)!(' . Nickname::DISPLAY_FMT . ')/',
- strtolower($this->content),
- $match);
- if (!$count) {
- return $groups;
- }
-
$profile = $this->getProfile();
+ $groups = self::groupsFromText($this->content, $profile);
+
/* Add them to the database */
- foreach (array_unique($match[1]) as $nickname) {
+ foreach ($groups as $group) {
/* XXX: remote groups. */
- $group = User_group::getForNickname($nickname, $profile);
if (empty($group)) {
continue;
}
- // we automatically add a tag for every group name, too
-
- $tag = Notice_tag::pkeyGet(array('tag' => common_canonical_tag($nickname),
- 'notice_id' => $this->id));
-
- if (is_null($tag)) {
- $this->saveTag($nickname);
- }
if ($profile->isMember($group)) {
return true;
}
+ /**
+ * record targets into profile_tag_inbox.
+ * @return array of Profile_list objects
+ */
+ function saveProfileTags($known=array())
+ {
+ // Don't save ptags for repeats, for now
+
+ if (!empty($this->repeat_of)) {
+ return array();
+ }
+
+ if (is_array($known)) {
+ $ptags = $known;
+ } else {
+ $ptags = array();
+ }
+
+ $ptag = new Profile_tag();
+ $ptag->tagged = $this->profile_id;
+
+ if($ptag->find()) {
+ while($ptag->fetch()) {
+ $plist = Profile_list::getByTaggerAndTag($ptag->tagger, $ptag->tag);
+ $ptags[] = clone($plist);
+ }
+ }
+
+ foreach ($ptags as $target) {
+ $this->addToProfileTagInbox($target);
+ }
+
+ return $ptags;
+ }
+
+ function addToProfileTagInbox($plist)
+ {
+ $ptagi = Profile_tag_inbox::pkeyGet(array('profile_tag_id' => $plist->id,
+ 'notice_id' => $this->id));
+
+ if (empty($ptagi)) {
+
+ $ptagi = new Profile_tag_inbox();
+
+ $ptagi->query('BEGIN');
+ $ptagi->profile_tag_id = $plist->id;
+ $ptagi->notice_id = $this->id;
+ $ptagi->created = $this->created;
+
+ $result = $ptagi->insert();
+ if (!$result) {
+ common_log_db_error($ptagi, 'INSERT', __FILE__);
+ throw new ServerException(_('Problem saving profile_tag inbox.'));
+ }
+
+ $ptagi->query('COMMIT');
+
+ self::blow('profile_tag:notice_ids:%d', $ptagi->profile_tag_id);
+ }
+
+ return true;
+ }
+
/**
* Save reply records indicating that this notice needs to be
* delivered to the local users with the given URIs.
if (!empty($reply_to)) {
$reply_notice = Notice::staticGet('id', $reply_to);
if (!empty($reply_notice)) {
- return $reply_to;
+ return $reply_notice;
}
}
$last = $recipient->getCurrentNotice();
if (!empty($last)) {
- return $last->id;
+ return $last;
}
+
+ return null;
}
static function maxContent()
* Users on the site who are not mentioned in the notice will not be able to see the
* notice.
*
- * @param Profile $profile The profile to check
+ * @param Profile $profile The profile to check; pass null to check for public/unauthenticated users.
*
* @return boolean whether the profile is in the notice's scope
*/
return true;
}
+
+ static function groupsFromText($text, $profile)
+ {
+ $groups = array();
+
+ /* extract all !group */
+ $count = preg_match_all('/(?:^|\s)!(' . Nickname::DISPLAY_FMT . ')/',
+ strtolower($text),
+ $match);
+
+ if (!$count) {
+ return $groups;
+ }
+
+ foreach (array_unique($match[1]) as $nickname) {
+ $group = User_group::getForNickname($nickname, $profile);
+ if (!empty($group) && $profile->isMember($group)) {
+ $groups[] = $group->id;
+ }
+ }
+
+ return $groups;
+ }
}
projects / quix0rs-gnu-social.git / blobdiff