From bed5e98bb03a2c7073f9f421a396fa7616d56ac5 Mon Sep 17 00:00:00 2001 From: Nuckyz <61953774+Nuckyz@users.noreply.github.com> Date: Sun, 5 Mar 2023 18:49:59 -0300 Subject: Misc fixes and improvements (#555) Co-authored-by: Ven --- .../components/HiddenChannelLockScreen.tsx | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'src/plugins/showHiddenChannels/components') diff --git a/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx b/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx index 7e66a6a..01bc3a7 100644 --- a/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx +++ b/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx @@ -19,9 +19,11 @@ import ErrorBoundary from "@components/ErrorBoundary"; import { LazyComponent } from "@utils/misc"; import { formatDuration } from "@utils/text"; -import { find, findByCode, findByPropsLazy } from "@webpack"; +import { find, findByPropsLazy } from "@webpack"; import { FluxDispatcher, GuildMemberStore, GuildStore, moment, Parser, SnowflakeUtils, Text, Timestamp, Tooltip } from "@webpack/common"; import { Channel } from "discord-types/general"; +import type { ComponentType } from "react"; + enum SortOrderTypes { LATEST_ACTIVITY = 0, @@ -73,6 +75,17 @@ enum ChannelFlags { REQUIRE_TAG = 1 << 4 } +let EmojiComponent: ComponentType; +let ChannelBeginHeader: ComponentType; + +export function setEmojiComponent(component: ComponentType) { + EmojiComponent = component; +} + +export function setChannelBeginHeaderComponent(component: ComponentType) { + ChannelBeginHeader = component; +} + const ChatScrollClasses = findByPropsLazy("auto", "content", "scrollerBase"); const TagComponent = LazyComponent(() => find(m => { if (typeof m !== "function") return false; @@ -81,9 +94,6 @@ const TagComponent = LazyComponent(() => find(m => { // Get the component which doesn't include increasedActivity logic return code.includes(".Messages.FORUM_TAG_A11Y_FILTER_BY_TAG") && !code.includes("increasedActivityPill"); })); -const EmojiComponent = LazyComponent(() => findByCode('.jumboable?"jumbo":"default"')); -// The component for the beggining of a channel, but we patched it so it only returns the allowed users and roles components for hidden channels -const ChannelBeginHeader = LazyComponent(() => findByCode(".Messages.ROLE_REQUIRED_SINGLE_USER_MESSAGE")); const ChannelTypesToChannelNames = { [ChannelTypes.GUILD_TEXT]: "text", -- cgit