friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

New uri format for our posts that is AP compatible

This commit is contained in:
Michael 2018-09-15 07:37:34 +00:00
parent 2e7ca76e15
commit fb5b6e4a14
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Model/Item.php
View File

@ -2329,13 +2329,7 @@ class Item extends BaseObject
$guid = System::createGUID(32);
}
$hostname = self::getApp()->get_hostname();
$user = DBA::selectFirst('user', ['nickname'], ['uid' => $uid]);
$uri = "urn:X-dfrn:" . $hostname . ':' . $user['nickname'] . ':' . $guid;
return $uri;
return self::getApp()->get_baseurl() . '/object/' . $guid;
}
/**

14
src/Protocol/Diaspora.php
View File

@ -1592,17 +1592,13 @@ class Diaspora
if (DBA::isResult($item)) {
return $item["uri"];
} elseif (!$onlyfound) {
$contact = Contact::getDetailsByAddr($author, 0);
if (!empty($contact['network'])) {
$prefix = 'urn:X-' . $contact['network'] . ':';
} else {
// This fallback should happen most unlikely
$prefix = 'urn:X-dspr:';
}
$person = self::personByHandle($author);
$author_parts = explode('@', $author);
$parts = parse_url($person['url']);
unset($parts['path']);
$host_url = Network::unparseURL($parts);
return $prefix . $author_parts[1] . ':' . $author_parts[0] . ':'. $guid;
return $host_url . '/object/' . $guid;
}
return "";