make requested changes

widgetbot-io · Nov 1, 2023 · 3b079e9 · 3b079e9
1 parent 6cbdb86
commit 3b079e9
Show file tree

Hide file tree

Showing 27 changed files with 82 additions and 85 deletions.
diff --git a/src/Content/index.tsx b/src/Content/index.tsx
@@ -16,7 +16,7 @@ import ThreadButton from "./Thread/ThreadButton";
 import Components from "../Message/Components";
 import getDisplayName from "../utils/getDisplayName";
 import { useTranslation } from "react-i18next";
-import type { DiscordMessage } from "../types";
+import type { ChatMessage } from "../types";
 
 interface EditedProps {
   editedAt: string;
@@ -70,7 +70,7 @@ export function MessageAccessories({
 interface ContentCoreProps {
   children: ReactNode;
   showTooltip: boolean;
-  referencedMessage: DiscordMessage | null;
+  referencedMessage: ChatMessage | null;
 }
 
 function ContentCore(props: ContentCoreProps) {
@@ -98,7 +98,7 @@ function ContentCore(props: ContentCoreProps) {
 }
 
 interface ContentProps {
-  message: DiscordMessage;
+  message: ChatMessage;
   isReplyContent?: boolean;
   noThreadButton?: boolean;
 }

diff --git a/src/Message/Components/ActionRow.tsx b/src/Message/Components/ActionRow.tsx
@@ -5,11 +5,11 @@ import type {
 import * as Styles from "./style";
 import React from "react";
 import Component from "./Component";
-import type { DiscordMessage } from "../../types";
+import type { ChatMessage } from "../../types";
 
 interface ActionRowProps {
   actionRow: APIActionRowComponent<APIMessageActionRowComponent>;
-  message: DiscordMessage;
+  message: ChatMessage;
 }
 
 function ActionRow({ actionRow, message }: ActionRowProps) {

diff --git a/src/Message/Components/ButtonComponent.tsx b/src/Message/Components/ButtonComponent.tsx
@@ -10,7 +10,7 @@ import { ButtonStyle } from "discord-api-types/v10";
 import Emoji from "../../Emoji";
 import { useConfig } from "../../core/ConfigContext";
 import ExternalLink from "../../ExternalLink";
-import type { DiscordMessage } from "../../types";
+import type { ChatMessage } from "../../types";
 
 const buttonStyleMap: Record<
   ButtonStyle,
@@ -33,7 +33,7 @@ type ButtonComponentWithURL = APIButtonComponentWithURL & {
 
 interface ButtonComponentProps {
   button: ButtonComponentWithCustomId | ButtonComponentWithURL;
-  message: DiscordMessage;
+  message: ChatMessage;
 }
 
 function ButtonComponent({ button, message }: ButtonComponentProps) {

diff --git a/src/Message/Components/Component.tsx b/src/Message/Components/Component.tsx
@@ -2,11 +2,11 @@ import type { APIMessageActionRowComponent } from "discord-api-types/v10";
 import { ComponentType } from "discord-api-types/v10";
 import ButtonComponent from "./ButtonComponent";
 import React from "react";
-import type { DiscordMessage } from "../../types";
+import type { ChatMessage } from "../../types";
 
 interface ComponentProps {
   component: APIMessageActionRowComponent;
-  message: DiscordMessage;
+  message: ChatMessage;
 }
 
 function Component({ component, message }: ComponentProps) {

diff --git a/src/Message/Components/index.tsx b/src/Message/Components/index.tsx
@@ -1,11 +1,11 @@
 import ActionRow from "./ActionRow";
 import React from "react";
 import * as Styles from "./style";
-import type { DiscordMessage } from "../../types";
+import type { ChatMessage } from "../../types";
 
 interface ComponentsProps {
-  components: DiscordMessage["components"];
-  message: DiscordMessage;
+  components: ChatMessage["components"];
+  message: ChatMessage;
 }
 
 function Components({ components, message }: ComponentsProps) {

diff --git a/src/Message/index.tsx b/src/Message/index.tsx
@@ -19,11 +19,11 @@ import ThreadCreated from "./variants/ThreadCreated";
 import { MessageTypeResponse, useConfig } from "../core/ConfigContext";
 import ThreadStarterMessage from "./variants/ThreadStarterMessage";
 import AutomodAction from "./variants/AutomodAction";
-import type { DiscordMessage } from "../types";
+import type { ChatMessage } from "../types";
 
 export interface MessageProps {
   isFirstMessage?: boolean;
-  message: DiscordMessage;
+  message: ChatMessage;
   isHovered?: boolean;
   showButtons?: boolean;
   thread?: boolean;
@@ -156,7 +156,7 @@ function MessageTypeSwitch(props: Omit<MessageProps, "showButtons">) {
     default: {
       switch (unknownMessageTypeResponse) {
         case MessageTypeResponse.InAppError: {
-          const errorMessage: DiscordMessage = {
+          const errorMessage: ChatMessage = {
             ...props.message,
             type: MessageType.Default,
             content: `Unknown message type \`${

diff --git a/src/Message/variants/AutomodAction.tsx b/src/Message/variants/AutomodAction.tsx
@@ -9,7 +9,7 @@ import { useConfig } from "../../core/ConfigContext";
 import { error } from "../../utils/error";
 import { MessageAccessories } from "../../Content";
 import Reactions from "../Reactions";
-import type { DiscordMessage } from "../../types";
+import type { ChatMessage } from "../../types";
 
 type QuarantineUserAction =
   | "quarantine_user"
@@ -116,7 +116,7 @@ function hasReactions(
 }
 
 interface AutomodActionProps {
-  message: DiscordMessage;
+  message: ChatMessage;
   isHovered?: boolean;
 }
 

diff --git a/src/Message/variants/BoostTierUpgrade.tsx b/src/Message/variants/BoostTierUpgrade.tsx
@@ -7,14 +7,14 @@ import type { Snowflake } from "discord-api-types/v10";
 import { MessageType } from "discord-api-types/v10";
 import { useConfig } from "../../core/ConfigContext";
 import { Trans, useTranslation } from "react-i18next";
-import type { DiscordMessage } from "../../types";
+import type { ChatMessage } from "../../types";
 
 interface BoostTierUpgradeProps {
-  createdAt: DiscordMessage["timestamp"];
+  createdAt: ChatMessage["timestamp"];
   content: string;
   channelId: Snowflake;
   type: MessageType;
-  author: DiscordMessage["author"];
+  author: ChatMessage["author"];
 }
 
 function BoostTierUpgrade({

diff --git a/src/Message/variants/ChannelFollowAdd.tsx b/src/Message/variants/ChannelFollowAdd.tsx
@@ -5,13 +5,13 @@ import * as Styles from "../style/message";
 import { SystemMessageIconSize } from "../style/message";
 import { useConfig } from "../../core/ConfigContext";
 import { Trans, useTranslation } from "react-i18next";
-import type { DiscordMessage } from "../../types";
+import type { ChatMessage } from "../../types";
 
 interface ChannelFollowAddProps {
   content: string;
-  author: DiscordMessage["author"];
-  channelId: DiscordMessage["channel_id"];
-  createdAt: DiscordMessage["timestamp"];
+  author: ChatMessage["author"];
+  channelId: ChatMessage["channel_id"];
+  createdAt: ChatMessage["timestamp"];
 }
 
 function ChannelFollowAdd(props: ChannelFollowAddProps) {

diff --git a/src/Message/variants/ChannelNameChange.tsx b/src/Message/variants/ChannelNameChange.tsx
@@ -5,13 +5,13 @@ import * as Styles from "../style/message";
 import { SystemMessageIconSize } from "../style/message";
 import { useConfig } from "../../core/ConfigContext";
 import { Trans, useTranslation } from "react-i18next";
-import type { DiscordMessage } from "../../types";
+import type { ChatMessage } from "../../types";
 
 interface ChannelNameChangeProps {
   content: string;
-  createdAt: DiscordMessage["timestamp"];
-  channelId: DiscordMessage["channel_id"];
-  author: DiscordMessage["author"];
+  createdAt: ChatMessage["timestamp"];
+  channelId: ChatMessage["channel_id"];
+  author: ChatMessage["author"];
 }
 
 function ChannelNameChange(props: ChannelNameChangeProps) {

diff --git a/src/Message/variants/ChannelPinnedMessage.tsx b/src/Message/variants/ChannelPinnedMessage.tsx
@@ -5,12 +5,12 @@ import * as Styles from "../style/message";
 import { SystemMessageIconSize } from "../style/message";
 import { useConfig } from "../../core/ConfigContext";
 import { Trans, useTranslation } from "react-i18next";
-import type { DiscordMessage } from "../../types";
+import type { ChatMessage } from "../../types";
 
 interface ChannelPinnedMessageProps {
-  author: DiscordMessage["author"];
-  createdAt: DiscordMessage["timestamp"];
-  channelId: DiscordMessage["channel_id"];
+  author: ChatMessage["author"];
+  createdAt: ChatMessage["timestamp"];
+  channelId: ChatMessage["channel_id"];
 }
 
 function ChannelPinnedMessage(props: ChannelPinnedMessageProps) {

diff --git a/src/Message/variants/GuildBoost.tsx b/src/Message/variants/GuildBoost.tsx
@@ -5,13 +5,13 @@ import * as Styles from "../style/message";
 import { SystemMessageIconSize } from "../style/message";
 import { useConfig } from "../../core/ConfigContext";
 import { Trans, useTranslation } from "react-i18next";
-import type { DiscordMessage } from "../../types";
+import type { ChatMessage } from "../../types";
 
 interface GuildBoostProps {
-  createdAt: DiscordMessage["timestamp"];
-  author: DiscordMessage["author"];
+  createdAt: ChatMessage["timestamp"];
+  author: ChatMessage["author"];
   content: string;
-  channelId: DiscordMessage["channel_id"];
+  channelId: ChatMessage["channel_id"];
 }
 
 function GuildBoost(props: GuildBoostProps) {

diff --git a/src/Message/variants/GuildDiscoveryDisqualified.tsx b/src/Message/variants/GuildDiscoveryDisqualified.tsx
@@ -3,10 +3,10 @@ import React from "react";
 import * as Styles from "../style/message";
 import { SystemMessageIconSize } from "../style/message";
 import { Trans, useTranslation } from "react-i18next";
-import type { DiscordMessage } from "../../types";
+import type { ChatMessage } from "../../types";
 
 interface GuildDiscoveryDisqualifiedProps {
-  createdAt: DiscordMessage["timestamp"];
+  createdAt: ChatMessage["timestamp"];
 }
 
 function GuildDiscoveryDisqualified(props: GuildDiscoveryDisqualifiedProps) {

diff --git a/src/Message/variants/GuildDiscoveryGracePeriodFinalWarning.tsx b/src/Message/variants/GuildDiscoveryGracePeriodFinalWarning.tsx
@@ -3,10 +3,10 @@ import React from "react";
 import * as Styles from "../style/message";
 import { SystemMessageIconSize } from "../style/message";
 import { Trans, useTranslation } from "react-i18next";
-import type { DiscordMessage } from "../../types";
+import type { ChatMessage } from "../../types";
 
 interface GuildDiscoveryGracePeriodFinalWarningProps {
-  createdAt: DiscordMessage["timestamp"];
+  createdAt: ChatMessage["timestamp"];
 }
 
 function GuildDiscoveryGracePeriodFinalWarning(

diff --git a/src/Message/variants/GuildDiscoveryGracePeriodInitialWarning.tsx b/src/Message/variants/GuildDiscoveryGracePeriodInitialWarning.tsx
@@ -3,10 +3,10 @@ import React from "react";
 import * as Styles from "../style/message";
 import { SystemMessageIconSize } from "../style/message";
 import { Trans, useTranslation } from "react-i18next";
-import type { DiscordMessage } from "../../types";
+import type { ChatMessage } from "../../types";
 
 interface GuildDiscoveryGracePeriodInitialWarningProps {
-  createdAt: DiscordMessage["timestamp"];
+  createdAt: ChatMessage["timestamp"];
 }
 
 function GuildDiscoveryGracePeriodInitialWarning(

diff --git a/src/Message/variants/GuildDiscoveryRequalified.tsx b/src/Message/variants/GuildDiscoveryRequalified.tsx
@@ -3,10 +3,10 @@ import React from "react";
 import * as Styles from "../style/message";
 import { SystemMessageIconSize } from "../style/message";
 import { Trans, useTranslation } from "react-i18next";
-import type { DiscordMessage } from "../../types";
+import type { ChatMessage } from "../../types";
 
 interface GuildDiscoveryRequalifiedProps {
-  createdAt: DiscordMessage["timestamp"];
+  createdAt: ChatMessage["timestamp"];
 }
 
 function GuildDiscoveryRequalified(props: GuildDiscoveryRequalifiedProps) {

diff --git a/src/Message/variants/GuildMemberJoin.tsx b/src/Message/variants/GuildMemberJoin.tsx
@@ -6,12 +6,12 @@ import { SystemMessageIconSize } from "../style/message";
 import { useConfig } from "../../core/ConfigContext";
 import { Trans, useTranslation } from "react-i18next";
 import { GuildMemberJoin as GuildMemberJoinI18n } from "../../i18n/locales/en/translation.json";
-import type { DiscordMessage } from "../../types";
+import type { ChatMessage } from "../../types";
 
 interface GuildMemberJoinProps {
-  createdAt: DiscordMessage["timestamp"];
-  author: DiscordMessage["author"];
-  channelId: DiscordMessage["channel_id"];
+  createdAt: ChatMessage["timestamp"];
+  author: ChatMessage["author"];
+  channelId: ChatMessage["channel_id"];
 }
 
 function GuildMemberJoin(props: GuildMemberJoinProps) {

diff --git a/src/Message/variants/NormalMessage.tsx b/src/Message/variants/NormalMessage.tsx
@@ -17,11 +17,11 @@ import type {
 import { MessageType } from "discord-api-types/v10";
 import { useConfig } from "../../core/ConfigContext";
 import getDisplayName from "../../utils/getDisplayName";
-import type { DiscordMessage } from "../../types";
+import type { ChatMessage } from "../../types";
 
 interface ReplyInfoProps {
   channelId: Snowflake;
-  referencedMessage: DiscordMessage["referenced_message"];
+  referencedMessage: ChatMessage["referenced_message"];
   mentioned?: boolean;
   interaction: APIMessageInteraction | undefined;
   isContextMenuInteraction?: boolean;
@@ -167,7 +167,7 @@ ReplyInfo.displayName = "ReplyInfo";
 
 interface MessageProps {
   isFirstMessage?: boolean;
-  message: DiscordMessage;
+  message: ChatMessage;
   isHovered?: boolean;
   noThreadButton?: boolean;
   isContextMenuInteraction?: boolean;

diff --git a/src/Message/variants/RecipientAdd.tsx b/src/Message/variants/RecipientAdd.tsx
@@ -6,13 +6,13 @@ import { SystemMessageIconSize } from "../style/message";
 import getDisplayName from "../../utils/getDisplayName";
 import { useConfig } from "../../core/ConfigContext";
 import { Trans, useTranslation } from "react-i18next";
-import type { DiscordMessage } from "../../types";
+import type { ChatMessage } from "../../types";
 
 interface RecipientAddProps {
-  createdAt: DiscordMessage["timestamp"];
-  author: DiscordMessage["author"];
-  target: DiscordMessage["mentions"][0];
-  channelId: DiscordMessage["channel_id"];
+  createdAt: ChatMessage["timestamp"];
+  author: ChatMessage["author"];
+  target: ChatMessage["mentions"][0];
+  channelId: ChatMessage["channel_id"];
 }
 
 // todo: check if this also applies to group chats, and support those as well.

diff --git a/src/Message/variants/RecipientRemove.tsx b/src/Message/variants/RecipientRemove.tsx
@@ -6,13 +6,13 @@ import { SystemMessageIconSize } from "../style/message";
 import getDisplayName from "../../utils/getDisplayName";
 import { useConfig } from "../../core/ConfigContext";
 import { Trans, useTranslation } from "react-i18next";
-import type { DiscordMessage } from "../../types";
+import type { ChatMessage } from "../../types";
 
 interface RecipientRemoveProps {
-  createdAt: DiscordMessage["timestamp"];
-  author: DiscordMessage["author"];
-  target: DiscordMessage["mentions"][0];
-  channelId: DiscordMessage["channel_id"];
+  createdAt: ChatMessage["timestamp"];
+  author: ChatMessage["author"];
+  target: ChatMessage["mentions"][0];
+  channelId: ChatMessage["channel_id"];
 }
 
 function RecipientRemove(props: RecipientRemoveProps) {

diff --git a/src/Message/variants/ThreadCreated.tsx b/src/Message/variants/ThreadCreated.tsx
@@ -7,15 +7,15 @@ import { SystemMessageIconSize } from "../style/message";
 import { MessageType } from "discord-api-types/v10";
 import { useConfig } from "../../core/ConfigContext";
 import { Trans, useTranslation } from "react-i18next";
-import type { DiscordMessage } from "../../types";
+import type { ChatMessage } from "../../types";
 
 interface ThreadCreatedProps {
-  createdAt: DiscordMessage["timestamp"];
-  thread: Exclude<DiscordMessage["thread"], undefined>;
-  author: DiscordMessage["author"];
-  messageReference: DiscordMessage["message_reference"];
-  messageId: DiscordMessage["id"];
-  channelId: DiscordMessage["channel_id"];
+  createdAt: ChatMessage["timestamp"];
+  thread: Exclude<ChatMessage["thread"], undefined>;
+  author: ChatMessage["author"];
+  messageReference: ChatMessage["message_reference"];
+  messageId: ChatMessage["id"];
+  channelId: ChatMessage["channel_id"];
   messageContent: string;
 }
 

diff --git a/src/Message/variants/ThreadStarterMessage.tsx b/src/Message/variants/ThreadStarterMessage.tsx
@@ -4,11 +4,11 @@ import { SystemMessageIconSize } from "../style/message";
 import NormalMessage from "./NormalMessage";
 import LargeTimestamp from "../LargeTimestamp";
 import { Trans, useTranslation } from "react-i18next";
-import type { DiscordMessage } from "../../types";
+import type { ChatMessage } from "../../types";
 
 interface ThreadStarterMessageProps {
-  createdAt: DiscordMessage["timestamp"];
-  referencedMessage: DiscordMessage | null | undefined;
+  createdAt: ChatMessage["timestamp"];
+  referencedMessage: ChatMessage | null | undefined;
 }
 
 function ThreadStarterMessage({