clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow longer avatar URLs / the system outbox is now handled

This commit is contained in:
Michael 2023-12-15 10:39:41 +00:00
parent 33102a76da
commit 0a4f0d616a
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Model/APContact.php
View File

@ -385,18 +385,18 @@ class APContact
} }
// When the photo is too large, try to shorten it by removing parts // When the photo is too large, try to shorten it by removing parts
if (strlen($apcontact['photo'] ?? '') > 255) { if (strlen($apcontact['photo'] ?? '') > 383) {
$parts = parse_url($apcontact['photo']); $parts = parse_url($apcontact['photo']);
unset($parts['fragment']); unset($parts['fragment']);
$apcontact['photo'] = (string)Uri::fromParts((array)$parts); $apcontact['photo'] = (string)Uri::fromParts((array)$parts);
if (strlen($apcontact['photo']) > 255) { if (strlen($apcontact['photo']) > 383) {
unset($parts['query']); unset($parts['query']);
$apcontact['photo'] = (string)Uri::fromParts((array)$parts); $apcontact['photo'] = (string)Uri::fromParts((array)$parts);
} }
if (strlen($apcontact['photo']) > 255) { if (strlen($apcontact['photo']) > 383) {
$apcontact['photo'] = substr($apcontact['photo'], 0, 255); $apcontact['photo'] = substr($apcontact['photo'], 0, 383);
} }
} }

3
src/Module/ActivityPub/Outbox.php
View File

@ -21,7 +21,6 @@
namespace Friendica\Module\ActivityPub; namespace Friendica\Module\ActivityPub;
use Friendica\Core\System;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Module\BaseApi; use Friendica\Module\BaseApi;
use Friendica\Protocol\ActivityPub; use Friendica\Protocol\ActivityPub;
@ -36,7 +35,7 @@ class Outbox extends BaseApi
protected function rawContent(array $request = []) protected function rawContent(array $request = [])
{ {
if (empty($this->parameters['nickname'])) { if (empty($this->parameters['nickname'])) {
throw new \Friendica\Network\HTTPException\NotFoundException(); $this->jsonExit([], 'application/activity+json');
} }
$owner = User::getOwnerDataByNick($this->parameters['nickname']); $owner = User::getOwnerDataByNick($this->parameters['nickname']);

1
static/routes.config.php
View File

@ -452,6 +452,7 @@ return [
'/following/{nickname}' => [Module\ActivityPub\Following::class, [R::GET]], '/following/{nickname}' => [Module\ActivityPub\Following::class, [R::GET]],
'/friendica[/{format:json}]' => [Module\Friendica::class, [R::GET]], '/friendica[/{format:json}]' => [Module\Friendica::class, [R::GET]],
'/friendica/inbox' => [Module\ActivityPub\Inbox::class, [R::GET, R::POST]], '/friendica/inbox' => [Module\ActivityPub\Inbox::class, [R::GET, R::POST]],
'/friendica/outbox' => [Module\ActivityPub\Outbox::class, [R::GET]],
'/fsuggest/{contact:\d+}' => [Module\FriendSuggest::class, [R::GET, R::POST]], '/fsuggest/{contact:\d+}' => [Module\FriendSuggest::class, [R::GET, R::POST]],