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

adjust URI, URL, and location in Ostatus_profile::processPost

This commit is contained in:
Evan Prodromou 2010-02-20 11:38:05 -05:00
parent 81ea0f8117
commit ab4ec095e8
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -457,28 +457,33 @@ class Ostatus_profile extends Memcached_DataObject
$oprofile = $this; $oprofile = $this;
} }
if ($activity->object->link) { $sourceUri = $activity->object->id;
$sourceUri = $activity->object->link;
} else if (preg_match('!^https?://!', $activity->object->id)) { $dupe = Notice::staticGet('uri', $sourceUri);
$sourceUri = $activity->object->id;
} else { if ($dupe) {
common_log(LOG_INFO, "OStatus: ignoring post with no source link: id $activity->object->id"); common_log(LOG_INFO, "OStatus: ignoring duplicate post: $sourceUri");
return; return;
} }
$dupe = Notice::staticGet('uri', $sourceUri); $sourceUrl = null;
if ($dupe) {
common_log(LOG_INFO, "OStatus: ignoring duplicate post: $noticeLink"); if ($activity->object->link) {
return; $sourceUrl = $activity->object->link;
} else if (preg_match('!^https?://!', $activity->object->id)) {
$sourceUrl = $activity->object->id;
} }
// @fixme sanitize and save HTML content if available // @fixme sanitize and save HTML content if available
$content = $activity->object->title; $content = $activity->object->title;
$params = array('is_local' => Notice::REMOTE_OMB, $params = array('is_local' => Notice::REMOTE_OMB,
'url' => $sourceUrl,
'uri' => $sourceUri); 'uri' => $sourceUri);
$location = $this->getEntryLocation($activity->entry); $location = $activity->context->location;
if ($location) { if ($location) {
$params['lat'] = $location->lat; $params['lat'] = $location->lat;
$params['lon'] = $location->lon; $params['lon'] = $location->lon;