Altitude/AltitudeWeb
5
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects Releases Wiki Activity

Add type, channel, and receiver fields to chat model and filter messages by PUBLIC channel type in ChatService.

Browse Source
This commit is contained in:
akastijn 2026-07-19 22:54:35 +02:00
parent 1c2478e8d0
commit b1267068a5
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/com/alttd/altitudeweb/services/chat/ChatService.java
View File

@ -2,6 +2,7 @@ package com.alttd.altitudeweb.services.chat;
import com.alttd.altitudeweb.controllers.chat.ChatMessage; import com.alttd.altitudeweb.controllers.chat.ChatMessage;
import com.alttd.altitudeweb.controllers.chat.ChatMessageMapper; import com.alttd.altitudeweb.controllers.chat.ChatMessageMapper;
import com.alttd.altitudeweb.controllers.chat.ChatMessageType;
import com.alttd.altitudeweb.database.Databases; import com.alttd.altitudeweb.database.Databases;
import com.alttd.altitudeweb.database.chat.ChatLogMapper; import com.alttd.altitudeweb.database.chat.ChatLogMapper;
import com.alttd.altitudeweb.model.PermissionClaimDto; import com.alttd.altitudeweb.model.PermissionClaimDto;
@ -88,6 +89,8 @@ public class ChatService {
String jsonMessageList = chatMessageList.stream() String jsonMessageList = chatMessageList.stream()
.filter(ChatMessage::isNotBlocked) .filter(ChatMessage::isNotBlocked)
.filter(chatMessage -> Arrays.asList(allowedServers).contains(chatMessage.getServer())) .filter(chatMessage -> Arrays.asList(allowedServers).contains(chatMessage.getServer()))
//TODO [Stijn] [2026-07-19]: Handle different channel types
.filter(chatMessage -> chatMessage.getType() == ChatMessageType.PUBLIC)
.map(ChatMessageMapper::toJson) .map(ChatMessageMapper::toJson)
.collect(Collectors.joining(",", "[", "]")); .collect(Collectors.joining(",", "[", "]"));

5
frontend/src/app/pages/altitude/chat/objects/chat-message.object.ts
View File

@ -4,8 +4,9 @@ export interface ChatMessage {
uuid: string; uuid: string;
timestamp: number; timestamp: number;
server: string; server: string;
//TODO [Stijn] [2026-07-18]: Handle channel types type: string;
//channel: Channel; channel: string;
receiver: string;
messageJson: MiniMessageComponent; messageJson: MiniMessageComponent;
notBlocked: boolean; notBlocked: boolean;
} }