Commit 78b02deb authored by Emiliano Balbuena's avatar Emiliano Balbuena
Browse files

(chore): Use "summons" and "summonses"

parent bdbd8404

Controllers/Cli/Moderation.php

+13 −13
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ namespace Minds\Controllers\Cli; 
use Minds\Core;

use Minds\Core\Di\Di;

use Minds\Cli;

use Minds\Core\Reports\Summons\Summon;

use Minds\Core\Reports\Summonses\Summons;

use Minds\Interfaces;

use Minds\Entities;
@@ -43,8 +43,8 @@ class Moderation extends Cli\Controller implements Interfaces\CliControllerInter 
        /** @var Core\Reports\Repository $reportsRepository */

        $reportsRepository = Di::_()->get('Reports\Repository');



        /** @var Core\Reports\Summons\Manager $summonsManager */

        $summonsManager = Di::_()->get('Moderation\Summons\Manager');

        /** @var Core\Reports\Summonses\Manager $summonsesManager */

        $summonsesManager = Di::_()->get('Moderation\Summonses\Manager');



        $userId = $this->getOpt('user');

        $reportUrn = $this->getOpt('report');
@@ -54,8 +54,8 @@ class Moderation extends Cli\Controller implements Interfaces\CliControllerInter 
        if (!$userId || !$reportUrn) {

            $this->out([

                'Usage:',

                '- Summoning: cli.php moderation summon --user=<username_or_guid> --report=<report_urn>',

                '- Responding: cli.php moderation summon --user=<username_or_guid> --report=<report_urn> --jury-type=<initial_jury|appeal_jury> --respond=<accepted|declined>',

                '- Summoning: cli.php moderation summons --user=<username_or_guid> --report=<report_urn>',

                '- Responding: cli.php moderation summons --user=<username_or_guid> --report=<report_urn> --jury-type=<initial_jury|appeal_jury> --respond=<accepted|declined>',

            ]);



            exit(1);
@@ -79,20 +79,20 @@ class Moderation extends Cli\Controller implements Interfaces\CliControllerInter 
            $appeal = new Core\Reports\Appeals\Appeal();

            $appeal->setReport($report);



            $summonsManager->summon($appeal, [ $user->guid ]);

            $summonsesManager->summon($appeal, [ $user->guid ]);



            $this->out("Summoned {$user->guid} to {$reportUrn}");

        } else {

            $summon = new Summon();

            $summon

            $summons = new Summons();

            $summons

                ->setReportUrn($reportUrn)

                ->setJuryType($juryType)

                ->setJurorGuid((string) $user->guid)

                ->setStatus($respond);



                $summonsManager->respond($summon);

                $summonsesManager->respond($summons);



            $this->out("Responded to {$user->guid}'s summon to {$reportUrn} with {$respond}");

            $this->out("Responded to {$user->guid}'s summons to {$reportUrn} with {$respond}");

        }

    }
@@ -104,8 +104,8 @@ class Moderation extends Cli\Controller implements Interfaces\CliControllerInter 
        /** @var Core\Reports\Repository $reportsRepository */

        $reportsRepository = Di::_()->get('Reports\Repository');



        /** @var Core\Reports\Summons\Manager $summonsManager */

        $summonsManager = Di::_()->get('Moderation\Summons\Manager');

        /** @var Core\Reports\Summonses\Manager $summonsesManager */

        $summonsesManager = Di::_()->get('Moderation\Summonses\Manager');



        $reportUrn = $this->getOpt('report');
@@ -128,7 +128,7 @@ class Moderation extends Cli\Controller implements Interfaces\CliControllerInter 
            ->setReport($report)

            ->setOwnerGuid($report->getEntityOwnerGuid());



        $cohort = $summonsManager->summon($appeal, null);

        $cohort = $summonsesManager->summon($appeal, null);



        var_dump($cohort);

    }

Controllers/api/v2/moderation/jury.php

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ use Minds\Interfaces; 
use Minds\Core\Di\Di;

use Minds\Core\Reports\Jury\Decision;

use Minds\Core\Reports\Jury\JuryClosedException;

use Minds\Core\Reports\Summons\SummonsNotFoundException;

use Minds\Core\Reports\Summonses\SummonsNotFoundException;



class jury implements Interfaces\Api

{

Controllers/api/v2/moderation/summons.php

+13 −13
Original line number Diff line number Diff line 
<?php

/**

 * summon

 * summons

 *

 * @author edgebal

 */
@@ -9,9 +9,9 @@ namespace Minds\Controllers\api\v2\moderation; 


use Minds\Api\Factory;

use Minds\Core\Di\Di;

use Minds\Core\Reports\Repository as ReportsRepository;

use Minds\Core\Reports\Summons\Manager;

use Minds\Core\Reports\Summons\Summon as SummonEntity;

use Minds\Core\Reports\Manager as ReportsManager;

use Minds\Core\Reports\Summonses\Manager;

use Minds\Core\Reports\Summonses\Summons as SummonsEntity;

use Minds\Core\Session;

use Minds\Interfaces;
@@ -40,21 +40,21 @@ class summons implements Interfaces\Api 
        $userGuid = Session::getLoggedInUserGuid();

        $status = $_POST['status'] ?? null;



        /** @var Manager $summonsManager */

        $summonsManager = Di::_()->get('Moderation\Summons\Manager');

        /** @var Manager $summonsesManager */

        $summonsesManager = Di::_()->get('Moderation\Summonses\Manager');



        /** @var ReportsManager $reportsManager */

        $reportsManager = Di::_()->get('Moderation\Manager');



        $summon = new SummonEntity();

        $summons = new SummonsEntity();

        try {

            $summon

            $summons

                ->setReportUrn($reportUrn)

                ->setJuryType($juryType)

                ->setJurorGuid((string) $userGuid)

                ->setStatus($status);



            $summonsManager->respond($summon);

            $summonsesManager->respond($summons);

        } catch (\Exception $e) {

            return Factory::response([

                'status' => 'error',
@@ -63,13 +63,13 @@ class summons implements Interfaces\Api 
        }



        $response = [

            'summon' => $summon->getStatus(),

            'expires_in' => $summon->getTtl(),

            'summon' => $summons->getStatus(),

            'expires_in' => $summons->getTtl(),

        ];



        if ($summon->isAccepted()) {

        if ($summons->isAccepted()) {

            $response['report'] = $reportsManager

                ->getReport($summon->getReportUrn())

                ->getReport($summons->getReportUrn())

                ->export();

        }

Core/Queue/Runners/ReportsAppealSummon.php

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ use Minds\Core\Queue\Client; 
use Minds\Core\Queue\Interfaces\QueueClient;

use Minds\Core\Queue\Interfaces\QueueRunner;

use Minds\Core\Reports\Appeals\Appeal;

use Minds\Core\Reports\Summons\Manager;

use Minds\Core\Reports\Summonses\Manager;



class ReportsAppealSummon implements QueueRunner

{
@@ -46,7 +46,7 @@ class ReportsAppealSummon implements QueueRunner 
                echo "Summoning for {$appeal->getReport()->getUrn()}..." . PHP_EOL;



                /** @var Manager $manager */

                $manager = Di::_()->get('Moderation\Summons\Manager');

                $manager = Di::_()->get('Moderation\Summonses\Manager');

                $missing = $manager->summon($appeal, $cohort);



                if ($missing > 0) {

Core/Reports/Jury/Manager.php

+7 −7
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ use Minds\Entities\NormalizedEntity; 
use Minds\Common\Repository\Response;

use Minds\Common\Urn;

use Minds\Core\Entities\Resolver as EntitiesResolver;

use Minds\Core\Reports\Summons\SummonsNotFoundException;

use Minds\Core\Reports\Summons\Summon as SummonsEntity;

use Minds\Core\Reports\Summonses\SummonsNotFoundException;

use Minds\Core\Reports\Summonses\Summons as SummonsEntity;

use Minds\Core\Security\ACL;



class Manager
@@ -30,8 +30,8 @@ class Manager 
    /** @var VerdictManager $verdictManager */

    private $verdictManager;



    /** @var SummonsManager $summonsManager */

    private $summonsManager;

    /** @var SummonsesManager $summonsesManager */

    private $summonsesManager;



    /** @var ACL $acl */

    private $acl;
@@ -46,14 +46,14 @@ class Manager 
        $repository = null,

        $entitiesResolver = null,

        $verdictManager = null,

        $summonsManager = null,

        $summonsesManager = null,

        $acl = null

    )

    {

        $this->repository = $repository ?: new Repository;

        $this->entitiesResolver = $entitiesResolver  ?: new EntitiesResolver;

        $this->verdictManager = $verdictManager ?: Di::_()->get('Moderation\Verdict\Manager');

        $this->summonsManager = $summonsManager ?: Di::_()->get('Moderation\Summons\Manager');

        $this->summonsesManager = $summonsesManager ?: Di::_()->get('Moderation\Summonses\Manager');

        $this->acl = $acl ?: new ACL;

    }
@@ -182,7 +182,7 @@ class Manager 
        $summons->setReportUrn($decision->getReport()->getUrn())

            ->setJurorGuid($decision->getJurorGuid())

            ->setJuryType('appeal_jury');

        return $this->summonsManager->isSummoned($summons);

        return $this->summonsesManager->isSummoned($summons);

    }



}