Offline last message updated in sidenav

app/lib/client/methods/sendMessage.js

@@ -3,7 +3,7 @@ import { TimeSync } from 'meteor/mizzao:timesync';
 import s from 'underscore.string';
 import toastr from 'toastr';
 
-import { ChatMessage, CachedChatMessage } from '../../../models';
+import { ChatMessage, CachedChatMessage, ChatRoom, ChatSubscription } from '../../../models';
 import { settings } from '../../../settings';
 import { callbacks } from '../../../callbacks';
 import { promises } from '../../../promises/client';
@@ -36,6 +36,8 @@ Meteor.methods({
 		promises.run('onClientMessageReceived', message).then(function(message) {
 			ChatMessage.insert(message);
 			CachedChatMessage.save();
+			ChatRoom.setLastMessage(message.rid, message);
+			ChatSubscription.setLastMessage(message.rid, message);
 			return callbacks.run('afterSaveMessage', message);
 		});
 	},

app/models/client/models/ChatRoom.js

@@ -9,3 +9,9 @@ ChatRoom.setReactionsInLastMessage = function(roomId, lastMessage) {
 ChatRoom.unsetReactionsInLastMessage = function(roomId) {
 	return this.update({ _id: roomId }, { $unset: { lastMessage: { reactions: 1 } } });
 };
+
+ChatRoom.setLastMessage = function(roomId, lastMessage) {
+	const update = this.update({ _id: roomId }, { $set: { lastMessage } });
+	CachedChatRoom.save();
+	return update;
+};

app/models/client/models/ChatSubscription.js

@@ -1,3 +1,9 @@
 import { CachedChatSubscription } from './CachedChatSubscription';
 
 export const ChatSubscription = CachedChatSubscription.collection;
+
+ChatSubscription.setLastMessage = function(roomId, lastMessage) {
+	const update = this.update({ rid: roomId }, { $set: { lastMessage } });
+	CachedChatSubscription.save();
+	return update;
+};

app/ui-sidenav/client/sidebarItem.html

@@ -56,6 +56,15 @@
 								<div class="sidebar-item__last-message">
 									<span class="message-body--unstyled">{{{lastMessage}}}</span>
 								</div>
+								{{#if lastMessageSentByUser}}
+									<div class="sidebar-item__time">
+										{{#if lastMessageDelivered}}
+											{{>icon icon="check"}}
+										{{else}}
+											{{>icon icon="clock"}}
+										{{/if}}
+									</div>
+								{{/if}}
 							{{/if}}
 						{{/if}}
 						{{#if unread}}

app/ui-sidenav/client/sidebarItem.js

@@ -29,6 +29,12 @@ Template.sidebarItem.helpers({
 	lastMessageTs() {
 		return this.lastMessage && Template.instance().lastMessageTs.get();
 	},
+	lastMessageDelivered() {
+		return this.lastMessage && !this.lastMessage.temp;
+	},
+	lastMessageSentByUser() {
+		return this.lastMessage && this.lastMessage.u && (this.lastMessage.u._id === Meteor.userId());
+	},
 	mySelf() {
 		return this.t === 'd' && this.name === Template.instance().user.username;
 	},
@@ -86,7 +92,7 @@ Template.sidebarItem.onCreated(function() {
 			}
 		}
 
-		if (!currentData.lastMessage._id) {
+		if (currentData.lastMessage && !currentData.lastMessage._id) {
 			this.renderedMessage = currentData.lastMessage.msg;
 			return;
 		}