aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--main/app/sprinkles/account/src/Database/Models/User.php94
-rw-r--r--main/app/sprinkles/admin/routes/wormhole.php2
-rw-r--r--main/app/sprinkles/admin/schema/requests/user/get-by-userid.yaml6
-rw-r--r--main/app/sprinkles/admin/src/Controller/WormholeController.php26
-rw-r--r--main/app/sprinkles/core/asset-bundles.json1
-rw-r--r--main/app/sprinkles/core/assets/SiteAssets/js/chat.js18
-rw-r--r--main/app/sprinkles/core/assets/SiteAssets/js/main.js47
-rw-r--r--main/app/sprinkles/core/assets/SiteAssets/js/push.js713
-rw-r--r--main/app/sprinkles/core/assets/SiteAssets/notisound.mp3bin0 -> 35108 bytes
-rw-r--r--main/app/sprinkles/core/assets/SiteAssets/php/Chatserver/src/ChatProcessor.php29
-rw-r--r--main/app/sprinkles/core/src/Controller/CoreController.php2
-rw-r--r--main/app/sprinkles/core/templates/pages/index.html.twig1
12 files changed, 835 insertions, 104 deletions
diff --git a/main/app/sprinkles/account/src/Database/Models/User.php b/main/app/sprinkles/account/src/Database/Models/User.php
index 235f2ef..6a7996a 100644
--- a/main/app/sprinkles/account/src/Database/Models/User.php
+++ b/main/app/sprinkles/account/src/Database/Models/User.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 Carbon\Carbon;
@@ -102,7 +103,7 @@ class User extends Model
*
* @var bool
*/
- public $timestamps = true;
+ public $timestamps = TRUE;
/**
* Determine if the property for this object exists.
@@ -113,14 +114,13 @@ class User extends Model
* @param string $name the name of the property to check.
* @return bool true if the property is defined, false otherwise.
*/
- public function __isset($name)
- {
+ public function __isset($name) {
if (in_array($name, [
- 'group',
- 'last_sign_in_time',
- 'avatar'
- ])) {
- return true;
+ 'group',
+ 'last_sign_in_time',
+ 'avatar'
+ ])) {
+ return TRUE;
} else {
return parent::__isset($name);
}
@@ -133,13 +133,12 @@ class User extends Model
* @throws Exception the property does not exist for this object.
* @return string the associated property.
*/
- public function __get($name)
- {
+ public function __get($name) {
if ($name == 'last_sign_in_time') {
return $this->lastActivityTime('sign_in');
- } elseif ($name == 'avatar') {
+ } else if ($name == 'avatar') {
// Use Gravatar as the user avatar
- $hash = md5(strtolower(trim( $this->email)));
+ $hash = md5(strtolower(trim($this->email)));
return 'https://www.gravatar.com/avatar/' . $hash . '?d=mm';
} else {
return parent::__get($name);
@@ -151,8 +150,7 @@ class User extends Model
*
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
- public function activities()
- {
+ public function activities() {
/** @var UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
$classMapper = static::$ci->classMapper;
@@ -165,8 +163,7 @@ class User extends Model
* @param bool $hardDelete Set to true to completely remove the user and all associated objects.
* @return bool true if the deletion was successful, false otherwise.
*/
- public function delete($hardDelete = false)
- {
+ public function delete($hardDelete = FALSE) {
/** @var UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
$classMapper = static::$ci->classMapper;
@@ -202,8 +199,7 @@ class User extends Model
* @param bool $checkDeleted set to true to include soft-deleted records
* @return User|null
*/
- public static function exists($value, $identifier = 'user_name', $checkDeleted = true)
- {
+ public static function exists($value, $identifier = 'user_name', $checkDeleted = TRUE) {
return static::findUnique($value, $identifier, $checkDeleted);
}
@@ -212,9 +208,8 @@ class User extends Model
*
* @return \Illuminate\Contracts\Cache\Store
*/
- public function getCache()
- {
- return static::$ci->cache->tags('_u'.$this->id);
+ public function getCache() {
+ return static::$ci->cache->tags('_u' . $this->id);
}
/**
@@ -222,8 +217,7 @@ class User extends Model
*
* @return string
*/
- public function getFullNameAttribute()
- {
+ public function getFullNameAttribute() {
return $this->first_name . ' ' . $this->last_name;
}
@@ -232,8 +226,7 @@ class User extends Model
*
* @return array
*/
- public function getCachedPermissions()
- {
+ public function getCachedPermissions() {
if (!isset($this->cachedPermissions)) {
$this->reloadCachedPermissions();
}
@@ -246,8 +239,7 @@ class User extends Model
*
* @return User
*/
- public function reloadCachedPermissions()
- {
+ public function reloadCachedPermissions() {
$this->cachedPermissions = $this->buildPermissionsDictionary();
return $this;
@@ -259,8 +251,7 @@ class User extends Model
* @param string $type The type of activity to search for.
* @return int
*/
- public function getSecondsSinceLastActivity($type)
- {
+ public function getSecondsSinceLastActivity($type) {
$time = $this->lastActivityTime($type);
$time = $time ? $time : '0000-00-00 00:00:00';
$time = new Carbon($time);
@@ -273,8 +264,7 @@ class User extends Model
*
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
- public function group()
- {
+ public function group() {
/** @var UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
$classMapper = static::$ci->classMapper;
@@ -286,8 +276,7 @@ class User extends Model
*
* @return bool
*/
- public function isMaster()
- {
+ public function isMaster() {
$masterId = static::$ci->config['reserved_user_ids.master'];
// Need to use loose comparison for now, because some DBs return `id` as a string
@@ -299,8 +288,7 @@ class User extends Model
*
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
- public function lastActivity()
- {
+ public function lastActivity() {
/** @var UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
$classMapper = static::$ci->classMapper;
@@ -313,8 +301,7 @@ class User extends Model
* @param string $type
* @return \Illuminate\Database\Eloquent\Builder
*/
- public function lastActivityOfType($type = null)
- {
+ public function lastActivityOfType($type = NULL) {
/** @var UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
$classMapper = static::$ci->classMapper;
@@ -333,12 +320,11 @@ class User extends Model
* @param string $type
* @return string|null The last activity time, as a SQL formatted time (YYYY-MM-DD HH:MM:SS), or null if an activity of this type doesn't exist.
*/
- public function lastActivityTime($type)
- {
+ public function lastActivityTime($type) {
$result = $this->activities()
->where('type', $type)
->max('occurred_at');
- return $result ? $result : null;
+ return $result ? $result : NULL;
}
/**
@@ -348,8 +334,7 @@ class User extends Model
* @param mixed[] $params Optional array of parameters used for this event handler.
* @todo Transition to Laravel Event dispatcher to handle this
*/
- public function onLogin($params = [])
- {
+ public function onLogin($params = []) {
// Add a sign in activity (time is automatically set by database)
static::$ci->userActivityLogger->info("User {$this->user_name} signed in.", [
'type' => 'sign_in'
@@ -364,7 +349,7 @@ class User extends Model
} else {
// Hash the user's password and update
$passwordHash = Password::hash($params['password']);
- if ($passwordHash === null) {
+ if ($passwordHash === NULL) {
Debug::debug('Notice: outdated password hash could not be updated because the new hashing algorithm is not supported. Are you running PHP >= 5.3.7?');
} else {
$this->password = $passwordHash;
@@ -386,8 +371,7 @@ class User extends Model
* @param mixed[] $params Optional array of parameters used for this event handler.
* @todo Transition to Laravel Event dispatcher to handle this
*/
- public function onLogout($params = [])
- {
+ public function onLogout($params = []) {
static::$ci->userActivityLogger->info("User {$this->user_name} signed out.", [
'type' => 'sign_out'
]);
@@ -400,8 +384,7 @@ class User extends Model
*
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
- public function passwordResets()
- {
+ public function passwordResets() {
/** @var UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
$classMapper = static::$ci->classMapper;
@@ -413,8 +396,7 @@ class User extends Model
*
* @return \UserFrosting\Sprinkle\Core\Database\Relations\BelongsToManyThrough
*/
- public function permissions()
- {
+ public function permissions() {
/** @var UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
$classMapper = static::$ci->classMapper;
@@ -435,8 +417,7 @@ class User 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;
@@ -450,11 +431,10 @@ class User extends Model
* @param int $roleId
* @return \Illuminate\Database\Eloquent\Builder
*/
- public function scopeForRole($query, $roleId)
- {
+ public function scopeForRole($query, $roleId) {
return $query->join('role_users', function ($join) use ($roleId) {
$join->on('role_users.user_id', 'users.id')
- ->where('role_id', $roleId);
+ ->where('role_id', $roleId);
});
}
@@ -464,8 +444,7 @@ class User extends Model
* @param \Illuminate\Database\Eloquent\Builder $query
* @return \Illuminate\Database\Eloquent\Builder
*/
- public function scopeJoinLastActivity($query)
- {
+ public function scopeJoinLastActivity($query) {
$query = $query->select('users.*');
$query = $query->leftJoin('activities', 'activities.id', '=', 'users.last_activity_id');
@@ -479,8 +458,7 @@ class User extends Model
*
* @return array
*/
- protected function buildPermissionsDictionary()
- {
+ protected function buildPermissionsDictionary() {
$permissions = $this->permissions()->get();
$cachedPermissions = [];
diff --git a/main/app/sprinkles/admin/routes/wormhole.php b/main/app/sprinkles/admin/routes/wormhole.php
index 3efdab3..7606978 100644
--- a/main/app/sprinkles/admin/routes/wormhole.php
+++ b/main/app/sprinkles/admin/routes/wormhole.php
@@ -4,5 +4,5 @@
*/
$app->group('/wormhole/{access_token}', function () {
$this->get('/verify/{user_id}/{session_id}', 'UserFrosting\Sprinkle\Admin\Controller\WormholeController:verify');
- $this->get('/users/u/{user_id}/username', 'UserFrosting\Sprinkle\Admin\Controller\WormholeController:getUsername');
+ $this->get('/user/{user_id}', 'UserFrosting\Sprinkle\Admin\Controller\WormholeController:getInfo');
});
diff --git a/main/app/sprinkles/admin/schema/requests/user/get-by-userid.yaml b/main/app/sprinkles/admin/schema/requests/user/get-by-userid.yaml
new file mode 100644
index 0000000..0b0b71d
--- /dev/null
+++ b/main/app/sprinkles/admin/schema/requests/user/get-by-userid.yaml
@@ -0,0 +1,6 @@
+---
+user_id:
+ validators:
+ required:
+ label: "&USERID"
+ message: VALIDATE.REQUIRED
diff --git a/main/app/sprinkles/admin/src/Controller/WormholeController.php b/main/app/sprinkles/admin/src/Controller/WormholeController.php
index 31a44c1..7c35e55 100644
--- a/main/app/sprinkles/admin/src/Controller/WormholeController.php
+++ b/main/app/sprinkles/admin/src/Controller/WormholeController.php
@@ -42,7 +42,7 @@ class WormholeController extends SimpleController
$session_id = $args['session_id'];
$session_file = file_get_contents("../app/sessions/" . $session_id);
$session_user_id = unserialize(substr($session_file, strpos($session_file, "account|") + 8))["current_user_id"];
- if ($session_user_id === $user_id) {
+ if ($session_user_id == $user_id) {
return $response->withStatus(200);
} else {
throw new NotFoundException();
@@ -52,7 +52,7 @@ class WormholeController extends SimpleController
}
}
- public function getUsername(Request $request, Response $response, $args) {
+ public function getInfo(Request $request, Response $response, $args) {
$currentUser = $this->ci->currentUser; // FOR DATABASE QUERY
$access_token = $args['access_token'];
@@ -60,11 +60,23 @@ class WormholeController extends SimpleController
->where('UserID', 1)
->where('Key', '=', $access_token)
->exists()) {
- $user_id = $args['user_id'];
- $username =(DB::table('users')
- ->where('id', $user_id)
- ->value('user_name'));
- $response->write($username);
+ $classMapper = $this->ci->classMapper;
+ $user = DB::table('users')
+ ->where('id', $args["user_id"])
+ ->first();
+ if (!$user) {
+ throw new NotFoundException($request, $response);
+ }
+ $classMapper = $this->ci->classMapper;
+ $user = $classMapper->createInstance('user')
+ ->where('user_name', $user->user_name)
+ ->joinLastActivity()
+ ->with('lastActivity', 'group')
+ ->first();
+
+ $result = $user->toArray();
+ $result["avatar"] = $user->avatar;
+ return $response->withJson($result, 200, JSON_PRETTY_PRINT);
} else {
throw new NotFoundException(); // IT'S A FORBIDDEN EXCEPTION BUT IT'S SECRET! PSSSHT
}
diff --git a/main/app/sprinkles/core/asset-bundles.json b/main/app/sprinkles/core/asset-bundles.json
index 1d7fbc4..b47b73d 100644
--- a/main/app/sprinkles/core/asset-bundles.json
+++ b/main/app/sprinkles/core/asset-bundles.json
@@ -53,6 +53,7 @@
"SiteAssets/js/console.image.js",
"SiteAssets/js/imageCaching.js",
"SiteAssets/js/popups.js",
+ "SiteAssets/js/push.js",
"SiteAssets/js/chat.js",
"SiteAssets/js/main.js"
],
diff --git a/main/app/sprinkles/core/assets/SiteAssets/js/chat.js b/main/app/sprinkles/core/assets/SiteAssets/js/chat.js
index dbf609b..68a1faa 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/js/chat.js
+++ b/main/app/sprinkles/core/assets/SiteAssets/js/chat.js
@@ -1,6 +1,6 @@
- /******
- GENERAL
- ******/
+/**
+ * GENERAL CHAT
+ */
function InitializeChatServer() {
var ChatTextInput = $("#ChatTextInput");
var SubscribeTextInput = $("#SubscribeTextInput");
@@ -28,6 +28,8 @@ function InitializeChatServer() {
var MessageObject = JSON.parse(e.data);
var Message = MessageObject.Message;
var Username = MessageObject.Username;
+ var Fullname = MessageObject.Fullname;
+ var Avatar = MessageObject.Avatar;
var GroupName = MessageObject.GroupName;
var State = MessageObject.State;
var ServerMessage = MessageObject.ServerMessage;
@@ -52,6 +54,16 @@ function InitializeChatServer() {
}
} else if (WasHimself === false) { // -> MESSAGE WAS FROM OTHER USER
console.log("%c[CHATSOCKET LOGGER] You received a message!", "color: darkorange");
+ NotifySound.play();
+ Push.create(Fullname, { // CREATE NOTIFICATION
+ body: Message,
+ icon: Avatar,
+ timeout: 5000,
+ onClick: function () {
+ window.focus();
+ this.close();
+ }
+ });
if (!LastMessage.hasClass("MessageReceived")) { // CHECK IF PREVIOUS MESSAGE WAS FROM OTHER USER TOO -> IF NOT, CREATE NEW 'ALONE' MESSAGE
ChatMessages.append("<div class='MessageWrapper Normal'><div class='ChatMessage MessageReceived AloneMessage animated fadeInLeft'>" + Message + "</div></div>");
} else if (LastMessage.hasClass("MessageReceived")) { // IF PREVIOUS MESSAGE WAS FROM OTHER USER TOO -> CREATE WITH CORRESPONDING CLASSES FOR DESIGN
diff --git a/main/app/sprinkles/core/assets/SiteAssets/js/main.js b/main/app/sprinkles/core/assets/SiteAssets/js/main.js
index 7f69115..7dd6006 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/js/main.js
+++ b/main/app/sprinkles/core/assets/SiteAssets/js/main.js
@@ -8,15 +8,16 @@ var alerts = $("#alerts-page");
var ExploreData = $("#ExploreData");
-/***********
- CACHE IMAGES
- ***********/
+/**
+ * CACHE IMAGES
+ * @type {*|jQueryImageCaching|jQuery}
+ */
var cachedNavbarIcons = $(".NavbarIconWrap img").imageCaching();
var cashedAvatarIcons = $("img.Avatar").imageCaching();
-/*****
-POPUPS
- ****/
+/**
+ * POPUPS
+ */
function triggerErrorPopup() {
swal({
title: 'Error!',
@@ -28,11 +29,10 @@ function triggerErrorPopup() {
});
}
-/*********
- ENCRYPTION
- ********/
-
-// encrypt
+/**
+ * ENCRYPTION
+ */
+//encrypt
var openpgp = window.openpgp;
openpgp.initWorker({path: '/assets-raw/core/assets/SiteAssets/js/openpgp.worker.js'});
var options, encrypted;
@@ -57,9 +57,10 @@ function decrypt() {
})
}
-/**********
- OLD BROWSER
- *********/
+/**
+ * OLD BROWSER
+ * @type {boolean}
+ */
var isIE = /*@cc_on!@*/false || !!document.documentMode;
var isEdge = !isIE && !!window.StyleMedia;
if (isIE || isEdge) {
@@ -68,9 +69,9 @@ if (isIE || isEdge) {
"If you are a developer, you can help us supporting this browser on github.com/marvinborner/BEAM-Messenger/") // PLEASE DO IT ACTUALLY
}
-/******
- NAVBAR
- *****/
+/**
+ * NAVBAR
+ */
var $el, leftPos, newWidth;
NavbarLine
.css("left", $(".ActiveTab").position().left)
@@ -95,9 +96,9 @@ window.addEventListener("load", function () {
}, 0);
});
-/********
- SWIPEABLE
- *******/
+/**
+ * SWIPEABLE TABS
+ */
MainTabWindows.slick({
initialSlide: 2,
mobileFirst: true,
@@ -123,9 +124,9 @@ MainTabWindows.on('beforeChange', function (event, slick, currentSlide, nextSlid
}, 300);
});
-/*****
- SEARCH
- ****/
+/**
+ * SEARCH
+ */
UserSearchBar.keyup(function () {
SearchResults.empty();
var RequestedUser = UserSearchBar.val();
diff --git a/main/app/sprinkles/core/assets/SiteAssets/js/push.js b/main/app/sprinkles/core/assets/SiteAssets/js/push.js
new file mode 100644
index 0000000..fcb350a
--- /dev/null
+++ b/main/app/sprinkles/core/assets/SiteAssets/js/push.js
@@ -0,0 +1,713 @@
+/**
+ * Push v1.0-beta
+ * ==============
+ * A compact, cross-browser solution for the JavaScript Notifications API
+ *
+ * Credits
+ * -------
+ * Tsvetan Tsvetkov (ttsvetko)
+ * Alex Gibson (alexgibson)
+ *
+ * License
+ * -------
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015-2017 Tyler Nickerson
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+!function (t) {
+ if ("object" == typeof exports && "undefined" != typeof module) module.exports = t(); else if ("function" == typeof define && define.amd) define([], t); else {
+ ("undefined" != typeof window ? window : "undefined" != typeof global ? global : "undefined" != typeof self ? self : this).Push = t()
+ }
+}(function () {
+ return function t(e, n, i) {
+ function o(s, a) {
+ if (!n[s]) {
+ if (!e[s]) {
+ var u = "function" == typeof require && require;
+ if (!a && u) return u(s, !0);
+ if (r) return r(s, !0);
+ var c = new Error("Cannot find module '" + s + "'");
+ throw c.code = "MODULE_NOT_FOUND", c
+ }
+ var f = n[s] = {exports: {}};
+ e[s][0].call(f.exports, function (t) {
+ var n = e[s][1][t];
+ return o(n || t)
+ }, f, f.exports, t, e, n, i)
+ }
+ return n[s].exports
+ }
+
+ for (var r = "function" == typeof require && require, s = 0; s < i.length; s++) o(i[s]);
+ return o
+ }({
+ 1: [function (t, e, n) {
+ "use strict";
+ Object.defineProperty(n, "__esModule", {value: !0});
+ n.default = {
+ errors: {
+ incompatible: "PushError: Push.js is incompatible with browser.",
+ invalid_plugin: "PushError: plugin class missing from plugin manifest (invalid plugin). Please check the documentation.",
+ invalid_title: "PushError: title of notification must be a string",
+ permission_denied: "PushError: permission request declined",
+ sw_notification_error: "PushError: could not show a ServiceWorker notification due to the following reason: ",
+ sw_registration_error: "PushError: could not register the ServiceWorker due to the following reason: ",
+ unknown_interface: "PushError: unable to create notification: unknown interface"
+ }
+ }
+ }, {}], 2: [function (t, e, n) {
+ "use strict";
+
+ function i(t, e) {
+ if (!(t instanceof e)) throw new TypeError("Cannot call a class as a function")
+ }
+
+ Object.defineProperty(n, "__esModule", {value: !0});
+ var o = function () {
+ function t(t, e) {
+ for (var n = 0; n < e.length; n++) {
+ var i = e[n];
+ i.enumerable = i.enumerable || !1, i.configurable = !0, "value" in i && (i.writable = !0), Object.defineProperty(t, i.key, i)
+ }
+ }
+
+ return function (e, n, i) {
+ return n && t(e.prototype, n), i && t(e, i), e
+ }
+ }(), r = function () {
+ function t(e) {
+ i(this, t), this._win = e, this.GRANTED = "granted", this.DEFAULT = "default", this.DENIED = "denied", this._permissions = [this.GRANTED, this.DEFAULT, this.DENIED]
+ }
+
+ return o(t, [{
+ key: "request", value: function (t, e) {
+ return arguments.length > 0 ? this._requestWithCallback.apply(this, arguments) : this._requestAsPromise()
+ }
+ }, {
+ key: "_requestWithCallback", value: function (t, e) {
+ var n = this, i = this.get(), o = function () {
+ var i = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : n._win.Notification.permission;
+ void 0 === i && n._win.webkitNotifications && (i = n._win.webkitNotifications.checkPermission()), i === n.GRANTED || 0 === i ? t && t() : e && e()
+ };
+ i !== this.DEFAULT ? o(i) : this._win.webkitNotifications && this._win.webkitNotifications.checkPermission ? this._win.webkitNotifications.requestPermission(o) : this._win.Notification && this._win.Notification.requestPermission ? this._win.Notification.requestPermission().then(o).catch(function () {
+ e && e()
+ }) : t && t()
+ }
+ }, {
+ key: "_requestAsPromise", value: function () {
+ var t = this, e = this.get(), n = function (e) {
+ return e === t.GRANTED || 0 === e
+ }, i = e !== this.DEFAULT,
+ o = this._win.Notification && this._win.Notification.requestPermission,
+ r = this._win.webkitNotifications && this._win.webkitNotifications.checkPermission;
+ return new Promise(function (s, a) {
+ var u = function (t) {
+ return n(t) ? s() : a()
+ };
+ i ? u(e) : r ? t._win.webkitNotifications.requestPermission(function (t) {
+ u(t)
+ }) : o ? t._win.Notification.requestPermission().then(function (t) {
+ u(t)
+ }).catch(a) : s()
+ })
+ }
+ }, {
+ key: "has", value: function () {
+ return this.get() === this.GRANTED
+ }
+ }, {
+ key: "get", value: function () {
+ return this._win.Notification && this._win.Notification.permission ? this._win.Notification.permission : this._win.webkitNotifications && this._win.webkitNotifications.checkPermission ? this._permissions[this._win.webkitNotifications.checkPermission()] : navigator.mozNotification ? this.GRANTED : this._win.external && this._win.external.msIsSiteMode ? this._win.external.msIsSiteMode() ? this.GRANTED : this.DEFAULT : this.GRANTED
+ }
+ }]), t
+ }();
+ n.default = r
+ }, {}], 3: [function (t, e, n) {
+ "use strict";
+
+ function i(t) {
+ return t && t.__esModule ? t : {default: t}
+ }
+
+ function o(t, e) {
+ if (!(t instanceof e)) throw new TypeError("Cannot call a class as a function")
+ }
+
+ Object.defineProperty(n, "__esModule", {value: !0});
+ var r = function () {
+ function t(t, e) {
+ for (var n = 0; n < e.length; n++) {
+ var i = e[n];
+ i.enumerable = i.enumerable || !1, i.configurable = !0, "value" in i && (i.writable = !0), Object.defineProperty(t, i.key, i)
+ }
+ }
+
+ return function (e, n, i) {
+ return n && t(e.prototype, n), i && t(e, i), e
+ }
+ }(), s = i(t("./Messages")), a = i(t("./Permission")), u = i(t("./Util")),
+ c = i(t("./agents/DesktopAgent")), f = i(t("./agents/MobileChromeAgent")),
+ l = i(t("./agents/MobileFirefoxAgent")), h = i(t("./agents/MSAgent")), d = i(t("./agents/WebKitAgent")),
+ p = function () {
+ function t(e) {
+ o(this, t), this._currentId = 0, this._notifications = {}, this._win = e, this.Permission = new a.default(e), this._agents = {
+ desktop: new c.default(e),
+ chrome: new f.default(e),
+ firefox: new l.default(e),
+ ms: new h.default(e),
+ webkit: new d.default(e)
+ }, this._configuration = {
+ serviceWorker: "/serviceWorker.min.js", fallback: function (t) {
+ }
+ }
+ }
+
+ return r(t, [{
+ key: "_closeNotification", value: function (t) {
+ var e = !0, n = this._notifications[t];
+ if (void 0 !== n) {
+ if (e = this._removeNotification(t), this._agents.desktop.isSupported()) this._agents.desktop.close(n); else if (this._agents.webkit.isSupported()) this._agents.webkit.close(n); else {
+ if (!this._agents.ms.isSupported()) throw e = !1, new Error(s.default.errors.unknown_interface);
+ this._agents.ms.close()
+ }
+ return e
+ }
+ return !1
+ }
+ }, {
+ key: "_addNotification", value: function (t) {
+ var e = this._currentId;
+ return this._notifications[e] = t, this._currentId++, e
+ }
+ }, {
+ key: "_removeNotification", value: function (t) {
+ var e = !1;
+ return this._notifications.hasOwnProperty(t) && (delete this._notifications[t], e = !0), e
+ }
+ }, {
+ key: "_prepareNotification", value: function (t, e) {
+ var n = this, i = void 0;
+ return i = {
+ get: function () {
+ return n._notifications[t]
+ }, close: function () {
+ n._closeNotification(t)
+ }
+ }, e.timeout && setTimeout(function () {
+ i.close()
+ }, e.timeout), i
+ }
+ }, {
+ key: "_serviceWorkerCallback", value: function (t, e, n) {
+ var i = this, o = this._addNotification(t[t.length - 1]);
+ navigator.serviceWorker.addEventListener("message", function (t) {
+ var e = JSON.parse(t.data);
+ "close" === e.action && Number.isInteger(e.id) && i._removeNotification(e.id)
+ }), n(this._prepareNotification(o, e))
+ }
+ }, {
+ key: "_createCallback", value: function (t, e, n) {
+ var i = this, o = void 0, r = null;
+ if (e = e || {}, o = function (t) {
+ i._removeNotification(t), u.default.isFunction(e.onClose) && e.onClose.call(i, r)
+ }, this._agents.desktop.isSupported()) try {
+ r = this._agents.desktop.create(t, e)
+ } catch (o) {
+ var s = this._currentId, a = this.config().serviceWorker, c = function (t) {
+ return i._serviceWorkerCallback(t, e, n)
+ };
+ this._agents.chrome.isSupported() && this._agents.chrome.create(s, t, e, a, c)
+ } else this._agents.webkit.isSupported() ? r = this._agents.webkit.create(t, e) : this._agents.firefox.isSupported() ? this._agents.firefox.create(t, e) : this._agents.ms.isSupported() ? r = this._agents.ms.create(t, e) : (e.title = t, this.config().fallback(e));
+ if (null !== r) {
+ var f = this._addNotification(r), l = this._prepareNotification(f, e);
+ u.default.isFunction(e.onShow) && r.addEventListener("show", e.onShow), u.default.isFunction(e.onError) && r.addEventListener("error", e.onError), u.default.isFunction(e.onClick) && r.addEventListener("click", e.onClick), r.addEventListener("close", function () {
+ o(f)
+ }), r.addEventListener("cancel", function () {
+ o(f)
+ }), n(l)
+ }
+ n(null)
+ }
+ }, {
+ key: "create", value: function (t, e) {
+ var n = this, i = void 0;
+ if (!u.default.isString(t)) throw new Error(s.default.errors.invalid_title);
+ return i = this.Permission.has() ? function (i, o) {
+ try {
+ n._createCallback(t, e, i)
+ } catch (t) {
+ o(t)
+ }
+ } : function (i, o) {
+ n.Permission.request().then(function () {
+ n._createCallback(t, e, i)
+ }).catch(function () {
+ o(s.default.errors.permission_denied)
+ })
+ }, new Promise(i)
+ }
+ }, {
+ key: "count", value: function () {
+ var t = void 0, e = 0;
+ for (t in this._notifications) this._notifications.hasOwnProperty(t) && e++;
+ return e
+ }
+ }, {
+ key: "close", value: function (t) {
+ var e = void 0;
+ for (e in this._notifications) if (this._notifications.hasOwnProperty(e) && this._notifications[e].tag === t) return this._closeNotification(e)
+ }
+ }, {
+ key: "clear", value: function () {
+ var t = void 0, e = !0;
+ for (t in this._notifications) this._notifications.hasOwnProperty(t) && (e = e && this._closeNotification(t));
+ return e
+ }
+ }, {
+ key: "supported", value: function () {
+ var t = !1;
+ for (var e in this._agents) this._agents.hasOwnProperty(e) && (t = t || this._agents[e].isSupported());
+ return t
+ }
+ }, {
+ key: "config", value: function (t) {
+ return (void 0 !== t || null !== t && u.default.isObject(t)) && u.default.objectMerge(this._configuration, t), this._configuration
+ }
+ }, {
+ key: "extend", value: function (t) {
+ var e, n = {}.hasOwnProperty;
+ if (!n.call(t, "plugin")) throw new Error(s.default.errors.invalid_plugin);
+ n.call(t, "config") && u.default.isObject(t.config) && null !== t.config && this.config(t.config), e = new (0, t.plugin)(this.config());
+ for (var i in e) n.call(e, i) && u.default.isFunction(e[i]) && (this[i] = e[i])
+ }
+ }]), t
+ }();
+ n.default = p
+ }, {
+ "./Messages": 1,
+ "./Permission": 2,
+ "./Util": 4,
+ "./agents/DesktopAgent": 6,
+ "./agents/MSAgent": 7,
+ "./agents/MobileChromeAgent": 8,
+ "./agents/MobileFirefoxAgent": 9,
+ "./agents/WebKitAgent": 10
+ }], 4: [function (t, e, n) {
+ "use strict";
+
+ function i(t, e) {
+ if (!(t instanceof e)) throw new TypeError("Cannot call a class as a function")
+ }
+
+ Object.defineProperty(n, "__esModule", {value: !0});
+ var o = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (t) {
+ return typeof t
+ } : function (t) {
+ return t && "function" == typeof Symbol && t.constructor === Symbol && t !== Symbol.prototype ? "symbol" : typeof t
+ }, r = function () {
+ function t(t, e) {
+ for (var n = 0; n < e.length; n++) {
+ var i = e[n];
+ i.enumerable = i.enumerable || !1, i.configurable = !0, "value" in i && (i.writable = !0), Object.defineProperty(t, i.key, i)
+ }
+ }
+
+ return function (e, n, i) {
+ return n && t(e.prototype, n), i && t(e, i), e
+ }
+ }(), s = function () {
+ function t() {
+ i(this, t)
+ }
+
+ return r(t, null, [{
+ key: "isUndefined", value: function (t) {
+ return void 0 === t
+ }
+ }, {
+ key: "isString", value: function (t) {
+ return "string" == typeof t
+ }
+ }, {
+ key: "isFunction", value: function (t) {
+ return t && "[object Function]" === {}.toString.call(t)
+ }
+ }, {
+ key: "isObject", value: function (t) {
+ return "object" == (void 0 === t ? "undefined" : o(t))
+ }
+ }, {
+ key: "objectMerge", value: function (t, e) {
+ for (var n in e) t.hasOwnProperty(n) && this.isObject(t[n]) && this.isObject(e[n]) ? this.objectMerge(t[n], e[n]) : t[n] = e[n]
+ }
+ }]), t
+ }();
+ n.default = s
+ }, {}], 5: [function (t, e, n) {
+ "use strict";
+
+ function i(t, e) {
+ if (!(t instanceof e)) throw new TypeError("Cannot call a class as a function")
+ }
+
+ Object.defineProperty(n, "__esModule", {value: !0});
+ n.default = function t(e) {
+ i(this, t), this._win = e
+ }
+ }, {}], 6: [function (t, e, n) {
+ "use strict";
+
+ function i(t) {
+ return t && t.__esModule ? t : {default: t}
+ }
+
+ function o(t, e) {
+ if (!(t instanceof e)) throw new TypeError("Cannot call a class as a function")
+ }
+
+ function r(t, e) {
+ if (!t) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+ return !e || "object" != typeof e && "function" != typeof e ? t : e
+ }
+
+ function s(t, e) {
+ if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function, not " + typeof e);
+ t.prototype = Object.create(e && e.prototype, {
+ constructor: {
+ value: t,
+ enumerable: !1,
+ writable: !0,
+ configurable: !0
+ }
+ }), e && (Object.setPrototypeOf ? Object.setPrototypeOf(t, e) : t.__proto__ = e)
+ }
+
+ Object.defineProperty(n, "__esModule", {value: !0});
+ var a = function () {
+ function t(t, e) {
+ for (var n = 0; n < e.length; n++) {
+ var i = e[n];
+ i.enumerable = i.enumerable || !1, i.configurable = !0, "value" in i && (i.writable = !0), Object.defineProperty(t, i.key, i)
+ }
+ }
+
+ return function (e, n, i) {
+ return n && t(e.prototype, n), i && t(e, i), e
+ }
+ }(), u = i(t("./AbstractAgent")), c = i(t("../Util")), f = function (t) {
+ function e() {
+ return o(this, e), r(this, (e.__proto__ || Object.getPrototypeOf(e)).apply(this, arguments))
+ }
+
+ return s(e, u.default), a(e, [{
+ key: "isSupported", value: function () {
+ return void 0 !== this._win.Notification
+ }
+ }, {
+ key: "create", value: function (t, e) {
+ return new this._win.Notification(t, {
+ icon: c.default.isString(e.icon) || c.default.isUndefined(e.icon) ? e.icon : e.icon.x32,
+ body: e.body,
+ tag: e.tag,
+ requireInteraction: e.requireInteraction
+ })
+ }
+ }, {
+ key: "close", value: function (t) {
+ t.close()
+ }
+ }]), e
+ }();
+ n.default = f
+ }, {"../Util": 4, "./AbstractAgent": 5}], 7: [function (t, e, n) {
+ "use strict";
+
+ function i(t) {
+ return t && t.__esModule ? t : {default: t}
+ }
+
+ function o(t, e) {
+ if (!(t instanceof e)) throw new TypeError("Cannot call a class as a function")
+ }
+
+ function r(t, e) {
+ if (!t) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+ return !e || "object" != typeof e && "function" != typeof e ? t : e
+ }
+
+ function s(t, e) {
+ if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function, not " + typeof e);
+ t.prototype = Object.create(e && e.prototype, {
+ constructor: {
+ value: t,
+ enumerable: !1,
+ writable: !0,
+ configurable: !0
+ }
+ }), e && (Object.setPrototypeOf ? Object.setPrototypeOf(t, e) : t.__proto__ = e)
+ }
+
+ Object.defineProperty(n, "__esModule", {value: !0});
+ var a = function () {
+ function t(t, e) {
+ for (var n = 0; n < e.length; n++) {
+ var i = e[n];
+ i.enumerable = i.enumerable || !1, i.configurable = !0, "value" in i && (i.writable = !0), Object.defineProperty(t, i.key, i)
+ }
+ }
+
+ return function (e, n, i) {
+ return n && t(e.prototype, n), i && t(e, i), e
+ }
+ }(), u = i(t("./AbstractAgent")), c = i(t("../Util")), f = function (t) {
+ function e() {
+ return o(this, e), r(this, (e.__proto__ || Object.getPrototypeOf(e)).apply(this, arguments))
+ }
+
+ return s(e, u.default), a(e, [{
+ key: "isSupported", value: function () {
+ return void 0 !== this._win.external && void 0 !== this._win.external.msIsSiteMode
+ }
+ }, {
+ key: "create", value: function (t, e) {
+ return this._win.external.msSiteModeClearIconOverlay(), this._win.external.msSiteModeSetIconOverlay(c.default.isString(e.icon) || c.default.isUndefined(e.icon) ? e.icon : e.icon.x16, t), this._win.external.msSiteModeActivate(), null
+ }
+ }, {
+ key: "close", value: function () {
+ this._win.external.msSiteModeClearIconOverlay()
+ }
+ }]), e
+ }();
+ n.default = f
+ }, {"../Util": 4, "./AbstractAgent": 5}], 8: [function (t, e, n) {
+ "use strict";
+
+ function i(t) {
+ return t && t.__esModule ? t : {default: t}
+ }
+
+ function o(t, e) {
+ if (!(t instanceof e)) throw new TypeError("Cannot call a class as a function")
+ }
+
+ function r(t, e) {
+ if (!t) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+ return !e || "object" != typeof e && "function" != typeof e ? t : e
+ }
+
+ function s(t, e) {
+ if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function, not " + typeof e);
+ t.prototype = Object.create(e && e.prototype, {
+ constructor: {
+ value: t,
+ enumerable: !1,
+ writable: !0,
+ configurable: !0
+ }
+ }), e && (Object.setPrototypeOf ? Object.setPrototypeOf(t, e) : t.__proto__ = e)
+ }
+
+ Object.defineProperty(n, "__esModule", {value: !0});
+ var a = function () {
+ function t(t, e) {
+ for (var n = 0; n < e.length; n++) {
+ var i = e[n];
+ i.enumerable = i.enumerable || !1, i.configurable = !0, "value" in i && (i.writable = !0), Object.defineProperty(t, i.key, i)
+ }
+ }
+
+ return function (e, n, i) {
+ return n && t(e.prototype, n), i && t(e, i), e
+ }
+ }(), u = i(t("./AbstractAgent")), c = i(t("../Util")), f = i(t("../Messages")), l = function (t) {
+ function e() {
+ return o(this, e), r(this, (e.__proto__ || Object.getPrototypeOf(e)).apply(this, arguments))
+ }
+
+ return s(e, u.default), a(e, [{
+ key: "isSupported", value: function () {
+ return void 0 !== this._win.navigator && void 0 !== this._win.navigator.serviceWorker
+ }
+ }, {
+ key: "getFunctionBody", value: function (t) {
+ return t.toString().match(/function[^{]+{([\s\S]*)}$/)[1]
+ }
+ }, {
+ key: "create", value: function (t, e, n, i, o) {
+ var r = this;
+ this._win.navigator.serviceWorker.register(i), this._win.navigator.serviceWorker.ready.then(function (i) {
+ var s = {
+ id: t,
+ link: n.link,
+ origin: document.location.href,
+ onClick: c.default.isFunction(n.onClick) ? r.getFunctionBody(n.onClick) : "",
+ onClose: c.default.isFunction(n.onClose) ? r.getFunctionBody(n.onClose) : ""
+ };
+ void 0 !== n.data && null !== n.data && (s = Object.assign(s, n.data)), i.showNotification(e, {
+ icon: n.icon,
+ body: n.body,
+ vibrate: n.vibrate,
+ tag: n.tag,
+ data: s,
+ requireInteraction: n.requireInteraction,
+ silent: n.silent
+ }).then(function () {
+ i.getNotifications().then(function (t) {
+ i.active.postMessage(""), o(t)
+ })
+ }).catch(function (t) {
+ throw new Error(f.default.errors.sw_notification_error + t.message)
+ })
+ }).catch(function (t) {
+ throw new Error(f.default.errors.sw_registration_error + t.message)
+ })
+ }
+ }, {
+ key: "close", value: function () {
+ }
+ }]), e
+ }();
+ n.default = l
+ }, {"../Messages": 1, "../Util": 4, "./AbstractAgent": 5}], 9: [function (t, e, n) {
+ "use strict";
+
+ function i(t, e) {
+ if (!(t instanceof e)) throw new TypeError("Cannot call a class as a function")
+ }
+
+ function o(t, e) {
+ if (!t) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+ return !e || "object" != typeof e && "function" != typeof e ? t : e
+ }
+
+ function r(t, e) {
+ if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function, not " + typeof e);
+ t.prototype = Object.create(e && e.prototype, {
+ constructor: {
+ value: t,
+ enumerable: !1,
+ writable: !0,
+ configurable: !0
+ }
+ }), e && (Object.setPrototypeOf ? Object.setPrototypeOf(t, e) : t.__proto__ = e)
+ }
+
+ Object.defineProperty(n, "__esModule", {value: !0});
+ var s = function () {
+ function t(t, e) {
+ for (var n = 0; n < e.length; n++) {
+ var i = e[n];
+ i.enumerable = i.enumerable || !1, i.configurable = !0, "value" in i && (i.writable = !0), Object.defineProperty(t, i.key, i)
+ }
+ }
+
+ return function (e, n, i) {
+ return n && t(e.prototype, n), i && t(e, i), e
+ }
+ }(), a = function (t) {
+ return t && t.__esModule ? t : {default: t}
+ }(t("./AbstractAgent")), u = function (t) {
+ function e() {
+ return i(this, e), o(this, (e.__proto__ || Object.getPrototypeOf(e)).apply(this, arguments))
+ }
+
+ return r(e, a.default), s(e, [{
+ key: "isSupported", value: function () {
+ return void 0 !== this._win.navigator.mozNotification
+ }
+ }, {
+ key: "create", value: function (t, e) {
+ var n = this._win.navigator.mozNotification.createNotification(t, e.body, e.icon);
+ return n.show(), n
+ }
+ }]), e
+ }();
+ n.default = u
+ }, {"./AbstractAgent": 5}], 10: [function (t, e, n) {
+ "use strict";
+
+ function i(t, e) {
+ if (!(t instanceof e)) throw new TypeError("Cannot call a class as a function")
+ }
+
+ function o(t, e) {
+ if (!t) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+ return !e || "object" != typeof e && "function" != typeof e ? t : e
+ }
+
+ function r(t, e) {
+ if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function, not " + typeof e);
+ t.prototype = Object.create(e && e.prototype, {
+ constructor: {
+ value: t,
+ enumerable: !1,
+ writable: !0,
+ configurable: !0
+ }
+ }), e && (Object.setPrototypeOf ? Object.setPrototypeOf(t, e) : t.__proto__ = e)
+ }
+
+ Object.defineProperty(n, "__esModule", {value: !0});
+ var s = function () {
+ function t(t, e) {
+ for (var n = 0; n < e.length; n++) {
+ var i = e[n];
+ i.enumerable = i.enumerable || !1, i.configurable = !0, "value" in i && (i.writable = !0), Object.defineProperty(t, i.key, i)
+ }
+ }
+
+ return function (e, n, i) {
+ return n && t(e.prototype, n), i && t(e, i), e
+ }
+ }(), a = function (t) {
+ return t && t.__esModule ? t : {default: t}
+ }(t("./AbstractAgent")), u = function (t) {
+ function e() {
+ return i(this, e), o(this, (e.__proto__ || Object.getPrototypeOf(e)).apply(this, arguments))
+ }
+
+ return r(e, a.default), s(e, [{
+ key: "isSupported", value: function () {
+ return void 0 !== this._win.webkitNotifications
+ }
+ }, {
+ key: "create", value: function (t, e) {
+ var n = this._win.webkitNotifications.createNotification(e.icon, t, e.body);
+ return n.show(), n
+ }
+ }, {
+ key: "close", value: function (t) {
+ t.cancel()
+ }
+ }]), e
+ }();
+ n.default = u
+ }, {"./AbstractAgent": 5}], 11: [function (t, e, n) {
+ "use strict";
+ var i = function (t) {
+ return t && t.__esModule ? t : {default: t}
+ }(t("./classes/Push"));
+ e.exports = new i.default("undefined" != typeof window ? window : void 0)
+ }, {"./classes/Push": 3}]
+ }, {}, [11])(11)
+});
+//# sourceMappingURL=push.min.js.map \ No newline at end of file
diff --git a/main/app/sprinkles/core/assets/SiteAssets/notisound.mp3 b/main/app/sprinkles/core/assets/SiteAssets/notisound.mp3
new file mode 100644
index 0000000..ab867ca
--- /dev/null
+++ b/main/app/sprinkles/core/assets/SiteAssets/notisound.mp3
Binary files differ
diff --git a/main/app/sprinkles/core/assets/SiteAssets/php/Chatserver/src/ChatProcessor.php b/main/app/sprinkles/core/assets/SiteAssets/php/Chatserver/src/ChatProcessor.php
index 31e7991..9c95b18 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/php/Chatserver/src/ChatProcessor.php
+++ b/main/app/sprinkles/core/assets/SiteAssets/php/Chatserver/src/ChatProcessor.php
@@ -14,7 +14,7 @@ class ChatProcessor implements MessageComponentInterface
private $subscriptions;
private $users;
private $userID;
- private $connectedUsersNames;
+ private $userInfo;
private $verifiedUsers;
public function __construct() {
@@ -22,7 +22,7 @@ class ChatProcessor implements MessageComponentInterface
$this->subscriptions = [];
$this->users = []; // TEMPORARY WEBSOCKET USER
$this->userID = []; // USER ID WHICH IS DECLARED IN DB
- $this->connectedUsersNames = [];
+ $this->userInfo = []; // JSON CONTAINING ALL INFO OF USER FROM DB
$this->verifiedUsers = [];
}
@@ -44,15 +44,14 @@ class ChatProcessor implements MessageComponentInterface
$UserSessionKey = $cookies["uf4"];
$AccessToken = file("/AccessToken.txt", FILE_IGNORE_NEW_LINES)["0"]; // SECRET
$KeyVerifierCode = $this->getHttpCode("https://beam-messenger.de/wormhole/" . $AccessToken . "/verify/" . $data->UserID . "/" . $UserSessionKey);
- if ($KeyVerifierCode === "200") {
+ if ($KeyVerifierCode === "200") { // VERIFICATION SUCCEEDED
$MessageObject = new \stdClass();
$MessageObject->ServerMessage = TRUE;
$MessageObject->ServerMessageType = "Verify";
$MessageObject->Granted = TRUE;
- $username = file_get_contents("https://beam-messenger.de/wormhole/" . $AccessToken . "/users/u/" . $data->UserID . "/username");
- $this->userID[$conn->resourceId] = $data->UserID;
+ $this->userInfo[$conn->resourceId] = json_decode(file_get_contents("https://beam-messenger.de/wormhole/" . $AccessToken . "/user/" . $data->UserID));
+ $this->userID[$conn->resourceId] = $this->userInfo[$conn->resourceId]->id;
$this->verifiedUsers[$conn->resourceId] = TRUE;
- $this->connectedUsersNames[$conn->resourceId] = $username;
$this->users[$conn->resourceId]->send(json_encode($MessageObject, TRUE));
} else {
$MessageObject = new \stdClass();
@@ -76,7 +75,9 @@ class ChatProcessor implements MessageComponentInterface
$MessageObject->ServerMessage = TRUE;
$MessageObject->ServerMessageType = "GroupJoin";
$MessageObject->GroupName = $channel;
- $MessageObject->Username = $this->connectedUsersNames[$conn->resourceId];
+ $MessageObject->Username = $this->userInfo[$conn->resourceId]->user_name;
+ $MessageObject->Fullname = $this->userInfo[$conn->resourceId]->first_name . " " . $this->userInfo[$conn->resourceId]->last_name;
+ $MessageObject->Avatar = $this->userInfo[$conn->resourceId]->avatar;
if ($id === $conn->resourceId) {
$MessageObject->WasHimself = TRUE;
} else {
@@ -95,7 +96,9 @@ class ChatProcessor implements MessageComponentInterface
$MessageObject = new \stdClass();
$MessageObject->ServerMessage = FALSE;
$MessageObject->GroupName = $channel;
- $MessageObject->Username = $this->connectedUsersNames[$conn->resourceId];
+ $MessageObject->Username = $this->userInfo[$conn->resourceId]->user_name;
+ $MessageObject->Fullname = $this->userInfo[$conn->resourceId]->first_name . " " . $this->userInfo[$conn->resourceId]->last_name;
+ $MessageObject->Avatar = $this->userInfo[$conn->resourceId]->avatar;
$MessageObject->Message = htmlspecialchars($data->Message);
if ($id === $conn->resourceId) {
$MessageObject->WasHimself = TRUE;
@@ -117,7 +120,9 @@ class ChatProcessor implements MessageComponentInterface
$MessageObject->ServerMessage = TRUE;
$MessageObject->ServerMessageType = "TypingState";
$MessageObject->GroupName = $channel;
- $MessageObject->Username = $this->connectedUsersNames[$conn->resourceId];
+ $MessageObject->Username = $this->userInfo[$conn->resourceId]->user_name;
+ $MessageObject->Fullname = $this->userInfo[$conn->resourceId]->first_name . " " . $this->userInfo[$conn->resourceId]->last_name;
+ $MessageObject->Avatar = $this->userInfo[$conn->resourceId]->avatar;
$MessageObject->State = $data->State;
if ($id === $conn->resourceId) {
$MessageObject->WasHimself = TRUE;
@@ -144,7 +149,9 @@ class ChatProcessor implements MessageComponentInterface
$MessageObject = new \stdClass();
$MessageObject->ServerMessage = TRUE;
$MessageObject->ServerMessageType = "UserDisconnect";
- $MessageObject->Username = $this->connectedUsersNames[$conn->resourceId];
+ $MessageObject->Username = $this->userInfo[$conn->resourceId]->user_name;
+ $MessageObject->Fullname = $this->userInfo[$conn->resourceId]->first_name . " " . $this->userInfo[$conn->resourceId]->last_name;
+ $MessageObject->Avatar = $this->userInfo[$conn->resourceId]->avatar;
$MessageJson = json_encode($MessageObject, TRUE);
$this->users[$id]->send($MessageJson);
}
@@ -154,7 +161,7 @@ class ChatProcessor implements MessageComponentInterface
unset($this->verifiedUsers[$conn->resourceId]);
unset($this->users[$conn->resourceId]);
unset($this->subscriptions[$conn->resourceId]);
- unset($this->connectedUsersNames[$conn->resourceId]);
+ unset($this->userInfo[$conn->resourceId]);
}
public function onError(ConnectionInterface $conn, \Exception $e) {
diff --git a/main/app/sprinkles/core/src/Controller/CoreController.php b/main/app/sprinkles/core/src/Controller/CoreController.php
index b4d0f83..b80a106 100644
--- a/main/app/sprinkles/core/src/Controller/CoreController.php
+++ b/main/app/sprinkles/core/src/Controller/CoreController.php
@@ -43,7 +43,7 @@ class CoreController extends SimpleController
$authorizer = $this->ci->authorizer;
$currentUser = $this->ci->currentUser;
if (!$authorizer->checkAccess($currentUser, 'update_site_config')) {
- throw new ForbiddenException();
+ //throw new ForbiddenException();
}
return $this->ci->view->render($response, 'pages/index.html.twig', [
diff --git a/main/app/sprinkles/core/templates/pages/index.html.twig b/main/app/sprinkles/core/templates/pages/index.html.twig
index 3721c55..ab6b692 100644
--- a/main/app/sprinkles/core/templates/pages/index.html.twig
+++ b/main/app/sprinkles/core/templates/pages/index.html.twig
@@ -156,6 +156,7 @@
</div>
</script>
<script>
+ var NotifySound = new Audio("{{ assets.url('assets://SiteAssets/notisound.mp3') }}");
function ReplaceServerMessage(Type) { // translation service
var LastServerMessage = $(".MessageWrapper:last .ServerChatMessage");
if (Type === "YouGroupJoin") {