Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: super reactions #9336

Merged
merged 11 commits into from
Aug 27, 2024
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ const Partials = require('../../util/Partials');
message_id: 'id',
emoji: { name: '�', id: null },
channel_id: 'id',
burst: boolean
// If originating from a guild
guild_id: 'id',
member: { ..., user: { ... } } }
Expand Down Expand Up @@ -36,17 +37,19 @@ class MessageReactionAdd extends Action {
emoji: data.emoji,
count: message.partial ? null : 0,
me: user.id === this.client.user.id,
burst_colors: data.burst_colors,
});
if (!reaction) return false;
reaction._add(user);
reaction._add(user, data.burst);
if (fromStructure) return { message, reaction, user };
/**
* Emitted whenever a reaction is added to a cached message.
* @event Client#messageReactionAdd
* @param {MessageReaction} messageReaction The reaction object
* @param {User} user The user that applied the guild or reaction emoji
* @param {boolean} burst Determines when a super reaction is added
jaw0r3k marked this conversation as resolved.
Show resolved Hide resolved
*/
this.client.emit(Events.MessageReactionAdd, reaction, user);
this.client.emit(Events.MessageReactionAdd, reaction, user, data.burst);
jaw0r3k marked this conversation as resolved.
Show resolved Hide resolved

return { message, reaction, user };
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,15 @@ class MessageReactionRemove extends Action {
// Verify reaction
const reaction = this.getReaction(data, message, user);
if (!reaction) return false;
reaction._remove(user);
reaction._remove(user, data.burst);
/**
* Emitted whenever a reaction is removed from a cached message.
* @event Client#messageReactionRemove
* @param {MessageReaction} messageReaction The reaction object
* @param {User} user The user whose emoji or reaction emoji was removed
* @param {boolean} burst Determines when a super reaction was removed
jaw0r3k marked this conversation as resolved.
Show resolved Hide resolved
*/
this.client.emit(Events.MessageReactionRemove, reaction, user);
this.client.emit(Events.MessageReactionRemove, reaction, user, data.burst);
jaw0r3k marked this conversation as resolved.
Show resolved Hide resolved

return { message, reaction, user };
}
Expand Down
7 changes: 4 additions & 3 deletions packages/discord.js/src/managers/ReactionUserManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

const { Collection } = require('@discordjs/collection');
const { makeURLSearchParams } = require('@discordjs/rest');
const { Routes } = require('discord-api-types/v10');
const { ReactionType, Routes } = require('discord-api-types/v10');
const CachedManager = require('./CachedManager');
const { DiscordjsError, ErrorCodes } = require('../errors');
const User = require('../structures/User');
Expand Down Expand Up @@ -31,6 +31,7 @@ class ReactionUserManager extends CachedManager {
/**
* Options used to fetch users who gave a reaction.
* @typedef {Object} FetchReactionUsersOptions
* @property {ReactionType} [type=ReactionType.Normal] The reaction type to fetch
* @property {number} [limit=100] The maximum amount of users to fetch, defaults to `100`
* @property {Snowflake} [after] Limit fetching users to those with an id greater than the supplied id
*/
Expand All @@ -40,9 +41,9 @@ class ReactionUserManager extends CachedManager {
* @param {FetchReactionUsersOptions} [options] Options for fetching the users
* @returns {Promise<Collection<Snowflake, User>>}
*/
async fetch({ limit = 100, after } = {}) {
async fetch({ type = ReactionType.Normal, limit = 100, after } = {}) {
const message = this.reaction.message;
const query = makeURLSearchParams({ limit, after });
const query = makeURLSearchParams({ limit, after, type });
const data = await this.client.rest.get(
Routes.channelMessageReaction(message.channelId, message.id, this.reaction.emoji.identifier),
{ query },
Expand Down
61 changes: 54 additions & 7 deletions packages/discord.js/src/structures/MessageReaction.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@ class MessageReaction {
*/
this.me = data.me;

/**
* Whether the client has super-reacted using this emoji
* @type {boolean}
*/
this.meBurst = data.me_burst;

/**
* A manager of the users that have given this reaction
* @type {ReactionUserManager}
Expand All @@ -39,17 +45,45 @@ class MessageReaction {

this._emoji = new ReactionEmoji(this, data.emoji);

this.burstColors = null;

this._patch(data);
}

_patch(data) {
if ('burst_colors' in data) {
/**
* Hexadecimal colors used for this super reaction
* @type {?(string[])}
jaw0r3k marked this conversation as resolved.
Show resolved Hide resolved
*/
this.burstColors = data.burst_colors;
}

if ('count' in data) {
/**
* The number of people that have given the same reaction
* @type {?number}
*/
this.count ??= data.count;
}

if ('count_details' in data) {
/**
* The reaction count details object contains information about super and normal reaction counts.
* @typedef {Object} ReactionCountDetailsData
* @property {number} burst Count of super reactions
* @property {number} normal Count of normal reactions
*/

/**
* The reaction count details object contains information about super and normal reaction counts.
* @type {ReactionCountDetailsData}
*/
this.countDetails = {
burst: data.count_details.burst,
normal: data.count_details.normal,
};
}
}

/**
Expand Down Expand Up @@ -121,18 +155,31 @@ class MessageReaction {
return this._emoji.id ?? this._emoji.name;
}

_add(user) {
_add(user, burst) {
if (this.partial) return;
this.users.cache.set(user.id, user);
if (!this.me || user.id !== this.message.client.user.id || this.count === 0) this.count++;
this.me ||= user.id === this.message.client.user.id;
if (!this.me || user.id !== this.message.client.user.id || this.count === 0) {
this.count++;
if (burst) this.countDetails.burst++;
else this.countDetails.normal++;
}
if (user.id === this.message.client.user.id) {
if (burst) this.meBurst = true;
else this.me = true;
}
}

_remove(user) {
_remove(user, burst) {
if (this.partial) return;
this.users.cache.delete(user.id);
if (!this.me || user.id !== this.message.client.user.id) this.count--;
if (user.id === this.message.client.user.id) this.me = false;
if (!this.me || user.id !== this.message.client.user.id) {
this.count--;
if (burst) this.countDetails.burst--;
else this.countDetails.normal--;
}
if (user.id === this.message.client.user.id) {
if (burst) this.meBurst = false;
else this.me = false;
}
if (this.count <= 0 && this.users.cache.size === 0) {
this.message.reactions.cache.delete(this.emoji.id ?? this.emoji.name);
}
Expand Down
14 changes: 12 additions & 2 deletions packages/discord.js/typings/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ import {
APISelectMenuDefaultValue,
SelectMenuDefaultValueType,
InviteType,
ReactionType,
} from 'discord-api-types/v10';
import { ChildProcess } from 'node:child_process';
import { EventEmitter } from 'node:events';
Expand Down Expand Up @@ -2373,10 +2374,13 @@ export class MessageReaction {
private constructor(client: Client<true>, data: RawMessageReactionData, message: Message);
private _emoji: GuildEmoji | ReactionEmoji;

public burstColors: string[] | null;
public readonly client: Client<true>;
public count: number;
public countDetails: ReactionCountDetailsData;
public get emoji(): GuildEmoji | ReactionEmoji;
public me: boolean;
public meBurst: boolean;
public message: Message | PartialMessage;
public get partial(): false;
public users: ReactionUserManager;
Expand Down Expand Up @@ -5245,8 +5249,8 @@ export interface ClientEvents {
messages: ReadonlyCollection<Snowflake, Message | PartialMessage>,
channel: GuildTextBasedChannel,
];
messageReactionAdd: [reaction: MessageReaction | PartialMessageReaction, user: User | PartialUser];
messageReactionRemove: [reaction: MessageReaction | PartialMessageReaction, user: User | PartialUser];
messageReactionAdd: [reaction: MessageReaction | PartialMessageReaction, user: User | PartialUser, burst: boolean];
jaw0r3k marked this conversation as resolved.
Show resolved Hide resolved
messageReactionRemove: [reaction: MessageReaction | PartialMessageReaction, user: User | PartialUser, burst: boolean];
messageUpdate: [oldMessage: Message | PartialMessage, newMessage: Message | PartialMessage];
presenceUpdate: [oldPresence: Presence | null, newPresence: Presence];
ready: [client: Client<true>];
Expand Down Expand Up @@ -5690,6 +5694,7 @@ export interface FetchMessagesOptions {
}

export interface FetchReactionUsersOptions {
type?: ReactionType;
limit?: number;
after?: Snowflake;
}
Expand Down Expand Up @@ -6425,6 +6430,11 @@ export interface MessageSelectOption {
value: string;
}

export interface ReactionCountDetailsData {
burst: number;
normal: number;
}

export interface SelectMenuComponentOptionData {
default?: boolean;
description?: string;
Expand Down
Loading