Feature/2020.q3.dev

twake/backend/core/src/Twake/Core/Command/MappingCommand.php

@@ -205,14 +205,15 @@ protected function execute()
             "_source" => Array(
                 "includes" => Array("id"),
                 "excludes" => Array(
-                    "firstname", "lastname", "username", "language", "creation_date", "groups_id", "workspaces_id"
+                    "firstname", "lastname", "username", "email", "language", "creation_date", "groups_id", "workspaces_id"
                 )
             ),
             "properties" => Array(
                 "id" => Array("type" => "keyword"),
                 "firstname" => Array("type" => "text"),
                 "lastname" => Array("type" => "text"),
                 "username" => Array("type" => "text"),
+                "email" => Array("type" => "text"),
                 "language" => Array("type" => "keyword"),
                 "creation_date" => Array("type" => "date"),
                 "workspaces_id" => Array("type" => "keyword"),

twake/backend/core/src/Twake/Discussion/Command/MessageToDispatchQueueCommand.php

@@ -54,12 +54,16 @@ protected function execute()
                     $user_id = $dispatch_informations["user_id"];
                     $message_id = $dispatch_informations["message_id"];
 
-                    $message_system->dispatchMessage(
-                        $channel,
-                        $application_id,
-                        $user_id,
-                        $message_id
-                    );
+                    try{
+                        $message_system->dispatchMessage(
+                            $channel,
+                            $application_id,
+                            $user_id,
+                            $message_id
+                        );
+                    }catch(\Exception $e){
+                        error_log($e->getMessage());
+                    }
 
                     $queues->ack("message_dispatch_queue", $queue_message);
                 }

twake/backend/core/src/Twake/Notifications/Services/Notifications.php

@@ -217,7 +217,7 @@ public function pushNotification(
                 foreach ($keywords as $keyword) {
                     $keyword = trim($keyword);
                     $keyword = " " . $keyword . " ";
-                    if (strrpos(strtolower($title . " " . $text . " "), strtolower($keyword)) >= 0) {
+                    if (mb_strrpos(mb_strtolower($title . " " . $text . " "), mb_strtolower($keyword)) >= 0) {
                         $present = true;
                     }
                 }
@@ -301,8 +301,8 @@ public function pushDevice($user, $text, $title, $badge = null, $data = null, $d
             $token = $device->getValue();
 
             $this->pushDeviceInternal($device->getType(), $token,
-                substr($text, 0, 100) . (strlen($title) > 100 ? "..." : ""),
-                substr($title, 0, 50) . (strlen($title) > 50 ? "..." : ""),
+                mb_substr($text, 0, 100) . (mb_strlen($title) > 100 ? "..." : ""),
+                mb_substr($title, 0, 50) . (mb_strlen($title) > 50 ? "..." : ""),
                 $badge,
                 $data,
                 $doPush
@@ -315,7 +315,7 @@ public function pushDevice($user, $text, $title, $badge = null, $data = null, $d
     public function pushDeviceInternal($type, $deviceId, $message, $title, $badge, $_data, $doPush = true)
     {
 
-        if (strlen($deviceId) < 32) { //False device
+        if (mb_strlen($deviceId) < 32) { //False device
             return;
         }
 

twake/backend/core/src/Twake/Users/Entity/User.php

@@ -566,6 +566,7 @@ public function getAsArray()
     public function getIndexationArray()
     {
         $return = Array(
+            "email" => $this->getEmail(),
             "username" => $this->getUsername(),
             "firstname" => $this->getFirstName(),
             "lastname" => $this->getLastName(),

twake/backend/core/src/Twake/Users/Services/Users.php

@@ -41,6 +41,16 @@ public function search($options = Array())
                 )
             );
 
+            $should[] = Array(
+                "bool" => Array(
+                    "filter" => Array(
+                        "regexp" => Array(
+                            "email" => $name . ".*"
+                        )
+                    )
+                )
+            );
+
             $should[] = Array(
                 "bool" => Array(
                     "filter" => Array(

twake/frontend/src/app/components/UserListManager/UserListManager.js

@@ -103,7 +103,7 @@ export default class UserListManager extends React.Component {
       return '';
     }
 
-    if (item.email && !item.thumbnail) {
+    if (item.email && !item.username) {
       item = item.email;
     }
 

twake/frontend/src/app/services/languages/locale/en.js

@@ -1202,7 +1202,8 @@ export default {
     'Invite your collaborators into your workspace.',
   'scenes.app.channelsbar.public_channel_label': 'Public channel',
   'scenes.app.channelsbar.private_channel_label': 'Private channel',
-  'scenes.app.channelsbar.private_channel_message': 'This is a public channel, all the workspace will be invited !',
+  'scenes.app.channelsbar.private_channel_message':
+    'This is a public channel, all the workspace will be invited !',
   'scenes.app.channelsbar.save_channel_button': 'Save',
   'scenes.app.channelsbar.sending_message_instruction': 'Send a first message in a discussion',
   'scenes.app.channelsbar.tutorial_alert': 'Never show this frame again?',
@@ -1250,7 +1251,7 @@ export default {
   'scenes.app.popup.appsparameters.pages.application_title': 'Application',
   'scenes.app.popup.appsparameters.pages.apps_connectors_small_text':
     'Create and administer your applications and connectors.',
-  'scenes.app.popup.appsparameters.pages.apps_title': 'Your apllications and connectors',
+  'scenes.app.popup.appsparameters.pages.apps_title': 'Your applications and connectors',
   'scenes.app.popup.appsparameters.pages.automatique_label': 'Automatic',
   'scenes.app.popup.appsparameters.pages.automatique_option_information':
     "If you activate 'Automatic', this application will automatically be added to the next workspaces of this company.",
@@ -1262,7 +1263,7 @@ export default {
   'scenes.app.popup.appsparameters.pages.categories_label': 'Categories',
   'scenes.app.popup.appsparameters.pages.company_label': 'Company owner',
   'scenes.app.popup.appsparameters.pages.configuration_label': 'Configuration',
-  'scenes.app.popup.appsparameters.pages.create_app_button': 'Create an apllication',
+  'scenes.app.popup.appsparameters.pages.create_app_button': 'Create an application',
   'scenes.app.popup.appsparameters.pages.create_my_app': 'Create my application',
   'scenes.app.popup.appsparameters.pages.creation_app_instruction':
     'Please confirm the following information before creating your app.',