Merge branch 'dev' into immediate-finds
This commit is contained in:
commit
13d47d91bf
|
@ -142,7 +142,15 @@ function makeShortcuts() {
|
||||||
guildId: { getter: () => Common.SelectedGuildStore.getGuildId(), preload: false },
|
guildId: { getter: () => Common.SelectedGuildStore.getGuildId(), preload: false },
|
||||||
me: { getter: () => Common.UserStore.getCurrentUser(), preload: false },
|
me: { getter: () => Common.UserStore.getCurrentUser(), preload: false },
|
||||||
meId: { getter: () => Common.UserStore.getCurrentUser().id, preload: false },
|
meId: { getter: () => Common.UserStore.getCurrentUser().id, preload: false },
|
||||||
messages: { getter: () => Common.MessageStore.getMessages(Common.SelectedChannelStore.getChannelId()), preload: false }
|
messages: { getter: () => Common.MessageStore.getMessages(Common.SelectedChannelStore.getChannelId()), preload: false },
|
||||||
|
|
||||||
|
Stores: {
|
||||||
|
getter: () => Object.fromEntries(
|
||||||
|
Common.Flux.Store.getAll()
|
||||||
|
.map(store => [store.getName(), store] as const)
|
||||||
|
.filter(([name]) => name.length > 1)
|
||||||
|
)
|
||||||
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,7 @@ import { UserUtils } from "@webpack/common";
|
||||||
|
|
||||||
import settings from "./settings";
|
import settings from "./settings";
|
||||||
import { ChannelDelete, ChannelType, GuildDelete, RelationshipRemove, RelationshipType } from "./types";
|
import { ChannelDelete, ChannelType, GuildDelete, RelationshipRemove, RelationshipType } from "./types";
|
||||||
import { deleteGroup, deleteGuild, getGroup, getGuild, notify } from "./utils";
|
import { deleteGroup, deleteGuild, getGroup, getGuild, GuildAvailabilityStore, notify } from "./utils";
|
||||||
|
|
||||||
let manuallyRemovedFriend: string | undefined;
|
let manuallyRemovedFriend: string | undefined;
|
||||||
let manuallyRemovedGuild: string | undefined;
|
let manuallyRemovedGuild: string | undefined;
|
||||||
|
@ -63,7 +63,7 @@ export async function onRelationshipRemove({ relationship: { type, id } }: Relat
|
||||||
|
|
||||||
export function onGuildDelete({ guild: { id, unavailable } }: GuildDelete) {
|
export function onGuildDelete({ guild: { id, unavailable } }: GuildDelete) {
|
||||||
if (!settings.store.servers) return;
|
if (!settings.store.servers) return;
|
||||||
if (unavailable) return;
|
if (unavailable || GuildAvailabilityStore.isUnavailable(id)) return;
|
||||||
|
|
||||||
if (manuallyRemovedGuild === id) {
|
if (manuallyRemovedGuild === id) {
|
||||||
deleteGuild(id);
|
deleteGuild(id);
|
||||||
|
|
|
@ -19,11 +19,20 @@
|
||||||
import { DataStore, Notices } from "@api/index";
|
import { DataStore, Notices } from "@api/index";
|
||||||
import { showNotification } from "@api/Notifications";
|
import { showNotification } from "@api/Notifications";
|
||||||
import { getUniqueUsername, openUserProfile } from "@utils/discord";
|
import { getUniqueUsername, openUserProfile } from "@utils/discord";
|
||||||
|
import { findStore } from "@webpack";
|
||||||
import { ChannelStore, GuildMemberStore, GuildStore, RelationshipStore, UserStore, UserUtils } from "@webpack/common";
|
import { ChannelStore, GuildMemberStore, GuildStore, RelationshipStore, UserStore, UserUtils } from "@webpack/common";
|
||||||
|
import { FluxStore } from "@webpack/types";
|
||||||
|
|
||||||
import settings from "./settings";
|
import settings from "./settings";
|
||||||
import { ChannelType, RelationshipType, SimpleGroupChannel, SimpleGuild } from "./types";
|
import { ChannelType, RelationshipType, SimpleGroupChannel, SimpleGuild } from "./types";
|
||||||
|
|
||||||
|
export const GuildAvailabilityStore = findStore("GuildAvailabilityStore") as FluxStore & {
|
||||||
|
totalGuilds: number;
|
||||||
|
totalUnavailableGuilds: number;
|
||||||
|
unavailableGuilds: string[];
|
||||||
|
isUnavailable(guildId: string): boolean;
|
||||||
|
};
|
||||||
|
|
||||||
const guilds = new Map<string, SimpleGuild>();
|
const guilds = new Map<string, SimpleGuild>();
|
||||||
const groups = new Map<string, SimpleGroupChannel>();
|
const groups = new Map<string, SimpleGroupChannel>();
|
||||||
const friends = {
|
const friends = {
|
||||||
|
@ -59,7 +68,7 @@ export async function syncAndRunChecks() {
|
||||||
|
|
||||||
if (settings.store.servers && oldGuilds?.size) {
|
if (settings.store.servers && oldGuilds?.size) {
|
||||||
for (const [id, guild] of oldGuilds) {
|
for (const [id, guild] of oldGuilds) {
|
||||||
if (!guilds.has(id))
|
if (!guilds.has(id) && !GuildAvailabilityStore.isUnavailable(id))
|
||||||
notify(`You are no longer in the server ${guild.name}.`, guild.iconURL);
|
notify(`You are no longer in the server ${guild.name}.`, guild.iconURL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
2
src/webpack/common/types/stores.d.ts
vendored
2
src/webpack/common/types/stores.d.ts
vendored
|
@ -39,6 +39,8 @@ export class FluxStore {
|
||||||
registerActionHandlers: GenericFunction;
|
registerActionHandlers: GenericFunction;
|
||||||
syncWith: GenericFunction;
|
syncWith: GenericFunction;
|
||||||
waitFor: GenericFunction;
|
waitFor: GenericFunction;
|
||||||
|
|
||||||
|
static getAll(): FluxStore[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export class FluxEmitter {
|
export class FluxEmitter {
|
||||||
|
|
Loading…
Reference in a new issue