WebSVN – LeadersLinked - Backend – Diff – /module/LeadersLinked/src/Controller/ChatController.php

 use LeadersLinked\Model\ChatGroup;
 use LeadersLinked\Model\ChatUser;
 use LeadersLinked\Form\CreateChatGroupForm;
 use LeadersLinked\Mapper\ChatGroupUserMapper;
 use LeadersLinked\Model\ChatGroupUser;
+use LeadersLinked\Mapper\UtilMapper;
 class ChatController extends AbstractActionController
             $users = $userMapper->fetchAllByIds($connectionIds);
             foreach($users as $user)
+            {
-                $username = trim($user->first_name . ' ' . $user->last_name);
-                if($this->isInactiveConnection($user->last_heart_beat_at ? $user->last_heart_beat_at : '')) {
+                $username = trim($user->first_name . ' ' . $user->last_name);
-                    $userMapper->updateChatOfflineStatus($user->id);
-                    $status = 'Offline';
-                } else {
-                    $status = "Online";
-                }
                 $status = $user->online ? 'Online' : 'Offline';
                 $user_image = $this->url()->fromRoute('storage', ['type' => 'user', 'code' => $user->uuid, 'filename' => $user->image]);
                 $userMapper = UserMapper::getInstance($this->adapter);
                 $users = $userMapper->fetchAllByIds($connectionIds);
                 foreach ($users as $user)
-                {
+                {
-                    if ($this->isInactiveConnection($user->last_heart_beat_at ? $user->last_heart_beat_at : '')) {
-                        $userMapper->updateChatOfflineStatus($user->id);
-                        $online = false;
-                    } else {
-                        $online = true;
                         'id'                        => $user->uuid,
                         'name'                      => trim($user->first_name . ' ' . $user->last_name),
                         'image'                     => $this->url()->fromRoute('storage', ['code' => $user->uuid, 'type' => 'user', 'filename' => $user->image]),
                         /*'profile'                   => $this->url()->fromRoute('profile/view', ['id' =>$user->uuid]),*/
                         'type'                      => 'user',
-                        'online'                    => $online ? 1 : 0,
+                        'online'                    => $user->online ? 1 : 0,
                         'is_open'                   => $is_open ? 1 : 0,
                         'not_seen_messages'         => $not_seen_messages,
                         'not_received_messages'     => $not_received_messages,
                     ];
                     'success' => false,
                     'data' => $chatGroupUserMapper->getError()
                 ]);
+            }
-            if ($this->isInactiveConnection($user->last_heart_beat_at ? $user->last_heart_beat_at : '')) {
-                $userMapper->updateChatOfflineStatus($user->id);
-                $online = false;
-            } else {
-                $online = true;
             return new JsonModel([
                 'success' => true,
                 'data' => [
                     'url_remove_from_group' => $this->url()->fromRoute('chat/remove-user-from-group', ['group_id' => $chatGroup->uuid, 'user_id' => $user->uuid]),
                     'id'        => $user->uuid,
                     'name'      => trim($user->first_name . ' ' . $user->last_name),
                     'image'     => $this->url()->fromRoute('storage', ['code' => $user->uuid, 'type' => 'user', 'filename' => $user->image]),
                     'type'      => 'user',
-                    'online'    => $online,
+                    'online'    => $user->online,
         $items = [];
         $users = [];
+        $userMapper = UserMapper::getInstance($this->adapter);
+        $utilMapper = UtilMapper::getInstance($this->adapter);
-        $userMapper = UserMapper::getInstance($this->adapter);
+        $now = $utilMapper->getDatebaseNow();
         foreach ($paginator as $m)
+        {
                 $content = $this->sanitize($m->content);
             } else {
                 $content = $this->url()->fromRoute('storage', ['code' => $chatGroup->uuid, 'type' => 'chat', 'filename' => $m->content]);
+            }
-            $msgtime = $this->timeAgo($m->added_on);
+            $msgtime = $this->timeAgo($m->added_on, $now);
             array_push($items, [
                 'user_name' => trim($userdata_from->first_name . ' ' .$userdata_from->last_name) ,
                 'user_id' => $userdata_from->uuid,
                 'user_image' => $pic_from,
         $items = [];
         $users = [];
+        $userMapper = UserMapper::getInstance($this->adapter);
+        $utilMapper = UtilMapper::getInstance($this->adapter);
+        $now = $utilMapper->getDatebaseNow();
         $userMapper = UserMapper::getInstance($this->adapter);
         $messages = $paginator->getCurrentItems();
         foreach ($messages as $m) {
                 $content = $this->sanitize($m->content);
             } else {
                 $content = $this->url()->fromRoute('storage', ['code' => $chatUser->uuid, 'type' => 'chat', 'filename' => $m->content]);
+            }
-            $msgtime = $this->timeAgo($m->added_on);
+            $msgtime = $this->timeAgo($m->added_on, $now);
             array_push($items, [
                 'user_name' => ($userdata_from->first_name . ' ' . $userdata_from->last_name),
                 'user_id' => $userdata_from->uuid,
                 'user_image' => $pic_from,
                 'time' => $msgtime,
                 'id' => $m->uuid,
             ]);
+        }
-        if ($this->isInactiveConnection($currentUser->last_heart_beat_at ? $currentUser->last_heart_beat_at : '')) {
-            $userMapper->updateChatOfflineStatus($currentUser->id);
-            $online = false;
-        } else {
-            $online = true;
         return [
             'success' => true,
             'data' => [
                 'page' => $page,
                 'pages' => $pages,
                 'items' => $items,
-                'online' => $online
+                'online' => 1
+            ]
                     'success' => false,
                     'data' => 'ERROR_PARAMETERS_ARE_INVALID'
                 ]);
+            }
+            $utilMapper = UtilMapper::getInstance($this->adapter);
+            $now = $utilMapper->getDatebaseNow();
             $currentUserPlugin = $this->plugin('currentUserPlugin');
             $currentUser = $currentUserPlugin->getUser();
                             ]);
+                        }
+                    }
+                }
-                $msgtime = $this->timeAgo(date('Y-m-d H:i:s'));
+                $msgtime = $this->timeAgo($now, $now);
                 return new JsonModel([
                     'success' => true,
                     'data' => [
                         'user_name'         => $sender_name,
                     ]);
+                }
                 $chatMessage = $chatMessageMapper->fetchOne($chatMessage->id);
-                $msgtime = $this->timeAgo(date('Y-m-d H:i:s'));
+                $msgtime = $this->timeAgo($chatMessage->added_on, $now);
                 return new JsonModel([
                     'success' => true,
                     'data' => [
                     'code' => $user->uuid,
                     'type' => 'user',
                     'filename' => $user->image
                 ]);
-                if ($this->isInactiveConnection($user->last_heart_beat_at ? $user->last_heart_beat_at : '')) {
-                    $userMapper->updateChatOfflineStatus($user->id);
-                    $online = false;
-                } else {
-                    $online = true;
                 array_push($items, [
                     'id'        => $user->uuid,
                     'name'      => $name,
                     'image'     => $image,
-                    'online'    => $online,
+                    'online'    => $user->online,
                 } else {
                     $url_remove_from_group = $this->url()->fromRoute('chat/remove-user-from-group', ['group_id' => $chatGroup->uuid, 'user_id' => $user->uuid ]);
+                }
-                if ($this->isInactiveConnection($user->last_heart_beat_at ? $user->last_heart_beat_at : '')) {
-                    $userMapper->updateChatOfflineStatus($user->id);
-                    $online = false;
-                } else {
                     $online = true;
                 array_push($items, [
                     'url_remove_from_group' => $url_remove_from_group,
                     'id'                    => $user->uuid,
                     'name'                  => $name,
                     'image'                 => $image,
-                    'online'                => $online,
+                    'online'                => $user->online,
+                        }
+                    }
+                }
-                    }
+                $utilMapper = UtilMapper::getInstance($this->adapter);
                 $now = $utilMapper->getDatebaseNow();
-                $msgtime = $this->timeAgo(date('Y-m-d H:i:s'));
+                $msgtime = $this->timeAgo($now, $now);
                 return new JsonModel([
                     'success' => true,
                     ]);
+                }
+                $chatMessage = $chatMessageMapper->fetchOne($chatMessage->id);
-                $chatMessage = $chatMessageMapper->fetchOne($chatMessage->id);
+                $utilMapper = UtilMapper::getInstance($this->adapter);
                 $now = $utilMapper->getDatebaseNow();
-                $msgtime = $this->timeAgo(date('Y-m-d H:i:s'));
+                $msgtime = $this->timeAgo($chatMessage->added_on, $now);
                 return new JsonModel([
                     'success' => true,
         $text = str_replace("\n", "<br>", $text);
         return $text;
+    }
     /**
+     *
+     * @param string $timestamp
-     * @param string $timestamp
+     * @param string $now
      * @return string
      */
-    private function timeAgo($timestamp)
+    private function timeAgo($timestamp, $now = '')
+    {
+        if($now) {
+            $datetime1 = \DateTime::createFromFormat('Y-m-d H:i:s', $now);
+        } else {
-    {
+            $now = date('Y-m-d H:i:s');
+            $datetime1 = date_create($now);
         $datetime1 = new \DateTime("now");
+        $datetime2 = date_create($timestamp);
         $datetime2 = date_create($timestamp);
         $diff = date_diff($datetime1, $datetime2);
         $timemsg = '';
         if ($diff->y > 0) {
-            $timemsg = $diff->y . ' anio' . ($diff->y > 1 ? "s" : '');
+            $timemsg = $diff->y . ' año' . ($diff->y > 1 ? "s" : '');
         } else if ($diff->m > 0) {
-            $timemsg = $diff->m . ' mes' . ($diff->m > 1 ? "s" : '');
+            $timemsg = $diff->m . ' mes' . ($diff->m > 1 ? "es" : '');
         } else if ($diff->d > 0) {
             $timemsg = $diff->d . ' dia' . ($diff->d > 1 ? "s" : '');
         } else if ($diff->h > 0) {
             $timemsg = $diff->h . ' hora' . ($diff->h > 1 ? "s" : '');

Proyectos de Subversion LeadersLinked - Backend

(root)/module/LeadersLinked/src/Controller/ChatController.php – Rev 12666 → 14590