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

12 files changed, 46 insertions, 47 deletions

diff --git a/main/app/sprinkles/admin/assets/userfrosting/js/pages/activities.js b/main/app/sprinkles/admin/assets/userfrosting/js/pages/activities.js
index 89ac5c1..4968ffd 100644
--- a/main/app/sprinkles/admin/assets/userfrosting/js/pages/activities.js
+++ b/main/app/sprinkles/admin/assets/userfrosting/js/pages/activities.js
@@ -7,7 +7,7 @@
  * Target page: /activities
  */
 
-$(document).ready(function() {
+$(document).ready(function () {
     // Set up table of activities
     $("#widget-activities").ufTable({
         dataUrl: site.uri.public + "/api/activities",
diff --git a/main/app/sprinkles/admin/assets/userfrosting/js/pages/dashboard.js b/main/app/sprinkles/admin/assets/userfrosting/js/pages/dashboard.js
index f2b8a4f..d78d611 100644
--- a/main/app/sprinkles/admin/assets/userfrosting/js/pages/dashboard.js
+++ b/main/app/sprinkles/admin/assets/userfrosting/js/pages/dashboard.js
@@ -5,8 +5,8 @@
  * Target page: /dashboard
  */
 
-$(document).ready(function() {
-    $('.js-clear-cache').click(function() {
+$(document).ready(function () {
+    $('.js-clear-cache').click(function () {
         $("body").ufModal({
             sourceUrl: site.uri.public + "/modals/dashboard/clear-cache",
             ajaxParams: {
@@ -20,10 +20,10 @@ $(document).ready(function() {
             var form = modal.find('.js-form');
 
             form.ufForm()
-            .on("submitSuccess.ufForm", function() {
-                // Reload page on success
-                window.location.reload();
-            });
+                .on("submitSuccess.ufForm", function () {
+                    // Reload page on success
+                    window.location.reload();
+                });
         });
     });
 
diff --git a/main/app/sprinkles/admin/assets/userfrosting/js/pages/group.js b/main/app/sprinkles/admin/assets/userfrosting/js/pages/group.js
index a1ca959..e54b897 100644
--- a/main/app/sprinkles/admin/assets/userfrosting/js/pages/group.js
+++ b/main/app/sprinkles/admin/assets/userfrosting/js/pages/group.js
@@ -7,7 +7,7 @@
  * Target page: /groups/g/{slug}
  */
 
-$(document).ready(function() {
+$(document).ready(function () {
     // Control buttons
     bindGroupButtons($("#view-group"));
 
diff --git a/main/app/sprinkles/admin/assets/userfrosting/js/pages/groups.js b/main/app/sprinkles/admin/assets/userfrosting/js/pages/groups.js
index 0bfc65a..42a1f05 100644
--- a/main/app/sprinkles/admin/assets/userfrosting/js/pages/groups.js
+++ b/main/app/sprinkles/admin/assets/userfrosting/js/pages/groups.js
@@ -7,7 +7,7 @@
  * Target page: /groups
  */
 
-$(document).ready(function() {
+$(document).ready(function () {
 
     $("#widget-groups").ufTable({
         dataUrl: site.uri.public + "/api/groups",
diff --git a/main/app/sprinkles/admin/assets/userfrosting/js/pages/permission.js b/main/app/sprinkles/admin/assets/userfrosting/js/pages/permission.js
index 87e851f..61eefb6 100644
--- a/main/app/sprinkles/admin/assets/userfrosting/js/pages/permission.js
+++ b/main/app/sprinkles/admin/assets/userfrosting/js/pages/permission.js
@@ -7,7 +7,7 @@
  * Target page: /permissions/p/{id}
  */
 
-$(document).ready(function() {
+$(document).ready(function () {
     $("#widget-permission-users").ufTable({
         dataUrl: site.uri.public + '/api/permissions/p/' + page.permission_id + '/users',
         useLoadingTransition: site.uf_table.use_loading_transition
diff --git a/main/app/sprinkles/admin/assets/userfrosting/js/pages/permissions.js b/main/app/sprinkles/admin/assets/userfrosting/js/pages/permissions.js
index 6266ff4..4881d25 100644
--- a/main/app/sprinkles/admin/assets/userfrosting/js/pages/permissions.js
+++ b/main/app/sprinkles/admin/assets/userfrosting/js/pages/permissions.js
@@ -7,7 +7,7 @@
  * Target page: /permissions
  */
 
-$(document).ready(function() {
+$(document).ready(function () {
     // Set up table of permissions
     $("#widget-permissions").ufTable({
         dataUrl: site.uri.public + "/api/permissions",
diff --git a/main/app/sprinkles/admin/assets/userfrosting/js/pages/role.js b/main/app/sprinkles/admin/assets/userfrosting/js/pages/role.js
index 8dae7f5..3bfcef7 100644
--- a/main/app/sprinkles/admin/assets/userfrosting/js/pages/role.js
+++ b/main/app/sprinkles/admin/assets/userfrosting/js/pages/role.js
@@ -7,7 +7,7 @@
  * Target page: /roles/r/{slug}
  */
 
-$(document).ready(function() {
+$(document).ready(function () {
     // Control buttons
     bindRoleButtons($("#view-role"));
 
diff --git a/main/app/sprinkles/admin/assets/userfrosting/js/pages/roles.js b/main/app/sprinkles/admin/assets/userfrosting/js/pages/roles.js
index b1febb2..0643305 100644
--- a/main/app/sprinkles/admin/assets/userfrosting/js/pages/roles.js
+++ b/main/app/sprinkles/admin/assets/userfrosting/js/pages/roles.js
@@ -7,7 +7,7 @@
  * Target page: /roles
  */
 
-$(document).ready(function() {
+$(document).ready(function () {
     // Set up table of roles
     $("#widget-roles").ufTable({
         dataUrl: site.uri.public + "/api/roles",
diff --git a/main/app/sprinkles/admin/assets/userfrosting/js/pages/user.js b/main/app/sprinkles/admin/assets/userfrosting/js/pages/user.js
index 70acf7c..79d0301 100644
--- a/main/app/sprinkles/admin/assets/userfrosting/js/pages/user.js
+++ b/main/app/sprinkles/admin/assets/userfrosting/js/pages/user.js
@@ -7,7 +7,7 @@
  * Target page: /users/u/{user_name}
  */
 
-$(document).ready(function() {
+$(document).ready(function () {
     // Control buttons
     bindUserButtons($("#view-user"));
 
diff --git a/main/app/sprinkles/admin/assets/userfrosting/js/pages/users.js b/main/app/sprinkles/admin/assets/userfrosting/js/pages/users.js
index d9e4bb7..2e8685c 100644
--- a/main/app/sprinkles/admin/assets/userfrosting/js/pages/users.js
+++ b/main/app/sprinkles/admin/assets/userfrosting/js/pages/users.js
@@ -7,7 +7,7 @@
  * Target page: /users
  */
 
-$(document).ready(function() {
+$(document).ready(function () {
     // Set up table of users
     $("#widget-users").ufTable({
         dataUrl: site.uri.public + "/api/users",
diff --git a/main/app/sprinkles/admin/assets/userfrosting/js/widgets/groups.js b/main/app/sprinkles/admin/assets/userfrosting/js/widgets/groups.js
index d701d81..cae3514 100644
--- a/main/app/sprinkles/admin/assets/userfrosting/js/widgets/groups.js
+++ b/main/app/sprinkles/admin/assets/userfrosting/js/widgets/groups.js
@@ -19,7 +19,7 @@ function attachGroupForm() {
         });
 
         // Auto-generate slug
-        form.find('input[name=name]').on('input change', function() {
+        form.find('input[name=name]').on('input change', function () {
             var manualSlug = form.find('#form-group-slug-override').prop('checked');
             if (!manualSlug) {
                 var slug = getSlug($(this).val());
@@ -27,7 +27,7 @@ function attachGroupForm() {
             }
         });
 
-        form.find('#form-group-slug-override').on('change', function() {
+        form.find('#form-group-slug-override').on('change', function () {
             if ($(this).prop('checked')) {
                 form.find('input[name=slug]').prop('readonly', false);
             } else {
@@ -37,14 +37,14 @@ function attachGroupForm() {
         });
 
         // Set icon when changed
-        form.find('input[name=icon]').on('input change', function() {
+        form.find('input[name=icon]').on('input change', function () {
             $(this).prev(".icon-preview").find("i").removeClass().addClass($(this).val());
         });
 
         // Set up the form for submission
         form.ufForm({
             validators: page.validators
-        }).on("submitSuccess.ufForm", function() {
+        }).on("submitSuccess.ufForm", function () {
             // Reload page on success
             window.location.reload();
         });
@@ -63,7 +63,7 @@ function bindGroupButtons(el) {
      * Buttons that launch a modal dialog
      */
     // Edit group details button
-    el.find('.js-group-edit').click(function() {
+    el.find('.js-group-edit').click(function () {
         $("body").ufModal({
             sourceUrl: site.uri.public + "/modals/groups/edit",
             ajaxParams: {
@@ -76,7 +76,7 @@ function bindGroupButtons(el) {
     });
 
     // Delete group button
-    el.find('.js-group-delete').click(function() {
+    el.find('.js-group-delete').click(function () {
         $("body").ufModal({
             sourceUrl: site.uri.public + "/modals/groups/confirm-delete",
             ajaxParams: {
@@ -90,17 +90,17 @@ function bindGroupButtons(el) {
             var form = modal.find('.js-form');
 
             form.ufForm()
-            .on("submitSuccess.ufForm", function() {
-                // Reload page on success
-                window.location.reload();
-            });
+                .on("submitSuccess.ufForm", function () {
+                    // Reload page on success
+                    window.location.reload();
+                });
         });
     });
 }
 
 function bindGroupCreationButton(el) {
     // Link create button
-    el.find('.js-group-create').click(function() {
+    el.find('.js-group-create').click(function () {
         $("body").ufModal({
             sourceUrl: site.uri.public + "/modals/groups/create",
             msgTarget: $("#alerts-page")
diff --git a/main/app/sprinkles/admin/assets/userfrosting/js/widgets/roles.js b/main/app/sprinkles/admin/assets/userfrosting/js/widgets/roles.js
index 0e32651..42b58ed 100644
--- a/main/app/sprinkles/admin/assets/userfrosting/js/widgets/roles.js
+++ b/main/app/sprinkles/admin/assets/userfrosting/js/widgets/roles.js
@@ -15,7 +15,7 @@ function attachRoleForm() {
          */
 
         // Auto-generate slug
-        form.find('input[name=name]').on('input change', function() {
+        form.find('input[name=name]').on('input change', function () {
             var manualSlug = form.find('#form-role-slug-override').prop('checked');
             if (!manualSlug) {
                 var slug = getSlug($(this).val());
@@ -23,7 +23,7 @@ function attachRoleForm() {
             }
         });
 
-        form.find('#form-role-slug-override').on('change', function() {
+        form.find('#form-role-slug-override').on('change', function () {
             if ($(this).prop('checked')) {
                 form.find('input[name=slug]').prop('readonly', false);
             } else {
@@ -35,7 +35,7 @@ function attachRoleForm() {
         // Set up the form for submission
         form.ufForm({
             validators: page.validators
-        }).on("submitSuccess.ufForm", function() {
+        }).on("submitSuccess.ufForm", function () {
             // Reload page on success
             window.location.reload();
         });
@@ -51,7 +51,7 @@ function bindRoleButtons(el) {
      */
 
     // Manage permissions button
-    el.find('.js-role-permissions').click(function() {
+    el.find('.js-role-permissions').click(function () {
         var slug = $(this).data('slug');
         $("body").ufModal({
             sourceUrl: site.uri.public + "/modals/roles/permissions",
@@ -70,26 +70,25 @@ function bindRoleButtons(el) {
             permissionWidget.ufCollection({
                 dropdown: {
                     ajax: {
-                        url     : site.uri.public + '/api/permissions'
+                        url: site.uri.public + '/api/permissions'
                     },
-                    placeholder : "Select a permission"
+                    placeholder: "Select a permission"
                 },
                 dropdownTemplate: modal.find('#role-permissions-select-option').html(),
-                rowTemplate     : modal.find('#role-permissions-row').html()
+                rowTemplate: modal.find('#role-permissions-row').html()
             });
 
             // Get current roles and add to widget
             $.getJSON(site.uri.public + '/api/roles/r/' + slug + '/permissions')
-            .done(function (data) {
-                $.each(data.rows, function (idx, permission) {
-                    permission.text = permission.name;
-                    permissionWidget.ufCollection('addRow', permission);
+                .done(function (data) {
+                    $.each(data.rows, function (idx, permission) {
+                        permission.text = permission.name;
+                        permissionWidget.ufCollection('addRow', permission);
+                    });
                 });
-            });
 
             // Set up form for submission
-            form.ufForm({
-            }).on("submitSuccess.ufForm", function() {
+            form.ufForm({}).on("submitSuccess.ufForm", function () {
                 // Reload page on success
                 window.location.reload();
             });
@@ -100,7 +99,7 @@ function bindRoleButtons(el) {
      * Buttons that launch a modal dialog
      */
     // Edit role details button
-    el.find('.js-role-edit').click(function() {
+    el.find('.js-role-edit').click(function () {
         $("body").ufModal({
             sourceUrl: site.uri.public + "/modals/roles/edit",
             ajaxParams: {
@@ -113,7 +112,7 @@ function bindRoleButtons(el) {
     });
 
     // Delete role button
-    el.find('.js-role-delete').click(function() {
+    el.find('.js-role-delete').click(function () {
         $("body").ufModal({
             sourceUrl: site.uri.public + "/modals/roles/confirm-delete",
             ajaxParams: {
@@ -127,17 +126,17 @@ function bindRoleButtons(el) {
             var form = modal.find('.js-form');
 
             form.ufForm()
-            .on("submitSuccess.ufForm", function() {
-                // Reload page on success
-                window.location.reload();
-            });
+                .on("submitSuccess.ufForm", function () {
+                    // Reload page on success
+                    window.location.reload();
+                });
         });
     });
 }
 
 function bindRoleCreationButton(el) {
     // Link create button
-    el.find('.js-role-create').click(function() {
+    el.find('.js-role-create').click(function () {
         $("body").ufModal({
             sourceUrl: site.uri.public + "/modals/roles/create",
             msgTarget: $("#alerts-page")