mirrors/Equicord
1
1
Fork 0
mirror of https://github.com/Equicord/Equicord.git synced 2025-01-31 03:33:36 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'dev'

Browse source
This commit is contained in:
thororen1234 2024-11-08 01:18:55 -05:00
commit a4d8741759
9 changed files with 68 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/equicordplugins/modalFade/index.tsx
View file

@ -14,7 +14,7 @@ import type { StoreApi, UseBoundStore } from "zustand";
type Modal = {
Layer?: any,
instant?: boolean,
backdropStyle?: "SUBTLE" | "DARK" | "BLUR",
backdropStyle?: "SUBTLE" | "DARK" | "BLUR", "IMMERSIVE",
};
const { useModalContext, useModalsStore } = proxyLazy(() => Forms as any as {
@ -26,8 +26,6 @@ const { useModalContext, useModalsStore } = proxyLazy(() => Forms as any as {
});
const { animated, useSpring, useTransition } = findByPropsLazy("a", "animated", "useTransition");
// This doesn't seem to be necessary
// const { default: AppLayer } = findByPropsLazy("AppLayerContainer", "AppLayerProvider");
const ANIMS = {
SUBTLE: {
@ -42,6 +40,10 @@ const ANIMS = {
off: { opacity: 1, filter: "blur(0px)" },
on: { opacity: 0.7, filter: "blur(8px)" },
},
IMMERSIVE: {
off: { opacity: 1 },
on: { opacity: 0.7 }
}
};
export default definePlugin({

11
src/plugins/_core/noTrack.ts
View file

@ -60,14 +60,17 @@ export default definePlugin({
}
]
},
{
find: ".installedLogHooks)",
// TEMP Work until Vencord Fix
...[
".DEBUG_LOGGING)",
".inputDeviceId)||"
].map(find => ({
find,
replacement: {
// if getDebugLogging() returns false, the hooks don't get installed.
match: "getDebugLogging(){",
replace: "getDebugLogging(){return false;"
}
},
})),
],
startAt: StartAt.Init,

2
src/plugins/consoleJanitor/index.ts
View file

@ -154,5 +154,5 @@ export default definePlugin({
replace: "$self.NoopLogger()"
}
}
],
]
});

2
src/plugins/decor/lib/stores/AuthorizationStore.tsx
View file

@ -93,7 +93,7 @@ export const useAuthorizationStore = proxyLazy(() => zustandCreate(
} as AuthorizationState),
{
name: "decor-auth",
getStorage: () => indexedDBStorage,
storage: indexedDBStorage,
partialize: state => ({ tokens: state.tokens }),
onRehydrateStorage: () => state => state?.init()
}

18
src/plugins/messageLogger/index.tsx
View file

@ -19,7 +19,7 @@ import { getIntlMessage } from "@utils/discord";
import { Logger } from "@utils/Logger";
import { classes } from "@utils/misc";
import definePlugin, { OptionType } from "@utils/types";
import { findByCodeLazy, findByPropsLazy } from "@webpack";
import { findByPropsLazy } from "@webpack";
import { ChannelStore, FluxDispatcher, Menu, MessageStore, Parser, SelectedChannelStore, Timestamp, UserStore, useStateFromStores } from "@webpack/common";
import { Message } from "discord-types/general";
@ -33,12 +33,7 @@ interface MLMessage extends Message {
firstEditTimestamp?: Date;
}
const styles = findByPropsLazy(
"edited",
"communicationDisabled",
"isSystemMessage",
);
const getMessage = findByCodeLazy('replace(/^\\n+|\\n+$/g,"")');
const styles = findByPropsLazy("edited", "communicationDisabled", "isSystemMessage");
function addDeleteStyle() {
if (Settings.plugins.MessageLogger.deleteStyle === "text") {
@ -348,9 +343,8 @@ export default definePlugin({
);
},
Messages: {
// DELETED_MESSAGE_COUNT: getMessage("{count, plural, =0 {No deleted messages} one {{count} deleted message} other {{count} deleted messages}}")
// TODO: find a better way to generate intl messages
// TODO: Find a better way to generate intl messages
DELETED_MESSAGE_COUNT: () => ({
ast: [[
6,
@ -375,8 +369,7 @@ export default definePlugin({
0,
"cardinal"
]]
})
},
}),
patches: [
{
@ -572,8 +565,7 @@ export default definePlugin({
},
{
match: /(\i).type===\i\.\i\.MESSAGE_GROUP_BLOCKED\?.*?:/,
replace:
'$&$1.type==="MESSAGE_GROUP_DELETED"?$self.Messages.DELETED_MESSAGE_COUNT:',
replace: '$&$1.type==="MESSAGE_GROUP_DELETED"?$self.DELETED_MESSAGE_COUNT:',
},
],
predicate: () => Settings.plugins.MessageLogger.collapseDeleted,

4
src/plugins/noBlockedMessages/index.ts
View file

@ -28,8 +28,8 @@ import { Message } from "discord-types/general";
const RelationshipStore = findByPropsLazy("getRelationships", "isBlocked");
interface MessageDeleteProps {
// i18n message i18n.t["+FcYMz"] if deleted, with args
collapsedReason: () => any
// Internal intl message for BLOCKED_MESSAGE_COUNT
collapsedReason: () => any;
}
export default definePlugin({

2
src/plugins/relationshipNotifier/utils.ts
View file

@ -50,6 +50,8 @@ async function runMigrations() {
export async function syncAndRunChecks() {
await runMigrations();
if (UserStore.getCurrentUser() == null) return;
const [oldGuilds, oldGroups, oldFriends] = await DataStore.getMany([
guildsKey(),
groupsKey(),

13
src/plugins/typingIndicator/index.tsx
View file

@ -24,7 +24,7 @@ import { Devs } from "@utils/constants";
import { getIntlMessage } from "@utils/discord";
import definePlugin, { OptionType } from "@utils/types";
import { findComponentByCodeLazy, findExportedComponentLazy, findStoreLazy } from "@webpack";
import { ChannelStore, GuildMemberStore, RelationshipStore, SelectedChannelStore, Tooltip, UserStore, useStateFromStores } from "@webpack/common";
import { GuildMemberStore, RelationshipStore, SelectedChannelStore, Tooltip, UserStore, useStateFromStores } from "@webpack/common";
import { buildSeveralUsers } from "../typingTweaks";
@ -44,7 +44,7 @@ function getDisplayName(guildId: string, userId: string) {
return GuildMemberStore.getNick(guildId, userId) ?? (user as any).globalName ?? user.username;
}
function TypingIndicator({ channelId }: { channelId: string; }) {
function TypingIndicator({ channelId, guildId }: { channelId: string; guildId: string; }) {
const typingUsers: Record<string, number> = useStateFromStores(
[TypingStore],
() => ({ ...TypingStore.getTypingUsers(channelId) as Record<string, number> }),
@ -57,7 +57,6 @@ function TypingIndicator({ channelId }: { channelId: string; }) {
}
);
const currentChannelId: string = useStateFromStores([SelectedChannelStore], () => SelectedChannelStore.getChannelId());
const guildId = ChannelStore.getChannel(channelId).guild_id;
if (!settings.store.includeMutedChannels) {
const isChannelMuted = UserGuildSettingsStore.isChannelMuted(guildId, channelId);
@ -165,7 +164,7 @@ export default definePlugin({
find: "UNREAD_IMPORTANT:",
replacement: {
match: /\.name\),.{0,120}\.children.+?:null(?<=,channel:(\i).+?)/,
replace: "$&,$self.TypingIndicator($1.id)"
replace: "$&,$self.TypingIndicator($1.id,$1.getGuildId())"
}
},
// Theads
@ -174,14 +173,14 @@ export default definePlugin({
find: "M11 9H4C2.89543 9 2 8.10457 2 7V1C2 0.447715 1.55228 0 1 0C0.447715 0 0 0.447715 0 1V7C0 9.20914 1.79086 11 4 11H11C11.5523 11 12 10.5523 12 10C12 9.44771 11.5523 9 11 9Z",
replacement: {
match: /mentionsCount:\i.+?null(?<=channel:(\i).+?)/,
replace: "$&,$self.TypingIndicator($1.id)"
replace: "$&,$self.TypingIndicator($1.id,$1.getGuildId())"
}
}
],
TypingIndicator: (channelId: string) => (
TypingIndicator: (channelId: string, guildId: string) => (
<ErrorBoundary noop>
<TypingIndicator channelId={channelId} />
<TypingIndicator channelId={channelId} guildId={guildId} />
</ErrorBoundary>
),
});

10
src/plugins/typingTweaks/index.tsx
View file

@ -129,7 +129,10 @@ export default definePlugin({
buildSeveralUsers,
mutateChildren(props: any, users: User[], children: any) {
if (!Array.isArray(children)) return children;
try {
if (!Array.isArray(children)) {
return children;
}
let element = 0;
@ -138,5 +141,10 @@ export default definePlugin({
? <TypingUser {...props} user={users[element++]} />
: c
);
} catch (e) {
console.error(e);
}
return children;
}
});