Refactored code, many fixes and improvements in chat backend+frontend

6 files changed, 37 insertions, 53 deletions

diff --git a/main/app/sprinkles/account/src/Database/Models/Activity.php b/main/app/sprinkles/account/src/Database/Models/Activity.php
index d5be589..4e5b609 100644
--- a/main/app/sprinkles/account/src/Database/Models/Activity.php
+++ b/main/app/sprinkles/account/src/Database/Models/Activity.php
@@ -5,6 +5,7 @@
  * @link      https://github.com/userfrosting/UserFrosting
  * @license   https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
  */
+
 namespace UserFrosting\Sprinkle\Account\Database\Models;
 
 use Illuminate\Database\Capsule\Manager as Capsule;
@@ -39,8 +40,7 @@ class Activity extends Model
     /**
      * Joins the activity's user, so we can do things like sort, search, paginate, etc.
      */
-    public function scopeJoinUser($query)
-    {
+    public function scopeJoinUser($query) {
         $query = $query->select('activities.*');
 
         $query = $query->leftJoin('users', 'activities.user_id', '=', 'users.id');
@@ -53,8 +53,7 @@ class Activity extends Model
      *
      * @return \Illuminate\Database\Query\Builder
      */
-    public function scopeMostRecentEvents($query)
-    {
+    public function scopeMostRecentEvents($query) {
         return $query->select('user_id', 'event_type', Capsule::raw('MAX(occurred_at) as occurred_at'))
             ->groupBy('user_id')
             ->groupBy('type');
@@ -66,8 +65,7 @@ class Activity extends Model
      * @param string $type The type of event, matching the `event_type` field in the user_event table.
      * @return \Illuminate\Database\Query\Builder
      */
-    public function scopeMostRecentEventsByType($query, $type)
-    {
+    public function scopeMostRecentEventsByType($query, $type) {
         return $query->select('user_id', Capsule::raw('MAX(occurred_at) as occurred_at'))
             ->where('type', $type)
             ->groupBy('user_id');
@@ -76,8 +74,7 @@ class Activity extends Model
     /**
      * Get the user associated with this activity.
      */
-    public function user()
-    {
+    public function user() {
         /** @var UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
         $classMapper = static::$ci->classMapper;
 
diff --git a/main/app/sprinkles/account/src/Database/Models/Group.php b/main/app/sprinkles/account/src/Database/Models/Group.php
index f10e066..b904eb5 100644
--- a/main/app/sprinkles/account/src/Database/Models/Group.php
+++ b/main/app/sprinkles/account/src/Database/Models/Group.php
@@ -5,6 +5,7 @@
  * @link      https://github.com/userfrosting/UserFrosting
  * @license   https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
  */
+
 namespace UserFrosting\Sprinkle\Account\Database\Models;
 
 use Illuminate\Database\Capsule\Manager as Capsule;
@@ -41,15 +42,14 @@ class Group extends Model
     /**
      * @var bool Enable timestamps for this class.
      */
-    public $timestamps = true;
+    public $timestamps = TRUE;
 
     /**
      * Delete this group from the database, along with any user associations
      *
      * @todo What do we do with users when their group is deleted?  Reassign them?  Or, can a user be "groupless"?
      */
-    public function delete()
-    {
+    public function delete() {
         // Delete the group
         $result = parent::delete();
 
@@ -59,8 +59,7 @@ class Group extends Model
     /**
      * Lazily load a collection of Users which belong to this group.
      */
-    public function users()
-    {
+    public function users() {
         /** @var UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
         $classMapper = static::$ci->classMapper;
 
diff --git a/main/app/sprinkles/account/src/Database/Models/PasswordReset.php b/main/app/sprinkles/account/src/Database/Models/PasswordReset.php
index ac8a930..3fc4e3c 100644
--- a/main/app/sprinkles/account/src/Database/Models/PasswordReset.php
+++ b/main/app/sprinkles/account/src/Database/Models/PasswordReset.php
@@ -5,6 +5,7 @@
  * @link      https://github.com/userfrosting/UserFrosting
  * @license   https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
  */
+
 namespace UserFrosting\Sprinkle\Account\Database\Models;
 
 use Illuminate\Database\Capsule\Manager as Capsule;
@@ -39,7 +40,7 @@ class PasswordReset extends Model
     /**
      * @var bool Enable timestamps for PasswordResets.
      */
-    public $timestamps = true;
+    public $timestamps = TRUE;
 
     /**
      * Stores the raw (unhashed) token when created, so that it can be emailed out to the user.  NOT persisted.
@@ -49,16 +50,14 @@ class PasswordReset extends Model
     /**
      * @return string
      */
-    public function getToken()
-    {
+    public function getToken() {
         return $this->token;
     }
 
     /**
      * @param string $value
      */
-    public function setToken($value)
-    {
+    public function setToken($value) {
         $this->token = $value;
         return $this;
     }
@@ -66,8 +65,7 @@ class PasswordReset extends Model
     /**
      * Get the user associated with this reset request.
      */
-    public function user()
-    {
+    public function user() {
         /** @var UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
         $classMapper = static::$ci->classMapper;
 
diff --git a/main/app/sprinkles/account/src/Database/Models/Permission.php b/main/app/sprinkles/account/src/Database/Models/Permission.php
index 463af8d..3035e56 100644
--- a/main/app/sprinkles/account/src/Database/Models/Permission.php
+++ b/main/app/sprinkles/account/src/Database/Models/Permission.php
@@ -5,6 +5,7 @@
  * @link      https://github.com/userfrosting/UserFrosting
  * @license   https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
  */
+
 namespace UserFrosting\Sprinkle\Account\Database\Models;
 
 use Illuminate\Database\Capsule\Manager as Capsule;
@@ -37,14 +38,13 @@ class Permission extends Model
     /**
      * @var bool Enable timestamps for this class.
      */
-    public $timestamps = true;
+    public $timestamps = TRUE;
 
     /**
      * Delete this permission from the database, removing associations with roles.
      *
      */
-    public function delete()
-    {
+    public function delete() {
         // Remove all role associations
         $this->roles()->detach();
 
@@ -59,8 +59,7 @@ class Permission extends Model
      *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
      */
-    public function roles()
-    {
+    public function roles() {
         /** @var UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
         $classMapper = static::$ci->classMapper;
 
@@ -74,11 +73,10 @@ class Permission extends Model
      * @param int $roleId
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeForRole($query, $roleId)
-    {
+    public function scopeForRole($query, $roleId) {
         return $query->join('permission_roles', function ($join) use ($roleId) {
             $join->on('permission_roles.permission_id', 'permissions.id')
-                 ->where('role_id', $roleId);
+                ->where('role_id', $roleId);
         });
     }
 
@@ -89,11 +87,10 @@ class Permission extends Model
      * @param int $roleId
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeNotForRole($query, $roleId)
-    {
+    public function scopeNotForRole($query, $roleId) {
         return $query->join('permission_roles', function ($join) use ($roleId) {
             $join->on('permission_roles.permission_id', 'permissions.id')
-                 ->where('role_id', '!=', $roleId);
+                ->where('role_id', '!=', $roleId);
         });
     }
 
@@ -102,8 +99,7 @@ class Permission extends Model
      *
      * @return \UserFrosting\Sprinkle\Core\Database\Relations\BelongsToManyThrough
      */
-    public function users()
-    {
+    public function users() {
         /** @var UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
         $classMapper = static::$ci->classMapper;
 
diff --git a/main/app/sprinkles/account/src/Database/Models/Role.php b/main/app/sprinkles/account/src/Database/Models/Role.php
index ce9cb8c..4a58df0 100644
--- a/main/app/sprinkles/account/src/Database/Models/Role.php
+++ b/main/app/sprinkles/account/src/Database/Models/Role.php
@@ -5,6 +5,7 @@
  * @link      https://github.com/userfrosting/UserFrosting
  * @license   https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
  */
+
 namespace UserFrosting\Sprinkle\Account\Database\Models;
 
 use Illuminate\Database\Capsule\Manager as Capsule;
@@ -35,14 +36,13 @@ class Role extends Model
     /**
      * @var bool Enable timestamps for this class.
      */
-    public $timestamps = true;
+    public $timestamps = TRUE;
 
     /**
      * Delete this role from the database, removing associations with permissions and users.
      *
      */
-    public function delete()
-    {
+    public function delete() {
         // Remove all permission associations
         $this->permissions()->detach();
 
@@ -58,19 +58,17 @@ class Role extends Model
     /**
      * Get a list of default roles.
      */
-    public static function getDefaultSlugs()
-    {
+    public static function getDefaultSlugs() {
         /** @var UserFrosting\Config $config */
         $config = static::$ci->config;
 
-        return array_map('trim', array_keys($config['site.registration.user_defaults.roles'], true));
+        return array_map('trim', array_keys($config['site.registration.user_defaults.roles'], TRUE));
     }
 
     /**
      * Get a list of permissions assigned to this role.
      */
-    public function permissions()
-    {
+    public function permissions() {
         /** @var UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
         $classMapper = static::$ci->classMapper;
 
@@ -84,19 +82,17 @@ class Role extends Model
      * @param int $userId
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeForUser($query, $userId)
-    {
+    public function scopeForUser($query, $userId) {
         return $query->join('role_users', function ($join) use ($userId) {
             $join->on('role_users.role_id', 'roles.id')
-                 ->where('user_id', $userId);
+                ->where('user_id', $userId);
         });
     }
 
     /**
      * Get a list of users who have this role.
      */
-    public function users()
-    {
+    public function users() {
         /** @var UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
         $classMapper = static::$ci->classMapper;
 
diff --git a/main/app/sprinkles/account/src/Database/Models/Verification.php b/main/app/sprinkles/account/src/Database/Models/Verification.php
index cd5166d..f6697b6 100644
--- a/main/app/sprinkles/account/src/Database/Models/Verification.php
+++ b/main/app/sprinkles/account/src/Database/Models/Verification.php
@@ -5,6 +5,7 @@
  * @link      https://github.com/userfrosting/UserFrosting
  * @license   https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
  */
+
 namespace UserFrosting\Sprinkle\Account\Database\Models;
 
 use Illuminate\Database\Capsule\Manager as Capsule;
@@ -39,20 +40,18 @@ class Verification extends Model
     /**
      * @var bool Enable timestamps for Verifications.
      */
-    public $timestamps = true;
+    public $timestamps = TRUE;
 
     /**
      * Stores the raw (unhashed) token when created, so that it can be emailed out to the user.  NOT persisted.
      */
     protected $token;
 
-    public function getToken()
-    {
+    public function getToken() {
         return $this->token;
     }
 
-    public function setToken($value)
-    {
+    public function setToken($value) {
         $this->token = $value;
         return $this;
     }
@@ -60,8 +59,7 @@ class Verification extends Model
     /**
      * Get the user associated with this verification request.
      */
-    public function user()
-    {
+    public function user() {
         /** @var UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
         $classMapper = static::$ci->classMapper;