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.

Sign up for GitHub

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

Jump to bottom

feat: Add ApplicationEmoji to EmojiResolvable and MessageReaction#emoji #10477

Merged
merged 9 commits into from
Oct 1, 2024
Merged

feat: Add ApplicationEmoji to EmojiResolvable and MessageReaction#emoji #10477

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ee1aa9c
types: add ApplicationEmoji to EmojiResolvable
Moebits Sep 3, 2024
58d1f5f
typings: add ApplicationEmoji to MessageReaction#emoji
Moebits Sep 3, 2024
95b4bab
removed ApplicationEmoji from MessageReaction
Moebits Sep 3, 2024
d27076c
update BaseGuildEmojiManager
Moebits Sep 3, 2024
d42f8da
chore: lint error
Moebits Sep 3, 2024
6f25ce8
feat: add ApplicationEmoji to MessageReaction#emoji getter
Moebits Sep 4, 2024
7f24d38
refactor: check application emojis first
Moebits Sep 5, 2024
c319602
Merge branch 'discordjs:main' into application-emoji-fix
Moebits Sep 12, 2024
19f162b
Merge branch 'main' into application-emoji-fix
kodiakhq[bot] Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion packages/discord.js/src/managers/BaseGuildEmojiManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'use strict';

const CachedManager = require('./CachedManager');
const ApplicationEmoji = require('../structures/ApplicationEmoji');
const GuildEmoji = require('../structures/GuildEmoji');
const ReactionEmoji = require('../structures/ReactionEmoji');
const { parseEmoji } = require('../util/Util');
Expand All @@ -25,7 +26,8 @@ class BaseGuildEmojiManager extends CachedManager {
* * A Snowflake
* * A GuildEmoji object
* * A ReactionEmoji object
* @typedef {Snowflake|GuildEmoji|ReactionEmoji} EmojiResolvable
* * An ApplicationEmoji object
* @typedef {Snowflake|GuildEmoji|ReactionEmoji|ApplicationEmoji} EmojiResolvable
*/

/**
Expand All @@ -35,6 +37,7 @@ class BaseGuildEmojiManager extends CachedManager {
*/
resolve(emoji) {
if (emoji instanceof ReactionEmoji) return super.resolve(emoji.id);
if (emoji instanceof ApplicationEmoji) return super.resolve(emoji.id);
return super.resolve(emoji);
}

Expand All @@ -45,6 +48,7 @@ class BaseGuildEmojiManager extends CachedManager {
*/
resolveId(emoji) {
if (emoji instanceof ReactionEmoji) return emoji.id;
if (emoji instanceof ApplicationEmoji) return emoji.id;
return super.resolveId(emoji);
}

Expand All @@ -65,6 +69,7 @@ class BaseGuildEmojiManager extends CachedManager {
const emojiResolvable = this.resolve(emoji);
if (emojiResolvable) return emojiResolvable.identifier;
if (emoji instanceof ReactionEmoji) return emoji.identifier;
if (emoji instanceof ApplicationEmoji) return emoji.identifier;
if (typeof emoji === 'string') {
const res = parseEmoji(emoji);
if (res?.name.length) {
Expand Down
6 changes: 3 additions & 3 deletions packages/discord.js/typings/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2429,13 +2429,13 @@ export class MessagePayload {

export class MessageReaction {
private constructor(client: Client<true>, data: RawMessageReactionData, message: Message);
private _emoji: GuildEmoji | ReactionEmoji;
private _emoji: GuildEmoji | ReactionEmoji | ApplicationEmoji;

public burstColors: string[] | null;
public readonly client: Client<true>;
public count: number;
public countDetails: ReactionCountDetailsData;
public get emoji(): GuildEmoji | ReactionEmoji;
public get emoji(): GuildEmoji | ReactionEmoji | ApplicationEmoji;
didinele marked this conversation as resolved.
Show resolved Hide resolved
public me: boolean;
public meBurst: boolean;
public message: Message | PartialMessage;
Expand Down Expand Up @@ -5675,7 +5675,7 @@ export type EmojiIdentifierResolvable =
| `<${'' | 'a'}:${string}:${Snowflake}>`
| string;

export type EmojiResolvable = Snowflake | GuildEmoji | ReactionEmoji;
export type EmojiResolvable = Snowflake | GuildEmoji | ReactionEmoji | ApplicationEmoji;

export interface FetchApplicationCommandOptions extends BaseFetchOptions {
guildId?: Snowflake;
Expand Down