From 08bee07e61a3710e428766ba9d737fcc634ae2ae Mon Sep 17 00:00:00 2001 From: TeamAbronDev Date: Sat, 11 Jan 2025 10:52:59 +0330 Subject: [PATCH 1/3] wrong file removed --- .env' | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 .env' diff --git a/.env' b/.env' deleted file mode 100644 index 16d366c6..00000000 --- a/.env' +++ /dev/null @@ -1,2 +0,0 @@ -VITE_API_URL=https://test.peptide.chat/api -# VITE_API_URL=http://local.revolt.chat:8000 From 8992dab209719c6f2e27cb9446948abd50097571 Mon Sep 17 00:00:00 2001 From: TeamAbronDev Date: Wed, 15 Jan 2025 10:57:47 +0330 Subject: [PATCH 2/3] changed checking server_id policy --- src/pages/channels/Channel.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/channels/Channel.tsx b/src/pages/channels/Channel.tsx index ae219cb2..7e561976 100644 --- a/src/pages/channels/Channel.tsx +++ b/src/pages/channels/Channel.tsx @@ -99,7 +99,7 @@ export const Channel = observer( const client = useClient(); const state = useApplicationState(); - if (!client.channels.exists(id) && client.servers.get(server_id)) { + if (!client.channels.exists(id) && server_id) { if (server_id) { const server = client.servers.get(server_id); if (server && server.channel_ids.length > 0) { From 0a67ab3e5f135c12500149d1bc33dcaa96b78b84 Mon Sep 17 00:00:00 2001 From: TeamAbronDev Date: Thu, 16 Jan 2025 18:30:56 +0330 Subject: [PATCH 3/3] Message box Permission --- .../common/messaging/MessageBox.tsx | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/src/components/common/messaging/MessageBox.tsx b/src/components/common/messaging/MessageBox.tsx index 70ee0633..e2264c0d 100644 --- a/src/components/common/messaging/MessageBox.tsx +++ b/src/components/common/messaging/MessageBox.tsx @@ -257,25 +257,27 @@ export default observer(({ channel }: Props) => { ); } - console.log(channel) - if (!channel.havePermission("SendMessage") && channel.recipient?.relationship == "Blocked" || channel.recipient?.relationship == "BlockedOther"){ - return ( - - - - - - - -
- -
-
- - ); - } + console.log(channel) //|| channel.channel_type != "DirectMessage" + if (channel.channel_type != "SavedMessages") + if (!channel.havePermission("SendMessage") && channel.channel_type == "TextChannel" || channel.recipient?.relationship == "Blocked" || channel.recipient?.relationship == "BlockedOther"){ + + return ( + + + + + + + +
+ +
+
+ + ); + } // Push message content to draft. const setMessage = useCallback( (content?: string) => {