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

Issue 5811: "objects" instead of "object"

This commit is contained in:
Michael 2018-10-02 20:12:38 +00:00
parent c02dea7b02
commit 518d461a8f
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/display.php
View File

@ -78,7 +78,7 @@ function display_init(App $a)
} }
if (ActivityPub::isRequest()) { if (ActivityPub::isRequest()) {
goaway(str_replace('display/', 'object/', $a->query_string)); goaway(str_replace('display/', 'objects/', $a->query_string));
} }
if ($item["id"] != $item["parent"]) { if ($item["id"] != $item["parent"]) {

2
src/Model/Item.php
View File

@ -2361,7 +2361,7 @@ class Item extends BaseObject
$guid = System::createUUID(); $guid = System::createUUID();
} }
return self::getApp()->get_baseurl() . '/object/' . $guid; return self::getApp()->get_baseurl() . '/objects/' . $guid;
} }
/** /**

2
src/Module/Object.php → src/Module/Objects.php
View File

@ -24,7 +24,7 @@ class Object extends BaseModule
} }
if (!ActivityPub::isRequest()) { if (!ActivityPub::isRequest()) {
goaway(str_replace('object/', 'display/', $a->query_string)); goaway(str_replace('objects/', 'display/', $a->query_string));
} }
$item = Item::selectFirst(['id'], ['guid' => $a->argv[1], 'wall' => true, 'private' => false]); $item = Item::selectFirst(['id'], ['guid' => $a->argv[1], 'wall' => true, 'private' => false]);

2
src/Protocol/ActivityPub.php
View File

@ -663,7 +663,7 @@ class ActivityPub
} elseif (DBA::isResult($conversation) && !empty($conversation['conversation-uri'])) { } elseif (DBA::isResult($conversation) && !empty($conversation['conversation-uri'])) {
$context_uri = $conversation['conversation-uri']; $context_uri = $conversation['conversation-uri'];
} else { } else {
$context_uri = str_replace('/object/', '/context/', $item['parent-uri']); $context_uri = str_replace('/objects/', '/context/', $item['parent-uri']);
} }
return $context_uri; return $context_uri;
} }

2
src/Protocol/Diaspora.php
View File

@ -1598,7 +1598,7 @@ class Diaspora
unset($parts['path']); unset($parts['path']);
$host_url = Network::unparseURL($parts); $host_url = Network::unparseURL($parts);
return $host_url . '/object/' . $guid; return $host_url . '/objects/' . $guid;
} }
return ""; return "";

2
src/Protocol/OStatus.php
View File

@ -2004,7 +2004,7 @@ class OStatus
} }
if (intval($item["parent"]) > 0) { if (intval($item["parent"]) > 0) {
$conversation_href = $conversation_uri = str_replace('/object/', '/context/', $item['parent-uri']); $conversation_href = $conversation_uri = str_replace('/objects/', '/context/', $item['parent-uri']);
if (isset($parent_item)) { if (isset($parent_item)) {
$conversation = DBA::selectFirst('conversation', ['conversation-uri', 'conversation-href'], ['item-uri' => $parent_item]); $conversation = DBA::selectFirst('conversation', ['conversation-uri', 'conversation-href'], ['item-uri' => $parent_item]);