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

[PLUGIN][ActivityPub][Postman] JSON_UNESCAPED_SLASHES

Browse Source 
Only record webfinger matches for acct
This commit is contained in:
Diogo Peralta Cordeiro 2022-02-25 13:52:21 +00:00
parent 26a50618b0
commit b630d530f4
Signed by: diogo
GPG Key ID: 18D2D35001FBFAB0
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/ActivityPub/ActivityPub.php
View File

@ -333,11 +333,13 @@ class ActivityPub extends Plugin
} else { } else {
array_push($delivered, ...$dummy); array_push($delivered, ...$dummy);
foreach ($dummy as $actor) { foreach ($dummy as $actor) {
FreeNetworkActorProtocol::protocolSucceeded( if ($actor->isPerson()) {
'activitypub', FreeNetworkActorProtocol::protocolSucceeded(
$actor, 'activitypub',
Discovery::normalize($actor->getNickname() . '@' . parse_url($inbox, \PHP_URL_HOST)), $actor,
); Discovery::normalize($actor->getNickname() . '@' . parse_url($inbox, \PHP_URL_HOST)),
);
}
} }
} }
} catch (Exception $e) { } catch (Exception $e) {

2
plugins/ActivityPub/Util/Model.php
View File

@ -121,7 +121,7 @@ abstract class Model
* *
* @throws ClientException * @throws ClientException
*/ */
public static function toJson(mixed $object, ?int $options = null): string public static function toJson(mixed $object, int $options = \JSON_UNESCAPED_SLASHES): string
{ {
switch ($object::class) { switch ($object::class) {
case \App\Entity\Activity::class: case \App\Entity\Activity::class:

2
plugins/ActivityPub/Util/Model/Activity.php
View File

@ -145,7 +145,7 @@ class Activity extends Model
* *
* @throws ClientException * @throws ClientException
*/ */
public static function toJson(mixed $object, ?int $options = null): string public static function toJson(mixed $object, int $options = \JSON_UNESCAPED_SLASHES): string
{ {
if ($object::class !== GSActivity::class) { if ($object::class !== GSActivity::class) {
throw new InvalidArgumentException('First argument type must be an Activity.'); throw new InvalidArgumentException('First argument type must be an Activity.');

2
plugins/ActivityPub/Util/Model/Actor.php
View File

@ -203,7 +203,7 @@ class Actor extends Model
* *
* @throws ServerException * @throws ServerException
*/ */
public static function toJson(mixed $object, ?int $options = null): string public static function toJson(mixed $object, int $options = \JSON_UNESCAPED_SLASHES): string
{ {
if ($object::class !== GSActor::class) { if ($object::class !== GSActor::class) {
throw new InvalidArgumentException('First argument type must be an Actor.'); throw new InvalidArgumentException('First argument type must be an Actor.');

2
plugins/ActivityPub/Util/Model/Note.php
View File

@ -337,7 +337,7 @@ class Note extends Model
* @throws InvalidArgumentException * @throws InvalidArgumentException
* @throws ServerException * @throws ServerException
*/ */
public static function toJson(mixed $object, ?int $options = null): string public static function toJson(mixed $object, int $options = \JSON_UNESCAPED_SLASHES): string
{ {
if ($object::class !== GSNote::class) { if ($object::class !== GSNote::class) {
throw new InvalidArgumentException('First argument type must be a Note.'); throw new InvalidArgumentException('First argument type must be a Note.');