ericek111/ts3java
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 1 Wiki Activity

Write both kinds of chat message through one method

Browse Source 
appendMessage and appendPrivateMessage built the same entry twice; they
now differ only in which log they pick.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
ericek111
2026-09-25 10:51:24 +00:00
parent a5c4ba1eb5
commit 1a3a3e37c1
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ts3-client/core/src/main/java/com/ts3client/chatlog/ChatLogStore.java
View File

@@ -103,9 +103,23 @@ public final class ChatLogStore {
return new SearchResult(last(hits, limit), hits.size()); return new SearchResult(last(hits, limit), hits.size());
} }
/** Logs a message; a private one goes to the log of the client it came from. */
public synchronized String appendMessage(ChatLogScope scope, boolean outgoing, int clientId, String uniqueId, public synchronized String appendMessage(ChatLogScope scope, boolean outgoing, int clientId, String uniqueId,
String nickname, String message) throws IOException { String nickname, String message) throws IOException {
LogFiles files = scope == ChatLogScope.PRIVATE ? privateLog(uniqueId) : log(scope); LogFiles files = scope == ChatLogScope.PRIVATE ? privateLog(uniqueId) : log(scope);
return append(files, scope, outgoing, clientId, uniqueId, nickname, message);
}
/** Logs a private message in the conversation with {@code peerUniqueId}, whoever wrote it. */
public synchronized String appendPrivateMessage(String peerUniqueId, boolean outgoing, int clientId,
String uniqueId, String nickname, String message)
throws IOException {
return append(privateLog(peerUniqueId), ChatLogScope.PRIVATE, outgoing, clientId, uniqueId, nickname,
message);
}
private String append(LogFiles files, ChatLogScope scope, boolean outgoing, int clientId, String uniqueId,
String nickname, String message) throws IOException {
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
String text = "<" + TIME.format(now) + "> " + safe(nickname) + ": " + safe(message); String text = "<" + TIME.format(now) + "> " + safe(nickname) + ": " + safe(message);
String html = messageHtml(scope, outgoing, now, clientId, uniqueId, nickname, message); String html = messageHtml(scope, outgoing, now, clientId, uniqueId, nickname, message);
@@ -113,16 +127,6 @@ public final class ChatLogStore {
return html; return html;
} }
public synchronized String appendPrivateMessage(String peerUniqueId, boolean outgoing, int clientId,
String uniqueId, String nickname, String message)
throws IOException {
LocalDateTime now = LocalDateTime.now();
String text = "<" + TIME.format(now) + "> " + safe(nickname) + ": " + safe(message);
String html = messageHtml(ChatLogScope.PRIVATE, outgoing, now, clientId, uniqueId, nickname, message);
appendRaw(privateLog(peerUniqueId), text, html);
return html;
}
public synchronized String appendServerEvent(String message) throws IOException { public synchronized String appendServerEvent(String message) throws IOException {
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
String text = "<" + TIME.format(now) + "> " + safe(message); String text = "<" + TIME.format(now) + "> " + safe(message);