mirror of
https://github.com/discordjs/discord.js.git
synced 2026-03-17 20:13:30 +01:00
feat: Role gradient colours (#10986)
* feat: backport role gradient colours * chore: add deprecations
This commit is contained in:
@@ -65,7 +65,7 @@ class GuildMemberRoleManager extends DataManager {
|
|||||||
* @readonly
|
* @readonly
|
||||||
*/
|
*/
|
||||||
get color() {
|
get color() {
|
||||||
const coloredRoles = this.cache.filter(role => role.color);
|
const coloredRoles = this.cache.filter(role => role.colors.primaryColor);
|
||||||
if (!coloredRoles.size) return null;
|
if (!coloredRoles.size) return null;
|
||||||
return coloredRoles.reduce((prev, role) => (role.comparePositionTo(prev) > 0 ? role : prev));
|
return coloredRoles.reduce((prev, role) => (role.comparePositionTo(prev) > 0 ? role : prev));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,6 +12,8 @@ const PermissionsBitField = require('../util/PermissionsBitField');
|
|||||||
const { setPosition, resolveColor } = require('../util/Util');
|
const { setPosition, resolveColor } = require('../util/Util');
|
||||||
|
|
||||||
let cacheWarningEmitted = false;
|
let cacheWarningEmitted = false;
|
||||||
|
let deprecationEmittedForCreate = false;
|
||||||
|
let deprecationEmittedForEdit = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Manages API methods for roles and stores their cache.
|
* Manages API methods for roles and stores their cache.
|
||||||
@@ -112,11 +114,24 @@ class RoleManager extends CachedManager {
|
|||||||
* @returns {?Snowflake}
|
* @returns {?Snowflake}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @typedef {Object} RoleColorsResolvable
|
||||||
|
* @property {ColorResolvable} primaryColor The primary color of the role
|
||||||
|
* @property {ColorResolvable} [secondaryColor] The secondary color of the role.
|
||||||
|
* This will make the role a gradient between the other provided colors
|
||||||
|
* @property {ColorResolvable} [tertiaryColor] The tertiary color of the role.
|
||||||
|
* When sending `tertiaryColor` the API enforces the role color to be a holographic style
|
||||||
|
* with values of `primaryColor = 11127295`, `secondaryColor = 16759788`, and `tertiaryColor = 16761760`.
|
||||||
|
* These values are available as a constant: `Constants.HolographicStyle`
|
||||||
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Options used to create a new role.
|
* Options used to create a new role.
|
||||||
* @typedef {Object} RoleCreateOptions
|
* @typedef {Object} RoleCreateOptions
|
||||||
* @property {string} [name] The name of the new role
|
* @property {string} [name] The name of the new role
|
||||||
* @property {ColorResolvable} [color] The data to create the role with
|
* @property {ColorResolvable} [color] The data to create the role with
|
||||||
|
* <warn>This property is deprecated. Use `colors` instead.</warn>
|
||||||
|
* @property {RoleColorsResolvable} [colors] The colors to create the role with
|
||||||
* @property {boolean} [hoist] Whether or not the new role should be hoisted
|
* @property {boolean} [hoist] Whether or not the new role should be hoisted
|
||||||
* @property {PermissionResolvable} [permissions] The permissions for the new role
|
* @property {PermissionResolvable} [permissions] The permissions for the new role
|
||||||
* @property {number} [position] The position of the new role
|
* @property {number} [position] The position of the new role
|
||||||
@@ -142,15 +157,30 @@ class RoleManager extends CachedManager {
|
|||||||
* // Create a new role with data and a reason
|
* // Create a new role with data and a reason
|
||||||
* guild.roles.create({
|
* guild.roles.create({
|
||||||
* name: 'Super Cool Blue People',
|
* name: 'Super Cool Blue People',
|
||||||
* color: Colors.Blue,
|
|
||||||
* reason: 'we needed a role for Super Cool People',
|
* reason: 'we needed a role for Super Cool People',
|
||||||
|
* colors: {
|
||||||
|
* primaryColor: Colors.Blue,
|
||||||
|
* },
|
||||||
|
* })
|
||||||
|
* .then(console.log)
|
||||||
|
* .catch(console.error);
|
||||||
|
* @example
|
||||||
|
* // Create a role with holographic colors
|
||||||
|
* guild.roles.create({
|
||||||
|
* name: 'Holographic Role',
|
||||||
|
* reason: 'Creating a role with holographic effect',
|
||||||
|
* colors: {
|
||||||
|
* primaryColor: Constants.HolographicStyle.Primary,
|
||||||
|
* secondaryColor: Constants.HolographicStyle.Secondary,
|
||||||
|
* tertiaryColor: Constants.HolographicStyle.Tertiary,
|
||||||
|
* },
|
||||||
* })
|
* })
|
||||||
* .then(console.log)
|
* .then(console.log)
|
||||||
* .catch(console.error);
|
* .catch(console.error);
|
||||||
*/
|
*/
|
||||||
async create(options = {}) {
|
async create(options = {}) {
|
||||||
let { name, color, hoist, permissions, position, mentionable, reason, icon, unicodeEmoji } = options;
|
let { permissions, icon } = options;
|
||||||
color &&= resolveColor(color);
|
const { name, color, hoist, position, mentionable, reason, unicodeEmoji } = options;
|
||||||
if (permissions !== undefined) permissions = new PermissionsBitField(permissions);
|
if (permissions !== undefined) permissions = new PermissionsBitField(permissions);
|
||||||
if (icon) {
|
if (icon) {
|
||||||
const guildEmojiURL = this.guild.emojis.resolve(icon)?.imageURL();
|
const guildEmojiURL = this.guild.emojis.resolve(icon)?.imageURL();
|
||||||
@@ -158,10 +188,30 @@ class RoleManager extends CachedManager {
|
|||||||
if (typeof icon !== 'string') icon = undefined;
|
if (typeof icon !== 'string') icon = undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let colors = options.colors && {
|
||||||
|
primary_color: resolveColor(options.colors.primaryColor),
|
||||||
|
secondary_color: options.colors.secondaryColor && resolveColor(options.colors.secondaryColor),
|
||||||
|
tertiary_color: options.colors.tertiaryColor && resolveColor(options.colors.tertiaryColor),
|
||||||
|
};
|
||||||
|
|
||||||
|
if (color !== undefined) {
|
||||||
|
if (!deprecationEmittedForCreate) {
|
||||||
|
process.emitWarning(`Passing "color" to RoleManager#create() is deprecated. Use "colors" instead.`);
|
||||||
|
}
|
||||||
|
|
||||||
|
deprecationEmittedForCreate = true;
|
||||||
|
|
||||||
|
colors = {
|
||||||
|
primary_color: resolveColor(color),
|
||||||
|
secondary_color: null,
|
||||||
|
tertiary_color: null,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
const data = await this.client.rest.post(Routes.guildRoles(this.guild.id), {
|
const data = await this.client.rest.post(Routes.guildRoles(this.guild.id), {
|
||||||
body: {
|
body: {
|
||||||
name,
|
name,
|
||||||
color,
|
colors,
|
||||||
hoist,
|
hoist,
|
||||||
permissions,
|
permissions,
|
||||||
mentionable,
|
mentionable,
|
||||||
@@ -210,9 +260,29 @@ class RoleManager extends CachedManager {
|
|||||||
if (typeof icon !== 'string') icon = undefined;
|
if (typeof icon !== 'string') icon = undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let colors = options.colors && {
|
||||||
|
primary_color: resolveColor(options.colors.primaryColor),
|
||||||
|
secondary_color: options.colors.secondaryColor && resolveColor(options.colors.secondaryColor),
|
||||||
|
tertiary_color: options.colors.tertiaryColor && resolveColor(options.colors.tertiaryColor),
|
||||||
|
};
|
||||||
|
|
||||||
|
if (options.color !== undefined) {
|
||||||
|
if (!deprecationEmittedForEdit) {
|
||||||
|
process.emitWarning(`Passing "color" to RoleManager#edit() is deprecated. Use "colors" instead.`);
|
||||||
|
}
|
||||||
|
|
||||||
|
deprecationEmittedForEdit = true;
|
||||||
|
|
||||||
|
colors = {
|
||||||
|
primary_color: resolveColor(options.color),
|
||||||
|
secondary_color: null,
|
||||||
|
tertiary_color: null,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
const body = {
|
const body = {
|
||||||
name: options.name,
|
name: options.name,
|
||||||
color: options.color === undefined ? undefined : resolveColor(options.color),
|
colors,
|
||||||
hoist: options.hoist,
|
hoist: options.hoist,
|
||||||
permissions: options.permissions === undefined ? undefined : new PermissionsBitField(options.permissions),
|
permissions: options.permissions === undefined ? undefined : new PermissionsBitField(options.permissions),
|
||||||
mentionable: options.mentionable,
|
mentionable: options.mentionable,
|
||||||
|
|||||||
@@ -54,11 +54,37 @@ class Role extends Base {
|
|||||||
if ('color' in data) {
|
if ('color' in data) {
|
||||||
/**
|
/**
|
||||||
* The base 10 color of the role
|
* The base 10 color of the role
|
||||||
|
*
|
||||||
* @type {number}
|
* @type {number}
|
||||||
|
* @deprecated Use {@link Role#colors} instead.
|
||||||
*/
|
*/
|
||||||
this.color = data.color;
|
this.color = data.color;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @typedef {Object} RoleColors
|
||||||
|
* @property {number} primaryColor The primary color of the role
|
||||||
|
* @property {?number} secondaryColor The secondary color of the role.
|
||||||
|
* This will make the role a gradient between the other provided colors
|
||||||
|
* @property {?number} tertiaryColor The tertiary color of the role.
|
||||||
|
* When sending `tertiaryColor` the API enforces the role color to be a holographic style
|
||||||
|
* with values of `primaryColor = 11127295`, `secondaryColor = 16759788`, and `tertiaryColor = 16761760`.
|
||||||
|
* These values are available as a constant: `Constants.HolographicStyle`
|
||||||
|
*/
|
||||||
|
|
||||||
|
if ('colors' in data) {
|
||||||
|
/**
|
||||||
|
* The colors of the role
|
||||||
|
*
|
||||||
|
* @type {RoleColors}
|
||||||
|
*/
|
||||||
|
this.colors = {
|
||||||
|
primaryColor: data.colors.primary_color,
|
||||||
|
secondaryColor: data.colors.secondary_color,
|
||||||
|
tertiaryColor: data.colors.tertiary_color,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
if ('hoist' in data) {
|
if ('hoist' in data) {
|
||||||
/**
|
/**
|
||||||
* If true, users that are part of this role will appear in a separate category in the users list
|
* If true, users that are part of this role will appear in a separate category in the users list
|
||||||
@@ -231,6 +257,8 @@ class Role extends Base {
|
|||||||
* @typedef {Object} RoleData
|
* @typedef {Object} RoleData
|
||||||
* @property {string} [name] The name of the role
|
* @property {string} [name] The name of the role
|
||||||
* @property {ColorResolvable} [color] The color of the role, either a hex string or a base 10 number
|
* @property {ColorResolvable} [color] The color of the role, either a hex string or a base 10 number
|
||||||
|
* <warn>This property is deprecated. Use `colors` instead.</warn>
|
||||||
|
* @property {RoleColorsResolvable} [colors] The colors of the role
|
||||||
* @property {boolean} [hoist] Whether or not the role should be hoisted
|
* @property {boolean} [hoist] Whether or not the role should be hoisted
|
||||||
* @property {number} [position] The position of the role
|
* @property {number} [position] The position of the role
|
||||||
* @property {PermissionResolvable} [permissions] The permissions of the role
|
* @property {PermissionResolvable} [permissions] The permissions of the role
|
||||||
@@ -286,17 +314,39 @@ class Role extends Base {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets a new color for the role.
|
* Sets a new color for the role.
|
||||||
|
*
|
||||||
* @param {ColorResolvable} color The color of the role
|
* @param {ColorResolvable} color The color of the role
|
||||||
* @param {string} [reason] Reason for changing the role's color
|
* @param {string} [reason] Reason for changing the role's color
|
||||||
* @returns {Promise<Role>}
|
* @returns {Promise<Role>}
|
||||||
|
* @deprecated Use {@link Role#setColors} instead.
|
||||||
|
*/
|
||||||
|
async setColor(color, reason) {
|
||||||
|
return this.edit({ color, reason });
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets new colors for the role.
|
||||||
|
*
|
||||||
|
* @param {RoleColorsResolvable} colors The colors of the role
|
||||||
|
* @param {string} [reason] Reason for changing the role's colors
|
||||||
|
* @returns {Promise<Role>}
|
||||||
* @example
|
* @example
|
||||||
* // Set the color of a role
|
* // Set the colors of a role
|
||||||
* role.setColor('#FF0000')
|
* role.setColors({ primaryColor: '#FF0000', secondaryColor: '#00FF00', tertiaryColor: '#0000FF' })
|
||||||
* .then(updated => console.log(`Set color of role to ${updated.color}`))
|
* .then(updated => console.log(`Set colors of role to ${updated.colors}`))
|
||||||
|
* .catch(console.error);
|
||||||
|
* @example
|
||||||
|
* // Set holographic colors using constants
|
||||||
|
* role.setColors({
|
||||||
|
* primaryColor: Constants.HolographicStyle.Primary,
|
||||||
|
* secondaryColor: Constants.HolographicStyle.Secondary,
|
||||||
|
* tertiaryColor: Constants.HolographicStyle.Tertiary,
|
||||||
|
* })
|
||||||
|
* .then(updated => console.log(`Set holographic colors for role ${updated.name}`))
|
||||||
* .catch(console.error);
|
* .catch(console.error);
|
||||||
*/
|
*/
|
||||||
setColor(color, reason) {
|
async setColors(colors, reason) {
|
||||||
return this.edit({ color, reason });
|
return this.edit({ colors, reason });
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -434,7 +484,9 @@ class Role extends Base {
|
|||||||
role &&
|
role &&
|
||||||
this.id === role.id &&
|
this.id === role.id &&
|
||||||
this.name === role.name &&
|
this.name === role.name &&
|
||||||
this.color === role.color &&
|
this.colors.primaryColor === role.colors.primaryColor &&
|
||||||
|
this.colors.secondaryColor === role.colors.secondaryColor &&
|
||||||
|
this.colors.tertiaryColor === role.colors.tertiaryColor &&
|
||||||
this.hoist === role.hoist &&
|
this.hoist === role.hoist &&
|
||||||
this.position === role.position &&
|
this.position === role.position &&
|
||||||
this.permissions.bitfield === role.permissions.bitfield &&
|
this.permissions.bitfield === role.permissions.bitfield &&
|
||||||
|
|||||||
@@ -254,6 +254,21 @@ exports.StickerFormatExtensionMap = {
|
|||||||
[StickerFormatType.GIF]: ImageFormat.GIF,
|
[StickerFormatType.GIF]: ImageFormat.GIF,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Holographic color values for role styling.
|
||||||
|
* When using `tertiaryColor`, the API enforces these specific values for holographic effect.
|
||||||
|
*
|
||||||
|
* @typedef {Object} HolographicStyle
|
||||||
|
* @property {number} Primary 11127295 (0xA9FFFF)
|
||||||
|
* @property {number} Secondary 16759788 (0xFFCCCC)
|
||||||
|
* @property {number} Tertiary 16761760 (0xFFE0A0)
|
||||||
|
*/
|
||||||
|
exports.HolographicStyle = {
|
||||||
|
Primary: 11_127_295,
|
||||||
|
Secondary: 16_759_788,
|
||||||
|
Tertiary: 16_761_760,
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @typedef {Object} Constants Constants that can be used in an enum or object-like way.
|
* @typedef {Object} Constants Constants that can be used in an enum or object-like way.
|
||||||
* @property {number} MaxBulkDeletableMessageAge Max bulk deletable message age
|
* @property {number} MaxBulkDeletableMessageAge Max bulk deletable message age
|
||||||
@@ -264,4 +279,5 @@ exports.StickerFormatExtensionMap = {
|
|||||||
* @property {VoiceBasedChannelTypes} VoiceBasedChannelTypes The types of channels that are voice-based
|
* @property {VoiceBasedChannelTypes} VoiceBasedChannelTypes The types of channels that are voice-based
|
||||||
* @property {SelectMenuTypes} SelectMenuTypes The types of components that are select menus.
|
* @property {SelectMenuTypes} SelectMenuTypes The types of components that are select menus.
|
||||||
* @property {Object} StickerFormatExtensionMap A mapping between sticker formats and their respective image formats.
|
* @property {Object} StickerFormatExtensionMap A mapping between sticker formats and their respective image formats.
|
||||||
|
* @property {HolographicStyle} HolographicStyle Holographic color values for role styling.
|
||||||
*/
|
*/
|
||||||
|
|||||||
23
packages/discord.js/typings/index.d.ts
vendored
23
packages/discord.js/typings/index.d.ts
vendored
@@ -3080,9 +3080,23 @@ export class RichPresenceAssets {
|
|||||||
public smallImageURL(options?: ImageURLOptions): string | null;
|
public smallImageURL(options?: ImageURLOptions): string | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface RoleColors {
|
||||||
|
primaryColor: number;
|
||||||
|
secondaryColor: number | null;
|
||||||
|
tertiaryColor: number | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface RoleColorsResolvable {
|
||||||
|
primaryColor: ColorResolvable;
|
||||||
|
secondaryColor?: ColorResolvable;
|
||||||
|
tertiaryColor?: ColorResolvable;
|
||||||
|
}
|
||||||
|
|
||||||
export class Role extends Base {
|
export class Role extends Base {
|
||||||
private constructor(client: Client<true>, data: RawRoleData, guild: Guild);
|
private constructor(client: Client<true>, data: RawRoleData, guild: Guild);
|
||||||
|
/** @deprecated Use {@link Role.colors} instead. */
|
||||||
public color: number;
|
public color: number;
|
||||||
|
public colors: RoleColors;
|
||||||
public get createdAt(): Date;
|
public get createdAt(): Date;
|
||||||
public get createdTimestamp(): number;
|
public get createdTimestamp(): number;
|
||||||
public get editable(): boolean;
|
public get editable(): boolean;
|
||||||
@@ -3110,7 +3124,9 @@ export class Role extends Base {
|
|||||||
channel: NonThreadGuildBasedChannel | Snowflake,
|
channel: NonThreadGuildBasedChannel | Snowflake,
|
||||||
checkAdmin?: boolean,
|
checkAdmin?: boolean,
|
||||||
): Readonly<PermissionsBitField>;
|
): Readonly<PermissionsBitField>;
|
||||||
|
/** @deprecated Use {@link Role.setColors} instead. */
|
||||||
public setColor(color: ColorResolvable, reason?: string): Promise<Role>;
|
public setColor(color: ColorResolvable, reason?: string): Promise<Role>;
|
||||||
|
public setColors(colors: RoleColorsResolvable, reason?: string): Promise<Role>;
|
||||||
public setHoist(hoist?: boolean, reason?: string): Promise<Role>;
|
public setHoist(hoist?: boolean, reason?: string): Promise<Role>;
|
||||||
public setMentionable(mentionable?: boolean, reason?: string): Promise<Role>;
|
public setMentionable(mentionable?: boolean, reason?: string): Promise<Role>;
|
||||||
public setName(name: string, reason?: string): Promise<Role>;
|
public setName(name: string, reason?: string): Promise<Role>;
|
||||||
@@ -4262,6 +4278,11 @@ export type DeletableMessageType =
|
|||||||
| MessageType.UserJoin;
|
| MessageType.UserJoin;
|
||||||
|
|
||||||
export const Constants: {
|
export const Constants: {
|
||||||
|
HolographicStyle: {
|
||||||
|
Primary: 11_127_295;
|
||||||
|
Secondary: 16_759_788;
|
||||||
|
Tertiary: 16_761_760;
|
||||||
|
};
|
||||||
MaxBulkDeletableMessageAge: 1_209_600_000;
|
MaxBulkDeletableMessageAge: 1_209_600_000;
|
||||||
SweeperKeys: SweeperKey[];
|
SweeperKeys: SweeperKey[];
|
||||||
NonSystemMessageTypes: NonSystemMessageType[];
|
NonSystemMessageTypes: NonSystemMessageType[];
|
||||||
@@ -7372,7 +7393,9 @@ export interface ResolvedOverwriteOptions {
|
|||||||
|
|
||||||
export interface RoleData {
|
export interface RoleData {
|
||||||
name?: string;
|
name?: string;
|
||||||
|
/** @deprecated Use {@link RoleData.colors} instead. */
|
||||||
color?: ColorResolvable;
|
color?: ColorResolvable;
|
||||||
|
colors?: RoleColorsResolvable;
|
||||||
hoist?: boolean;
|
hoist?: boolean;
|
||||||
position?: number;
|
position?: number;
|
||||||
permissions?: PermissionResolvable;
|
permissions?: PermissionResolvable;
|
||||||
|
|||||||
Reference in New Issue
Block a user