summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-02-20 16:45:30 -0800
committerBrion Vibber <brion@pobox.com>2010-02-20 16:45:30 -0800
commit145a19954f6f993714cb8b65aaf9d54996503664 (patch)
tree164747041212a556f9bbbf2984eafdd15c1f153e
parent9c2fe8492f7dae183e0369f8d43f124fd80e4433 (diff)
OStatus: Salmon favorite & unfavorite events now handled
-rw-r--r--plugins/OStatus/actions/usersalmon.php77
-rw-r--r--plugins/OStatus/lib/salmonaction.php3
2 files changed, 48 insertions, 32 deletions
diff --git a/plugins/OStatus/actions/usersalmon.php b/plugins/OStatus/actions/usersalmon.php
index 4363488dd..20c6c2942 100644
--- a/plugins/OStatus/actions/usersalmon.php
+++ b/plugins/OStatus/actions/usersalmon.php
@@ -131,10 +131,51 @@ class UsersalmonAction extends SalmonAction
function handleFavorite()
{
- // WORST VARIABLE NAME EVER
- $object = $this->act->object;
+ $notice = $this->getNotice($this->act->object);
+ $profile = $this->ensureProfile()->localProfile();
- switch ($this->act->object->type) {
+ $old = Fave::pkeyGet(array('user_id' => $profile->id,
+ 'notice_id' => $notice->id));
+
+ if (!empty($old)) {
+ throw new ClientException("We already know that's a fave!");
+ }
+
+ if (!Fave::addNew($profile, $notice)) {
+ throw new ClientException("Could not save new favorite.");
+ }
+ }
+
+ /**
+ * Remote user doesn't like one of our posts after all!
+ * Confirm the post is ours, and save a local favorite event.
+ */
+ function handleUnfavorite()
+ {
+ $notice = $this->getNotice($this->act->object);
+ $profile = $this->ensureProfile()->localProfile();
+
+ $fave = Fave::pkeyGet(array('user_id' => $profile->id,
+ 'notice_id' => $notice->id));
+ if (empty($fave)) {
+ throw new ClientException("Notice wasn't favorited!");
+ }
+
+ $fave->delete();
+ }
+
+ /**
+ * @param ActivityObject $object
+ * @return Notice
+ * @throws ClientException on invalid input
+ */
+ function getNotice($object)
+ {
+ if (!$object) {
+ throw new ClientException("Can't favorite/unfavorite without an object.");
+ }
+
+ switch ($object->type) {
case ActivityObject::ARTICLE:
case ActivityObject::BLOGENTRY:
case ActivityObject::NOTE:
@@ -155,35 +196,7 @@ class UsersalmonAction extends SalmonAction
throw new ClientException("Notice with ID $object->id not posted by $this->user->id.");
}
- $profile = $this->ensureProfile();
-
- $old = Fave::pkeyGet(array('user_id' => $profile->id,
- 'notice_id' => $notice->id));
-
- if (!empty($old)) {
- throw new ClientException("We already know that's a fave!");
- }
-
- $fave = new Fave();
-
- // @fixme need to change this attribute name, maybe references
- $fave->user_id = $profile->id;
- $fave->notice_id = $notice->id;
-
- $result = $fave->insert();
-
- if (!$result) {
- common_log_db_error($fave, 'INSERT', __FILE__);
- throw new ServerException('Could not save new favorite.');
- }
- }
-
- /**
- * Remote user doesn't like one of our posts after all!
- * Confirm the post is ours, and save a local favorite event.
- */
- function handleUnfavorite()
- {
+ return $notice;
}
}
diff --git a/plugins/OStatus/lib/salmonaction.php b/plugins/OStatus/lib/salmonaction.php
index 7085e4583..c83890507 100644
--- a/plugins/OStatus/lib/salmonaction.php
+++ b/plugins/OStatus/lib/salmonaction.php
@@ -81,6 +81,9 @@ class SalmonAction extends Action
case ActivityVerb::FAVORITE:
$this->handleFavorite();
break;
+ case ActivityVerb::UNFAVORITE:
+ $this->handleUnfavorite();
+ break;
case ActivityVerb::FOLLOW:
case ActivityVerb::FRIEND:
$this->handleFollow();