Skip to content

Commit cc37bbd

Browse files
committed
ANTIED 1.4.3b
Commit "b": Hopefully fix Serialize Crash
1 parent d12bc83 commit cc37bbd

File tree

2 files changed

+19
-35
lines changed

2 files changed

+19
-35
lines changed

angel/antied/manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"name":"Cute Moodle should get lot of hugs v1.4.3a",
3-
"originalName": "Cute Moodle should get lot of hugs v1.4.3a",
2+
"name":"Must Hug Cute Moodle v1.4.3b",
3+
"originalName": "Must Hug Cute Moodle v1.4.3b",
44
"description":"Keeps a temporary record of deleted messages and any edits until you reload the app.",
55
"main": "index.jsx",
66
"authors": [

angel/antied/patches/flux_dispatch.js

Lines changed: 17 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export default deletedMessageArray => before("dispatch", FluxDispatcher, args =>
6666

6767
/* reuse the same object shape every time */
6868

69-
const newMessageObject = {
69+
ev.message = {
7070
...orig,
7171
content: orig.content,
7272
channel_id: orig.channel_id || ev.channelId,
@@ -78,16 +78,14 @@ export default deletedMessageArray => before("dispatch", FluxDispatcher, args =>
7878
// state: "SENT",
7979
}
8080

81-
if(cfg.switches.useEphemeralForDeleted) newMessageObject.flags = 64;
81+
if(cfg.switches.useEphemeralForDeleted) ev.message.flags = 64;
8282

83-
args[0] = {
84-
type: "MESSAGE_UPDATE",
85-
channelId: orig.channel_id || ev.channelId,
86-
message: newMessageObject,
87-
optimistic: false,
88-
sendMessageOptions: {},
89-
isPushNotification: false
90-
}
83+
ev.type = "MESSAGE_UPDATE"
84+
ev.channelId = orig.channel_id || ev.channelId;
85+
ev.optimistic = false;
86+
ev.sendMessageOptions = {};
87+
ev.isPushNotification = false;
88+
9189

9290
deletedMessageArray.set(ev.id, { message: args, stage: 1 });
9391

@@ -126,7 +124,6 @@ export default deletedMessageArray => before("dispatch", FluxDispatcher, args =>
126124
: null;
127125

128126
const tsPos = cfg.misc?.timestampPos === "BEFORE";
129-
const newMessage = msg || orig;
130127

131128
let prefix = `${editedTag}`;
132129

@@ -135,16 +132,14 @@ export default deletedMessageArray => before("dispatch", FluxDispatcher, args =>
135132
`${time} ${prefix}\n\n` : `${prefix} ${time}\n\n` :
136133
`${prefix}\n\n`;
137134

138-
139-
args[0] = {
140-
type: "MESSAGE_UPDATE",
141-
message: {
142-
...newMessage,
143-
content: `${orig.content} ${prefix}${msg.content}`,
144-
guild_id: ChannelStore.getChannel(chId)?.guild_id ?? msg.guild_id,
145-
edited_timestamp: "invalid_timestamp",
146-
message_reference: msg?.message_reference || orig?.messageReference || null,
147-
}
135+
136+
ev.message = {
137+
...msg,
138+
content: `${orig.content} ${prefix}${msg.content}`,
139+
guild_id: ChannelStore.getChannel(chId)?.guild_id ?? msg.guild_id,
140+
edited_timestamp: "invalid_timestamp",
141+
message_reference: msg?.message_reference || orig?.messageReference || null,
142+
148143
};
149144

150145
return args;
@@ -155,15 +150,4 @@ export default deletedMessageArray => before("dispatch", FluxDispatcher, args =>
155150
console.error("[ANTIED] Flux patch\n", e);
156151
}
157152
}
158-
});
159-
160-
/*
161-
type: 19
162-
163-
messageReference:
164-
{ type: 0,
165-
message_id: '1418310241086472312',
166-
guild_id: '1088889567354028083',
167-
channel_id: '1100378389744992317' },
168-
169-
*/
153+
});

0 commit comments

Comments
 (0)