From 9da5aa5be455f007e149484f11f5f0f399d503ca Mon Sep 17 00:00:00 2001 From: Kyren223 Date: Mon, 10 Feb 2025 18:04:38 +0200 Subject: [PATCH] @everyone is now sent as normal text when a user doesn't have permission to send it (instead of just disappearing) --- internal/client/ui/core/chat/chat.go | 9 ++++++--- internal/server/api/migrations/20250127154005_ping.sql | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/internal/client/ui/core/chat/chat.go b/internal/client/ui/core/chat/chat.go index b8a2075..8084c9b 100644 --- a/internal/client/ui/core/chat/chat.go +++ b/internal/client/ui/core/chat/chat.go @@ -680,9 +680,12 @@ func (m *Model) sendMessage() tea.Cmd { value := message[len(PingPrefix):index] switch value { case "everyone": - pingValue := packet.PingEveryone - ping = &pingValue - message = message[index+1:] + member := state.State.Members[*networkId][*state.UserID] + if member.IsAdmin { + pingValue := packet.PingEveryone + ping = &pingValue + message = message[index+1:] + } case "admins": pingValue := packet.PingAdmins ping = &pingValue diff --git a/internal/server/api/migrations/20250127154005_ping.sql b/internal/server/api/migrations/20250127154005_ping.sql index 54f207a..90f0655 100644 --- a/internal/server/api/migrations/20250127154005_ping.sql +++ b/internal/server/api/migrations/20250127154005_ping.sql @@ -1,7 +1,7 @@ -- +goose Up ALTER TABLE messages ADD ping INTEGER DEFAULT NULL; -- Must be null if freuqencyId is null --- 0 - @ping:everyone, 1 - @ping:admins, otherwise references userId +-- 0 - @everyone, 1 - @admins, otherwise references userId -- +goose Down