.gitlab-ci.yml

@@ -23,7 +23,7 @@ build:
   stage: build
   script:
     - apk update && apk add --no-cache git
-    - sh tools/setup.sh
+    - sh tools/setup.sh production
   cache:
     paths:
       - vendor

Controllers/Cli/EntityCentric.php

+<?php
+
+namespace Minds\Controllers\Cli;
+
+use Minds\Core;
+use Minds\Core\Analytics\EntityCentric\Manager;
+use Minds\Cli;
+use Minds\Interfaces;
+use Minds\Exceptions;
+use Minds\Entities;
+
+class EntityCentric extends Cli\Controller implements Interfaces\CliControllerInterface
+{
+    public function __construct()
+    {
+    }
+
+    public function help($command = null)
+    {
+        $this->out('TBD');
+    }
+    
+    public function exec()
+    {
+        $this->out('Missing subcommand');
+    }
+
+    public function sync()
+    {
+        error_reporting(E_ALL);
+        ini_set('display_errors', 1);
+
+        $daysAgo = $this->getOpt('daysAgo') ?: 0;
+        $from = $this->getOpt('from') ?: strtotime("midnight $daysAgo days ago");
+        $manager = new Manager();
+        $manager->setFrom($from);
+
+        $i = 0;
+        foreach ($manager->sync() as $record) {
+            $this->out(++$i);
+        }
+    }
+}

Controllers/Cli/User.php

@@ -50,4 +50,35 @@ class User extends Cli\Controller implements Interfaces\CliControllerInterface
             $this->out("Set feature flags for {$user->username}: " . implode(', ', $features));
         }
     }
+
+    /**
+     * Resets a users passwords.
+     * Requires username and password.
+     *
+     * Example call: php ./cli.php User password_reset --username=nemofin --password=password123
+     * @return void
+     */
+    public function password_reset()
+    {
+        try {
+            if (!$this->getOpt('username') || !$this->getOpt('password')) {
+                throw new Exceptions\CliException('Missing username / password');
+            }
+
+            $username = $this->getOpt('username');
+            $password = $this->getOpt('password');
+
+            $user = new Entities\User($username);
+        
+            $user->password = Core\Security\Password::generate($user, $password);
+            $user->password_reset_code = "";
+            $user->override_password = true;
+            $user->save();
+
+            $this->out("Password changed successfuly for user ".$username);
+        } catch (Exception $e) {
+            $this->out("An error has occured");
+            $this->out($e);
+        }
+    }
 }

Controllers/api/v1/comments.php

@@ -347,15 +347,22 @@ class comments implements Interfaces\Api
 
         $comment = $manager->getByLuid($pages[0]);
 
-        if ($comment && $comment->canEdit()) {
+        if (!$comment) {
+            return Factory::response([
+                'status' => 'error',
+                'message' => 'Comment not found',
+            ]);
+        }
+
+        if ($comment->canEdit()) {
             $manager->delete($comment);
             return Factory::response([]);
         }
         //check if owner of activity trying to remove
         $entity = Entities\Factory::build($comment->getEntityGuid());
-        
+
         if ($entity->owner_guid == Core\Session::getLoggedInUserGuid()) {
-            $manager->delete($comment, [ 'force' => true ]);
+            $manager->delete($comment, ['force' => true]);
             return Factory::response([]);
         }
 

Controllers/api/v2/blockchain/wallet.php

@@ -25,6 +25,8 @@ class wallet implements Interfaces\Api
      */
     public function get($pages)
     {
+        Factory::isLoggedIn();
+
         /** @var abstractCacher $cache */
         $cache = Di::_()->get('Cache');
 

Controllers/api/v2/payments/stripe/transactions.php

@@ -28,7 +28,14 @@ class transactions implements Interfaces\Api
                 'message' => 'There was an error returning the usd account',
             ]);
         }
- 
+
+        if (!$account) {
+            return Factory::response([
+                'status' => 'error',
+                'message' => 'Stripe account not found',
+            ]);
+        }
+
         $transactionsManger = new Stripe\Transactions\Manager();
         $transactions = $transactionsManger->getByAccount($account);
 

Core/Analytics/EntityCentric/ActiveUsersSynchroniser.php

+<?php
+namespace Minds\Core\Analytics\EntityCentric;
+
+use Minds\Core\Analytics\Metrics\Active;
+use DateTime;
+use Exception;
+
+class ActiveUsersSynchroniser
+{
+    /** @var array */
+    private $records = [];
+
+    /** @var Active */
+    private $activeMetric;
+
+    public function __construct($activeMetric = null)
+    {
+        $this->activeMetric = $activeMetric ?? new Active();
+    }
+
+    /**
+     * @param int $from
+     * @return self
+     */
+    public function setFrom($from): self
+    {
+        $this->from = $from;
+        return $this;
+    }
+
+    /**
+     * Convert to records
+     * @return iterable
+     */
+    public function toRecords(): iterable
+    {
+        $date = (new DateTime())->setTimestamp($this->from);
+        $now = new DateTime();
+        $days = (int) $date->diff($now)->format('%a');
+        $months = round($days / 28);
+
+        // Daily resolution
+        foreach ($this->activeMetric->get($days ?: 1) as $bucket) {
+            $record = new EntityCentricRecord();
+            $record->setEntityUrn("urn:metric:global")
+                ->setOwnerGuid((string) 0) // Site is owner
+                ->setTimestamp($bucket['timestamp'])
+                ->setResolution('day')
+                ->incrementSum('active::total', $bucket['total']);
+            $this->records[] = $record;
+        }
+
+        // Monthly resolution
+        foreach ($this->activeMetric->get($months ?: 1, 'month') as $bucket) {
+            $record = new EntityCentricRecord();
+            $record->setEntityUrn("urn:metric:global")
+                ->setOwnerGuid((string) 0) // Site is owner
+                ->setTimestamp($bucket['timestamp'])
+                ->setResolution('month')
+                ->incrementSum('active::total', $bucket['total']);
+            $this->records[] = $record;
+        }
+
+        foreach ($this->records as $record) {
+            yield $record;
+        }
+    }
+}

Core/Analytics/EntityCentric/EntityCentricRecord.php

+<?php
+/**
+ * EntityCentricRecord
+ * @author Mark
+ */
+
+namespace Minds\Core\Analytics\EntityCentric;
+
+use Minds\Traits\MagicAttributes;
+
+/**
+ * Class EntityCentricRecord
+ * @package Minds\Core\Analytics\EntityCentric
+ * @method EntityCentricRecord setResolution(int $year)
+ * @method string getResolution()
+ * @method EntityCentricRecord setEntityUrn(string $entityUrn)
+ * @method string getEntityUrn()
+ * @method EntityCentricRecord setOwnerGuid(string $ownerGuid)
+ * @method string getOwnerGuid()
+ * @method EntityCentricRecord setTimestampMs(int $timestampMs)
+ * @method int getTimestampMs()
+ * @method EntityCentricRecord setTimestamp(int $timestamp)
+ * @method int getTimestamp()
+ * @method EntityCentricRecord setSums(array $sums)
+ * @method int getSums()
+ */
+class EntityCentricRecord
+{
+    use MagicAttributes;
+
+    /** @var string */
+    private $resolution;
+
+    /** @var int */
+    protected $timestamp;
+
+    /** @var int */
+    protected $timestampMs;
+
+    /** @var string */
+    protected $entityUrn;
+
+    /** @var string */
+    protected $ownerGuid;
+
+    /** @var array */
+    private $sums;
+
+    /**
+     * Increment views
+     * @param string $metric
+     * @param int $value
+     * @return EntityCentricRecord
+     */
+    public function incrementSum($metric, $value = 1): EntityCentricRecord
+    {
+        if (!isset($this->sums[$metric])) {
+            $this->sums[$metric] = 0;
+        }
+        $this->sums[$metric] = $this->sums[$metric] + $value;
+        return $this;
+    }
+}

Core/Analytics/EntityCentric/Manager.php

+<?php
+/**
+ * EntityCentric Manager
+ * @author Mark
+ */
+
+namespace Minds\Core\Analytics\EntityCentric;
+
+use DateTime;
+use Exception;
+
+class Manager
+{
+    /** @var array */
+    const SYNCHRONISERS = [
+        SignupsSynchroniser::class,
+        ActiveUsersSynchroniser::class,
+        ViewsSynchroniser::class,
+    ];
+
+    /** @var Repository */
+    protected $repository;
+
+    /** @var int */
+    private $from;
+
+    /** @var int */
+    private $to;
+
+    public function __construct(
+        $repository = null
+    ) {
+        $this->repository = $repository ?: new Repository();
+    }
+
+    /**
+     * @param int $from
+     * @return self
+     */
+    public function setFrom($from): self
+    {
+        $this->from = $from;
+        return $this;
+    }
+
+    /**
+     * Synchronise views from cassandra to elastic
+     * @return iterable
+     */
+    public function sync(): iterable
+    {
+        foreach (Manager::SYNCHRONISERS as $synchroniserClass) {
+            $synchroniser = new $synchroniserClass;
+            $date = (new DateTime())->setTimestamp($this->from);
+            $synchroniser->setFrom($this->from);
+            foreach ($synchroniser->toRecords() as $record) {
+                $this->add($record);
+                yield $record;
+            }
+            // Call again incase any leftover
+            $this->repository->bulk();
+        }
+        echo "done";
+    }
+
+    /**
+     * Add an entity centric record to the database
+     * @param EntityCentricRecord $record
+     * @return bool
+     */
+    public function add(EntityCentricRecord $record): bool
+    {
+        return (bool) $this->repository->add($record);
+    }
+
+    /**
+     * Query aggregate
+     * @param array $query
+     * @return array
+     */
+    public function getAggregateByQuery(array $query): array
+    {
+    }
+}

Core/Analytics/EntityCentric/Repository.php

+<?php
+/**
+ * EntityCentric Repository
+ * @author Mark
+ */
+
+namespace Minds\Core\Analytics\EntityCentric;
+
+use DateTime;
+use DateTimeZone;
+use Exception;
+use Minds\Common\Repository\Response;
+use Minds\Core\Data\ElasticSearch\Client as ElasticClient;
+use Minds\Core\Di\Di;
+
+class Repository
+{
+    /** @var ElasticClient */
+    protected $es;
+
+    /** @var array $pendingBulkInserts * */
+    private $pendingBulkInserts = [];
+
+    /**
+     * Repository constructor.
+     * @param ElasticClient $es
+     */
+    public function __construct(
+        $es = null
+    ) {
+        $this->es = $es ?: Di::_()->get('Database\ElasticSearch');
+    }
+
+    /**
+     * @param array $opts
+     * @return Response
+     */
+    public function getList(array $opts = [])
+    {
+        $response = new Response();
+
+        return $response;
+    }
+
+    /**
+     * @param EntityCentricRecord $record
+     * @return bool
+     * @throws Exception
+     */
+    public function add(EntityCentricRecord $record)
+    {
+        $index = 'minds-entitycentric-' . date('m-Y', $record->getTimestamp());
+
+        $body = [
+            'resolution' => $record->getResolution(),
+            '@timestamp' => $record->getTimestamp() * 1000,
+            'entity_urn' => $record->getEntityUrn(),
+            'owner_guid' => $record->getOwnerGuid(),
+        ];
+
+        $body = array_merge($body, $record->getSums());
+
+        $body = array_filter($body, function ($val) {
+            if ($val === '' || $val === null) {
+                return false;
+            }
+            return true;
+        });
+
+        $this->pendingBulkInserts[] = [
+            'update' => [
+                '_id' => (string) implode('-', [ $record->getEntityUrn(), $record->getResolution(), $record->getTimestamp() ]),
+                '_index' => $index,
+                '_type' => '_doc',
+            ],
+        ];
+
+        $this->pendingBulkInserts[] = [
+            'doc' => $body,
+            'doc_as_upsert' => true,
+        ];
+
+        if (count($this->pendingBulkInserts) > 2000) { //1000 inserts
+            $this->bulk();
+        }
+    }
+
+    /**
+     * Bulk insert results
+     */
+    public function bulk()
+    {
+        if (count($this->pendingBulkInserts) > 0) {
+            $res = $this->es->bulk(['body' => $this->pendingBulkInserts]);
+            $this->pendingBulkInserts = [];
+        }
+    }
+}

Core/Analytics/EntityCentric/SignupsSynchroniser.php

+<?php
+namespace Minds\Core\Analytics\EntityCentric;
+
+use Minds\Core\Analytics\Metrics\Signup;
+use DateTime;
+use Exception;
+
+class SignupsSynchroniser
+{
+    /** @var array */
+    private $records = [];
+
+    /** @var Signup */
+    private $signupMetric;
+
+    public function __construct($signupMetric = null)
+    {
+        $this->signupMetric = $signupMetric ?? new Signup;
+    }
+
+    /**
+     * @param int $from
+     * @return self
+     */
+    public function setFrom($from): self
+    {
+        $this->from = $from;
+        return $this;
+    }
+
+    /**
+     * Convert to records
+     * @return iterable
+     */
+    public function toRecords(): iterable
+    {
+        $date = (new DateTime())->setTimestamp($this->from);
+        $now = new DateTime();
+        $days = (int) $date->diff($now)->format('%a');
+
+        foreach ($this->signupMetric->get($days) as $bucket) {
+            error_log($bucket['date']);
+            $record = new EntityCentricRecord();
+            $record->setEntityUrn("urn:metric:global")
+                ->setOwnerGuid((string) 0) // Site is owner
+                ->setTimestamp($bucket['timestamp'])
+                ->setResolution('day')
+                ->incrementSum('signups::total', $bucket['total']);
+            $this->records[] = $record;
+        }
+        
+        foreach ($this->records as $record) {
+            yield $record;
+        }
+    }
+}

Core/Analytics/EntityCentric/ViewsSynchroniser.php

+<?php
+namespace Minds\Core\Analytics\EntityCentric;
+
+use Minds\Core\Analytics\Views\Repository as ViewsRepository;
+use DateTime;
+use Exception;
+
+class ViewsSynchroniser
+{
+    /** @var array */
+    private $records = [];
+
+    /** @var ViewsRepository */
+    private $viewsRepository;
+
+    public function __construct($viewsRepository = null)
+    {
+        $this->viewsRepository = $viewsRepository ?: new ViewsRepository();
+    }
+
+    /**
+     * @param int $from
+     * @return self
+     */
+    public function setFrom($from): self
+    {
+        $this->from = $from;
+        return $this;
+    }
+
+    /**
+     * Convert to records
+     * @return iterable
+     */
+    public function toRecords(): iterable
+    {
+        $date = (new DateTime())->setTimestamp($this->from);
+
+        $opts['day'] = intval($date->format('d'));
+        $opts['month'] = intval($date->format('m'));
+        $opts['year'] = $date->format('Y');
+
+        $opts['from'] = $this->from;
+
+        $i = 0;
+        while (true) {
+            $result = $this->viewsRepository->getList($opts);
+
+            $opts['offset'] = $result->getPagingToken();
+
+            foreach ($result as $view) {
+                // if (!in_array($view->getSource(), [ 'single', 'feed/channel'])) {
+                //     continue;
+                // }
+                $this->downsampleViewToRecord($view);
+                error_log(++$i);
+            }
+
+            if ($result->isLastPage()) {
+                break;
+            }
+        }
+
+        foreach ($this->records as $record) {
+            yield $record;
+        }
+    }
+
+    /**
+     * Add entity to map
+     * @param View $view
+     * @return void
+     */
+    private function downsampleViewToRecord($view): void
+    {
+        $entityUrn = $view->getEntityUrn();
+
+        if (!isset($this->records[$view->getEntityUrn()])) {
+            $timestamp = (new \DateTime())->setTimestamp($view->getTimestamp())->setTime(0, 0, 0);
+            $record = new EntityCentricRecord();
+            $record->setEntityUrn($view->getEntityUrn())
+                ->setOwnerGuid($view->getOwnerGuid())
+                ->setTimestamp($timestamp->getTimestamp())
+                ->setResolution('day');
+
+            $this->records[$view->getEntityUrn()] = $record;
+        }
+        if ($view->getCampaign()) {
+            $this->records[$view->getEntityUrn()]->incrementSum('views::boosted');
+        } else {
+            $this->records[$view->getEntityUrn()]->incrementSum('views::organic');
+        }
+
+        if ($view->getSource() === 'single') {
+            $this->records[$view->getEntityUrn()]->incrementSum('views::single');
+        }
+
+        $this->records[$view->getEntityUrn()]->incrementSum('views::total');
+    }
+}

Core/Blogs/BlogsProvider.php

+<?php
+
+namespace Minds\Core\Blogs;
+
+use Minds\Core\Di\Provider;
+
+class BlogsProvider extends Provider
+{
+    public function register()
+    {
+        $this->di->bind('Blogs\Manager', function () {
+            return new Manager();
+        });
+    }
+}

Core/Blogs/Events.php

@@ -8,19 +8,11 @@ use Minds\Core\Events\EventsDispatcher;
 
 class Events
 {
-    /** @var Legacy\Entity */
-    protected $legacyEntity;
-
-    /** @var Manager */
-    protected $manager;
-
     /** @var EventsDispatcher */
     protected $eventsDispatcher;
 
-    public function __construct($legacyEntity = null, $manager = null, $eventsDispatcher = null)
+    public function __construct($eventsDispatcher = null)
     {
-        $this->legacyEntity = $legacyEntity ?: new Legacy\Entity();
-        $this->manager = $manager ?: new Manager();
         $this->eventsDispatcher = $eventsDispatcher ?: Di::_()->get('EventsDispatcher');
     }
 
@@ -31,7 +23,7 @@ class Events
             $params = $event->getParameters();
 
             if ($params['row']->type == 'object' && $params['row']->subtype == 'blog') {
-                $blog = $this->legacyEntity->build($params['row']);
+                $blog = (new Legacy\Entity())->build($params['row']);
                 $blog->setEphemeral(false);
 
                 $event->setResponse($blog);
@@ -42,7 +34,8 @@ class Events
 
         $this->eventsDispatcher->register('entity:save', 'object:blog', function (Event $event) {
             $blog = $event->getParameters()['entity'];
-            $event->setResponse($this->manager->update($blog));
+            $manager = Di::_()->get('Blogs\Manager');
+            $event->setResponse($manager->update($blog));
         });
     }
 }

Core/Blogs/SEO.php

@@ -3,6 +3,7 @@
 namespace Minds\Core\Blogs;
 
 use Minds\Core;
+use Minds\Core\Di\Di;
 use Minds\Entities;
 use Minds\Helpers;
 use Minds\Helpers\Counters;
@@ -10,13 +11,8 @@ use Zend\Diactoros\ServerRequestFactory;
 
 class SEO
 {
-    /** @var Manager */
-    protected $manager;
-
     public function __construct(
-        $manager = null
     ) {
-        $this->manager = $manager ?: new Manager();
     }
 
     public function setup()
@@ -104,7 +100,7 @@ class SEO
         });
     }
 
-    public function viewHandler($slugs = [])
+    public function viewHandler($slugs = [], $manager = null)
     {
         if (!is_numeric($slugs[0]) && isset($slugs[1]) && is_numeric($slugs[1])) {
             $guid = $slugs[1];
@@ -112,7 +108,10 @@ class SEO
             $guid = $slugs[0];
         }
 
-        $blog = $this->manager->get($guid);
+        if (is_null($manager)) {
+            $manager = Di::_()->get('Blogs\Manager');
+        }
+        $blog = $manager->get($guid);
         if (!$blog || !$blog->getTitle() || Helpers\Flags::shouldFail($blog) || !Core\Security\ACL::_()->read($blog)) {
             header("HTTP/1.0 404 Not Found");
             return [

Core/Channels/Events.php

@@ -13,20 +13,15 @@ use Minds\Core\Events\Event;
 
 class Events
 {
-    /** @var Manager */
-    protected $manager;
-
     /** @var Dispatcher */
     protected $eventsDispatcher;
 
     /**
      * Events constructor.
-     * @param Manager $manager
      * @param Dispatcher $eventsDispatcher
      */
-    public function __construct($manager = null, $eventsDispatcher = null)
+    public function __construct($eventsDispatcher = null)
     {
-        $this->manager = $manager ?: Di::_()->get('Channels\Manager');
         $this->eventsDispatcher = $eventsDispatcher ?: Di::_()->get('EventsDispatcher');
     }
 
@@ -35,8 +30,8 @@ class Events
         // User entity deletion
         $this->eventsDispatcher->register('entity:delete', 'user', function (Event $event) {
             $user = $event->getParameters()['entity'];
-
-            $event->setResponse($this->manager->setUser($user)->delete());
+            $manager = Di::_()->get('Channels\Manager');
+            $event->setResponse($manager->setUser($user)->delete());
         });
     }
 }

Core/Comments/Events.php

@@ -19,25 +19,16 @@ use Minds\Core\Security\ACL;
 
 class Events
 {
-    /** @var Manager */
-    protected $manager;
-
     /** @var Dispatcher */
     protected $eventsDispatcher;
 
-    /** @var Votes\Manager */
-    protected $votesManager;
-
     /**
      * Events constructor.
-     * @param Manager $manager
      * @param Dispatcher $eventsDispatcher
      */
-    public function __construct($manager = null, $eventsDispatcher = null, $votesManager = null)
+    public function __construct($eventsDispatcher = null)
     {
-        $this->manager = $manager ?: new Manager();
         $this->eventsDispatcher = $eventsDispatcher ?: Di::_()->get('EventsDispatcher');
-        $this->votesManager = $votesManager ?: new Votes\Manager();
     }
 
     public function register()
@@ -46,23 +37,24 @@ class Events
 
         $this->eventsDispatcher->register('entity:resolve', 'comment', function (Event $event) {
             $luid = $event->getParameters()['luid'];
-            
-            $event->setResponse($this->manager->getByLuid($luid));
+            $manager = new Manager();
+            $event->setResponse($manager->getByLuid($luid));
         });
 
         // Entity save
 
         $this->eventsDispatcher->register('entity:save', 'comment', function (Event $event) {
             $comment = $event->getParameters()['entity'];
-
-            $event->setResponse($this->manager->update($comment));
+            $manager = new Manager();
+            $event->setResponse($manager->update($comment));
         });
 
         // Votes Module
 
         $this->eventsDispatcher->register('vote:action:has', 'comment', function (Event $event) {
+            $votesManager = new Votes\Manager();
             $event->setResponse(
-                $this->votesManager
+                $votesManager
                     ->setVote($event->getParameters()['vote'])
                     ->has()
             );
@@ -81,8 +73,9 @@ class Events
                     $vote->getDirection()
                 );
 
+            $votesManager = new Votes\Manager();
             $event->setResponse(
-                $this->votesManager
+                $votesManager
                     ->setVote($event->getParameters()['vote'])
                     ->cast()
             );
@@ -101,8 +94,9 @@ class Events
                     $vote->getDirection()
                 );
 
+            $votesManager = new Votes\Manager();
             $event->setResponse(
-                $this->votesManager
+                $votesManager
                     ->setVote($event->getParameters()['vote'])
                     ->cancel()
             );

Core/Data/Client.php

@@ -2,11 +2,12 @@
 /**
  * Minds Data Client Factory
  */
-namespace Minds\Core\data;
+
+namespace Minds\Core\Data;
 
 class Client
 {
-    private static $default = '\Minds\Core\Data\cassandra\client';
+    private static $default = '\Minds\Core\Data\Cassandra\Client';
     private static $clients = [];
 
     /**

Core/Groups/Events.php

@@ -18,7 +18,7 @@ class Events
      */
     public function register()
     {
-        \elgg_register_plugin_hook_handler('entities_class_loader', 'all', function ($hook, $type, $return, $row) {
+        Dispatcher::register('entities_class_loader', "elgg/hook/all", function ($hook, $type, $return, $row) {
             if ($row->type == 'group') {
                 $entity = new GroupEntity();
                 $entity->loadFromArray((array) $row);

Core/Minds.php

@@ -3,6 +3,7 @@
 namespace Minds\Core;
 
 use Minds\Core\Di\Di;
+use Minds\Core\Events\Dispatcher;
 
 /**
  * Core Minds Engine.
@@ -111,6 +112,7 @@ class Minds extends base
         (new Feeds\FeedsProvider())->register();
         (new Analytics\AnalyticsProvider())->register();
         (new Channels\ChannelsProvider())->register();
+        (new Blogs\BlogsProvider())->register();
     }
 
     /**
@@ -141,12 +143,12 @@ class Minds extends base
         /*
          * Boot the system, @todo this should be oop?
          */
-        \elgg_trigger_event('boot', 'system');
+        Dispatcher::trigger('boot', 'elgg/event/system', null, true);
 
         /*
          * Complete the boot process for both engine and plugins
          */
-        elgg_trigger_event('init', 'system');
+        Dispatcher::trigger('init', 'elgg/event/system', null, true);
 
         /*
          * tell the system that we have fully booted
@@ -156,7 +158,7 @@ class Minds extends base
         /*
          * System loaded and ready
          */
-        \elgg_trigger_event('ready', 'system');
+        Dispatcher::trigger('ready', 'elgg/event/system', null, true);
     }
 
     /**