(
undefined,
);
@@ -43,7 +36,7 @@ export function Component({ options }: Props) {
}
@@ -51,6 +44,7 @@ export function Component({ options }: Props) {
if (desktopEnabled) {
const permission =
await Notification.requestPermission();
+
if (permission !== "granted") {
return openScreen({
id: "error",
@@ -59,10 +53,7 @@ export function Component({ options }: Props) {
}
}
- dispatch({
- type: "SETTINGS_SET_NOTIFICATION_OPTIONS",
- options: { desktopEnabled },
- });
+ settings.set("notifications:desktop", desktopEnabled);
}}>
@@ -115,20 +106,16 @@ export function Component({ options }: Props) {
- {sounds.getState().map(({ id, enabled }) => (
+ {settings.sounds.getState().map(({ id, enabled }) => (
sounds.setEnabled(id, enabled)}>
+ onChange={(enabled) =>
+ settings.sounds.setEnabled(id, enabled)
+ }>
))}
);
}
-
-export const Notifications = connectState(Component, (state) => {
- return {
- options: state.settings.notification,
- };
-});
diff --git a/src/pages/settings/panes/Sync.tsx b/src/pages/settings/panes/Sync.tsx
index c77b5df2..1eff8640 100644
--- a/src/pages/settings/panes/Sync.tsx
+++ b/src/pages/settings/panes/Sync.tsx
@@ -1,17 +1,16 @@
+import { observer } from "mobx-react-lite";
+
import styles from "./Panes.module.scss";
import { Text } from "preact-i18n";
-import { dispatch } from "../../../redux";
-import { connectState } from "../../../redux/connector";
-import { SyncKeys, SyncOptions } from "../../../redux/reducers/sync";
+import { useApplicationState } from "../../../mobx/State";
+import { SyncKeys } from "../../../mobx/stores/Sync";
import Checkbox from "../../../components/ui/Checkbox";
-interface Props {
- options?: SyncOptions;
-}
+export const Sync = observer(() => {
+ const sync = useApplicationState().sync;
-export function Component(props: Props) {
return (
@@ -27,31 +26,16 @@ export function Component(props: Props) {
).map(([key, title]) => (
}
- onChange={(enabled) =>
- dispatch({
- type: enabled
- ? "SYNC_ENABLE_KEY"
- : "SYNC_DISABLE_KEY",
- key,
- })
- }>
+ onChange={() => sync.toggle(key)}>
))}
);
-}
-
-export const Sync = connectState(Component, (state) => {
- return {
- options: state.sync,
- };
});
diff --git a/src/pages/settings/panes/ThemeShop.tsx b/src/pages/settings/panes/ThemeShop.tsx
index 11965e64..10220ec7 100644
--- a/src/pages/settings/panes/ThemeShop.tsx
+++ b/src/pages/settings/panes/ThemeShop.tsx
@@ -3,9 +3,8 @@ import styled from "styled-components";
import { useEffect, useState } from "preact/hooks";
import { useApplicationState } from "../../../mobx/State";
-import { dispatch } from "../../../redux";
-import { Theme, generateVariables, ThemeOptions } from "../../../context/Theme";
+import { Theme, generateVariables } from "../../../context/Theme";
import Tip from "../../../components/ui/Tip";
import previewPath from "../assets/preview.svg";
diff --git a/src/redux/State.tsx b/src/redux/State.tsx
deleted file mode 100644
index 7edfd4b7..00000000
--- a/src/redux/State.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import localForage from "localforage";
-import { Provider } from "react-redux";
-
-import { useEffect, useRef, useState } from "preact/hooks";
-
-import MobXState, { StateContextProvider } from "../mobx/State";
-
-import { dispatch, State, store } from ".";
-import { Children } from "../types/Preact";
-
-interface Props {
- children: Children;
-}
-
-/**
- * Component for loading application state.
- * @param props Provided children
- */
-export default function StateLoader(props: Props) {
- const [loaded, setLoaded] = useState(false);
- const { current: state } = useRef(new MobXState());
-
- // Globally expose the application state.
- useEffect(() => {
- (window as unknown as Record).state = state;
- }, [state]);
-
- useEffect(() => {
- localForage.getItem("state").then((s) => {
- if (s !== null) {
- dispatch({ type: "__INIT", state: s as State });
- }
-
- state.hydrate().then(() => setLoaded(true));
- });
- }, []);
-
- if (!loaded) return null;
-
- useEffect(state.registerListeners);
-
- return (
-
-
- {props.children}
-
-
- );
-}
diff --git a/src/redux/connector.tsx b/src/redux/connector.tsx
deleted file mode 100644
index 699238d6..00000000
--- a/src/redux/connector.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import { connect, ConnectedComponent } from "react-redux";
-
-import { h } from "preact";
-import { memo } from "preact/compat";
-
-import { State } from ".";
-
-export function connectState(
- component: (props: any) => h.JSX.Element | null,
- mapKeys: (state: State, props: T) => any,
- memoize?: boolean,
-): ConnectedComponent<(props: any) => h.JSX.Element | null, T> {
- const c = connect(mapKeys)(component);
- return memoize ? memo(c) : c;
-}
diff --git a/src/redux/index.ts b/src/redux/index.ts
deleted file mode 100644
index 2e5b7d84..00000000
--- a/src/redux/index.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import localForage from "localforage";
-import { createStore } from "redux";
-import { RevoltConfiguration } from "revolt-api/types/Core";
-
-import { Language } from "../context/Locale";
-
-import rootReducer, { Action } from "./reducers";
-import { AuthState } from "./reducers/auth";
-import { Drafts } from "./reducers/drafts";
-import { ExperimentOptions } from "./reducers/experiments";
-import { LastOpened } from "./reducers/last_opened";
-import { Notifications } from "./reducers/notifications";
-import { QueuedMessage } from "./reducers/queue";
-import { SectionToggle } from "./reducers/section_toggle";
-import { Settings } from "./reducers/settings";
-import { SyncOptions } from "./reducers/sync";
-import { Themes } from "./reducers/themes";
-import { TrustedLinks } from "./reducers/trusted_links";
-import { Unreads } from "./reducers/unreads";
-
-export type State = {
- config: RevoltConfiguration;
- locale: Language;
- auth: AuthState;
- settings: Settings;
- unreads: Unreads;
- queue: QueuedMessage[];
- drafts: Drafts;
- sync: SyncOptions;
- experiments: ExperimentOptions;
- lastOpened: LastOpened;
- notifications: Notifications;
- sectionToggle: SectionToggle;
- trustedLinks: TrustedLinks;
- themes: Themes;
-};
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const store = createStore((state: any, action: any) => {
- if (import.meta.env.DEV) {
- console.debug("State Update:", action);
- }
-
- if (action.type === "__INIT") {
- return action.state;
- }
-
- return rootReducer(state, action);
-});
-
-// Save state using localForage.
-store.subscribe(() => {
- const {
- config,
- locale,
- auth,
- settings,
- unreads,
- queue,
- drafts,
- sync,
- experiments,
- lastOpened,
- notifications,
- sectionToggle,
- trustedLinks,
- themes,
- } = store.getState() as State;
-
- localForage.setItem("state", {
- config,
- locale,
- auth,
- settings,
- unreads,
- queue,
- drafts,
- sync,
- experiments,
- lastOpened,
- notifications,
- sectionToggle,
- trustedLinks,
- themes,
- });
-});
-
-export function dispatch(action: Action) {
- store.dispatch(action);
-}
-
-export function getState(): State {
- return store.getState();
-}
diff --git a/src/redux/reducers/auth.ts b/src/redux/reducers/auth.ts
deleted file mode 100644
index 2bb2ce99..00000000
--- a/src/redux/reducers/auth.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { Session } from "revolt-api/types/Auth";
-
-export interface AuthState {
- accounts: {
- [key: string]: {
- session: Session;
- };
- };
- active?: string;
-}
-
-export type AuthAction =
- | { type: undefined }
- | {
- type: "LOGIN";
- session: Session;
- }
- | {
- type: "LOGOUT";
- user_id?: string;
- };
-
-export function auth(
- state = { accounts: {} } as AuthState,
- action: AuthAction,
-): AuthState {
- switch (action.type) {
- case "LOGIN":
- return {
- accounts: {
- ...state.accounts,
- [action.session.user_id]: {
- session: action.session,
- },
- },
- active: action.session.user_id,
- };
- case "LOGOUT": {
- const accounts = Object.assign({}, state.accounts);
- action.user_id && delete accounts[action.user_id];
-
- return {
- accounts,
- };
- }
- default:
- return state;
- }
-}
diff --git a/src/redux/reducers/drafts.ts b/src/redux/reducers/drafts.ts
deleted file mode 100644
index 4f36a846..00000000
--- a/src/redux/reducers/drafts.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-export type Drafts = { [key: string]: string };
-
-export type DraftAction =
- | { type: undefined }
- | {
- type: "SET_DRAFT";
- channel: string;
- content: string;
- }
- | {
- type: "CLEAR_DRAFT";
- channel: string;
- }
- | {
- type: "RESET";
- };
-
-export function drafts(state: Drafts = {}, action: DraftAction): Drafts {
- switch (action.type) {
- case "SET_DRAFT":
- return {
- ...state,
- [action.channel]: action.content,
- };
- case "CLEAR_DRAFT": {
- // eslint-disable-next-line @typescript-eslint/no-unused-vars
- const { [action.channel]: _, ...newState } = state;
- return newState;
- }
- case "RESET":
- return {};
- default:
- return state;
- }
-}
diff --git a/src/redux/reducers/experiments.ts b/src/redux/reducers/experiments.ts
deleted file mode 100644
index 7d081f86..00000000
--- a/src/redux/reducers/experiments.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { getState } from "..";
-
-export type Experiments = "search" | "theme_shop";
-
-export const AVAILABLE_EXPERIMENTS: Experiments[] = ["theme_shop"];
-
-export const EXPERIMENTS: {
- [key in Experiments]: { title: string; description: string };
-} = {
- search: {
- title: "Search",
- description: "Allows you to search for messages in channels.",
- },
- theme_shop: {
- title: "Theme Shop",
- description: "Allows you to access and set user submitted themes.",
- },
-};
-
-export interface ExperimentOptions {
- enabled?: Experiments[];
-}
-
-export type ExperimentsAction =
- | { type: undefined }
- | {
- type: "EXPERIMENTS_ENABLE";
- key: Experiments;
- }
- | {
- type: "EXPERIMENTS_DISABLE";
- key: Experiments;
- };
-
-export function experiments(
- state = {} as ExperimentOptions,
- action: ExperimentsAction,
-): ExperimentOptions {
- switch (action.type) {
- case "EXPERIMENTS_ENABLE":
- return {
- ...state,
- enabled: [
- ...(state.enabled ?? [])
- .filter((x) => AVAILABLE_EXPERIMENTS.includes(x))
- .filter((v) => v !== action.key),
- action.key,
- ],
- };
- case "EXPERIMENTS_DISABLE":
- return {
- ...state,
- enabled: state.enabled
- ?.filter((v) => v !== action.key)
- .filter((x) => AVAILABLE_EXPERIMENTS.includes(x)),
- };
- default:
- return state;
- }
-}
-
-export function isExperimentEnabled(
- name: Experiments,
- experiments: ExperimentOptions = getState().experiments,
-) {
- return experiments.enabled?.includes(name) ?? false;
-}
diff --git a/src/redux/reducers/index.ts b/src/redux/reducers/index.ts
deleted file mode 100644
index aa8be8f4..00000000
--- a/src/redux/reducers/index.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { combineReducers } from "redux";
-
-import { State } from "..";
-import { auth, AuthAction } from "./auth";
-import { drafts, DraftAction } from "./drafts";
-import { experiments, ExperimentsAction } from "./experiments";
-import { lastOpened, LastOpenedAction } from "./last_opened";
-import { locale, LocaleAction } from "./locale";
-import { notifications, NotificationsAction } from "./notifications";
-import { queue, QueueAction } from "./queue";
-import { sectionToggle, SectionToggleAction } from "./section_toggle";
-import { config, ConfigAction } from "./server_config";
-import { settings, SettingsAction } from "./settings";
-import { sync, SyncAction } from "./sync";
-import { themes, ThemesAction } from "./themes";
-import { trustedLinks, TrustedLinksAction } from "./trusted_links";
-import { unreads, UnreadsAction } from "./unreads";
-
-export default combineReducers({
- config,
- locale,
- auth,
- settings,
- unreads,
- queue,
- drafts,
- sync,
- experiments,
- lastOpened,
- notifications,
- sectionToggle,
- trustedLinks,
- themes,
-});
-
-export type Action =
- | ConfigAction
- | LocaleAction
- | AuthAction
- | SettingsAction
- | UnreadsAction
- | QueueAction
- | DraftAction
- | SyncAction
- | ExperimentsAction
- | LastOpenedAction
- | NotificationsAction
- | SectionToggleAction
- | TrustedLinksAction
- | ThemesAction
- | { type: "__INIT"; state: State };
diff --git a/src/redux/reducers/last_opened.ts b/src/redux/reducers/last_opened.ts
deleted file mode 100644
index e49c444e..00000000
--- a/src/redux/reducers/last_opened.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-export interface LastOpened {
- [key: string]: string;
-}
-
-export type LastOpenedAction =
- | { type: undefined }
- | {
- type: "LAST_OPENED_SET";
- parent: string;
- child: string;
- }
- | {
- type: "RESET";
- };
-
-export function lastOpened(
- state = {} as LastOpened,
- action: LastOpenedAction,
-): LastOpened {
- switch (action.type) {
- case "LAST_OPENED_SET": {
- return {
- ...state,
- [action.parent]: action.child,
- };
- }
- case "RESET":
- return {};
- default:
- return state;
- }
-}
diff --git a/src/redux/reducers/locale.ts b/src/redux/reducers/locale.ts
deleted file mode 100644
index 5e8e4ec0..00000000
--- a/src/redux/reducers/locale.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { Language, Languages } from "../../context/Locale";
-
-import type { SyncUpdateAction } from "./sync";
-
-export type LocaleAction =
- | { type: undefined }
- | {
- type: "SET_LOCALE";
- locale: Language;
- }
- | SyncUpdateAction;
-
-export function findLanguage(lang?: string): Language {
- if (!lang) {
- if (typeof navigator === "undefined") {
- lang = Language.ENGLISH;
- } else {
- lang = navigator.language;
- }
- }
-
- const code = lang.replace("-", "_");
- const short = code.split("_")[0];
-
- const values = [];
- for (const key in Language) {
- const value = Language[key as keyof typeof Language];
-
- // Skip alternative/joke languages
- if (Languages[value].cat === "alt") continue;
-
- values.push(value);
- if (value.startsWith(code)) {
- return value as Language;
- }
- }
-
- for (const value of values.reverse()) {
- if (value.startsWith(short)) {
- return value as Language;
- }
- }
-
- return Language.ENGLISH;
-}
-
-export function locale(state = findLanguage(), action: LocaleAction): Language {
- switch (action.type) {
- case "SET_LOCALE":
- return action.locale;
- case "SYNC_UPDATE":
- return (action.update.locale?.[1] ?? state) as Language;
- default:
- return state;
- }
-}
diff --git a/src/redux/reducers/notifications.ts b/src/redux/reducers/notifications.ts
deleted file mode 100644
index 76e3679b..00000000
--- a/src/redux/reducers/notifications.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import { Channel } from "revolt.js/dist/maps/Channels";
-import { Message } from "revolt.js/dist/maps/Messages";
-
-import type { SyncUpdateAction } from "./sync";
-
-export type NotificationState = "all" | "mention" | "none" | "muted";
-
-export type Notifications = {
- [key: string]: NotificationState;
-};
-
-export const DEFAULT_STATES: {
- [key in Channel["channel_type"]]: NotificationState;
-} = {
- SavedMessages: "all",
- DirectMessage: "all",
- Group: "all",
- TextChannel: "mention",
- VoiceChannel: "mention",
-};
-
-export function getNotificationState(
- notifications: Notifications,
- channel: Channel,
-) {
- return notifications[channel._id] ?? DEFAULT_STATES[channel.channel_type];
-}
-
-export function shouldNotify(
- state: NotificationState,
- message: Message,
- user_id: string,
-) {
- switch (state) {
- case "muted":
- case "none":
- return false;
- case "mention": {
- if (!message.mention_ids?.includes(user_id)) return false;
- }
- }
-
- return true;
-}
-
-export type NotificationsAction =
- | { type: undefined }
- | {
- type: "NOTIFICATIONS_SET";
- key: string;
- state: NotificationState;
- }
- | {
- type: "NOTIFICATIONS_REMOVE";
- key: string;
- }
- | SyncUpdateAction
- | {
- type: "RESET";
- };
-
-export function notifications(
- state = {} as Notifications,
- action: NotificationsAction,
-): Notifications {
- switch (action.type) {
- case "NOTIFICATIONS_SET":
- return {
- ...state,
- [action.key]: action.state,
- };
- case "NOTIFICATIONS_REMOVE": {
- const { [action.key]: _, ...newState } = state;
- return newState;
- }
- case "SYNC_UPDATE":
- return action.update.notifications?.[1] ?? state;
- case "RESET":
- return {};
- default:
- return state;
- }
-}
diff --git a/src/redux/reducers/queue.ts b/src/redux/reducers/queue.ts
deleted file mode 100644
index c4059e05..00000000
--- a/src/redux/reducers/queue.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-export enum QueueStatus {
- SENDING = "sending",
- ERRORED = "errored",
-}
-
-export interface Reply {
- id: string;
- mention: boolean;
-}
-
-export type QueuedMessageData = {
- _id: string;
- author: string;
- channel: string;
-
- content: string;
- replies: Reply[];
-};
-
-export interface QueuedMessage {
- id: string;
- channel: string;
- data: QueuedMessageData;
- status: QueueStatus;
- error?: string;
-}
-
-export type QueueAction =
- | { type: undefined }
- | {
- type: "QUEUE_ADD";
- nonce: string;
- channel: string;
- message: QueuedMessageData;
- }
- | {
- type: "QUEUE_FAIL";
- nonce: string;
- error: string;
- }
- | {
- type: "QUEUE_START";
- nonce: string;
- }
- | {
- type: "QUEUE_REMOVE";
- nonce: string;
- }
- | {
- type: "QUEUE_DROP_ALL";
- }
- | {
- type: "QUEUE_FAIL_ALL";
- }
- | {
- type: "RESET";
- };
-
-export function queue(
- state: QueuedMessage[] = [],
- action: QueueAction,
-): QueuedMessage[] {
- switch (action.type) {
- case "QUEUE_ADD": {
- return [
- ...state.filter((x) => x.id !== action.nonce),
- {
- id: action.nonce,
- data: action.message,
- channel: action.channel,
- status: QueueStatus.SENDING,
- },
- ];
- }
- case "QUEUE_FAIL": {
- const entry = state.find(
- (x) => x.id === action.nonce,
- ) as QueuedMessage;
- return [
- ...state.filter((x) => x.id !== action.nonce),
- {
- ...entry,
- status: QueueStatus.ERRORED,
- error: action.error,
- },
- ];
- }
- case "QUEUE_START": {
- const entry = state.find(
- (x) => x.id === action.nonce,
- ) as QueuedMessage;
- return [
- ...state.filter((x) => x.id !== action.nonce),
- {
- ...entry,
- status: QueueStatus.SENDING,
- },
- ];
- }
- case "QUEUE_REMOVE":
- return state.filter((x) => x.id !== action.nonce);
- case "QUEUE_FAIL_ALL":
- return state.map((x) => {
- return {
- ...x,
- status: QueueStatus.ERRORED,
- };
- });
- case "QUEUE_DROP_ALL":
- case "RESET":
- return [];
- default:
- return state;
- }
-}
diff --git a/src/redux/reducers/section_toggle.ts b/src/redux/reducers/section_toggle.ts
deleted file mode 100644
index cff440d0..00000000
--- a/src/redux/reducers/section_toggle.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-export interface SectionToggle {
- [key: string]: boolean;
-}
-
-export type SectionToggleAction =
- | { type: undefined }
- | {
- type: "SECTION_TOGGLE_SET";
- id: string;
- state: boolean;
- }
- | {
- type: "SECTION_TOGGLE_UNSET";
- id: string;
- }
- | {
- type: "RESET";
- };
-
-export function sectionToggle(
- state = {} as SectionToggle,
- action: SectionToggleAction,
-): SectionToggle {
- switch (action.type) {
- case "SECTION_TOGGLE_SET": {
- return {
- ...state,
- [action.id]: action.state,
- };
- }
- case "SECTION_TOGGLE_UNSET": {
- const { [action.id]: _, ...newState } = state;
- return newState;
- }
- case "RESET":
- return {};
- default:
- return state;
- }
-}
diff --git a/src/redux/reducers/server_config.ts b/src/redux/reducers/server_config.ts
deleted file mode 100644
index 916cb2d7..00000000
--- a/src/redux/reducers/server_config.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import type { RevoltConfiguration } from "revolt-api/types/Core";
-
-export type ConfigAction =
- | { type: undefined }
- | {
- type: "SET_CONFIG";
- config: RevoltConfiguration;
- };
-
-export function config(
- state = {} as RevoltConfiguration,
- action: ConfigAction,
-): RevoltConfiguration {
- switch (action.type) {
- case "SET_CONFIG":
- return action.config;
- default:
- return state;
- }
-}
diff --git a/src/redux/reducers/settings.ts b/src/redux/reducers/settings.ts
deleted file mode 100644
index 42248faa..00000000
--- a/src/redux/reducers/settings.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-import type { Theme, ThemeOptions } from "../../context/Theme";
-
-import { setGlobalEmojiPack } from "../../components/common/Emoji";
-
-import type { SyncUpdateAction } from "./sync";
-
-type Sounds = "message" | "outbound" | "call_join" | "call_leave";
-
-export type SoundOptions = {
- [key in Sounds]?: boolean;
-};
-
-export const DEFAULT_SOUNDS: SoundOptions = {
- message: true,
- outbound: false,
- call_join: true,
- call_leave: true,
-};
-
-export interface NotificationOptions {
- desktopEnabled?: boolean;
- sounds?: SoundOptions;
-}
-
-export type EmojiPacks = "mutant" | "twemoji" | "noto" | "openmoji";
-export interface AppearanceOptions {
- emojiPack?: EmojiPacks;
-}
-
-export interface Settings {
- theme?: ThemeOptions;
- appearance?: AppearanceOptions;
- notification?: NotificationOptions;
-}
-
-export type SettingsAction =
- | { type: undefined }
- | {
- type: "SETTINGS_SET_THEME";
- theme: ThemeOptions;
- }
- | {
- type: "SETTINGS_SET_THEME_OVERRIDE";
- custom?: Partial;
- }
- | {
- type: "SETTINGS_SET_NOTIFICATION_OPTIONS";
- options: NotificationOptions;
- }
- | {
- type: "SETTINGS_SET_APPEARANCE";
- options: Partial;
- }
- | SyncUpdateAction
- | {
- type: "RESET";
- };
-
-export function settings(
- state = {} as Settings,
- action: SettingsAction,
-): Settings {
- // setGlobalEmojiPack(state.appearance?.emojiPack ?? "mutant");
-
- switch (action.type) {
- case "SETTINGS_SET_THEME":
- return {
- ...state,
- theme: {
- ...state.theme,
- ...action.theme,
- },
- };
- case "SETTINGS_SET_THEME_OVERRIDE":
- return {
- ...state,
- theme: {
- ...state.theme,
- custom: {
- ...state.theme?.custom,
- ...action.custom,
- },
- },
- };
- case "SETTINGS_SET_NOTIFICATION_OPTIONS":
- return {
- ...state,
- notification: {
- ...state.notification,
- ...action.options,
- },
- };
- case "SETTINGS_SET_APPEARANCE":
- return {
- ...state,
- appearance: {
- ...state.appearance,
- ...action.options,
- },
- };
- case "SYNC_UPDATE":
- return {
- ...state,
- appearance: action.update.appearance?.[1] ?? state.appearance,
- theme: action.update.theme?.[1] ?? state.theme,
- };
- case "RESET":
- return {};
- default:
- return state;
- }
-}
diff --git a/src/redux/reducers/sync.ts b/src/redux/reducers/sync.ts
deleted file mode 100644
index e62c31c6..00000000
--- a/src/redux/reducers/sync.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import type { Language } from "../../context/Locale";
-import type { ThemeOptions } from "../../context/Theme";
-
-import type { Notifications } from "./notifications";
-import type { AppearanceOptions } from "./settings";
-
-export type SyncKeys = "theme" | "appearance" | "locale" | "notifications";
-
-export interface SyncData {
- locale?: Language;
- theme?: ThemeOptions;
- appearance?: AppearanceOptions;
- notifications?: Notifications;
-}
-
-export const DEFAULT_ENABLED_SYNC: SyncKeys[] = [
- "theme",
- "appearance",
- "locale",
- "notifications",
-];
-export interface SyncOptions {
- disabled?: SyncKeys[];
- revision?: {
- [key: string]: number;
- };
-}
-
-export type SyncUpdateAction = {
- type: "SYNC_UPDATE";
- update: { [key in SyncKeys]?: [number, SyncData[key]] };
-};
-
-export type SyncAction =
- | { type: undefined }
- | {
- type: "SYNC_ENABLE_KEY";
- key: SyncKeys;
- }
- | {
- type: "SYNC_DISABLE_KEY";
- key: SyncKeys;
- }
- | {
- type: "SYNC_SET_REVISION";
- key: SyncKeys;
- timestamp: number;
- }
- | SyncUpdateAction;
-
-export function sync(
- state = {} as SyncOptions,
- action: SyncAction,
-): SyncOptions {
- switch (action.type) {
- case "SYNC_DISABLE_KEY":
- return {
- ...state,
- disabled: [
- ...(state.disabled ?? []).filter((v) => v !== action.key),
- action.key,
- ],
- };
- case "SYNC_ENABLE_KEY":
- return {
- ...state,
- disabled: state.disabled?.filter((v) => v !== action.key),
- };
- case "SYNC_SET_REVISION":
- return {
- ...state,
- revision: {
- ...state.revision,
- [action.key]: action.timestamp,
- },
- };
- case "SYNC_UPDATE": {
- const revision = { ...state.revision };
- for (const key of Object.keys(action.update)) {
- const value = action.update[key as SyncKeys];
- if (value) {
- revision[key] = value[0];
- }
- }
-
- return {
- ...state,
- revision,
- };
- }
- default:
- return state;
- }
-}
diff --git a/src/redux/reducers/themes.ts b/src/redux/reducers/themes.ts
deleted file mode 100644
index 89b9c840..00000000
--- a/src/redux/reducers/themes.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { Theme } from "../../context/Theme";
-
-import { ThemeMetadata } from "../../pages/settings/panes/ThemeShop";
-
-export interface StoredTheme {
- slug: string;
- meta: ThemeMetadata;
- theme: Theme;
-}
-
-export type Themes = Record;
-
-export type ThemesAction =
- | { type: undefined }
- | { type: "THEMES_SET_THEME"; theme: StoredTheme }
- | { type: "THEMES_REMOVE_THEME"; slug: string }
- | { type: "RESET" };
-
-export function themes(state: Themes = {}, action: ThemesAction) {
- switch (action.type) {
- case "THEMES_SET_THEME":
- return {
- ...state,
- [action.theme.slug]: action.theme,
- };
- case "THEMES_REMOVE_THEME":
- return { ...state, [action.slug]: null };
- case "RESET":
- return {};
- default:
- return state;
- }
-}
diff --git a/src/redux/reducers/trusted_links.ts b/src/redux/reducers/trusted_links.ts
deleted file mode 100644
index 4675b3cd..00000000
--- a/src/redux/reducers/trusted_links.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-export interface TrustedLinks {
- domains?: string[];
-}
-
-export type TrustedLinksAction =
- | { type: undefined }
- | {
- type: "TRUSTED_LINKS_ADD_DOMAIN";
- domain: string;
- }
- | {
- type: "TRUSTED_LINKS_REMOVE_DOMAIN";
- domain: string;
- };
-
-export function trustedLinks(
- state = {} as TrustedLinks,
- action: TrustedLinksAction,
-): TrustedLinks {
- switch (action.type) {
- case "TRUSTED_LINKS_ADD_DOMAIN":
- return {
- ...state,
- domains: [
- ...(state.domains ?? []).filter((v) => v !== action.domain),
- action.domain,
- ],
- };
- case "TRUSTED_LINKS_REMOVE_DOMAIN":
- return {
- ...state,
- domains: state.domains?.filter((v) => v !== action.domain),
- };
- default:
- return state;
- }
-}
diff --git a/src/redux/reducers/unreads.ts b/src/redux/reducers/unreads.ts
deleted file mode 100644
index e7f57886..00000000
--- a/src/redux/reducers/unreads.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import type { ChannelUnread } from "revolt-api/types/Sync";
-import { ulid } from "ulid";
-
-export interface Unreads {
- [key: string]: Partial>;
-}
-
-export type UnreadsAction =
- | { type: undefined }
- | {
- type: "UNREADS_MARK_READ";
- channel: string;
- message: string;
- }
- | {
- type: "UNREADS_MARK_MULTIPLE_READ";
- channels: string[];
- }
- | {
- type: "UNREADS_SET";
- unreads: ChannelUnread[];
- }
- | {
- type: "UNREADS_MENTION";
- channel: string;
- message: string;
- }
- | {
- type: "RESET";
- };
-
-export function unreads(state = {} as Unreads, action: UnreadsAction): Unreads {
- switch (action.type) {
- case "UNREADS_MARK_READ":
- return {
- ...state,
- [action.channel]: {
- last_id: action.message,
- },
- };
- case "UNREADS_MARK_MULTIPLE_READ": {
- const newState = { ...state };
- const last_id = ulid();
- for (const channel of action.channels) {
- newState[channel] = {
- last_id,
- };
- }
-
- return newState;
- }
- case "UNREADS_SET": {
- const obj: Unreads = {};
- for (const entry of action.unreads) {
- const { _id, ...v } = entry;
- obj[_id.channel] = v;
- }
-
- return obj;
- }
- case "UNREADS_MENTION": {
- const obj = state[action.channel];
-
- return {
- ...state,
- [action.channel]: {
- ...obj,
- mentions: [...(obj?.mentions ?? []), action.message],
- },
- };
- }
- case "RESET":
- return {};
- default:
- return state;
- }
-}
diff --git a/yarn.lock b/yarn.lock
index 44bc6454..ce022ce1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2463,10 +2463,10 @@ events@^3.3.0:
resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
-exponential-backoff@^3.1.0:
+"exponential-backoff@npm:@insertish/exponential-backoff":
version "3.1.0"
- resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.0.tgz#9409c7e579131f8bd4b32d7d8094a911040f2e68"
- integrity sha512-oBuz5SYz5zzyuHINoe9ooePwSu0xApKWgeNzok4hZ5YKXFh9zrQBEM15CXqoZkJJPuI2ArvqjPQd8UKJA753XA==
+ resolved "https://registry.yarnpkg.com/@insertish/exponential-backoff/-/exponential-backoff-3.1.0.tgz#1d2e4c215fa8647779cfeab74ecb54a5c36835e6"
+ integrity sha512-8Jab9OfjheI84T04QjUwXceSO1DMGy8goDqVdnuoffC2fg23zBnikLJkrRHiT/ao4c08v4R2mU7+/DXMWmROng==
fake-mediastreamtrack@^1.1.6:
version "1.1.6"
@@ -2912,10 +2912,10 @@ isexe@^2.0.0:
resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
-isomorphic-ws@^4.0.1:
+"isomorphic-ws@npm:@insertish/isomorphic-ws":
version "4.0.1"
- resolved "https://registry.yarnpkg.com/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz#55fd4cd6c5e6491e76dc125938dd863f5cd4f2dc"
- integrity sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==
+ resolved "https://registry.yarnpkg.com/@insertish/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz#5bcd6f73b93efa9ccdb6abf887ae808d40827169"
+ integrity sha512-kFD/p8T4Hkqr992QrdkbW/cQ/W/q2d9MPCobwzBv2PwTKLkCD9RaYDy6m17qRnSLQQ5PU0kHCG8kaOwAqzj1vQ==
javascript-natural-sort@0.7.1:
version "0.7.1"
@@ -3576,18 +3576,6 @@ react-redux@^7.2.0:
prop-types "^15.7.2"
react-is "^16.13.1"
-react-redux@^7.2.4:
- version "7.2.4"
- resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.4.tgz#1ebb474032b72d806de2e0519cd07761e222e225"
- integrity sha512-hOQ5eOSkEJEXdpIKbnRyl04LhaWabkDPV+Ix97wqQX3T3d2NQ8DUblNXXtNMavc7DpswyQM6xfaN4HQDKNY2JA==
- dependencies:
- "@babel/runtime" "^7.12.1"
- "@types/react-redux" "^7.1.16"
- hoist-non-react-statics "^3.3.2"
- loose-envify "^1.4.0"
- prop-types "^15.7.2"
- react-is "^16.13.1"
-
react-router-dom@^5.2.0:
version "5.2.1"
resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.2.1.tgz#34af8b551a4ce17487d3f80e651b91651978dff6"
@@ -3651,7 +3639,7 @@ readdirp@~3.6.0:
dependencies:
picomatch "^2.2.1"
-redux@^4.0.0, redux@^4.0.4, redux@^4.1.0:
+redux@^4.0.0, redux@^4.0.4:
version "4.1.1"
resolved "https://registry.yarnpkg.com/redux/-/redux-4.1.1.tgz#76f1c439bb42043f985fbd9bf21990e60bd67f47"
integrity sha512-hZQZdDEM25UY2P493kPYuKqviVwZ58lEmGQNeQ+gXa+U0gYPUBf7NKYazbe3m+bs/DzM/ahN12DbF+NG8i0CWw==
@@ -3770,15 +3758,15 @@ revolt-api@^0.5.3-alpha.9:
resolved "https://registry.yarnpkg.com/revolt-api/-/revolt-api-0.5.3-alpha.9.tgz#46e75b7d8f9c6702df39039b829dddbb7897f237"
integrity sha512-L8K9uPV3ME8bLdtWm8L9iPQvFM0GghA+5LzmWFjd6Gbn56u22ZYub2lABi4iHrWgeA2X41dGSsuSBgHSlts9Og==
-revolt.js@5.2.0-patch.0:
- version "5.2.0-patch.0"
- resolved "https://registry.yarnpkg.com/revolt.js/-/revolt.js-5.2.0-patch.0.tgz#af6afc402399e5394b50b2e7d1573ff490fd3906"
- integrity sha512-PnHKqRpEvrBFm1xtLA/lGG5FIsp5kW4eB8sYiejjQCA1DWi7Xg6MNvyOjjha6jKftPXF8roivfZWEnM7sY1bnA==
+revolt.js@5.2.1-patch.1:
+ version "5.2.1-patch.1"
+ resolved "https://registry.yarnpkg.com/revolt.js/-/revolt.js-5.2.1-patch.1.tgz#4b392d4dae12ea28f559ef89790368f53788c81d"
+ integrity sha512-u2vvbCWXKx+vZKqlt5izowf9XnMbWdh3GaPMzipek6l6mBYSCIlr796HoiiIO3c2T3AWqh3zav97rm8z3jOIXg==
dependencies:
axios "^0.21.4"
eventemitter3 "^4.0.7"
- exponential-backoff "^3.1.0"
- isomorphic-ws "^4.0.1"
+ exponential-backoff "npm:@insertish/exponential-backoff"
+ isomorphic-ws "npm:@insertish/isomorphic-ws"
lodash.defaultsdeep "^4.6.1"
lodash.flatten "^4.4.0"
lodash.isequal "^4.5.0"