- {Parser.parse(edit.content)}
+ {Parser.parse(edit.content, true, {
+ channelId,
+ messageId,
+ allowLinks: true,
+ allowHeading: true,
+ allowList: true,
+ allowEmojiLinks: true,
+ viewingChannelId: SelectedChannelStore.getChannelId(),
+ })}
Date: Mon, 15 Jul 2024 04:36:42 +0200
Subject: [PATCH 10/14] MessageLogger: add compact display of history & edit
modal (#2299)
Co-authored-by: vee
---
package.json | 2 +-
src/plugins/messageLogger/HistoryModal.tsx | 91 +++++++++++++++++++
src/plugins/messageLogger/index.tsx | 97 +++++++++++++++++----
src/plugins/messageLogger/messageLogger.css | 14 +++
src/plugins/viewRaw/index.tsx | 1 +
5 files changed, 189 insertions(+), 16 deletions(-)
create mode 100644 src/plugins/messageLogger/HistoryModal.tsx
diff --git a/package.json b/package.json
index ac4859593..cfd4bd010 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "vencord",
"private": "true",
- "version": "1.9.4",
+ "version": "1.9.5",
"description": "The cutest Discord client mod",
"homepage": "https://github.com/Vendicated/Vencord#readme",
"bugs": {
diff --git a/src/plugins/messageLogger/HistoryModal.tsx b/src/plugins/messageLogger/HistoryModal.tsx
new file mode 100644
index 000000000..a7715203d
--- /dev/null
+++ b/src/plugins/messageLogger/HistoryModal.tsx
@@ -0,0 +1,91 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { classNameFactory } from "@api/Styles";
+import ErrorBoundary from "@components/ErrorBoundary";
+import { Margins } from "@utils/margins";
+import { classes } from "@utils/misc";
+import { ModalCloseButton, ModalContent, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
+import { findByPropsLazy } from "@webpack";
+import { TabBar, Text, Timestamp, TooltipContainer, useState } from "@webpack/common";
+
+import { parseEditContent } from ".";
+
+const CodeContainerClasses = findByPropsLazy("markup", "codeContainer");
+const MiscClasses = findByPropsLazy("messageContent", "markupRtl");
+
+const cl = classNameFactory("vc-ml-modal-");
+
+export function openHistoryModal(message: any) {
+ openModal(props =>
+
+
+ );
+}
+
+export function HistoryModal({ modalProps, message }: { modalProps: ModalProps; message: any; }) {
+ const [currentTab, setCurrentTab] = useState(message.editHistory.length);
+ const timestamps = [message.firstEditTimestamp, ...message.editHistory.map(m => m.timestamp)];
+ const contents = [...message.editHistory.map(m => m.content), message.content];
+
+ return (
+
+
+ Message Edit History
+
+
+
+
+ {message.firstEditTimestamp.getTime() !== message.timestamp.getTime() && (
+
+
+
+
+ )}
+
+ {timestamps.map((timestamp, index) => (
+
+
+ ))}
+
+
+
+
+ );
+}
diff --git a/src/plugins/messageLogger/index.tsx b/src/plugins/messageLogger/index.tsx
index f88af01a0..9181306ad 100644
--- a/src/plugins/messageLogger/index.tsx
+++ b/src/plugins/messageLogger/index.tsx
@@ -24,21 +24,26 @@ import { Settings } from "@api/Settings";
import { disableStyle, enableStyle } from "@api/Styles";
import ErrorBoundary from "@components/ErrorBoundary";
import { Devs } from "@utils/constants";
+import { proxyLazy } from "@utils/lazy";
import { Logger } from "@utils/Logger";
+import { classes } from "@utils/misc";
import definePlugin, { OptionType } from "@utils/types";
-import { findByPropsLazy } from "@webpack";
+import { findByCodeLazy, findByPropsLazy } from "@webpack";
import { ChannelStore, FluxDispatcher, i18n, Menu, MessageStore, Parser, SelectedChannelStore, Timestamp, UserStore, useStateFromStores } from "@webpack/common";
import { Message } from "discord-types/general";
import overlayStyle from "./deleteStyleOverlay.css?managed";
import textStyle from "./deleteStyleText.css?managed";
+import { openHistoryModal } from "./HistoryModal";
interface MLMessage extends Message {
deleted?: boolean;
editHistory?: { timestamp: Date; content: string; }[];
+ firstEditTimestamp?: Date;
}
const styles = findByPropsLazy("edited", "communicationDisabled", "isSystemMessage");
+const getMessage = findByCodeLazy('replace(/^\\n+|\\n+$/g,"")');
function addDeleteStyle() {
if (Settings.plugins.MessageLogger.deleteStyle === "text") {
@@ -125,10 +130,22 @@ const patchChannelContextMenu: NavContextMenuPatchCallback = (children, { channe
);
};
+export function parseEditContent(content: string, message: Message) {
+ return Parser.parse(content, true, {
+ channelId: message.channel_id,
+ messageId: message.id,
+ allowLinks: true,
+ allowHeading: true,
+ allowList: true,
+ allowEmojiLinks: true,
+ viewingChannelId: SelectedChannelStore.getChannelId(),
+ });
+}
+
export default definePlugin({
name: "MessageLogger",
description: "Temporarily logs deleted and edited messages.",
- authors: [Devs.rushii, Devs.Ven, Devs.AutumnVN, Devs.Nickyux],
+ authors: [Devs.rushii, Devs.Ven, Devs.AutumnVN, Devs.Nickyux, Devs.Kyuuhachi],
dependencies: ["MessageUpdaterAPI"],
contextMenus: {
@@ -150,19 +167,11 @@ export default definePlugin({
(oldMsg, newMsg) => oldMsg?.editHistory === newMsg?.editHistory
);
- return (
+ return Settings.plugins.MessageLogger.inlineEdits && (
<>
{message.editHistory?.map(edit => (
+ {parseEditContent(contents[currentTab], message)}
+
+
- {Parser.parse(edit.content, true, {
- channelId,
- messageId,
- allowLinks: true,
- allowHeading: true,
- allowList: true,
- allowEmojiLinks: true,
- viewingChannelId: SelectedChannelStore.getChannelId(),
- })}
+ {parseEditContent(edit.content, message)}
openHistoryModal(message)}
+ aria-role="button"
+ >
+ {children}
+
+ );
+ },
+
+ Messages: proxyLazy(() => ({
+ DELETED_MESSAGE_COUNT: getMessage("{count, plural, =0 {No deleted messages} one {{count} deleted message} other {{count} deleted messages}}")
+ })),
+
patches: [
{
// MessageStore
@@ -332,7 +368,8 @@ export default definePlugin({
match: /this\.customRenderedContent=(\i)\.customRenderedContent,/,
replace: "this.customRenderedContent = $1.customRenderedContent," +
"this.deleted = $1.deleted || false," +
- "this.editHistory = $1.editHistory || [],"
+ "this.editHistory = $1.editHistory || []," +
+ "this.firstEditTimestamp = $1.firstEditTimestamp || this.editedTimestamp || this.timestamp,"
}
]
},
@@ -345,7 +382,7 @@ export default definePlugin({
// Pass through editHistory & deleted & original attachments to the "edited message" transformer
match: /(?<=null!=\i\.edited_timestamp\)return )\i\(\i,\{reactions:(\i)\.reactions.{0,50}\}\)/,
replace:
- "Object.assign($&,{ deleted:$1.deleted, editHistory:$1.editHistory })"
+ "Object.assign($&,{ deleted:$1.deleted, editHistory:$1.editHistory, firstEditTimestamp:$1.firstEditTimestamp })"
},
{
@@ -364,7 +401,8 @@ export default definePlugin({
" return $2;" +
"})())," +
"deleted: arguments[1]?.deleted," +
- "editHistory: arguments[1]?.editHistory"
+ "editHistory: arguments[1]?.editHistory," +
+ "firstEditTimestamp: new Date(arguments[1]?.firstEditTimestamp ?? $2.editedTimestamp ?? $2.timestamp)"
},
{
// Preserve deleted attribute on attachments
@@ -412,6 +450,11 @@ export default definePlugin({
// Render editHistory in the deepest div for message content
match: /(\)\("div",\{id:.+?children:\[)/,
replace: "$1 (!!arguments[0].message.editHistory?.length && $self.renderEdits(arguments[0])),"
+ },
+ {
+ // Make edit marker clickable
+ match: /"span",\{(?=className:\i\.edited,)/,
+ replace: "$self.EditMarker,{message:arguments[0].message,"
}
]
},
@@ -441,6 +484,30 @@ export default definePlugin({
replace: "children:arguments[0].message.deleted?[]:$1"
}
]
+ },
+ {
+ // Message grouping
+ find: "NON_COLLAPSIBLE.has(",
+ replacement: {
+ match: /if\((\i)\.blocked\)return \i\.\i\.MESSAGE_GROUP_BLOCKED;/,
+ replace: '$&else if($1.deleted) return"MESSAGE_GROUP_DELETED";',
+ },
+ predicate: () => Settings.plugins.MessageLogger.collapseDeleted
+ },
+ {
+ // Message group rendering
+ find: "Messages.NEW_MESSAGES_ESTIMATED_WITH_DATE",
+ replacement: [
+ {
+ match: /(\i).type===\i\.\i\.MESSAGE_GROUP_BLOCKED\|\|/,
+ replace: '$&$1.type==="MESSAGE_GROUP_DELETED"||',
+ },
+ {
+ match: /(\i).type===\i\.\i\.MESSAGE_GROUP_BLOCKED\?.*?:/,
+ replace: '$&$1.type==="MESSAGE_GROUP_DELETED"?$self.Messages.DELETED_MESSAGE_COUNT:',
+ },
+ ],
+ predicate: () => Settings.plugins.MessageLogger.collapseDeleted
}
]
});
diff --git a/src/plugins/messageLogger/messageLogger.css b/src/plugins/messageLogger/messageLogger.css
index a112b1961..2759129d9 100644
--- a/src/plugins/messageLogger/messageLogger.css
+++ b/src/plugins/messageLogger/messageLogger.css
@@ -38,3 +38,17 @@
.theme-light .messagelogger-edited {
opacity: 0.5;
}
+
+.messagelogger-edit-marker {
+ cursor: pointer;
+}
+
+.vc-ml-modal-timestamp {
+ cursor: unset;
+ height: unset;
+}
+
+.vc-ml-modal-tab-bar {
+ flex-wrap: wrap;
+ gap: 16px;
+}
diff --git a/src/plugins/viewRaw/index.tsx b/src/plugins/viewRaw/index.tsx
index 68b33eed0..56c285ecd 100644
--- a/src/plugins/viewRaw/index.tsx
+++ b/src/plugins/viewRaw/index.tsx
@@ -55,6 +55,7 @@ function cleanMessage(msg: Message) {
const cloneAny = clone as any;
delete cloneAny.editHistory;
delete cloneAny.deleted;
+ delete cloneAny.firstEditTimestamp;
cloneAny.attachments?.forEach(a => delete a.deleted);
return clone;
From 5bd10c860861b1c2ab8bf61b029592c0805c497d Mon Sep 17 00:00:00 2001
From: Vendicated
Date: Mon, 15 Jul 2024 05:09:13 +0200
Subject: [PATCH 11/14] MessageLogger: fix edit modal close button
---
src/plugins/messageLogger/HistoryModal.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/messageLogger/HistoryModal.tsx b/src/plugins/messageLogger/HistoryModal.tsx
index a7715203d..d1b5bf29c 100644
--- a/src/plugins/messageLogger/HistoryModal.tsx
+++ b/src/plugins/messageLogger/HistoryModal.tsx
@@ -39,7 +39,7 @@ export function HistoryModal({ modalProps, message }: { modalProps: ModalProps;
Message Edit History
-
From c3852cb892e88eef6509d5114bd17910e72703cb Mon Sep 17 00:00:00 2001
From: Vendicated
Date: Wed, 17 Jul 2024 02:34:05 +0200
Subject: [PATCH 12/14] fix badges on canary
---
package.json | 1 +
src/plugins/_api/badges/index.tsx | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/package.json b/package.json
index cfd4bd010..5d8f9f97d 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
"buildReporter": "pnpm buildWebStandalone --reporter --skip-extension",
"buildReporterDesktop": "pnpm build --reporter",
"watch": "pnpm build --watch",
+ "dev": "pnpm watch",
"watchWeb": "pnpm buildWeb --watch",
"generatePluginJson": "tsx scripts/generatePluginList.ts",
"generateTypes": "tspc --emitDeclarationOnly --declaration --outDir packages/vencord-types",
diff --git a/src/plugins/_api/badges/index.tsx b/src/plugins/_api/badges/index.tsx
index 94dc673a5..89a992ac3 100644
--- a/src/plugins/_api/badges/index.tsx
+++ b/src/plugins/_api/badges/index.tsx
@@ -91,7 +91,7 @@ export default definePlugin({
/* new profiles */
{
- find: ".PANEL]:14",
+ find: ".FULL_SIZE]:26",
replacement: {
match: /(?<=(\i)=\(0,\i\.\i\)\(\i\);)return 0===\i.length\?/,
replace: "$1.unshift(...$self.getBadges(arguments[0].displayProfile));$&"
From 67632ecc113ef490a322c894c6bb11e9c4c4b2e7 Mon Sep 17 00:00:00 2001
From: Vendicated
Date: Wed, 17 Jul 2024 02:35:53 +0200
Subject: [PATCH 13/14] MentionAvatars: fix mentions being ultra wide in topics
---
src/plugins/mentionAvatars/styles.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/mentionAvatars/styles.css b/src/plugins/mentionAvatars/styles.css
index 33404d7b5..022f968c0 100644
--- a/src/plugins/mentionAvatars/styles.css
+++ b/src/plugins/mentionAvatars/styles.css
@@ -1,6 +1,6 @@
.vc-mentionAvatars-avatar {
vertical-align: middle;
- width: 1em;
+ width: 1em !important; /* insane discord sets width: 100% in channel topic */
height: 1em;
margin: 0 4px 0.2rem 2px;
border-radius: 50%;
From 80b493d7a863831e7770463f03d56048ae9bdced Mon Sep 17 00:00:00 2001
From: Vendicated
Date: Wed, 17 Jul 2024 21:30:10 +0200
Subject: [PATCH 14/14] WhoReacted: fix errors
---
src/plugins/messageLinkEmbeds/index.tsx | 1 +
src/plugins/whoReacted/index.tsx | 32 +++++++++++++------------
2 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/src/plugins/messageLinkEmbeds/index.tsx b/src/plugins/messageLinkEmbeds/index.tsx
index cf180d0d4..9fd677389 100644
--- a/src/plugins/messageLinkEmbeds/index.tsx
+++ b/src/plugins/messageLinkEmbeds/index.tsx
@@ -147,6 +147,7 @@ async function fetchMessage(channelID: string, messageID: string) {
if (!msg) return;
const message: Message = MessageStore.getMessages(msg.channel_id).receiveMessage(msg).get(msg.id);
+ if (!message) return;
messageCache.set(message.id, {
message,
diff --git a/src/plugins/whoReacted/index.tsx b/src/plugins/whoReacted/index.tsx
index 5721dc912..679fe714e 100644
--- a/src/plugins/whoReacted/index.tsx
+++ b/src/plugins/whoReacted/index.tsx
@@ -43,14 +43,23 @@ function fetchReactions(msg: Message, emoji: ReactionEmoji, type: number) {
},
oldFormErrors: true
})
- .then(res => FluxDispatcher.dispatch({
- type: "MESSAGE_REACTION_ADD_USERS",
- channelId: msg.channel_id,
- messageId: msg.id,
- users: res.body,
- emoji,
- reactionType: type
- }))
+ .then(res => {
+ for (const user of res.body) {
+ FluxDispatcher.dispatch({
+ type: "USER_UPDATE",
+ user
+ });
+ }
+
+ FluxDispatcher.dispatch({
+ type: "MESSAGE_REACTION_ADD_USERS",
+ channelId: msg.channel_id,
+ messageId: msg.id,
+ users: res.body,
+ emoji,
+ reactionType: type
+ });
+ })
.catch(console.error)
.finally(() => sleep(250));
}
@@ -148,13 +157,6 @@ export default definePlugin({
const reactions = getReactionsWithQueue(message, emoji, type);
const users = Object.values(reactions).filter(Boolean) as User[];
- for (const user of users) {
- FluxDispatcher.dispatch({
- type: "USER_UPDATE",
- user
- });
- }
-
return (