X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FOStatus%2Factions%2Fusersalmon.php;h=483de9e50737d0551d68d08599150084055eee20;hb=4651c9d94a19bc66494255629833bf44fed455e0;hp=06a72bf0244331be868a790eb38b6bd3f7697ae3;hpb=12eee30586dbac883e39adf453586ffef9189214;p=quix0rs-gnu-social.git
diff --git a/plugins/OStatus/actions/usersalmon.php b/plugins/OStatus/actions/usersalmon.php
index 06a72bf024..483de9e507 100644
--- a/plugins/OStatus/actions/usersalmon.php
+++ b/plugins/OStatus/actions/usersalmon.php
@@ -17,15 +17,14 @@
* along with this program. If not, see .
*/
-/**
- * @package OStatusPlugin
- * @author James Walker
- */
-
if (!defined('STATUSNET')) {
exit(1);
}
+/**
+ * @package OStatusPlugin
+ * @author James Walker
+ */
class UsersalmonAction extends SalmonAction
{
function prepare($args)
@@ -35,15 +34,19 @@ class UsersalmonAction extends SalmonAction
$id = $this->trimmed('id');
if (!$id) {
- $this->clientError(_('No ID.'));
+ // TRANS: Client error displayed trying to perform an action without providing an ID.
+ $this->clientError(_m('No ID.'));
}
$this->user = User::staticGet('id', $id);
if (empty($this->user)) {
- $this->clientError(_('No such user.'));
+ // TRANS: Client error displayed when referring to a non-existing user.
+ $this->clientError(_m('No such user.'));
}
+ $this->target = $this->user;
+
return true;
}
@@ -66,7 +69,8 @@ class UsersalmonAction extends SalmonAction
case ActivityObject::COMMENT:
break;
default:
- throw new ClientException("Can't handle that kind of post.");
+ // TRANS: Client exception thrown when an undefied activity is performed.
+ throw new ClientException(_m('Cannot handle that kind of post.'));
}
// Notice must either be a) in reply to a notice by this user
@@ -78,20 +82,24 @@ class UsersalmonAction extends SalmonAction
if (!empty($context->replyToID)) {
$notice = Notice::staticGet('uri', $context->replyToID);
if (empty($notice)) {
- throw new ClientException("In reply to unknown notice");
+ // TRANS: Client exception.
+ throw new ClientException(_m('In reply to unknown notice.'));
}
if ($notice->profile_id != $this->user->id &&
!in_array($this->user->id, $notice->getReplies())) {
- throw new ClientException("In reply to a notice not by this user and not mentioning this user");
+ // TRANS: Client exception.
+ throw new ClientException(_m('In reply to a notice not by this user and not mentioning this user.'));
}
} else if (!empty($context->attention)) {
if (!in_array($this->user->uri, $context->attention) &&
!in_array(common_profile_url($this->user->nickname), $context->attention)) {
common_log(LOG_ERR, "{$this->user->uri} not in attention list (".implode(',', $context->attention).")");
- throw new ClientException("To the attention of user(s) not including this one!");
+ // TRANS: Client exception.
+ throw new ClientException(_m('To the attention of user(s), not including this one.'));
}
} else {
- throw new ClientException("Not to anyone in reply to anything!");
+ // TRANS: Client exception.
+ throw new ClientException(_m('Not to anyone in reply to anything.'));
}
$existing = Notice::staticGet('uri', $this->activity->objects[0]->id);
@@ -108,7 +116,6 @@ class UsersalmonAction extends SalmonAction
* We've gotten a follow/subscribe notification from a remote user.
* Save a subscription relationship for them.
*/
-
function handleFollow()
{
$oprofile = $this->ensureProfile();
@@ -152,11 +159,13 @@ class UsersalmonAction extends SalmonAction
'notice_id' => $notice->id));
if (!empty($old)) {
- throw new ClientException("We already know that's a fave!");
+ // TRANS: Client exception.
+ throw new ClientException(_m('This is already a favorite.'));
}
if (!Fave::addNew($profile, $notice)) {
- throw new ClientException("Could not save new favorite.");
+ // TRANS: Client exception.
+ throw new ClientException(_m('Could not save new favorite.'));
}
}
@@ -172,12 +181,82 @@ class UsersalmonAction extends SalmonAction
$fave = Fave::pkeyGet(array('user_id' => $profile->id,
'notice_id' => $notice->id));
if (empty($fave)) {
- throw new ClientException("Notice wasn't favorited!");
+ // TRANS: Client exception.
+ throw new ClientException(_m('Notice was not favorited!'));
}
$fave->delete();
}
+ function handleTag()
+ {
+ if ($this->activity->target->type == ActivityObject::_LIST) {
+ if ($this->activity->objects[0]->type != ActivityObject::PERSON) {
+ // TRANS: Client exception.
+ throw new ClientException(_m('Not a person object.'));
+ return false;
+ }
+ // this is a peopletag
+ $tagged = User::staticGet('uri', $this->activity->objects[0]->id);
+
+ if (empty($tagged)) {
+ // TRANS: Client exception.
+ throw new ClientException(_m('Unidentified profile being tagged.'));
+ }
+
+ if ($tagged->id !== $this->user->id) {
+ // TRANS: Client exception.
+ throw new ClientException(_m('This user is not the one being tagged.'));
+ }
+
+ // save the list
+ $tagger = $this->ensureProfile();
+ $list = Ostatus_profile::ensureActivityObjectProfile($this->activity->target);
+
+ $ptag = $list->localPeopletag();
+ $result = Profile_tag::setTag($ptag->tagger, $tagged->id, $ptag->tag);
+ if (!$result) {
+ // TRANS: Client exception.
+ throw new ClientException(_m('The tag could not be saved.'));
+ }
+ }
+ }
+
+ function handleUntag()
+ {
+ if ($this->activity->target->type == ActivityObject::_LIST) {
+ if ($this->activity->objects[0]->type != ActivityObject::PERSON) {
+ // TRANS: Client exception.
+ throw new ClientException(_m('Not a person object.'));
+ return false;
+ }
+ // this is a peopletag
+ $tagged = User::staticGet('uri', $this->activity->objects[0]->id);
+
+ if (empty($tagged)) {
+ // TRANS: Client exception.
+ throw new ClientException(_m('Unidentified profile being untagged.'));
+ }
+
+ if ($tagged->id !== $this->user->id) {
+ // TRANS: Client exception.
+ throw new ClientException(_m('This user is not the one being untagged.'));
+ }
+
+ // save the list
+ $tagger = $this->ensureProfile();
+ $list = Ostatus_profile::ensureActivityObjectProfile($this->activity->target);
+
+ $ptag = $list->localPeopletag();
+ $result = Profile_tag::unTag($ptag->tagger, $tagged->id, $ptag->tag);
+
+ if (!$result) {
+ // TRANS: Client exception.
+ throw new ClientException(_m('The tag could not be deleted.'));
+ }
+ }
+ }
+
/**
* @param ActivityObject $object
* @return Notice
@@ -186,7 +265,8 @@ class UsersalmonAction extends SalmonAction
function getNotice($object)
{
if (!$object) {
- throw new ClientException("Can't favorite/unfavorite without an object.");
+ // TRANS: Client exception.
+ throw new ClientException(_m('Cannot favorite/unfavorite without an object.'));
}
switch ($object->type) {
@@ -197,20 +277,22 @@ class UsersalmonAction extends SalmonAction
case ActivityObject::COMMENT:
break;
default:
- throw new ClientException("Can't handle that kind of object for liking/faving.");
+ // TRANS: Client exception.
+ throw new ClientException(_m('Cannot handle that kind of object for liking/faving.'));
}
$notice = Notice::staticGet('uri', $object->id);
if (empty($notice)) {
- throw new ClientException("Notice with ID $object->id unknown.");
+ // TRANS: Client exception. %s is an object ID.
+ throw new ClientException(sprintf(_m('Notice with ID %s unknown.'),$object->id));
}
if ($notice->profile_id != $this->user->id) {
- throw new ClientException("Notice with ID $object->id not posted by $this->user->id.");
+ // TRANS: Client exception. %1$s is a notice ID, %2$s is a user ID.
+ throw new ClientException(sprintf(_m('Notice with ID %1$s not posted by %2$s.'),$object->id,$this->user->id));
}
return $notice;
}
-
}