- Fix when sending/receiving a message, scroll to the bottom.

- Fix ensure use of boolean types in order to support PostgreSQL.

Author: akazorg

CHANGELOG.md

@@ -1,8 +1,22 @@
 # CHANGELOG
 
+## [0.0.5] - 2018-10-12
+- Fix when sending/receiving a message, scroll to the bottom.
+- Fix ensure use of boolean types in order to support PostgreSQL.
+
+
+## [0.0.4] - 2018-10-11
+- Fix SQL query to support PostgreSQL.
+
+
+## [0.0.3] - 2018-10-11
+- Fix messages id collision when appending a message, and request more data.
+
+
 ## [0.0.2] - 2018-10-11
 - Changed documentation.
 - Fix messages panel initialScrollY.
 
+
 ## [0.0.1] - 2018-10-10
 - First Release beta.

publishable/public/js/mercurius.js

@@ -4,6 +4,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta content="author" description="Bruno Torrinha <https://torrinha.com>">
 
     <meta name="csrf-token" content="{{ csrf_token() }}">
 

publishable/views/master.blade.php

@@ -37,7 +37,7 @@
 
                             <!-- Message -->
                             <div class="message__body"
-                                v-b-toggle="'aux'+msg.id"
+                                v-b-toggle="'aux'+idx"
                                 v-text="msg.message">
                             </div>
 
@@ -56,7 +56,7 @@
                         <!-- Message Datetime -->
                         <b-collapse
                             class="message__datetime"
-                            :id="'aux'+msg.id"
+                            :id="'aux'+idx"
                         >
                             <svg class="ic ic-clock"><use xlink:href="#icon-clock"></use></svg>
                             {{msg.created_at | datetimeSingle}}
@@ -145,18 +145,9 @@ export default {
 
         // Private helpers
         //
-        _scrollTo(scroll_y) {
-            setTimeout(() => {
-                this.$refs.wrap.scrollTo({x: 0, y: scroll_y+'%'}, false)
-            }, 300);
-        },
         _hasMsg(idx) {
             return (!!this.messages[idx]);
         },
-        _appendMsg(msg) {
-            this.messages.unshift(msg)
-            this._scrollTo(10)
-        },
         // Check if message was received or sent
         _received(msg) {
             return msg.sender_id !== Mercurius.user.id
@@ -171,6 +162,15 @@ export default {
             if (!this._hasMsg(idx+1)) return false;
             return (this.messages[idx+1].sender_id === msg.sender_id);
         },
+        _scrollTo(scroll_y) {
+            setTimeout(() => {
+                this.$refs.wrap.scrollTo({x: 0, y: scroll_y+'%'}, false)
+            }, 300);
+        },
+        _appendMsg(msg) {
+            this.messages.unshift(msg)
+            this._scrollTo(100)
+        },
 
 
         // Event handlers
@@ -189,7 +189,7 @@ export default {
             if (barY.scrollTop > 20 || this.offset < 0) return false;
 
             this.loadMessages()
-                .then(() => this._scrollTo(15));
+                .then(() => this._scrollTo(25));
         },
     }
 }

resources/js/messages/Messages.vue

@@ -28,12 +28,12 @@ public function get($receiver, $offset = 0, $limit = 10, $sender = null)
             ->where([
                 ['sender_id', $sender],
                 ['receiver_id', $receiver],
-                ['deleted_by_sender', '=', 0],
+                ['deleted_by_sender', '=', false],
             ])
             ->orWhere([
                 ['sender_id', $receiver],
                 ['receiver_id', $sender],
-                ['deleted_by_receiver', '=', 0],
+                ['deleted_by_receiver', '=', false],
             ])
             ->orderBy('created_at', 'desc')
             ->offset($offset)
@@ -92,10 +92,10 @@ public function all($user = null)
             '    FROM',
             '        (',
             '        SELECT receiver_id as usr, MAX(id) AS id FROM '.$tbl_messages,
-            '        WHERE deleted_by_sender IS NOT TRUE AND sender_id ='.$user.' GROUP BY usr',
+            '        WHERE deleted_by_sender IS FALSE AND sender_id ='.$user.' GROUP BY usr',
             '        UNION ALL',
             '        SELECT sender_id as usr, MAX(id) as id FROM '.$tbl_messages,
-            '        WHERE deleted_by_receiver IS NOT TRUE AND receiver_id ='.$user.' GROUP BY usr',
+            '        WHERE deleted_by_receiver IS FALSE AND receiver_id ='.$user.' GROUP BY usr',
             '        ) u',
             '    GROUP BY u.usr',
             '    ) mm',
@@ -127,10 +127,10 @@ public function recipients($user = null)
             'FROM',
             '    (',
             '    SELECT receiver_id as id FROM '.$tbl_messages,
-            '    WHERE sender_id ='.$user.' AND deleted_by_receiver IS NOT TRUE',
+            '    WHERE sender_id ='.$user.' AND deleted_by_receiver IS FALSE',
             '    UNION ALL',
             '    SELECT sender_id as id FROM '.$tbl_messages,
-            '    WHERE receiver_id ='.$user.' AND deleted_by_sender IS NOT TRUE',
+            '    WHERE receiver_id ='.$user.' AND deleted_by_sender IS FALSE',
             ') u',
         ]));
 
@@ -183,26 +183,26 @@ public function delete($senderId, $receiverId)
                     ['sender_id', $senderId],
                     ['receiver_id', $receiverId],
                 ])
-                ->update(['deleted_by_sender' => 1]);
+                ->update(['deleted_by_sender' => true]);
 
             (new $_mdl())
                 ->where([
                     ['sender_id', $receiverId],
                     ['receiver_id', $senderId],
                 ])
-                ->update(['deleted_by_receiver' => 1]);
+                ->update(['deleted_by_receiver' => true]);
 
             // Deletes messages, if removed from both users
             $res = (new $_mdl())
                 ->where([
                     ['sender_id', $senderId],
                     ['receiver_id', $receiverId],
-                    ['deleted_by_sender', '=', 1],
+                    ['deleted_by_sender', '=', true],
                 ])
                 ->Where([
                     ['sender_id', $receiverId],
                     ['receiver_id', $senderId],
-                    ['deleted_by_receiver', '=', 1],
+                    ['deleted_by_receiver', '=', true],
                 ])
                 ->delete();
 
@@ -227,12 +227,12 @@ private function userConversations($sender, $receiver)
             ->where([
                 ['sender_id', $sender],
                 ['receiver_id', $receiver],
-                ['deleted_by_sender', '=', 0],
+                ['deleted_by_sender', '=', false],
             ])
             ->orWhere([
                 ['sender_id', $receiver],
                 ['receiver_id', $sender],
-                ['deleted_by_receiver', '=', 0],
+                ['deleted_by_receiver', '=', false],
             ]);
     }
 }

src/Repositories/ConversationRepository.php

@@ -57,14 +57,14 @@ public function delete($msg, $user)
         try {
             // Set message 'deleted' for the current user only
             if ($msg->sender_id == $user) {
-                $msg->deleted_by_sender = 1;
+                $msg->deleted_by_sender = true;
             } else {
-                $msg->deleted_by_receiver = 1;
+                $msg->deleted_by_receiver = true;
             }
 
             // If message is marked deleted for both users (sender and receiver)
             // we remove the message from the database.
-            if ($msg->deleted_by_sender == 1 && $msg->deleted_by_receiver == 1) {
+            if ($msg->deleted_by_sender === true && $msg->deleted_by_receiver === true) {
                 $msg->delete();
             } else {
                 $msg->save();