From a65b0297dc2113259aabb9e5f7afb2580d517264 Mon Sep 17 00:00:00 2001 From: Tinashe Musonza Date: Thu, 1 Feb 2018 22:40:47 -0800 Subject: [PATCH] Apply fixes from StyleCI --- src/Chat.php | 2 +- src/Conversations/Conversation.php | 8 ++++---- src/config/musonza_chat.php | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Chat.php b/src/Chat.php index ff93964..f594b78 100644 --- a/src/Chat.php +++ b/src/Chat.php @@ -371,7 +371,7 @@ private function getConversationsInCommon($conversation1, $conversation2) public function unreadCount() { - return $this->message->unreadCount($this->user); + return $this->message->unreadCount($this->user); } /** diff --git a/src/Conversations/Conversation.php b/src/Conversations/Conversation.php index 88b2005..75f1a62 100644 --- a/src/Conversations/Conversation.php +++ b/src/Conversations/Conversation.php @@ -299,8 +299,8 @@ private function notifications($user, $readAll) if ($readAll) { return $notifications->markAsRead(); - } - + } + return $notifications; } @@ -309,8 +309,8 @@ private function notifications($user, $readAll) if ($readAll) { return $notifications->update(['is_seen' => 1]); - } - + } + return $notifications->get(); } diff --git a/src/config/musonza_chat.php b/src/config/musonza_chat.php index c951d7d..7eac107 100755 --- a/src/config/musonza_chat.php +++ b/src/config/musonza_chat.php @@ -3,15 +3,15 @@ return [ 'user_model' => 'App\User', - /** + /* * This will allow you to broadcast an event when a message is sent * Example: - * Channel: private-mc-chat-conversation.2, - * Event: Musonza\Chat\Messages\MessageWasSent + * Channel: private-mc-chat-conversation.2, + * Event: Musonza\Chat\Messages\MessageWasSent */ 'broadcasts' => false, - /** + /* * If set to true, this will use Laravel notifications table to store each * user message notification. * Otherwise it will use mc_message_notification table.