Some More Fixes

This commit is contained in:
thororen1234 2024-06-20 12:35:05 -04:00
parent c8acee8955
commit a5cc68d9a2
6 changed files with 50 additions and 24 deletions

View file

@ -37,7 +37,7 @@ import { openLogModal } from "./components/LogsModal";
import { addMessage, loggedMessages, MessageLoggerStore, removeLog } from "./LoggedMessageManager";
import * as LoggedMessageManager from "./LoggedMessageManager";
import { LoadMessagePayload, LoggedAttachment, LoggedMessage, LoggedMessageJSON, MessageCreatePayload, MessageDeleteBulkPayload, MessageDeletePayload, MessageUpdatePayload } from "./types";
import { addToXAndRemoveFromOpposite, cleanUpCachedMessage, cleanupUserObject, doesBlobUrlExist, getNative, isGhostPinged, ListType, mapEditHistory, reAddDeletedMessages, removeFromX } from "./utils";
import { addToXAndRemoveFromOpposite, cleanUpCachedMessage, cleanupUserObject, doesBlobUrlExist, getNative, isGhostPinged, ListType, mapEditHistory, messageJsonToMessageClass, reAddDeletedMessages, removeFromX } from "./utils";
import { DEFAULT_IMAGE_CACHE_DIR } from "./utils/constants";
import { shouldIgnore } from "./utils/index";
import { LimitedMap } from "./utils/LimitedMap";
@ -594,8 +594,8 @@ export default definePlugin({
{
find: "THREAD_STARTER_MESSAGE?null===",
replacement: {
match: /(attachments: \i\(.{1,500})deleted:.{1,50},editHistory:.{1,30},/,
replace: "$1deleted: $self.getDeleted(...arguments),editHistory: $self.getEdited(...arguments),"
match: / deleted:\i\.deleted, editHistory:\i\.editHistory,/,
replace: "deleted:$self.getDeleted(...arguments), editHistory:$self.getEdited(...arguments),"
}
},
@ -637,7 +637,7 @@ export default definePlugin({
{
find: "Using PollReferenceMessageContext without",
replacement: {
match: /\i\.(?:default\.)?focusMessage\(/,
match: /(?:\i\.)?\i\.(?:default\.)?focusMessage\(/,
replace: "!(arguments[0]?.message?.deleted || arguments[0]?.message?.editHistory?.length > 0) && $&"
}
},
@ -747,10 +747,23 @@ export default definePlugin({
},
async start() {
this.oldGetMessage = MessageStore.getMessage;
// we have to do this because the original message logger fetches the message from the store now
MessageStore.getMessage = (channelId: string, messageId: string) => {
const MLMessage = LoggedMessageManager.getMessage(channelId, messageId);
if (MLMessage?.message) return messageJsonToMessageClass(MLMessage);
return this.oldGetMessage(channelId, messageId);
};
Native.init();
const { imageCacheDir, logsDir } = await Native.getSettings();
settings.store.imageCacheDir = imageCacheDir;
settings.store.logsDir = logsDir;
},
stop() {
MessageStore.getMessage = this.oldGetMessage;
}
});