diff options
author | Zach Copley <zach@status.net> | 2010-03-22 18:53:09 -0700 |
---|---|---|
committer | Zach Copley <zach@status.net> | 2010-03-22 18:55:17 -0700 |
commit | b8e97ac7098783f0380c7f8f61c20a100e814dc0 (patch) | |
tree | 0ede4a61bcbbcd475ac3d339a08c23d54ef792a9 /plugins | |
parent | 073e3a1572d0cd5934c6578f4245c39e8376351f (diff) |
Some initial media parsing
- Activity now returns a list of activity objects
- Processing of photo objects
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/OStatus/actions/groupsalmon.php | 3 | ||||
-rw-r--r-- | plugins/OStatus/actions/usersalmon.php | 5 | ||||
-rw-r--r-- | plugins/OStatus/classes/Ostatus_profile.php | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/plugins/OStatus/actions/groupsalmon.php b/plugins/OStatus/actions/groupsalmon.php index 29377b5fa..d60725a71 100644 --- a/plugins/OStatus/actions/groupsalmon.php +++ b/plugins/OStatus/actions/groupsalmon.php @@ -60,7 +60,8 @@ class GroupsalmonAction extends SalmonAction function handlePost() { - switch ($this->act->object->type) { + // @fixme process all objects? + switch ($this->act->objects[0]->type) { case ActivityObject::ARTICLE: case ActivityObject::BLOGENTRY: case ActivityObject::NOTE: diff --git a/plugins/OStatus/actions/usersalmon.php b/plugins/OStatus/actions/usersalmon.php index 15e8c1869..ecdcfa193 100644 --- a/plugins/OStatus/actions/usersalmon.php +++ b/plugins/OStatus/actions/usersalmon.php @@ -55,9 +55,10 @@ class UsersalmonAction extends SalmonAction */ function handlePost() { - common_log(LOG_INFO, "Received post of '{$this->act->object->id}' from '{$this->act->actor->id}'"); + common_log(LOG_INFO, "Received post of '{$this->act->objects[0]->id}' from '{$this->act->actor->id}'"); - switch ($this->act->object->type) { + // @fixme: process all activity objects? + switch ($this->act->objects[0]->type) { case ActivityObject::ARTICLE: case ActivityObject::BLOGENTRY: case ActivityObject::NOTE: diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php index 0eb5b8b82..df937643b 100644 --- a/plugins/OStatus/classes/Ostatus_profile.php +++ b/plugins/OStatus/classes/Ostatus_profile.php @@ -494,7 +494,7 @@ class Ostatus_profile extends Memcached_DataObject // It's not always an ActivityObject::NOTE, but... let's just say it is. - $note = $activity->object; + $note = $activity->objects[0]; // The id URI will be used as a unique identifier for for the notice, // protecting against duplicate saves. It isn't required to be a URL; |