Fix timestamp when restoring chat rooms

The timestamp could be wrong for some lines.
zapek · Jan 7, 2025 · 45e5181 · 45e5181
1 parent 66ed45d
commit 45e5181
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/common/src/main/java/io/xeres/common/message/chat/ChatRoomBacklog.java b/common/src/main/java/io/xeres/common/message/chat/ChatRoomBacklog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 by David Gerber - https://zapek.com
+ * Copyright (c) 2024-2025 by David Gerber - https://zapek.com
  *
  * This file is part of Xeres.
  *
@@ -23,6 +23,6 @@
 
 import java.time.Instant;
 
-public record ChatRoomBacklog(Instant create, GxsId gxsId, String nickname, String message)
+public record ChatRoomBacklog(Instant created, GxsId gxsId, String nickname, String message)
 {
 }
diff --git a/ui/src/main/java/io/xeres/ui/controller/chat/ChatListView.java b/ui/src/main/java/io/xeres/ui/controller/chat/ChatListView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2023 by David Gerber - https://zapek.com
+ * Copyright (c) 2019-2025 by David Gerber - https://zapek.com
  *
  * This file is part of Xeres.
  *
@@ -153,9 +153,14 @@ public void addUserMessage(Instant when, String from, String message)
 	}
 
 	public void addUserMessage(String from, GxsId gxsId, String message)
+	{
+		addUserMessage(Instant.now(), from, gxsId, message);
+	}
+
+	public void addUserMessage(Instant when, String from, GxsId gxsId, String message)
 	{
 		var chatAction = new ChatAction(SAY, from, gxsId);
-		addMessage(Instant.now(), chatAction, message);
+		addMessage(when, chatAction, message);
 	}
 
 	private void addMessage(Instant time, ChatAction chatAction, String message)
@@ -172,7 +177,7 @@ private void addMessage(Instant time, ChatAction chatAction, String message)
 				var image = new Image(data);
 				if (!image.isError())
 				{
-					addMessageLine(chatAction, image);
+					addMessageLine(time, chatAction, image);
 				}
 			}
 		}
@@ -317,9 +322,9 @@ private void addMessageLine(ChatLine line)
 		trimScrollBackIfNeeded();
 	}
 
-	private void addMessageLine(ChatAction action, Image image)
+	private void addMessageLine(Instant when, ChatAction action, Image image)
 	{
-		var chatLine = new ChatLine(Instant.now(), action, new ContentImage(image, chatView));
+		var chatLine = new ChatLine(when, action, new ContentImage(image, chatView));
 		addMessageLine(chatLine);
 	}
 

diff --git a/ui/src/main/java/io/xeres/ui/controller/chat/ChatViewController.java b/ui/src/main/java/io/xeres/ui/controller/chat/ChatViewController.java
@@ -675,11 +675,11 @@ private void fillBacklog(ChatListView chatListView, List<ChatRoomBacklog> messag
 		messages.forEach(message -> {
 			if (message.gxsId() == null)
 			{
-				chatListView.addOwnMessage(message.create(), message.message());
+				chatListView.addOwnMessage(message.created(), message.message());
 			}
 			else
 			{
-				chatListView.addUserMessage(message.nickname(), message.gxsId(), message.message());
+				chatListView.addUserMessage(message.created(), message.nickname(), message.gxsId(), message.message());
 			}
 		});
 		chatListView.jumpToBottom(true);