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

better ID from shared activities

Browse Source
This commit is contained in:
Evan Prodromou 2011-07-20 11:11:05 -04:00
parent e7ad9bf17a
commit 17b1492690
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -534,17 +534,21 @@ class Ostatus_profile extends Managed_DataObject
// XXX: process*() should return the new or existing notice. They don't, so we have to // XXX: process*() should return the new or existing notice. They don't, so we have to
// go fishing for it now. // go fishing for it now.
$sharedNotice = Notice::staticGet('uri', $shared->id); $sharedId = ($shared->id) ? $shared->id : $shared->objects[0]->id;
$sharedNotice = Notice::staticGet('uri', $sharedId);
if (empty($sharedNotice)) { if (empty($sharedNotice)) {
throw new ClientException(sprintf(_m("Failed to save activity %d"), throw new ClientException(sprintf(_m("Failed to save activity %d"),
$shared->id)); $sharedId));
} }
// The id URI will be used as a unique identifier for for the notice, // 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; // protecting against duplicate saves. It isn't required to be a URL;
// tag: URIs for instance are found in Google Buzz feeds. // tag: URIs for instance are found in Google Buzz feeds.
$sourceUri = $activity->id; $sourceUri = $activity->id;
$dupe = Notice::staticGet('uri', $sourceUri); $dupe = Notice::staticGet('uri', $sourceUri);
if ($dupe) { if ($dupe) {
common_log(LOG_INFO, "OStatus: ignoring duplicate post: $sourceUri"); common_log(LOG_INFO, "OStatus: ignoring duplicate post: $sourceUri");
@ -552,6 +556,7 @@ class Ostatus_profile extends Managed_DataObject
} }
// We'll also want to save a web link to the original notice, if provided. // We'll also want to save a web link to the original notice, if provided.
$sourceUrl = null; $sourceUrl = null;
if ($activity->link) { if ($activity->link) {
$sourceUrl = $activity->link; $sourceUrl = $activity->link;