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

[CORE][Event] Make all events return \EventResult, enforced at container build time

Browse Source
This commit is contained in:
Hugo Sales
2022-04-03 21:40:32 +01:00
parent aef1fac536
commit d4b7e990ce
60 changed files with 345 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/WebMonetization/WebMonetization.php
View File

@@ -43,6 +43,7 @@ use App\Entity\LocalUser;
use App\Util\Common;
use App\Util\Exception\RedirectException;
use App\Util\Formatting;
use EventResult;
use Plugin\ActivityPub\Entity\ActivitypubActor;
use Plugin\WebMonetization\Entity\Wallet;
use Plugin\WebMonetization\Entity\WebMonetization as Monetization;
@@ -52,7 +53,7 @@ use Symfony\Component\HttpFoundation\Request;
class WebMonetization extends Plugin
{
public function onAppendRightPanelBlock(Request $request, $vars, &$res): bool
public function onAppendRightPanelBlock(Request $request, $vars, &$res): EventResult
{
$user = Common::actor();
if (\is_null($user)) {
@@ -209,7 +210,7 @@ class WebMonetization extends Plugin
];
}
public function onAppendToHead(Request $request, &$res): bool
public function onAppendToHead(Request $request, &$res): EventResult
{
$user = Common::user();
if (\is_null($user)) {
@@ -241,7 +242,7 @@ class WebMonetization extends Plugin
return Event::next;
}
public function onActivityStreamsTwoContext(array &$activity_streams_two_context): bool
public function onActivityStreamsTwoContext(array &$activity_streams_two_context): EventResult
{
$activity_streams_two_context[] = [
'webmonetizationWallet' => [
@@ -252,7 +253,7 @@ class WebMonetization extends Plugin
return Event::next;
}
public function onActivityPubAddActivityStreamsTwoData(string $type_name, &$type): bool
public function onActivityPubAddActivityStreamsTwoData(string $type_name, &$type): EventResult
{
if ($type_name === 'Person') {
$actor = \Plugin\ActivityPub\Util\Explorer::getOneFromUri($type->getId());
@@ -265,7 +266,7 @@ class WebMonetization extends Plugin
return Event::next;
}
public function onActivityPubCreateOrUpdateActor(\ActivityPhp\Type\AbstractObject $object, Actor $actor, ActivitypubActor $ap_actor): bool
public function onActivityPubCreateOrUpdateActor(\ActivityPhp\Type\AbstractObject $object, Actor $actor, ActivitypubActor $ap_actor): EventResult
{
if ($object->has('webmonetizationWallet')) {
$attr = ['actor_id' => $actor->getId(), 'address' => $object->get('webmonetizationWallet')];