SheWhoReignsSupreme/Equicord
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/dev' into dev

Browse source
This commit is contained in:
thororen 2026-09-26 21:52:00 -04:00
commit 88c35d30c5
No known key found for this signature in database
19 changed files with 21 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -1,7 +1,7 @@
{
"name": "equicord",
"private": "true",
"version": "1.15.7.0",
"version": "1.15.8.0",
"description": "The other cutest Discord client mod",
"homepage": "https://github.com/Equicord/Equicord#readme",
"bugs": {

2
packages/discord-types/src/stores/AccessibilityStore.d.ts vendored
View file

@ -74,9 +74,7 @@ export class AccessibilityStore extends FluxStore {
get condensePickerWhenNarrow(): boolean;
get youBarNameplateAnimation(): YouBarAnimationPreference;
get youBarAvatarDecoAnimation(): YouBarAnimationPreference;
/** resolves youBarNameplateAnimation against useReducedMotion */
get animateYouBarNameplate(): boolean;
/** resolves youBarAvatarDecoAnimation against useReducedMotion */
get animateYouBarAvatarDeco(): boolean;
get syncProfileThemeWithUserTheme(): boolean;
get systemPrefersReducedMotion(): ReducedMotionPreference;

1
packages/discord-types/src/stores/ApplicationStreamPreviewStore.d.ts vendored
View file

@ -4,6 +4,5 @@ export interface ApplicationStreamPreviewStore extends FluxStore {
getIsPreviewLoading: (guildId: string | bigint | null, channelId: string | bigint, ownerId: string | bigint) => boolean;
getPreviewURL: (guildId: string | bigint | null, channelId: string | bigint, ownerId: string | bigint) => string | undefined;
getPreviewURLForStreamKey: (streamKey: string) => ReturnType<ApplicationStreamPreviewStore["getPreviewURL"]>;
/** true if no preview exists and fewer than 5 fetches failed, or the preview expired, and none is loading */
shouldFetchPreview: (guildId: string | bigint | null, channelId: string | bigint, ownerId: string | bigint) => boolean;
}

1
packages/discord-types/src/stores/ApplicationStreamingStore.d.ts vendored
View file

@ -31,7 +31,6 @@ export interface ApplicationStreamingStore extends FluxStore {
getAllApplicationStreamsForChannel: (channelId: string | bigint) => ApplicationStream[];
getAllActiveStreamsForChannel: (channelId: string | bigint) => Stream[];
getAnyStreamForUser: (userId: string | bigint) => Stream | ApplicationStream | null;
/** like getAnyStreamForUser, but skips streams with discoverable set to false */
getAnyDiscoverableStreamForUser: (userId: string | bigint) => ApplicationStream | null;
getStreamForUser: (userId: string | bigint, guildId?: string | bigint | null) => Stream | null;
getCurrentUserActiveStream: () => Stream | null;

4
packages/discord-types/src/stores/AuthorizedAppsStore.d.ts vendored
View file

@ -2,7 +2,7 @@ import { FluxStore } from "..";
export interface AuthorizedAppToken {
id: string;
application: { id: string; parent_id?: string | null; [key: string]: unknown; };
application: { id: string; parent_id?: string | null;[key: string]: unknown; };
scopes: string[];
}
@ -11,10 +11,8 @@ export type AuthorizedAppsFetchState = "NOT_FETCHED" | "FETCHING" | "FETCHED";
export class AuthorizedAppsStore extends FluxStore {
getNewestTokenForApplication(applicationId: string): AuthorizedAppToken | null;
getNewestTokens(): AuthorizedAppToken[];
/** tokens whose application has no parent_id */
getNewestTokensForNonChildrenApplications(): AuthorizedAppToken[];
getFetchState(): AuthorizedAppsFetchState;
getFetchStateForApplication(applicationId: string): AuthorizedAppsFetchState;
/** incremented whenever a fetch state changes */
getApplicationFetchStateVersion(): number;
}

2
packages/discord-types/src/stores/ClientThemesBackgroundStore.d.ts vendored
View file

@ -7,10 +7,8 @@ export interface GradientPreset {
export class ClientThemesBackgroundStore extends FluxStore {
get gradientPreset(): GradientPreset | undefined;
/** true while previewing a theme the user can't use */
get isPreview(): boolean;
get isCoachmark(): boolean;
get mobilePendingThemeIndex(): number | undefined;
/** css linear-gradient for the current preset, or null if none */
getLinearGradient(): string | null;
}

1
packages/discord-types/src/stores/ConnectedAccountsStore.d.ts vendored
View file

@ -2,7 +2,6 @@ import { ConnectedAccount, FluxStore } from "..";
export class ConnectedAccountsStore extends FluxStore {
getAccounts(): ConnectedAccount[];
/** accounts for platforms that are connected locally, like xbox or playstation */
getLocalAccounts(): ConnectedAccount[];
getAccount(accountId: string | null | undefined, type: string): ConnectedAccount | undefined;
getLocalAccount(type: string): ConnectedAccount | undefined;

3
packages/discord-types/src/stores/ExperimentStore.d.ts vendored
View file

@ -113,12 +113,9 @@ export class ExperimentStore extends FluxStore {
getUserExperimentDescriptor(experimentId: string): ExperimentAssignmentOverride;
hasRegisteredExperiment(experimentId: string): boolean;
/** sends an experiment exposure event unless it was already tracked in the last 7 days */
trackExposure: (options: TrackExposureOptions) => false | void;
/** returns [experimentId, time] pairs for exposures of the given type and experiment */
getRecentExposures(type: "user" | "guild", experimentId: string): [string, number][];
hasExperimentTrackedExposure(experimentId: string, descriptor: ExperimentExposureDescriptor, location?: string, triggerDebugging?: boolean): boolean;
/** loads experiments from the cache snapshot */
loadCache(): void;
takeSnapshot(): { version: number; data: Record<string, unknown>; };
}

2
packages/discord-types/src/stores/MessageStore.d.ts vendored
View file

@ -55,9 +55,7 @@ export class MessageStore extends FluxStore {
getMessages(channelId: string): ChannelMessages;
hasCurrentUserSentMessage(channelId: string): boolean;
hasCurrentUserSentMessageSinceAppStart(channelId: string): boolean;
/** true if the current user sent any message other than a friend request accepted one */
hasCurrentUserSentWaveBlockingMessage(channelId: string): boolean;
/** notice attached to a message removed by automod, keyed by message id */
getAutomodRemovalNotice(messageId: string): unknown;
hasPresent(channelId: string): boolean;
isLoadingMessages(channelId: string): boolean;

2
packages/discord-types/src/stores/PrivateChannelSortStore.d.ts vendored
View file

@ -9,8 +9,6 @@ export interface PrivateChannelSortEntry {
export class PrivateChannelSortStore extends FluxStore {
getPrivateChannelIds(): string[];
/** returns [favorites, others], both sorted by last message */
getSortedChannels(): [PrivateChannelSortEntry[], PrivateChannelSortEntry[]];
/** returns a map of channel ids to last message ids */
serializeForOverlay(): Record<string, string>;
}

1
packages/discord-types/src/stores/ReferencedMessageStore.d.ts vendored
View file

@ -1,7 +1,6 @@
import { FluxStore, Message } from "..";
export interface ReferencedMessage {
/** 0 loaded, 1 not loaded, 2 deleted */
state: number;
message?: Message;
}

1
packages/discord-types/src/stores/RunningGameStore.d.ts vendored
View file

@ -35,7 +35,6 @@ export class RunningGameStore extends FluxStore {
getCurrentGameForAnalytics(): RunningGame | null;
getCurrentNonGameForAnalytics(): RunningGame | null;
getDebugRunningGame(): RunningGame | null;
/** last detection pass, null until the first scan */
getDetectionDebug(): { timestamp: number; totalFromNative: number; entries: { game: RunningGame; outcome: { kind: string; }; }[]; } | null;
canCollectExecutableFingerprintsForRunningGames(): boolean;
getGameForName(name: string): RunningGame | null;

2
packages/discord-types/src/stores/SessionsStore.d.ts vendored
View file

@ -15,11 +15,9 @@ export interface Session {
export class SessionsStore extends FluxStore {
getSessions(): Record<string, Session>;
/** session for the current connection */
getSession(): Session | null | undefined;
getSessionById(sessionId: string): Session | undefined;
getActiveSession(): Session | undefined;
/** activities from the active session on another device */
getRemoteActivities(): Activity[];
getHiddenActivities(): Activity[];
getRemoteApplicationActivity(applicationId: string | null | undefined): Activity | null | undefined;

1
packages/discord-types/src/stores/SortedGuildStore.d.ts vendored
View file

@ -20,7 +20,6 @@ export interface GuildsTree {
export class SortedGuildStore extends FluxStore {
getGuildsTree(): GuildsTree;
/** every folder and guild node, depth first */
getFlattenedGuildFolderList(): GuildsTreeNode[];
getCompatibleGuildFolders(): GuildFolder[];
getFastListGuildFolders(): GuildsTreeNode[];

1
packages/discord-types/src/stores/SpellCheckStore.d.ts vendored
View file

@ -2,7 +2,6 @@ import { FluxStore } from "..";
export class SpellCheckStore extends FluxStore {
hasLearnedWord(word: string): boolean;
/** returns the first learned word found as a whole word in text */
findLearnedWordIn(text: string): string | null;
isEnabled(): boolean;
}

1
packages/discord-types/src/stores/StreamerModeStore.d.ts vendored
View file

@ -22,6 +22,5 @@ export class StreamerModeStore extends FluxStore {
getSettings(): StreamerModeSettings;
getState(): Record<string, StreamerModeSettings>;
/** true only when the overlay widget is listed in disabledOverlayWidgets and streamer mode is enabled */
isOverlayWidgetDisabled(widget: string): boolean;
}

3
packages/discord-types/src/stores/UserProfileSettingsStore.d.ts vendored
View file

@ -7,10 +7,7 @@ export class UserProfileSettingsStore extends FluxStore {
getErrors(guildId?: string): Record<string, unknown>;
getTryItOutChanges(): Record<string, unknown>;
hasTryItOutChanges(): boolean;
/** true if any pending change exists for the user or any guild */
hasUnsavedChanges(): boolean;
/** true if there are pending changes for the user or the selected guild */
showNotice(): boolean;
/** false if a pending bio is over the length limit */
canSubmit(): boolean;
}

3
packages/discord-types/src/stores/UserSettingsProtoStore.d.ts vendored
View file

@ -224,10 +224,7 @@ export class UserSettingsProtoStore extends FluxStore {
// TODO: finish typing
getGuildDismissedContentState(guildId: string): any;
getGuildsProto(): Record<string, GuildProto>;
/** guild theme source preference from appearance settings, 0 if unspecified */
getDefaultGuildThemePreference(): number;
/** per guild theme source preference, 0 if unspecified */
getGuildThemeSourcePreferenceOverride(guildId: string | null | undefined): number;
/** override if set, otherwise the default preference */
resolveGuildThemeSourcePreference(guildId: string | null | undefined): number;
}

19
src/webpack/common/stores.ts
View file

@ -87,6 +87,25 @@ export let ExperimentStore: t.ExperimentStore;
export let UserAffinitiesStore: t.UserAffinitiesStore;
export let ApplicationStreamingStore: t.ApplicationStreamingStore;
export let ApplicationStreamPreviewStore: t.ApplicationStreamPreviewStore;
export let SortedGuildStore: t.SortedGuildStore;
export let JoinedThreadsStore: t.JoinedThreadsStore;
export let SafetyHubStore: t.SafetyHubStore;
export let PrivateChannelSortStore: t.PrivateChannelSortStore;
export let UserProfileSettingsStore: t.UserProfileSettingsStore;
export let AuthorizedAppsStore: t.AuthorizedAppsStore;
export let ChannelSectionStore: t.ChannelSectionStore;
export let ClientThemesBackgroundStore: t.ClientThemesBackgroundStore;
export let ConnectedAccountsStore: t.ConnectedAccountsStore;
export let ChannelMemberStore: t.ChannelMemberStore;
export let ThreadMemberListStore: t.ThreadMemberListStore;
export let CollapsedVoiceChannelStore: t.CollapsedVoiceChannelStore;
export let ReferencedMessageStore: t.ReferencedMessageStore;
export let SessionsStore: t.SessionsStore;
export let UserGuildJoinRequestStore: t.UserGuildJoinRequestStore;
export let SelfPresenceStore: t.SelfPresenceStore;
export let MessageRequestStore: t.MessageRequestStore;
export let GIFPickerViewStore: t.GIFPickerViewStore;
export let GuildReadStateStore: t.GuildReadStateStore;
export let SortedGuildStore: t.SortedGuildStore;
export let JoinedThreadsStore: t.JoinedThreadsStore;