Added timestamps to messages

Author: CruseCtrl

client/Q3Client/App.xaml.cs

@@ -169,7 +169,7 @@ private void QueueMessageReceived(object sender, QueueMessageEventArgs queueMess
             Dispatcher.Invoke(
                 () =>
                     queueUpdater.AddQueueMessage(queueMessageEventArgs.QueueId, queueMessageEventArgs.Sender,
-                        queueMessageEventArgs.Message));
+                        queueMessageEventArgs.Message, queueMessageEventArgs.Timestamp));
         }
 
         private void QueueNagged(object sender, QueueIdEventArgs e)

client/Q3Client/ChatMessage.xaml.cs

@@ -25,6 +25,7 @@ public ChatMessage(Queue.Message message)
             InitializeComponent();
             AvatarCanvas.Children.Add(new Avatar(message.Sender));
             MessageText.Text = message.Content;
+            MessageText.ToolTip = "Sent at " + message.Timestamp.ToLocalTime().ToString("HH:mm:ss");
         }
     }
 }

client/Q3Client/Hub.cs

@@ -42,7 +42,7 @@ public Hub(User user, Dispatcher dispatcher)
             hub.On<Queue>("NewQueue", q => RaiseEvent("created", QueueCreated, q));
             hub.On<Queue>("QueueMembershipChanged", q => RaiseEvent("membershipchanged", QueueMembershipChanged, q));
             hub.On<Queue>("QueueStatusChanged", q => RaiseEvent("statuschanged", QueueStatusChanged, q));
-            hub.On<int, User, string>("QueueMessageSent", RaiseMessageEvent);
+            hub.On<int, User, string, DateTimeOffset>("QueueMessageSent", RaiseMessageEvent);
             hub.On<int>("NagQueue", id => RaiseEvent("nag", QueueNagged, id));
             hubConnection.Headers["User"] = this.user.ToString();
             hubConnection.StateChanged += HubConnectionOnStateChanged;
@@ -157,10 +157,10 @@ private void RaiseEvent(string name, EventHandler<QueueIdEventArgs> eventHandler
             eventHandler.SafeInvoke(this, new QueueIdEventArgs(id));
         }
 
-        private void RaiseMessageEvent(int queueId, User sender, string message)
+        private void RaiseMessageEvent(int queueId, User sender, string message, DateTimeOffset timestamp)
         {
-            logger.Info("hub messaage " + queueId + " " + sender + " " + message);
-            QueueMessageReceived.SafeInvoke(this, new QueueMessageEventArgs(queueId, sender, message));
+            logger.Info("hub message " + queueId + " " + sender + " " + message);
+            QueueMessageReceived.SafeInvoke(this, new QueueMessageEventArgs(queueId, sender, message, timestamp));
         }
 
         #endregion

client/Q3Client/Queue.cs

@@ -84,12 +84,12 @@ public IList<Message> Messages
 
         public bool Equals(Queue other)
         {
-            return other.Id == this.Id;
+            return other != null && other.Id == Id;
         }
 
         public event PropertyChangedEventHandler PropertyChanged;
 
-        protected  void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        protected void OnPropertyChanged([CallerMemberName] string propertyName = null)
         {
             logger.Info("q changed " + propertyName);
             PropertyChangedEventHandler handler = PropertyChanged;
@@ -100,6 +100,7 @@ public class Message
         {
             public User Sender;
             public string Content;
+            public DateTimeOffset Timestamp;
 
             protected bool Equals(Message other)
             {

client/Q3Client/QueueActionEventArgs.cs

@@ -32,25 +32,21 @@ public QueueIdEventArgs(int id)
 
     public class QueueMessageEventArgs  : QueueIdEventArgs
     {
-        private readonly User sender;
-        private readonly string message;
 
         public QueueMessageEventArgs(int queueId, string message) : base(queueId)
         {
-            this.message = message;
+            Message = message;
         }
 
-        public QueueMessageEventArgs(int queueId, User sender, string message) : base(queueId)
+        public QueueMessageEventArgs(int queueId, User sender, string message, DateTimeOffset timestamp) : base(queueId)
         {
-            this.sender = sender;
-            this.message = message;
+            Sender = sender;
+            Message = message;
+            Timestamp = timestamp;
         }
 
-        public string Message { get { return message; } }
-
-        public User Sender
-        {
-            get { return sender; }
-        }
+        public string Message { get; }
+        public User Sender { get; }
+        public DateTimeOffset Timestamp { get; }
     }
 }

client/Q3Client/QueueUpdater.cs

@@ -147,13 +147,13 @@ public void UpdateQueueStatus(Queue queue)
             UpdateQueue(queue);
         }
 
-        public void AddQueueMessage(int queueId, User sender, string message)
+        public void AddQueueMessage(int queueId, User sender, string message, DateTimeOffset timestamp)
         {
             logger.Debug(nameof(AddQueueMessage));
             if (queuesById.ContainsKey(queueId))
             { 
                 var q = queuesById[queueId];
-                q.AddMessage(new Queue.Message() {Sender = sender, Content = message});
+                q.AddMessage(new Queue.Message() {Sender = sender, Content = message, Timestamp = timestamp});
             }
         }
 

server/src/Q3Server/QEventsListener.cs

@@ -31,7 +31,7 @@ public void OnQueueCreated(object sender, QueueEventArgs e)
 
         private void QueueMessageSent(object sender, QueueMessageEventArgs e)
         {
-            hubContext.Clients.All.QueueMessageSent(e.Queue.Id, e.Message.Sender, e.Message.Content);
+            hubContext.Clients.All.QueueMessageSent(e.Queue.Id, e.Message.Sender, e.Message.Content, e.Message.Timestamp);
         }
 
         private void QueueStatusChanged(object sender, QueueEventArgs e)

server/src/Q3Server/Queue.cs

@@ -137,6 +137,12 @@ public class Message
         {
             public User Sender;
             public string Content;
+            public DateTimeOffset Timestamp;
+
+            public Message()
+            {
+                Timestamp = DateTimeOffset.UtcNow;
+            }
 
             public string Describe()
             {