Merge branch 'main' into byPrototype

replugged-org · Jul 5, 2023 · d5b4bd1 · d5b4bd1
2 parents e79e2f3 + 3a7aaad
commit d5b4bd1
Show file tree

Hide file tree

Showing 20 changed files with 47 additions and 22 deletions.
diff --git a/cspell.json b/cspell.json
@@ -37,6 +37,7 @@
     "LOCALAPPDATA",
     "logname",
     "Millis",
+    "notif",
     "notrack",
     "outfile",
     "popout",

diff --git a/i18n/en-GB.json b/i18n/en-GB.json
@@ -128,7 +128,7 @@
     "REPLUGGED_CANCEL": "Cancel",
     "REPLUGGED_CONFIRM": "Confirm",
     "REPLUGGED_OK": "OK",
-    "REPLUGGED_COMMAND_DEBUG_DESC": "Sends the device's, discord's, and replugged's debug info in chat.",
+    "REPLUGGED_COMMAND_DEBUG_DESC": "Sends the device's, Discord's, and Replugged's debug info in chat.",
     "REPLUGGED_COMMAND_DISABLE_DESC": "Disable a plugin/theme",
     "REPLUGGED_COMMAND_DISABLE_DISABLED": "{type} \"{id}\" disabled!",
     "REPLUGGED_COMMAND_ENABLE_ENABLED": "{type} \"{id}\" enabled!",

diff --git a/i18n/en-US.json b/i18n/en-US.json
@@ -17,7 +17,7 @@
     "REPLUGGED_COMMAND_AUTOCOMPLETE_ENTITY_LIST": "Installed Plugins and Themes",
     "REPLUGGED_COMMAND_AUTOCOMPLETE_PLUGIN": "Plugin - {description}",
     "REPLUGGED_COMMAND_AUTOCOMPLETE_THEME": "Theme - {description}",
-    "REPLUGGED_COMMAND_DEBUG_DESC": "Sends the device's, discord's, and replugged's debug info in chat.",
+    "REPLUGGED_COMMAND_DEBUG_DESC": "Sends the device's, Discord's, and Replugged's debug info in chat.",
     "REPLUGGED_COMMAND_DISABLE_DESC": "Disable a plugin/theme",
     "REPLUGGED_COMMAND_DISABLE_DISABLED": "{type} \"{id}\" disabled!",
     "REPLUGGED_COMMAND_ENABLE_DESC": "Enable a plugin/theme",
@@ -215,5 +215,8 @@
     "REPLUGGED_ADDON_NOT_REVIEWED": "Unreviewed {type}",
     "REPLUGGED_ADDON_NOT_REVIEWED_DESC": "This {type} has not been reviewed by the Replugged team and could harm your computer. Use at your own risk.",
     "REPLUGGED_SETTINGS_QUICKCSS_AUTO_APPLY": "Automatically Apply Quick CSS",
-    "REPLUGGED_SETTINGS_QUICKCSS_AUTO_APPLY_DESC": "Automatically apply changes to Quick CSS as you type."
+    "REPLUGGED_SETTINGS_QUICKCSS_AUTO_APPLY_DESC": "Automatically apply changes to Quick CSS as you type.",
+    "REPLUGGED_SETTINGS_DEV_COMPANION": "Reconnect Dev Companion",
+    "REPLUGGED_SETTINGS_DEV_COMPANION_DESC": "Reconnects the Dev Companion coremod to the VSCode extension.",
+    "REPLUGGED_SETTINGS_DEV_COMPANION_RECONNECT": "Reconnect"
 }
diff --git a/i18n/hi.json b/i18n/hi.json
@@ -10,7 +10,7 @@
     "REPLUGGED_OK": "ठीक",
     "REPLUGGED_COMMAND_AUTOCOMPLETE_PLUGIN": "Plugin - {description}",
     "REPLUGGED_COMMAND_AUTOCOMPLETE_THEME": "Theme - {description}",
-    "REPLUGGED_COMMAND_DEBUG_DESC": "Device का Discord और replugged का debug जानकारी chat मैं भेजती है",
+    "REPLUGGED_COMMAND_DEBUG_DESC": "Device का Discord और Replugged का debug जानकारी chat मैं भेजती है.",
     "REPLUGGED_COMMAND_DISABLE_DESC": "plugin/theme को अक्षम करें",
     "REPLUGGED_BADGES_DEVELOPER": "Replugged डेवलपर",
     "REPLUGGED_BADGES_STAFF": "Replugged स्टाफ़",

diff --git a/i18n/hu.json b/i18n/hu.json
@@ -78,7 +78,7 @@
     "REPLUGGED_CANCEL": "Mégse",
     "REPLUGGED_CONFIRM": "Megerősít",
     "REPLUGGED_OK": "OK",
-    "REPLUGGED_COMMAND_DEBUG_DESC": "Elküldi az eszköz, a discord és a replugged debug információkat chatbe.",
+    "REPLUGGED_COMMAND_DEBUG_DESC": "Elküldi az eszköz, a Discord és a Replugged debug információkat chatbe.",
     "REPLUGGED_COMMAND_DISABLE_DESC": "Plugin/Téma kikapcsolása",
     "REPLUGGED_COMMAND_AUTOCOMPLETE_ENTITY_LIST": "Telepített Pluginok és Témák",
     "REPLUGGED_COMMAND_AUTOCOMPLETE_PLUGIN": "Plugin - {description}",

diff --git a/i18n/id-ID.json b/i18n/id-ID.json
@@ -69,7 +69,7 @@
     "REPLUGGED_CANCEL": "Batal",
     "REPLUGGED_CONFIRM": "Ya",
     "REPLUGGED_OK": "OK",
-    "REPLUGGED_COMMAND_DEBUG_DESC": "Mengirim informasi debug perangkat, discord, dan replugged ke obrolan",
+    "REPLUGGED_COMMAND_DEBUG_DESC": "Mengirim informasi debug perangkat, Discord, dan Replugged ke obrolan.",
     "REPLUGGED_COMMAND_DISABLE_DESC": "Matikan sebuah plugin/tema",
     "REPLUGGED_COMMAND_DISABLE_DISABLED": "{type} \"{id}\" mati!",
     "REPLUGGED_COMMAND_AUTOCOMPLETE_ENTITY_LIST": "Plugin dan Tema yang Terpasang",

diff --git a/i18n/lv.json b/i18n/lv.json
@@ -13,7 +13,7 @@
     "REPLUGGED_CONFIRM": "Apstiprināt",
     "REPLUGGED_OK": "LABI",
     "REPLUGGED_COMMAND_AUTOCOMPLETE_THEME": "Tēma - {description}",
-    "REPLUGGED_COMMAND_DEBUG_DESC": "Nosūta ierīces, discorda, un replugged atkļūdošanas informāciju čatā.",
+    "REPLUGGED_COMMAND_DEBUG_DESC": "Nosūta ierīces, Discorda, un Replugged atkļūdošanas informāciju čatā.",
     "REPLUGGED_COMMAND_ENABLE_ENABLED": "{type} \"{id}\" ieslēkts!",
     "REPLUGGED_COMMAND_ECHO_DESC": "Atgriež norādītos argumentus.",
     "REPLUGGED_COMMAND_HELP_DESC": "Sniedz komandu sarakstu vai informāciju par konkrētu komandu.",

diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
@@ -71,7 +71,7 @@
     "REPLUGGED_BUTTON_GOT_IT": "Entendi",
     "REPLUGGED_BUTTON_INSTALLER_INSTALLED": "{type} instalado(s)",
     "REPLUGGED_COMMAND_ENABLE_DESC": "Ativa um plugin ou tema",
-    "REPLUGGED_COMMAND_DEBUG_DESC": "Envia no chat informações de depuração do dispositivo, do discord e do replugged.",
+    "REPLUGGED_COMMAND_DEBUG_DESC": "Envia no chat informações de depuração do dispositivo, do Discord e do Replugged.",
     "REPLUGGED_COMMAND_HELP_COMMAND_NOT_FOUND": "Comando `{commandName}` não encontrado.",
     "REPLUGGED_COMMAND_HELP_LIST_FOOTER": "Use {prefix}help <nome do comando> para mais informações sobre um comando específico.",
     "REPLUGGED_BUTTON_INSTALLER_DOWNLOAD": "Baixar {type}",

diff --git a/i18n/pt-PT.json b/i18n/pt-PT.json
@@ -79,7 +79,7 @@
     "REPLUGGED_COMMAND_AUTOCOMPLETE_PLUGIN": "Plugin - {description}",
     "REPLUGGED_COMMAND_AUTOCOMPLETE_THEME": "Tema - {description}",
     "REPLUGGED_COMMAND_DISABLE_DESC": "Desabilitar um plugin/tema",
-    "REPLUGGED_COMMAND_DEBUG_DESC": "Envia as informações de depuração do dispositivo, discord e do replugged no chat.",
+    "REPLUGGED_COMMAND_DEBUG_DESC": "Envia as informações de depuração do dispositivo, Discord e do Replugged no chat.",
     "REPLUGGED_COMMAND_DISABLE_DISABLED": "{type} \"{id}\" desativado!",
     "REPLUGGED_COMMAND_ENABLE_ENABLED": "{type} \"{id}\" ativado!",
     "REPLUGGED_COMMAND_ECHO_DESC": "Retorna os argumentos especificados.",

diff --git a/i18n/ro.json b/i18n/ro.json
@@ -76,7 +76,7 @@
     "REPLUGGED_CANCEL": "Anulare",
     "REPLUGGED_CONFIRM": "Confirmă",
     "REPLUGGED_OK": "OK",
-    "REPLUGGED_COMMAND_DEBUG_DESC": "Trimite informația de depanare a discordului, dispozitivului și replugged în chat.",
+    "REPLUGGED_COMMAND_DEBUG_DESC": "Trimite informația de depanare a Discordului, dispozitivului și Replugged în chat.",
     "REPLUGGED_COMMAND_DISABLE_DESC": "Dezactivează un plugin sau o temă",
     "REPLUGGED_COMMAND_DISABLE_DISABLED": "{type} \"{id}\" dezactivat!",
     "REPLUGGED_COMMAND_ENABLE_ENABLED": "{type} \"{id}\" activat!",

diff --git a/i18n/sl.json b/i18n/sl.json
@@ -12,7 +12,7 @@
     "REPLUGGED_OK": "OK",
     "REPLUGGED_COMMAND_AUTOCOMPLETE_PLUGIN": "Plugin - {description}",
     "REPLUGGED_COMMAND_AUTOCOMPLETE_THEME": "Tema - {description}",
-    "REPLUGGED_COMMAND_DEBUG_DESC": "Pošlje informacije o odpravljanju napak naprave, discorda in replugged v klepet.",
+    "REPLUGGED_COMMAND_DEBUG_DESC": "Pošlje informacije o odpravljanju napak naprave, Discorda in Replugged v klepet.",
     "REPLUGGED_COMMAND_DISABLE_DESC": "Onemogoči plugin/temo",
     "REPLUGGED_COMMAND_ENABLE_ENABLED": "{type} \"{id}\" omogočen!",
     "REPLUGGED_COMMAND_DISABLE_DISABLED": "{type} \"{id}\" onemogočen!",

diff --git a/i18n/sv-SE.json b/i18n/sv-SE.json
@@ -80,7 +80,7 @@
     "REPLUGGED_CANCEL": "Avbryt",
     "REPLUGGED_CONFIRM": "Bekräfta",
     "REPLUGGED_OK": "OK",
-    "REPLUGGED_COMMAND_DEBUG_DESC": "Skickar enhetens, discords och repluggeds felsökningsinformation i chatten.",
+    "REPLUGGED_COMMAND_DEBUG_DESC": "Skickar enhetens, Discords och Repluggeds felsökningsinformation i chatten.",
     "REPLUGGED_COMMAND_DISABLE_DESC": "Inaktivera ett plugin/tema",
     "REPLUGGED_COMMAND_DISABLE_DISABLED": "{type} \"{id}\" inaktiverat!",
     "REPLUGGED_COMMAND_ENABLE_ENABLED": "{type} \"{id}\" aktiverat!",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/renderer/coremods/settings/pages/General.tsx b/src/renderer/coremods/settings/pages/General.tsx
@@ -114,13 +114,13 @@ export const General = (): React.ReactElement => {
       </SwitchItem>
 
       <ButtonItem
-        button="Reconnect"
-        note="Reconnects the Dev Companion coremod to the VSCode extension."
+        button={Messages.REPLUGGED_SETTINGS_DEV_COMPANION_RECONNECT}
+        note={Messages.REPLUGGED_SETTINGS_DEV_COMPANION_DESC}
         onClick={() => {
           socket?.close(1000, "Reconnecting");
           initWs(true);
         }}>
-        Reconnect Dev Companion
+        {Messages.REPLUGGED_SETTINGS_DEV_COMPANION}
       </ButtonItem>
 
       {/* Sleeping? Wake up. */}

diff --git a/src/renderer/modules/common/constants.ts b/src/renderer/modules/common/constants.ts
@@ -56,6 +56,7 @@ export const UserFlags = getExportsForProps<Record<string, number>>(Constants, [
   "SPAMMER",
 ])!;
 
+// ThemeColor
 export const CSSVariables = await waitForProps<Record<string, string>>(
   "TEXT_NORMAL",
   "BACKGROUND_PRIMARY",

diff --git a/src/renderer/modules/common/flux.ts b/src/renderer/modules/common/flux.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import type { FluxDispatcher as Dispatcher } from "./fluxDispatcher";
+import type { Band, FluxDispatcher as Dispatcher } from "./fluxDispatcher";
 import { waitForProps } from "../webpack";
 
 type DispatchToken = string;
@@ -55,7 +55,7 @@ declare class Callbacks {
 }
 
 export declare class Store {
-  public constructor(dispatcher: Dispatcher, actions?: ActionHandlerRecord, band?: number);
+  public constructor(dispatcher: Dispatcher, actions?: ActionHandlerRecord, band?: Band);
 
   public static destroy(): void;
   public static getAll(): Store[];
@@ -85,7 +85,7 @@ export declare class Store {
   public removeChangeListener(listener: Callback): void;
   public removeReactChangeListener(listener: Callback): void;
 
-  public registerActionHandlers(actions: ActionHandlerRecord, band?: number): void;
+  public registerActionHandlers(actions: ActionHandlerRecord, band?: Band): void;
 
   // eslint-disable-next-line @typescript-eslint/naming-convention
   public __getLocalVars?(): Record<string, unknown>;

diff --git a/src/renderer/modules/common/messages.ts b/src/renderer/modules/common/messages.ts
@@ -32,7 +32,7 @@ interface InviteSuggestion {
   isFiltered: boolean;
 }
 
-interface FetchMessageOptions {
+interface FetchMessagesOptions {
   channelId: string;
   /** Snowflake */
   before?: string;
@@ -53,7 +53,7 @@ interface FetchMessageOptions {
   truncate?: boolean;
 }
 
-type FetchMessagesCachedOptions = Omit<FetchMessageOptions, "isPreload" | "skipLocalFetch">;
+type FetchMessagesCachedOptions = Omit<FetchMessagesOptions, "isPreload" | "skipLocalFetch">;
 
 interface FocusMessageOptions {
   channelId: string;
@@ -354,7 +354,8 @@ export interface MessageActions {
     limit: number,
     localFetchComplete: LocalFetchComplete,
   ) => Promise<void>;
-  fetchMessages: (options: FetchMessageOptions) => Promise<boolean>;
+  fetchMessages: (options: FetchMessagesOptions) => Promise<boolean>;
+  fetchNewLocalMessages: (channelId: string, limit: number) => Promise<void>;
   focusMessage: (options: FocusMessageOptions) => void;
   getSendMessageOptionsForReply: (
     options: SendMessageForReplyOptions,

diff --git a/src/renderer/modules/common/parser.ts b/src/renderer/modules/common/parser.ts
@@ -65,6 +65,20 @@ type ParseFn = (
 export interface Parser {
   defaultRules: DefaultRules;
   guildEventRules: Omit<DefaultRules, "codeBlock" | "blockQuote" | "br">;
+  notifCenterV2MessagePreviewRules: Omit<
+    DefaultRules,
+    | "paragraph"
+    | "newline"
+    | "strong"
+    | "codeBlock"
+    | "inlineCode"
+    | "u"
+    | "link"
+    | "url"
+    | "autolink"
+    | "list"
+    | "heading"
+  >;
   parse: ParseFn;
   parseAutoModerationSystemMessage: ParseFn;
   parseAutoModerationSystemMessageToAST: ParseFn;

diff --git a/src/renderer/modules/common/users.ts b/src/renderer/modules/common/users.ts
@@ -24,6 +24,7 @@ export interface GuildMemberStore {
   getMemberIds: (guildId?: string) => string[];
   getMemberRoleWithPendingUpdates: (guildId: string, userId: string) => string[];
   getMembers: (guildId?: string) => GuildMember[];
+  getMemberVersion: () => number;
   getMutableAllGuildsAndMembers: () => Record<string, Record<string, GuildMember>>;
   getNick: (guildId?: string, userId?: string) => string | null;
   getNicknameGuildsMapping: (userId: string) => Record<string, string[]>;

diff --git a/src/renderer/modules/components/Text.tsx b/src/renderer/modules/components/Text.tsx
@@ -56,6 +56,10 @@ export type Variant =
   | "text-lg/medium"
   | "text-lg/semibold"
   | "text-lg/bold"
+  | "redesign/message-preview/normal"
+  | "redesign/message-preview/medium"
+  | "redesign/message-preview/semibold"
+  | "redesign/message-preview/bold"
   | "display-sm"
   | "display-md"
   | "display-lg"