diff --git a/app/src/main/java/io/xeres/app/xrs/service/chat/ChatRsService.java b/app/src/main/java/io/xeres/app/xrs/service/chat/ChatRsService.java index 0632cffe..036819fc 100644 --- a/app/src/main/java/io/xeres/app/xrs/service/chat/ChatRsService.java +++ b/app/src/main/java/io/xeres/app/xrs/service/chat/ChatRsService.java @@ -566,7 +566,7 @@ else if (item.getEventType() == ChatRoomEvent.KEEP_ALIVE.getCode()) else if (item.getEventType() == ChatRoomEvent.PEER_STATUS.getCode()) { chatRoom.userActivity(user); - sendChatRoomEventToConsumers(item.getRoomId(), CHAT_ROOM_TYPING_NOTIFICATION, user, item.getSenderNickname()); + sendChatRoomTypingNotificationToConsumers(item.getRoomId(), user, item.getSenderNickname()); } } @@ -581,6 +581,12 @@ private void sendChatRoomEventToConsumers(long roomId, MessageType messageType, sendChatRoomEventToConsumers(roomId, messageType, gxsId, nickname, null); } + private void sendChatRoomTypingNotificationToConsumers(long roomId, GxsId gxsId, String nickname) + { + var chatRoomMessage = new ChatRoomMessage(nickname, gxsId, null); + messageService.sendToConsumers(chatRoomDestination(), CHAT_ROOM_TYPING_NOTIFICATION, roomId, chatRoomMessage); + } + private void sendChatRoomTimeoutToConsumers(long roomId, GxsId gxsId, boolean split) { var chatRoomTimeoutEvent = new ChatRoomTimeoutEvent(gxsId, split); diff --git a/ui/src/main/resources/view/windows.css b/ui/src/main/resources/view/windows.css index f3743145..0bc8991d 100644 --- a/ui/src/main/resources/view/windows.css +++ b/ui/src/main/resources/view/windows.css @@ -21,8 +21,6 @@ -fx-font-family: "Consolas"; } -/* this is needed to display emojis before sending them */ .chat-send { - -fx-font-family: "Segoe UI Emoji"; - -fx-pref-height: 36px; /* and this is needed otherwise the widget is too small */ + -fx-pref-height: 36px; /* this is needed otherwise the widget is too small */ } \ No newline at end of file