Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-09 16:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: rename Snowflake to SnowflakeUtil (#5502)

Browse Source
This commit is contained in:
Jan
2021-04-15 00:37:54 +02:00
committed by GitHub
parent e9bf206d88
commit 164ddf668f
15 changed files with 28 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
esm/discord.mjs
View File

@@ -22,7 +22,6 @@ export const {
Intents,
Permissions,
Speaking,
Snowflake,
SnowflakeUtil,
Structures,
SystemChannelFlags,

3
src/index.js
View File

@@ -25,8 +25,7 @@ module.exports = {
Intents: require('./util/Intents'),
Permissions: require('./util/Permissions'),
Speaking: require('./util/Speaking'),
Snowflake: require('./util/Snowflake'),
SnowflakeUtil: require('./util/Snowflake'),
SnowflakeUtil: require('./util/SnowflakeUtil'),
Structures: require('./util/Structures'),
SystemChannelFlags: require('./util/SystemChannelFlags'),
UserFlags: require('./util/UserFlags'),

2
src/managers/GuildMemberManager.js
View File

@@ -5,7 +5,7 @@ const { Error, TypeError, RangeError } = require('../errors');
const GuildMember = require('../structures/GuildMember');
const Collection = require('../util/Collection');
const { Events, OPCodes } = require('../util/Constants');
const SnowflakeUtil = require('../util/Snowflake');
const SnowflakeUtil = require('../util/SnowflakeUtil');
/**
* Manages API methods for GuildMembers and stores their cache.

4
src/structures/Channel.js
View File

@@ -2,7 +2,7 @@
const Base = require('./Base');
const { ChannelTypes } = require('../util/Constants');
const Snowflake = require('../util/Snowflake');
const SnowflakeUtil = require('../util/SnowflakeUtil');
/**
* Represents any channel on Discord.
@@ -51,7 +51,7 @@ class Channel extends Base {
* @readonly
*/
get createdTimestamp() {
return Snowflake.deconstruct(this.id).timestamp;
return SnowflakeUtil.deconstruct(this.id).timestamp;
}
/**

4
src/structures/Emoji.js
View File

@@ -1,7 +1,7 @@
'use strict';
const Base = require('./Base');
const Snowflake = require('../util/Snowflake');
const SnowflakeUtil = require('../util/SnowflakeUtil');
/**
* Represents an emoji, see {@link GuildEmoji} and {@link ReactionEmoji}.
@@ -62,7 +62,7 @@ class Emoji extends Base {
*/
get createdTimestamp() {
if (!this.id) return null;
return Snowflake.deconstruct(this.id).timestamp;
return SnowflakeUtil.deconstruct(this.id).timestamp;
}
/**

4
src/structures/Guild.js
View File

@@ -24,7 +24,7 @@ const {
ExplicitContentFilterLevels,
} = require('../util/Constants');
const DataResolver = require('../util/DataResolver');
const Snowflake = require('../util/Snowflake');
const SnowflakeUtil = require('../util/SnowflakeUtil');
const SystemChannelFlags = require('../util/SystemChannelFlags');
const Util = require('../util/Util');
@@ -444,7 +444,7 @@ class Guild extends Base {
* @readonly
*/
get createdTimestamp() {
return Snowflake.deconstruct(this.id).timestamp;
return SnowflakeUtil.deconstruct(this.id).timestamp;
}
/**

4
src/structures/GuildAuditLogs.js
View File

@@ -5,7 +5,7 @@ const Webhook = require('./Webhook');
const Collection = require('../util/Collection');
const { OverwriteTypes, PartialTypes } = require('../util/Constants');
const Permissions = require('../util/Permissions');
const Snowflake = require('../util/Snowflake');
const SnowflakeUtil = require('../util/SnowflakeUtil');
const Util = require('../util/Util');
/**
@@ -491,7 +491,7 @@ class GuildAuditLogsEntry {
* @readonly
*/
get createdTimestamp() {
return Snowflake.deconstruct(this.id).timestamp;
return SnowflakeUtil.deconstruct(this.id).timestamp;
}
/**

2
src/structures/Message.js
View File

@@ -13,7 +13,7 @@ const Collection = require('../util/Collection');
const { MessageTypes, SystemMessageTypes } = require('../util/Constants');
const MessageFlags = require('../util/MessageFlags');
const Permissions = require('../util/Permissions');
const SnowflakeUtil = require('../util/Snowflake');
const SnowflakeUtil = require('../util/SnowflakeUtil');
const Util = require('../util/Util');
/**

4
src/structures/Role.js
View File

@@ -3,7 +3,7 @@
const Base = require('./Base');
const { Error, TypeError } = require('../errors');
const Permissions = require('../util/Permissions');
const Snowflake = require('../util/Snowflake');
const SnowflakeUtil = require('../util/SnowflakeUtil');
const Util = require('../util/Util');
/**
@@ -110,7 +110,7 @@ class Role extends Base {
* @readonly
*/
get createdTimestamp() {
return Snowflake.deconstruct(this.id).timestamp;
return SnowflakeUtil.deconstruct(this.id).timestamp;
}
/**

4
src/structures/Team.js
View File

@@ -3,7 +3,7 @@
const Base = require('./Base');
const TeamMember = require('./TeamMember');
const Collection = require('../util/Collection');
const Snowflake = require('../util/Snowflake');
const SnowflakeUtil = require('../util/SnowflakeUtil');
/**
* Represents a Client OAuth2 Application Team.
@@ -67,7 +67,7 @@ class Team extends Base {
* @readonly
*/
get createdTimestamp() {
return Snowflake.deconstruct(this.id).timestamp;
return SnowflakeUtil.deconstruct(this.id).timestamp;
}
/**

4
src/structures/User.js
View File

@@ -3,7 +3,7 @@
const Base = require('./Base');
const TextBasedChannel = require('./interfaces/TextBasedChannel');
const { Error } = require('../errors');
const Snowflake = require('../util/Snowflake');
const SnowflakeUtil = require('../util/SnowflakeUtil');
const UserFlags = require('../util/UserFlags');
let Structures;
@@ -116,7 +116,7 @@ class User extends Base {
* @readonly
*/
get createdTimestamp() {
return Snowflake.deconstruct(this.id).timestamp;
return SnowflakeUtil.deconstruct(this.id).timestamp;
}
/**

4
src/structures/Webhook.js
View File

@@ -4,7 +4,7 @@ const APIMessage = require('./APIMessage');
const Channel = require('./Channel');
const { WebhookTypes } = require('../util/Constants');
const DataResolver = require('../util/DataResolver');
const Snowflake = require('../util/Snowflake');
const SnowflakeUtil = require('../util/SnowflakeUtil');
/**
* Represents a webhook.
@@ -281,7 +281,7 @@ class Webhook {
* @readonly
*/
get createdTimestamp() {
return Snowflake.deconstruct(this.id).timestamp;
return SnowflakeUtil.deconstruct(this.id).timestamp;
}
/**

4
src/structures/interfaces/Application.js
View File

@@ -1,7 +1,7 @@
'use strict';
const { ClientApplicationAssetTypes, Endpoints } = require('../../util/Constants');
const Snowflake = require('../../util/Snowflake');
const SnowflakeUtil = require('../../util/SnowflakeUtil');
const Base = require('../Base');
const AssetTypes = Object.keys(ClientApplicationAssetTypes);
@@ -48,7 +48,7 @@ class Application extends Base {
* @readonly
*/
get createdTimestamp() {
return Snowflake.deconstruct(this.id).timestamp;
return SnowflakeUtil.deconstruct(this.id).timestamp;
}
/**

4
src/structures/interfaces/TextBasedChannel.js
View File

@@ -3,7 +3,7 @@
/* eslint-disable import/order */
const MessageCollector = require('../MessageCollector');
const APIMessage = require('../APIMessage');
const Snowflake = require('../../util/Snowflake');
const SnowflakeUtil = require('../../util/SnowflakeUtil');
const Collection = require('../../util/Collection');
const { RangeError, TypeError } = require('../../errors');
@@ -317,7 +317,7 @@ class TextBasedChannel {
if (Array.isArray(messages) || messages instanceof Collection) {
let messageIDs = messages instanceof Collection ? messages.keyArray() : messages.map(m => m.id || m);
if (filterOld) {
messageIDs = messageIDs.filter(id => Date.now() - Snowflake.deconstruct(id).date.getTime() < 1209600000);
messageIDs = messageIDs.filter(id => Date.now() - SnowflakeUtil.deconstruct(id).timestamp < 1209600000);
}
if (messageIDs.length === 0) return new Collection();
if (messageIDs.length === 1) {

14
src/util/Snowflake.js → src/util/SnowflakeUtil.js
View File

@@ -1,6 +1,6 @@
'use strict';
const Util = require('../util/Util');
const Util = require('./Util');
// Discord epoch (2015-01-01T00:00:00.000Z)
const EPOCH = 1420070400000;
@@ -64,20 +64,16 @@ class SnowflakeUtil {
*/
static deconstruct(snowflake) {
const BINARY = Util.idToBinary(snowflake).toString(2).padStart(64, '0');
const res = {
return {
timestamp: parseInt(BINARY.substring(0, 42), 2) + EPOCH,
get date() {
return new Date(this.timestamp);
},
workerID: parseInt(BINARY.substring(42, 47), 2),
processID: parseInt(BINARY.substring(47, 52), 2),
increment: parseInt(BINARY.substring(52, 64), 2),
binary: BINARY,
};
Object.defineProperty(res, 'date', {
get: function get() {
return new Date(this.timestamp);
},
enumerable: true,
});
return res;
}
/**