From d740c23b098124f936b339a0fbddef3f6cef164d Mon Sep 17 00:00:00 2001 From: Harish Vishwakarma Date: Wed, 4 Dec 2024 09:16:08 +0530 Subject: [PATCH 01/17] spacing fix (#10) --- src/components/common/user/UserBadges.tsx | 67 ++++++++++++++--------- 1 file changed, 41 insertions(+), 26 deletions(-) diff --git a/src/components/common/user/UserBadges.tsx b/src/components/common/user/UserBadges.tsx index 2d134e9c..e3ab847f 100644 --- a/src/components/common/user/UserBadges.tsx +++ b/src/components/common/user/UserBadges.tsx @@ -6,17 +6,17 @@ import { Localizer, Text } from "preact-i18n"; import Tooltip from "../Tooltip"; enum Badges { - Developer = 1, // Developer - Translator = 2, // First 100 Members - Supporter = 4, // Supporter - ResponsibleDisclosure = 8, // Trusted Seller - Founder = 16, // Founder - PlatformModeration = 32, // Administrator + Developer = 1, + Translator = 2, + Supporter = 4, + ResponsibleDisclosure = 8, + Founder = 16, + PlatformModeration = 32, ActiveSupporter = 64, - Paw = 128, // Clown - EarlyAdopter = 256, // Top Contributor - ReservedRelevantJokeBadge1 = 512, // Karen - ReservedRelevantJokeBadge2 = 1024, // Gump + Paw = 128, + EarlyAdopter = 256, + ReservedRelevantJokeBadge1 = 512, + ReservedRelevantJokeBadge2 = 1024, } const BadgesBase = styled.div` @@ -39,60 +39,75 @@ export default function UserBadges({ badges, uid }: Props) { return ( - {badges & Badges.Founder && ( + {badges & Badges.Founder ? ( + ) : ( + <> )} - {badges & Badges.Developer && ( + {badges & Badges.Developer ? ( + ) : ( + <> )} - {badges & Badges.Translator && ( + {badges & Badges.Translator ? ( + ) : ( + <> )} - {badges & Badges.EarlyAdopter && ( + {badges & Badges.EarlyAdopter ? ( + ) : ( + <> )} - {badges & Badges.PlatformModeration && ( + {badges & Badges.PlatformModeration ? ( + ) : ( + <> )} - {badges & Badges.ResponsibleDisclosure && ( + {badges & Badges.ResponsibleDisclosure ? ( + ) : ( + <> )} - {badges & Badges.Supporter && ( + {badges & Badges.Supporter ? ( - + + ) : ( + <> )} - {badges & Badges.ReservedRelevantJokeBadge1 && ( + {badges & Badges.ReservedRelevantJokeBadge1 ? ( + ) : ( + <> )} - {badges & Badges.ReservedRelevantJokeBadge2 && ( + {badges & Badges.ReservedRelevantJokeBadge2 ? ( + ) : ( + <> )} - {badges & Badges.Paw && ( + {badges & Badges.Paw ? ( + ) : ( + <> )} From 6742ea390b789500e4c4ff8337f969980e4243c3 Mon Sep 17 00:00:00 2001 From: Harish Vishwakarma Date: Wed, 11 Dec 2024 20:23:29 +0530 Subject: [PATCH 02/17] prefix https:// with invite code copied (#11) --- src/controllers/modals/components/CreateInvite.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/controllers/modals/components/CreateInvite.tsx b/src/controllers/modals/components/CreateInvite.tsx index 28e7a7d1..0efa3be4 100644 --- a/src/controllers/modals/components/CreateInvite.tsx +++ b/src/controllers/modals/components/CreateInvite.tsx @@ -7,10 +7,10 @@ import { ModalForm } from "@revoltchat/ui"; import { noopAsync } from "../../../lib/js"; +import { IS_REVOLT } from "../../../version"; import { takeError } from "../../client/jsx/error"; import { modalController } from "../ModalController"; import { ModalProps } from "../types"; -import { IS_REVOLT } from "../../../version"; /** * Code block which displays invite @@ -79,7 +79,9 @@ export default function CreateInvite({ children: , onClick: () => modalController.writeText( - IS_REVOLT ? `https://rvlt.gg/${code}` : `${window.location.host}/invite/${code}` + IS_REVOLT + ? `https://rvlt.gg/${code}` + : `https://${window.location.host}/invite/${code}`, ), }, ]} From e954c31eba7fd07242be9bbb6278f0f1ca8b2719 Mon Sep 17 00:00:00 2001 From: TeamAbronDev Date: Thu, 2 Jan 2025 15:53:33 +0330 Subject: [PATCH 03/17] dm non friend --- .env | 4 ++-- src/components/common/messaging/MessageBox.tsx | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.env b/.env index 5436a1ed..1b08a29c 100644 --- a/.env +++ b/.env @@ -1,2 +1,2 @@ -VITE_API_URL=https://peptide.chat/api -# VITE_API_URL=http://local.revolt.chat:8000 +# VITE_API_URL=https://peptide.chat/api +VITE_API_URL=http://local.revolt.chat:8000 diff --git a/src/components/common/messaging/MessageBox.tsx b/src/components/common/messaging/MessageBox.tsx index 78c26981..2b2e0bfb 100644 --- a/src/components/common/messaging/MessageBox.tsx +++ b/src/components/common/messaging/MessageBox.tsx @@ -45,6 +45,7 @@ import AutoComplete, { useAutoComplete } from "../AutoComplete"; import { PermissionTooltip } from "../Tooltip"; import FilePreview from "./bars/FilePreview"; import ReplyBar from "./bars/ReplyBar"; +import { User } from "@styled-icons/boxicons-regular"; type Props = { channel: Channel; @@ -256,8 +257,8 @@ export default observer(({ channel }: Props) => { ); } - - if (!channel.havePermission("SendMessage")) { + console.log(channel) + if (!channel.havePermission("SendMessage") && channel.recipient?.relationship == "Blocked" || channel.recipient?.relationship == "BlockedOther"){ return ( @@ -275,7 +276,6 @@ export default observer(({ channel }: Props) => { ); } - // Push message content to draft. const setMessage = useCallback( (content?: string) => { From fd25aef5355837eb8708f39f85792f56b2c9f22a Mon Sep 17 00:00:00 2001 From: TeamAbronDev Date: Thu, 2 Jan 2025 15:56:15 +0330 Subject: [PATCH 04/17] change env file --- .env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env b/.env index 1b08a29c..5436a1ed 100644 --- a/.env +++ b/.env @@ -1,2 +1,2 @@ -# VITE_API_URL=https://peptide.chat/api -VITE_API_URL=http://local.revolt.chat:8000 +VITE_API_URL=https://peptide.chat/api +# VITE_API_URL=http://local.revolt.chat:8000 From 7fc0d268276f13bf63c94bc6dec10689e455914f Mon Sep 17 00:00:00 2001 From: TeamAbronDev Date: Thu, 2 Jan 2025 16:21:11 +0330 Subject: [PATCH 05/17] invite url --- src/controllers/modals/components/CreateInvite.tsx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/controllers/modals/components/CreateInvite.tsx b/src/controllers/modals/components/CreateInvite.tsx index 0efa3be4..10927a5e 100644 --- a/src/controllers/modals/components/CreateInvite.tsx +++ b/src/controllers/modals/components/CreateInvite.tsx @@ -7,10 +7,10 @@ import { ModalForm } from "@revoltchat/ui"; import { noopAsync } from "../../../lib/js"; -import { IS_REVOLT } from "../../../version"; import { takeError } from "../../client/jsx/error"; import { modalController } from "../ModalController"; import { ModalProps } from "../types"; +import { IS_REVOLT } from "../../../version"; /** * Code block which displays invite @@ -37,6 +37,7 @@ export default function CreateInvite({ }: ModalProps<"create_invite">) { const [processing, setProcessing] = useState(false); const [code, setCode] = useState("abcdef"); + const [url, setUrl] = useState("abcdef"); // Generate an invite code useEffect(() => { @@ -44,7 +45,10 @@ export default function CreateInvite({ target .createInvite() - .then(({ _id }) => setCode(_id)) + .then((res) => { + setUrl(res.url || "default_url"); + setCode(res._id || "default_code"); + }) .catch((err) => modalController.push({ type: "error", error: takeError(err) }), ) @@ -65,7 +69,7 @@ export default function CreateInvite({ ) : ( - {code} + {url} ), }, @@ -79,9 +83,7 @@ export default function CreateInvite({ children: , onClick: () => modalController.writeText( - IS_REVOLT - ? `https://rvlt.gg/${code}` - : `https://${window.location.host}/invite/${code}`, + `${url}` ), }, ]} From a0b4e420e54a5431bd09fbf9c8ce0b4e87679963 Mon Sep 17 00:00:00 2001 From: TeamAbronDev Date: Thu, 2 Jan 2025 16:36:36 +0330 Subject: [PATCH 06/17] invite url --- src/controllers/modals/components/legacy/UserProfile.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/controllers/modals/components/legacy/UserProfile.tsx b/src/controllers/modals/components/legacy/UserProfile.tsx index 9cbb150a..fac30f03 100644 --- a/src/controllers/modals/components/legacy/UserProfile.tsx +++ b/src/controllers/modals/components/legacy/UserProfile.tsx @@ -207,7 +207,8 @@ export const UserProfile = observer( )} - {(user.relationship === "Friend" || user.bot) && ( +                        {(user.relationship === "Friend" || user.bot || user.relationship === "None") && ( + Date: Thu, 2 Jan 2025 16:45:39 +0330 Subject: [PATCH 07/17] file permission --- .env | 2 +- src/components/common/messaging/MessageBox.tsx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.env b/.env index 5436a1ed..1512e2f3 100644 --- a/.env +++ b/.env @@ -1,2 +1,2 @@ VITE_API_URL=https://peptide.chat/api -# VITE_API_URL=http://local.revolt.chat:8000 +#VITE_API_URL=http://local.revolt.chat:8000 diff --git a/src/components/common/messaging/MessageBox.tsx b/src/components/common/messaging/MessageBox.tsx index 2b2e0bfb..70ee0633 100644 --- a/src/components/common/messaging/MessageBox.tsx +++ b/src/components/common/messaging/MessageBox.tsx @@ -627,7 +627,7 @@ export default observer(({ channel }: Props) => { )} - {channel.havePermission("UploadFiles") ? ( + {/* {channel.havePermission("UploadFiles") ? ( */} { }} /> - ) : ( + {/* ) : ( - )} + )} */} Date: Thu, 2 Jan 2025 16:50:33 +0330 Subject: [PATCH 08/17] test push --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 1512e2f3..5436a1ed 100644 --- a/.env +++ b/.env @@ -1,2 +1,2 @@ VITE_API_URL=https://peptide.chat/api -#VITE_API_URL=http://local.revolt.chat:8000 +# VITE_API_URL=http://local.revolt.chat:8000 From ed6e0f3fbe7b27410ff180032462fde85e2d6660 Mon Sep 17 00:00:00 2001 From: teamabron <110968521+teamabron@users.noreply.github.com> Date: Fri, 3 Jan 2025 22:16:44 +0330 Subject: [PATCH 09/17] Update UserProfile.tsx --- src/controllers/modals/components/legacy/UserProfile.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/modals/components/legacy/UserProfile.tsx b/src/controllers/modals/components/legacy/UserProfile.tsx index fac30f03..f9040a66 100644 --- a/src/controllers/modals/components/legacy/UserProfile.tsx +++ b/src/controllers/modals/components/legacy/UserProfile.tsx @@ -207,7 +207,7 @@ export const UserProfile = observer( )} -                        {(user.relationship === "Friend" || user.bot || user.relationship === "None") && ( + {(user.relationship === "Friend" || user.relationship === "None" || user.relationship === "Outgoing" || user.relationship === "Incoming" || user.bot ) && ( Date: Sat, 4 Jan 2025 10:14:40 +0330 Subject: [PATCH 10/17] bug-open closed dms --- src/pages/channels/Channel.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/channels/Channel.tsx b/src/pages/channels/Channel.tsx index 55318ad5..ae219cb2 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)) { + if (!client.channels.exists(id) && client.servers.get(server_id)) { if (server_id) { const server = client.servers.get(server_id); if (server && server.channel_ids.length > 0) { @@ -110,7 +110,7 @@ export const Channel = observer( target_id = last_id; } } - + return ( Date: Sat, 4 Jan 2025 10:14:54 +0330 Subject: [PATCH 11/17] bug-open closed dms --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 5436a1ed..16d366c6 100644 --- a/.env +++ b/.env @@ -1,2 +1,2 @@ -VITE_API_URL=https://peptide.chat/api +VITE_API_URL=https://test.peptide.chat/api # VITE_API_URL=http://local.revolt.chat:8000 From 4bf3553ec32ab8b1953e03a7a7eb46c4ba135d04 Mon Sep 17 00:00:00 2001 From: TeamAbronDev Date: Sat, 11 Jan 2025 10:51:51 +0330 Subject: [PATCH 12/17] removed .env file --- .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 73015196b0fbfc7b392f111b9d74e9d51682b490 Mon Sep 17 00:00:00 2001 From: TeamAbronDev Date: Sat, 11 Jan 2025 10:52:09 +0330 Subject: [PATCH 13/17] gitignored .env file --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index f42007b4..d9c1202a 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ dist-ssr *.local *.log /.idea +.env .yarn/cache .yarn/install-state.gz From 9f516b44d09fa98b2dae5667fede8dc8f487093b Mon Sep 17 00:00:00 2001 From: TeamAbronDev Date: Sat, 11 Jan 2025 10:52:25 +0330 Subject: [PATCH 14/17] env file --- .env' | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .env' diff --git a/.env' b/.env' new file mode 100644 index 00000000..16d366c6 --- /dev/null +++ b/.env' @@ -0,0 +1,2 @@ +VITE_API_URL=https://test.peptide.chat/api +# VITE_API_URL=http://local.revolt.chat:8000 From 08bee07e61a3710e428766ba9d737fcc634ae2ae Mon Sep 17 00:00:00 2001 From: TeamAbronDev Date: Sat, 11 Jan 2025 10:52:59 +0330 Subject: [PATCH 15/17] 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 16/17] 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 17/17] 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) => {