From 0f19bb7d0607179365bfec285ea98500f8c205eb Mon Sep 17 00:00:00 2001 From: Keno Dressel Date: Fri, 19 Jan 2024 16:00:59 +0100 Subject: [PATCH] chore: satisfies prettier --- src/atoms.ts | 4 ++-- .../elements/CommunityRoomPeekMessage.tsx | 9 ++++---- .../views/elements/DisabledMessageField.tsx | 21 +++++++++---------- .../views/elements/MessageButton.tsx | 20 ++++++++++-------- .../views/rooms/MessageComposer.tsx | 19 +++++++++-------- src/components/views/rooms/RoomPreviewBar.tsx | 7 +++---- src/context/SuperheroProvider.tsx | 7 +++---- src/hooks/useVerifiedRoom.ts | 16 +++++++------- 8 files changed, 53 insertions(+), 50 deletions(-) diff --git a/src/atoms.ts b/src/atoms.ts index 97a0aae3a1..4a933a575d 100644 --- a/src/atoms.ts +++ b/src/atoms.ts @@ -3,12 +3,12 @@ import { atomWithStorage } from "jotai/utils"; type TokenThreshold = { threshold: string; symbol: string; -} +}; export type BareUser = { userId: string; rawDisplayName: string; -} +}; export const verifiedAccountsAtom = atomWithStorage>("VERIFIED_ACCOUNTS", {}); export const minimumTokenThresholdAtom = atomWithStorage>("TOKEN_THRESHOLD", {}); diff --git a/src/components/views/elements/CommunityRoomPeekMessage.tsx b/src/components/views/elements/CommunityRoomPeekMessage.tsx index 4c370c8885..3f10662d4f 100644 --- a/src/components/views/elements/CommunityRoomPeekMessage.tsx +++ b/src/components/views/elements/CommunityRoomPeekMessage.tsx @@ -6,14 +6,15 @@ import { _t } from "../../../languageHandler"; import { cleanRoomName } from "../../../hooks/useVerifiedRoom"; export function CommunityRoomPeekMessage({ roomName }: { roomName: string }): ReactElement { - const [allTokens] = useAtom(minimumTokenThresholdAtom) + const [allTokens] = useAtom(minimumTokenThresholdAtom); const cleanedRoomName = cleanRoomName(roomName); const tokenThreshold = allTokens[cleanedRoomName]; return ( -

{_t("room|no_peek_join_prompt_community", { roomName: cleanedRoomName })} { - tokenThreshold ? (_t('room|no_peek_join_prompt_community_threshold', tokenThreshold)) : '' - }

+

+ {_t("room|no_peek_join_prompt_community", { roomName: cleanedRoomName })}{" "} + {tokenThreshold ? _t("room|no_peek_join_prompt_community_threshold", tokenThreshold) : ""} +

); } diff --git a/src/components/views/elements/DisabledMessageField.tsx b/src/components/views/elements/DisabledMessageField.tsx index 976fc4d43c..a51575e9b3 100644 --- a/src/components/views/elements/DisabledMessageField.tsx +++ b/src/components/views/elements/DisabledMessageField.tsx @@ -5,37 +5,36 @@ import { Room } from "matrix-js-sdk/src/matrix"; import { minimumTokenThresholdAtom } from "../../../atoms"; import { _t } from "../../../languageHandler"; import { useVerifiedRoom } from "../../../hooks/useVerifiedRoom"; -import { MessageCommunityBotButton } from "./MessageButton"; +import { MessageCommunityBotButton } from "./MessageButton"; export function DisabledMessageField({ room }: { room: Room }): JSX.Element { - const [allTokens] = useAtom(minimumTokenThresholdAtom) - const { isTokenGatedRoom, isCommunityRoom, } = useVerifiedRoom(room); + const [allTokens] = useAtom(minimumTokenThresholdAtom); + const { isTokenGatedRoom, isCommunityRoom } = useVerifiedRoom(room); let tokenThreshold = allTokens[room.name]; - if(!tokenThreshold) { + if (!tokenThreshold) { const tokenName = room.name.match(/\[TG] (.*) \(ct_.*\)/)?.[1]; - if(isTokenGatedRoom && tokenName) { + if (isTokenGatedRoom && tokenName) { tokenThreshold = { threshold: "1", symbol: tokenName, - } + }; } } - if (tokenThreshold) { return (
{_t("composer|no_perms_token_notice", tokenThreshold)} - { isCommunityRoom ? ( + {isCommunityRoom ? ( <> - + - ) : null } + ) : null}
); - } else { + } else { return (
{_t("composer|no_perms_notice")} diff --git a/src/components/views/elements/MessageButton.tsx b/src/components/views/elements/MessageButton.tsx index 3d2c21a227..c6ca62d4dc 100644 --- a/src/components/views/elements/MessageButton.tsx +++ b/src/components/views/elements/MessageButton.tsx @@ -13,7 +13,7 @@ import { BareUser, communityBotAtom } from "../../../atoms"; * Converts the member to a DirectoryMember and starts a DM with them. */ async function openDmForUser(matrixClient: MatrixClient, user: Member | BareUser): Promise { - const avatarUrl = user instanceof User ? user.avatarUrl : user instanceof RoomMember ? user.getMxcAvatarUrl() : ''; + const avatarUrl = user instanceof User ? user.avatarUrl : user instanceof RoomMember ? user.getMxcAvatarUrl() : ""; const startDmUser = new DirectoryMember({ user_id: user.userId, display_name: user.rawDisplayName, @@ -22,7 +22,13 @@ async function openDmForUser(matrixClient: MatrixClient, user: Member | BareUser await startDmOnFirstMessage(matrixClient, [startDmUser]); } -export const MessageButton = ({ member, text = 'Send Message' }: { member: Member | BareUser, text?: string }): JSX.Element => { +export const MessageButton = ({ + member, + text = "Send Message", +}: { + member: Member | BareUser; + text?: string; +}): JSX.Element => { const cli = useContext(MatrixClientContext); const [busy, setBusy] = useState(false); @@ -44,12 +50,8 @@ export const MessageButton = ({ member, text = 'Send Message' }: { member: Membe ); }; -export const MessageCommunityBotButton = ({ text = 'Send Message' }: { text?: string }): JSX.Element => { - const [communityBot] = useAtom(communityBotAtom) +export const MessageCommunityBotButton = ({ text = "Send Message" }: { text?: string }): JSX.Element => { + const [communityBot] = useAtom(communityBotAtom); - return ( - - ); + return ; }; - - diff --git a/src/components/views/rooms/MessageComposer.tsx b/src/components/views/rooms/MessageComposer.tsx index 57960067f4..ce1004c4df 100644 --- a/src/components/views/rooms/MessageComposer.tsx +++ b/src/components/views/rooms/MessageComposer.tsx @@ -47,7 +47,11 @@ import { Action } from "matrix-react-sdk/src/dispatcher/actions"; import { SettingUpdatedPayload } from "matrix-react-sdk/src/dispatcher/payloads/SettingUpdatedPayload"; import { ViewRoomPayload } from "matrix-react-sdk/src/dispatcher/payloads/ViewRoomPayload"; import { ComposerInsertPayload } from "matrix-react-sdk/src/dispatcher/payloads/ComposerInsertPayload"; -import { getConversionFunctions, sendMessage, SendWysiwygComposer } from "matrix-react-sdk/src/components/views/rooms/wysiwyg_composer"; +import { + getConversionFunctions, + sendMessage, + SendWysiwygComposer, +} from "matrix-react-sdk/src/components/views/rooms/wysiwyg_composer"; import EditorModel from "matrix-react-sdk/src/editor/model"; import { isLocalRoom } from "matrix-react-sdk/src/utils/localRoom/isLocalRoom"; import { aboveLeftOf, MenuProps } from "matrix-react-sdk/src/components/structures/ContextMenu"; @@ -55,7 +59,9 @@ import { SdkContextClass } from "matrix-react-sdk/src/contexts/SDKContext"; import { VoiceBroadcastInfoState } from "matrix-react-sdk/src/voice-broadcast"; import { createCantStartVoiceMessageBroadcastDialog } from "matrix-react-sdk/src/components/views/dialogs/CantStartVoiceMessageBroadcastDialog"; import E2EIcon from "matrix-react-sdk/src/components/views/rooms/E2EIcon"; -import SendMessageComposer, { SendMessageComposer as SendMessageComposerClass } from "matrix-react-sdk/src/components/views/rooms/SendMessageComposer"; +import SendMessageComposer, { + SendMessageComposer as SendMessageComposerClass, +} from "matrix-react-sdk/src/components/views/rooms/SendMessageComposer"; import Tooltip, { Alignment } from "matrix-react-sdk/src/components/views/elements/Tooltip"; import { formatTimeLeft } from "matrix-react-sdk/src/DateUtils"; import Stickerpicker from "matrix-react-sdk/src/components/views/rooms/Stickerpicker"; @@ -546,10 +552,7 @@ export class MessageComposer extends React.Component { controls.push(
- + {_t("composer|room_upgraded_notice")} @@ -559,9 +562,7 @@ export class MessageComposer extends React.Component {
, ); } else { - controls.push( - , - ); + controls.push(); } let recordingTooltip: JSX.Element | undefined; diff --git a/src/components/views/rooms/RoomPreviewBar.tsx b/src/components/views/rooms/RoomPreviewBar.tsx index f1389dee3f..d7a8aa6945 100644 --- a/src/components/views/rooms/RoomPreviewBar.tsx +++ b/src/components/views/rooms/RoomPreviewBar.tsx @@ -334,7 +334,6 @@ export default class RoomPreviewBar extends React.Component { const { isCommunityRoom } = isVerifiedRoom(roomName); - const messageCase = this.getMessageCase(); switch (messageCase) { case MessageCase.Joining: { @@ -704,10 +703,10 @@ export default class RoomPreviewBar extends React.Component { ); } - if(isCommunityRoom) { + if (isCommunityRoom) { secondaryButton = primaryButton; - primaryButton = (); - titleElement = (); + primaryButton = ; + titleElement = ; } const isPanel = this.props.canPreview; diff --git a/src/context/SuperheroProvider.tsx b/src/context/SuperheroProvider.tsx index b9c1471874..0653efc08b 100644 --- a/src/context/SuperheroProvider.tsx +++ b/src/context/SuperheroProvider.tsx @@ -16,7 +16,7 @@ const useMinimumTokenThreshold = (config: any): void => { .then((res) => res.json()) .then(setMinimumTokenThreshold) .catch((e) => { - console.error('Error loading minimum token threshold', e); + console.error("Error loading minimum token threshold", e); }) .finally(() => { setIsLoading(false); @@ -33,8 +33,7 @@ const useMinimumTokenThreshold = (config: any): void => { return (): void => clearInterval(interval); }, [loadMinimumTokenThreshold]); -} - +}; /** * Provides the superhero context to its children components. @@ -49,7 +48,7 @@ export const SuperheroProvider = ({ children, config }: any): any => { useEffect(() => { setCommunityBot({ userId: config.community_bot_user_id, - rawDisplayName: 'Community DAO Room Bot', + rawDisplayName: "Community DAO Room Bot", }); }, [setCommunityBot, config.community_bot_user_id]); diff --git a/src/hooks/useVerifiedRoom.ts b/src/hooks/useVerifiedRoom.ts index d28077581f..d5abbab604 100644 --- a/src/hooks/useVerifiedRoom.ts +++ b/src/hooks/useVerifiedRoom.ts @@ -25,21 +25,23 @@ export function useVerifiedRoom(room?: Room | IPublicRoomsChunkRoom): { export const cleanRoomName = (roomName: string): string => { // remove # in the beginning - let parsedName = roomName.startsWith('#') ? roomName.slice(1) : roomName; + let parsedName = roomName.startsWith("#") ? roomName.slice(1) : roomName; // remove domain - parsedName = parsedName.split(':')[0]; + parsedName = parsedName.split(":")[0]; return parsedName; -} +}; -export const isVerifiedRoom = (roomName: string): { +export const isVerifiedRoom = ( + roomName: string, +): { isTokenGatedRoom: boolean; isCommunityRoom: boolean; -} => { +} => { const parsedRoomName = cleanRoomName(roomName); return { isTokenGatedRoom: parsedRoomName.startsWith("[TG]"), isCommunityRoom: parsedRoomName.startsWith("$"), - } -} + }; +};