tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #6144 from Alkarex/ATOM-self

Browse source 
Correct self attribute in ATOM feeds
This commit is contained in:
Michael Vogel 2018-11-18 12:31:15 +01:00 committed by GitHub
parent 2456a66597 bd19e93c09
commit 9dfc970bd6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/Protocol/OStatus.php
View file

@ -1263,10 +1263,11 @@ class OStatus
* @param object $doc XML document
* @param array $owner Contact data of the poster
* @param string $filter The related feed filter (activity, posts or comments)
* @param bool $feed_mode Behave like a regular feed for users if true
*
* @return object header root element
*/
private static function addHeader(DOMDocument $doc, array $owner, $filter)
private static function addHeader(DOMDocument $doc, array $owner, $filter, $feed_mode = false)
{
$a = get_app();
@ -1283,10 +1284,23 @@ class OStatus
$root->setAttribute("xmlns:mastodon", NAMESPACE_MASTODON);
$title = '';
$selfUri = '/feed/' . $owner["nick"] . '/';
switch ($filter) {
case 'activity': $title = L10n::t('%s\'s timeline', $owner['name']); break;
case 'posts' : $title = L10n::t('%s\'s posts' , $owner['name']); break;
case 'comments': $title = L10n::t('%s\'s comments', $owner['name']); break;
case 'activity':
$title = L10n::t('%s\'s timeline', $owner['name']);
$selfUri .= $filter;
break;
case 'posts':
$title = L10n::t('%s\'s posts', $owner['name']);
break;
case 'comments':
$title = L10n::t('%s\'s comments', $owner['name']);
$selfUri .= $filter;
break;
}
if (!$feed_mode) {
$selfUri = "/dfrn_poll/" . $owner["nick"];
}
$attributes = ["uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION . "-" . DB_UPDATE_VERSION];
@ -1320,8 +1334,7 @@ class OStatus
$attributes = ["href" => System::baseUrl() . "/salmon/" . $owner["nick"], "rel" => "http://salmon-protocol.org/ns/salmon-mention"];
XML::addElement($doc, $root, "link", "", $attributes);
$attributes = ["href" => System::baseUrl() . "/dfrn_poll/" . $owner["nick"],
"rel" => "self", "type" => "application/atom+xml"];
$attributes = ["href" => System::baseUrl() . $selfUri, "rel" => "self", "type" => "application/atom+xml"];
XML::addElement($doc, $root, "link", "", $attributes);
if ($owner['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY) {
@ -2206,7 +2219,7 @@ class OStatus
$doc = new DOMDocument('1.0', 'utf-8');
$doc->formatOutput = true;
$root = self::addHeader($doc, $owner, $filter);
$root = self::addHeader($doc, $owner, $filter, $feed_mode);
foreach ($items as $item) {
if (Config::get('system', 'ostatus_debug')) {