* @link http://status.net/
*/
-if (!defined('STATUSNET')) {
- // This check helps protect against security problems;
- // your code file can't be executed directly from the web.
- exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
/**
* Class comment
$done = null;
- if (Event::handle('StartImportActivity',
- array($user, $author, $activity, $trusted, &$done))) {
- try {
+ try {
+ if (Event::handle('StartImportActivity',
+ array($user, $author, $activity, $trusted, &$done))) {
switch ($activity->verb) {
case ActivityVerb::FOLLOW:
$this->subscribeProfile($user, $author, $activity);
Event::handle('EndImportActivity',
array($user, $author, $activity, $trusted));
$done = true;
- } catch (ClientException $ce) {
- common_log(LOG_WARNING, $ce->getMessage());
- $done = true;
- } catch (ServerException $se) {
- common_log(LOG_ERR, $se->getMessage());
- $done = false;
- } catch (Exception $e) {
- common_log(LOG_ERR, $e->getMessage());
- $done = false;
}
+ } catch (Exception $e) {
+ common_log(LOG_ERR, $e->getMessage());
+ $done = true;
}
return $done;
}
if ($activity->objects[0]->id == $author->id) {
if (!$this->trusted) {
// TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
- throw new ClientException(_("Cannot force subscription for untrusted user."));
+ throw new ClientException(_('Cannot force subscription for untrusted user.'));
}
$other = $activity->actor;
- $otherUser = User::staticGet('uri', $other->id);
+ $otherUser = User::getKV('uri', $other->id);
- if (!empty($otherUser)) {
- $otherProfile = $otherUser->getProfile();
- } else {
- // TRANS: Client exception thrown when trying to for a remote user to subscribe.
- throw new Exception(_("Cannot force remote user to subscribe."));
+ if (!$otherUser instanceof User) {
+ // TRANS: Client exception thrown when trying to force a remote user to subscribe.
+ throw new Exception(_('Cannot force remote user to subscribe.'));
}
+ $otherProfile = $otherUser->getProfile();
+
// XXX: don't do this for untrusted input!
- Subscription::start($otherProfile, $profile);
+ Subscription::ensureStart($otherProfile, $profile);
} else if (empty($activity->actor)
|| $activity->actor->id == $author->id) {
$other = $activity->objects[0];
- $otherProfile = Profile::fromUri($other->id);
-
- if (empty($otherProfile)) {
+ try {
+ $otherProfile = Profile::fromUri($other->id);
// TRANS: Client exception thrown when trying to subscribe to an unknown profile.
- throw new ClientException(_("Unknown profile."));
+ } catch (UnknownUriException $e) {
+ // Let's convert it to a client exception instead of server.
+ throw new ClientException(_('Unknown profile.'));
}
- Subscription::start($profile, $otherProfile);
+ Subscription::ensureStart($profile, $otherProfile);
} else {
// TRANS: Client exception thrown when trying to import an event not related to the importing user.
- throw new Exception(_("This activity seems unrelated to our user."));
+ throw new Exception(_('This activity seems unrelated to our user.'));
}
}
$uri = $activity->objects[0]->id;
- $group = User_group::staticGet('uri', $uri);
+ $group = User_group::getKV('uri', $uri);
- if (empty($group)) {
+ if (!$group instanceof User_group) {
$oprofile = Ostatus_profile::ensureActivityObjectProfile($activity->objects[0]);
if (!$oprofile->isGroup()) {
// TRANS: Client exception thrown when trying to join a remote group that is not a group.
- throw new ClientException(_("Remote profile is not a group!"));
+ throw new ClientException(_('Remote profile is not a group!'));
}
$group = $oprofile->localGroup();
}
throw new ClientException(_("User is already a member of this group."));
}
- if (Event::handle('StartJoinGroup', array($group, $user))) {
- Group_member::join($group->id, $user->id);
- Event::handle('EndJoinGroup', array($group, $user));
- }
+ $user->joinGroup($group);
}
// XXX: largely cadged from Ostatus_profile::processNote()
$sourceUri = $note->id;
- $notice = Notice::staticGet('uri', $sourceUri);
+ $notice = Notice::getKV('uri', $sourceUri);
- if (!empty($notice)) {
+ if ($notice instanceof Notice) {
common_log(LOG_INFO, "Notice {$sourceUri} already exists.");
$uri = $profile->getUri();
- if ($uri == $author->id) {
- common_log(LOG_INFO, "Updating notice author from $author->id to $user->uri");
+ if ($uri === $author->id) {
+ common_log(LOG_INFO, sprintf('Updating notice author from %s to %s', $author->id, $user->getUri()));
$orig = clone($notice);
$notice->profile_id = $user->id;
$notice->update($orig);
} else {
// TRANS: Client exception thrown when trying to import a notice by another user.
// TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
- throw new ClientException(sprintf(_("Already know about notice %1$s and ".
- " it has a different author %2$s."),
+ throw new ClientException(sprintf(_('Already know about notice %1$s and '.
+ ' it has a different author %2$s.'),
$sourceUri, $uri));
}
} else {
// TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
- throw new ClientException(_("Not overwriting author info for non-trusted user."));
+ throw new ClientException(_('Not overwriting author info for non-trusted user.'));
}
}
// @fixme fetch from $sourceUrl?
// TRANS: Client exception thrown when trying to import a notice without content.
// TRANS: %s is the notice URI.
- throw new ClientException(sprintf(_("No content for notice %s."),$sourceUri));
+ throw new ClientException(sprintf(_('No content for notice %s.'),$sourceUri));
}
// Get (safe!) HTML and text versions of the content
- $rendered = $this->purify($sourceContent);
- $content = html_entity_decode(strip_tags($rendered), ENT_QUOTES, 'UTF-8');
+ $rendered = common_purify($sourceContent);
+ $content = common_strip_html($rendered);
$shortened = $user->shortenLinks($content);
// Maintain direct reply associations
// @fixme what about conversation ID?
if (!empty($activity->context->replyToID)) {
- $orig = Notice::staticGet('uri',
- $activity->context->replyToID);
- if (!empty($orig)) {
+ $orig = Notice::getKV('uri', $activity->context->replyToID);
+ if ($orig instanceof Notice) {
$options['reply_to'] = $orig->id;
}
}
return $saved;
}
- function filterAttention($attn)
+ protected function filterAttention(array $attn)
{
- $groups = array();
- $replies = array();
+ $groups = array(); // TODO: context->attention
+ $replies = array(); // TODO: context->attention
- foreach (array_unique($attn) as $recipient) {
+ foreach ($attn as $recipient=>$type) {
// Is the recipient a local user?
- $user = User::staticGet('uri', $recipient);
+ $user = User::getKV('uri', $recipient);
- if ($user) {
- // @fixme sender verification, spam etc?
+ if ($user instanceof User) {
+ // TODO: @fixme sender verification, spam etc?
$replies[] = $recipient;
continue;
}
// Is the recipient a remote group?
$oprofile = Ostatus_profile::ensureProfileURI($recipient);
- if ($oprofile) {
+ if ($oprofile instanceof Ostatus_profile) {
if (!$oprofile->isGroup()) {
// may be canonicalized or something
$replies[] = $oprofile->uri;
}
// Is the recipient a local group?
- // @fixme uri on user_group isn't reliable yet
- // $group = User_group::staticGet('uri', $recipient);
+ // TODO: @fixme uri on user_group isn't reliable yet
+ // $group = User_group::getKV('uri', $recipient);
$id = OStatusPlugin::localGroupFromUrl($recipient);
if ($id) {
- $group = User_group::staticGet('id', $id);
- if ($group) {
+ $group = User_group::getKV('id', $id);
+ if ($group instanceof User_group) {
// Deliver to all members of this local group if allowed.
- $profile = $sender->localProfile();
- if ($profile->isMember($group)) {
+ $profile = Profile::getKV('id', $recipient);
+
+ if (($profile instanceof Profile) && ($profile->isMember($group))) {
$groups[] = $group->id;
} else {
common_log(LOG_INFO, "Skipping reply to local group {$group->nickname} as sender {$profile->id} is not a member");
return array($groups, $replies);
}
-
-
- function purify($content)
- {
- require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php';
-
- $config = array('safe' => 1,
- 'deny_attribute' => 'id,style,on*');
-
- return htmLawed($content, $config);
- }
}
projects / quix0rs-gnu-social.git / blobdiff