Merge branch 'dev' into modules-proxy-patches
This commit is contained in:
commit
e57c99399d
|
@ -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,
|
||||
|
|
|
@ -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 (
|
||||
<div
|
||||
style={{ marginLeft: "0.5em", transform: "scale(0.9)" }}
|
||||
|
|
Loading…
Reference in a new issue