GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x

Browse Source
This commit is contained in:
Brion Vibber
2010-03-23 08:21:32 -07:00
parent 68a5fba248 5b0b6097e0
commit a5c78a6f1a
8 changed files with 269 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/OStatus/actions/groupsalmon.php
View File

@@ -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:

5
plugins/OStatus/actions/usersalmon.php
View File

@@ -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:

5
plugins/OStatus/classes/Ostatus_profile.php
View File

@@ -442,7 +442,8 @@ class Ostatus_profile extends Memcached_DataObject
{
$activity = new Activity($entry, $feed);
switch ($activity->object->type) {
// @todo process all activity objects
switch ($activity->objects[0]->type) {
case ActivityObject::ARTICLE:
case ActivityObject::BLOGENTRY:
case ActivityObject::NOTE:
@@ -494,7 +495,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;