forked from element-hq/element-web
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #45 from superhero-com/fix/disabled-message
feat: adds thresholds to preview screens & chat bar
- Loading branch information
Showing
12 changed files
with
1,635 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,18 @@ | ||
| import { atomWithStorage } from "jotai/utils"; | ||
|
|
||
| type TokenThreshold = { | ||
| threshold: string; | ||
| symbol: string; | ||
| }; | ||
|
|
||
| export type BareUser = { | ||
| userId: string; | ||
| rawDisplayName: string; | ||
| }; | ||
|
|
||
| export const verifiedAccountsAtom = atomWithStorage<Record<string, string>>("VERIFIED_ACCOUNTS", {}); | ||
| export const minimumTokenThresholdAtom = atomWithStorage<Record<string, TokenThreshold>>("TOKEN_THRESHOLD", {}); | ||
| export const communityBotAtom = atomWithStorage<BareUser>("COMMUNITY_BOT", { | ||
| userId: "", | ||
| rawDisplayName: "", | ||
| }); |
20 changes: 20 additions & 0 deletions
20
src/components/views/elements/CommunityRoomPeekMessage.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| import { useAtom } from "jotai"; | ||
| import React, { ReactElement } from "react"; | ||
|
|
||
| import { minimumTokenThresholdAtom } from "../../../atoms"; | ||
| import { _t } from "../../../languageHandler"; | ||
| import { cleanRoomName } from "../../../hooks/useVerifiedRoom"; | ||
|
|
||
| export function CommunityRoomPeekMessage({ roomName }: { roomName: string }): ReactElement { | ||
| const [allTokens] = useAtom(minimumTokenThresholdAtom); | ||
| const cleanedRoomName = cleanRoomName(roomName); | ||
|
|
||
| const tokenThreshold = allTokens[cleanedRoomName]; | ||
|
|
||
| return ( | ||
| <h3> | ||
| {_t("room|no_peek_join_prompt_community", { roomName: cleanedRoomName })}{" "} | ||
| {tokenThreshold ? _t("room|no_peek_join_prompt_community_threshold", tokenThreshold) : ""} | ||
| </h3> | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| import { useAtom } from "jotai"; | ||
| import React from "react"; | ||
| 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"; | ||
|
|
||
| export function DisabledMessageField({ room }: { room: Room }): JSX.Element { | ||
| const [allTokens] = useAtom(minimumTokenThresholdAtom); | ||
| const { isTokenGatedRoom, isCommunityRoom } = useVerifiedRoom(room); | ||
|
|
||
| let tokenThreshold = allTokens[room.name]; | ||
| if (!tokenThreshold) { | ||
| const tokenName = room.name.match(/\[TG] (.*) \(ct_.*\)/)?.[1]; | ||
| if (isTokenGatedRoom && tokenName) { | ||
| tokenThreshold = { | ||
| threshold: "1", | ||
| symbol: tokenName, | ||
| }; | ||
| } | ||
| } | ||
|
|
||
| if (tokenThreshold) { | ||
| return ( | ||
| <div key="controls_error" className="mx_MessageComposer_noperm_error"> | ||
| {_t("composer|no_perms_token_notice", tokenThreshold)} | ||
| {isCommunityRoom ? ( | ||
| <> | ||
| <span style={{ marginLeft: "1rem", display: "block" }} /> | ||
| <MessageCommunityBotButton text="Get room tokens" /> | ||
| </> | ||
| ) : null} | ||
| </div> | ||
| ); | ||
| } else { | ||
| return ( | ||
| <div key="controls_error" className="mx_MessageComposer_noperm_error"> | ||
| {_t("composer|no_perms_notice")} | ||
| </div> | ||
| ); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| import React, { useContext, useState } from "react"; | ||
| import MatrixClientContext from "matrix-react-sdk/src/contexts/MatrixClientContext"; | ||
| import AccessibleButton from "matrix-react-sdk/src/components/views/elements/AccessibleButton"; | ||
| import { MatrixClient, RoomMember, User } from "matrix-js-sdk/src/matrix"; | ||
| import { DirectoryMember, startDmOnFirstMessage } from "matrix-react-sdk/src/utils/direct-messages"; | ||
| import { useAtom } from "jotai"; | ||
|
|
||
| import { Member } from "../right_panel/UserInfo"; | ||
| import { Icon as SendMessage } from "../../../../res/themes/superhero/img/icons/send.svg"; | ||
| 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<void> { | ||
| const avatarUrl = user instanceof User ? user.avatarUrl : user instanceof RoomMember ? user.getMxcAvatarUrl() : ""; | ||
| const startDmUser = new DirectoryMember({ | ||
| user_id: user.userId, | ||
| display_name: user.rawDisplayName, | ||
| avatar_url: avatarUrl, | ||
| }); | ||
| await startDmOnFirstMessage(matrixClient, [startDmUser]); | ||
| } | ||
|
|
||
| export const MessageButton = ({ | ||
| member, | ||
| text = "Send Message", | ||
| }: { | ||
| member: Member | BareUser; | ||
| text?: string; | ||
| }): JSX.Element => { | ||
| const cli = useContext(MatrixClientContext); | ||
| const [busy, setBusy] = useState(false); | ||
|
|
||
| return ( | ||
| <AccessibleButton | ||
| kind="primary" | ||
| onClick={async (): Promise<void> => { | ||
| if (busy) return; | ||
| setBusy(true); | ||
| await openDmForUser(cli, member); | ||
| setBusy(false); | ||
| }} | ||
| className="mx_UserInfo_field" | ||
| disabled={busy} | ||
| > | ||
| <SendMessage width="16px" height="16px" /> | ||
| <span style={{ marginLeft: "5px" }}>{text}</span> | ||
| </AccessibleButton> | ||
| ); | ||
| }; | ||
|
|
||
| export const MessageCommunityBotButton = ({ text = "Send Message" }: { text?: string }): JSX.Element => { | ||
| const [communityBot] = useAtom(communityBotAtom); | ||
|
|
||
| return <MessageButton member={communityBot} text={text} />; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.