mirror of
https://github.com/Vendicated/Vencord.git
synced 2024-09-20 06:30:35 +00:00
Merge branch 'main' into emoteCloner
This commit is contained in:
commit
efc38a1d2e
5 changed files with 21 additions and 17 deletions
|
@ -21,6 +21,7 @@
|
||||||
"buildReporter": "pnpm buildWebStandalone --reporter --skip-extension",
|
"buildReporter": "pnpm buildWebStandalone --reporter --skip-extension",
|
||||||
"buildReporterDesktop": "pnpm build --reporter",
|
"buildReporterDesktop": "pnpm build --reporter",
|
||||||
"watch": "pnpm build --watch",
|
"watch": "pnpm build --watch",
|
||||||
|
"dev": "pnpm watch",
|
||||||
"watchWeb": "pnpm buildWeb --watch",
|
"watchWeb": "pnpm buildWeb --watch",
|
||||||
"generatePluginJson": "tsx scripts/generatePluginList.ts",
|
"generatePluginJson": "tsx scripts/generatePluginList.ts",
|
||||||
"generateTypes": "tspc --emitDeclarationOnly --declaration --outDir packages/vencord-types",
|
"generateTypes": "tspc --emitDeclarationOnly --declaration --outDir packages/vencord-types",
|
||||||
|
|
|
@ -91,7 +91,7 @@ export default definePlugin({
|
||||||
|
|
||||||
/* new profiles */
|
/* new profiles */
|
||||||
{
|
{
|
||||||
find: ".PANEL]:14",
|
find: ".FULL_SIZE]:26",
|
||||||
replacement: {
|
replacement: {
|
||||||
match: /(?<=(\i)=\(0,\i\.\i\)\(\i\);)return 0===\i.length\?/,
|
match: /(?<=(\i)=\(0,\i\.\i\)\(\i\);)return 0===\i.length\?/,
|
||||||
replace: "$1.unshift(...$self.getBadges(arguments[0].displayProfile));$&"
|
replace: "$1.unshift(...$self.getBadges(arguments[0].displayProfile));$&"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
.vc-mentionAvatars-avatar {
|
.vc-mentionAvatars-avatar {
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
width: 1em;
|
width: 1em !important; /* insane discord sets width: 100% in channel topic */
|
||||||
height: 1em;
|
height: 1em;
|
||||||
margin: 0 4px 0.2rem 2px;
|
margin: 0 4px 0.2rem 2px;
|
||||||
border-radius: 50%;
|
border-radius: 50%;
|
||||||
|
|
|
@ -147,6 +147,7 @@ async function fetchMessage(channelID: string, messageID: string) {
|
||||||
if (!msg) return;
|
if (!msg) return;
|
||||||
|
|
||||||
const message: Message = MessageStore.getMessages(msg.channel_id).receiveMessage(msg).get(msg.id);
|
const message: Message = MessageStore.getMessages(msg.channel_id).receiveMessage(msg).get(msg.id);
|
||||||
|
if (!message) return;
|
||||||
|
|
||||||
messageCache.set(message.id, {
|
messageCache.set(message.id, {
|
||||||
message,
|
message,
|
||||||
|
|
|
@ -43,14 +43,23 @@ function fetchReactions(msg: Message, emoji: ReactionEmoji, type: number) {
|
||||||
},
|
},
|
||||||
oldFormErrors: true
|
oldFormErrors: true
|
||||||
})
|
})
|
||||||
.then(res => FluxDispatcher.dispatch({
|
.then(res => {
|
||||||
type: "MESSAGE_REACTION_ADD_USERS",
|
for (const user of res.body) {
|
||||||
channelId: msg.channel_id,
|
FluxDispatcher.dispatch({
|
||||||
messageId: msg.id,
|
type: "USER_UPDATE",
|
||||||
users: res.body,
|
user
|
||||||
emoji,
|
});
|
||||||
reactionType: type
|
}
|
||||||
}))
|
|
||||||
|
FluxDispatcher.dispatch({
|
||||||
|
type: "MESSAGE_REACTION_ADD_USERS",
|
||||||
|
channelId: msg.channel_id,
|
||||||
|
messageId: msg.id,
|
||||||
|
users: res.body,
|
||||||
|
emoji,
|
||||||
|
reactionType: type
|
||||||
|
});
|
||||||
|
})
|
||||||
.catch(console.error)
|
.catch(console.error)
|
||||||
.finally(() => sleep(250));
|
.finally(() => sleep(250));
|
||||||
}
|
}
|
||||||
|
@ -148,13 +157,6 @@ export default definePlugin({
|
||||||
const reactions = getReactionsWithQueue(message, emoji, type);
|
const reactions = getReactionsWithQueue(message, emoji, type);
|
||||||
const users = Object.values(reactions).filter(Boolean) as User[];
|
const users = Object.values(reactions).filter(Boolean) as User[];
|
||||||
|
|
||||||
for (const user of users) {
|
|
||||||
FluxDispatcher.dispatch({
|
|
||||||
type: "USER_UPDATE",
|
|
||||||
user
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
style={{ marginLeft: "0.5em", transform: "scale(0.9)" }}
|
style={{ marginLeft: "0.5em", transform: "scale(0.9)" }}
|
||||||
|
|
Loading…
Reference in a new issue