From 18d483144cdc848c13364fee5f7d0912a6856b4a Mon Sep 17 00:00:00 2001 From: Skillz Date: Tue, 22 Sep 2020 19:08:14 -0400 Subject: [PATCH] remove logger --- docs/content/stepbystep/createevent.md | 14 ++++---- mod.ts | 1 - src/handlers/guild.ts | 1 + src/module/basicShard.ts | 4 +-- src/module/requestManager.ts | 2 -- src/module/shard.ts | 3 +- src/utils/logger.ts | 49 -------------------------- 7 files changed, 10 insertions(+), 64 deletions(-) delete mode 100644 src/utils/logger.ts diff --git a/docs/content/stepbystep/createevent.md b/docs/content/stepbystep/createevent.md index 4afc8bea5..42ff52f06 100644 --- a/docs/content/stepbystep/createevent.md +++ b/docs/content/stepbystep/createevent.md @@ -20,14 +20,14 @@ import { cache } from "https://x.nest.land/Discordeno@8.4.1/src/utils/cache.ts"; import logger from "https://x.nest.land/Discordeno@8.4.1/src/utils/logger.ts"; botCache.eventHandlers.ready = function () { - logger.info(`Loaded ${botCache.arguments.size} Argument(s)`); - logger.info(`Loaded ${botCache.commands.size} Command(s)`); - logger.info(`Loaded ${Object.keys(botCache.eventHandlers).length} Event(s)`); - logger.info(`Loaded ${botCache.inhibitors.size} Inhibitor(s)`); - logger.info(`Loaded ${botCache.monitors.size} Monitor(s)`); - logger.info(`Loaded ${botCache.tasks.size} Task(s)`); + console.log(`Loaded ${botCache.arguments.size} Argument(s)`); + console.log(`Loaded ${botCache.commands.size} Command(s)`); + console.log(`Loaded ${Object.keys(botCache.eventHandlers).length} Event(s)`); + console.log(`Loaded ${botCache.inhibitors.size} Inhibitor(s)`); + console.log(`Loaded ${botCache.monitors.size} Monitor(s)`); + console.log(`Loaded ${botCache.tasks.size} Task(s)`); - logger.success( + console.log( `[READY] Bot is online and ready in ${cache.guilds.size} guild(s)!`, ); }; diff --git a/mod.ts b/mod.ts index 2440f74c2..a7a5b58b5 100644 --- a/mod.ts +++ b/mod.ts @@ -45,7 +45,6 @@ export * from "./src/types/role.ts"; export * from "./src/utils/cache.ts"; export * from "./src/utils/cdn.ts"; export * from "./src/utils/collection.ts"; -export * from "./src/utils/logger.ts"; export * from "./src/utils/permissions.ts"; export * from "./src/utils/utils.ts"; diff --git a/src/handlers/guild.ts b/src/handlers/guild.ts index de07a76d4..47a3a9945 100644 --- a/src/handlers/guild.ts +++ b/src/handlers/guild.ts @@ -99,6 +99,7 @@ export async function createGuildChannel( name, permission_overwrites: options?.permission_overwrites?.map((perm) => ({ ...perm, + allow: perm.allow.reduce( (bits, p) => bits |= BigInt(Permissions[p]), BigInt(0), diff --git a/src/module/basicShard.ts b/src/module/basicShard.ts index 2f10296b4..d2be980f6 100644 --- a/src/module/basicShard.ts +++ b/src/module/basicShard.ts @@ -12,14 +12,12 @@ import type { FetchMembersOptions } from "../types/guild.ts"; import type { BotStatusRequest } from "../utils/utils.ts"; import { handleDiscordPayload } from "./shardingManager.ts"; -import { logRed } from "../utils/logger.ts"; import { GatewayOpcode } from "../types/discord.ts"; import { eventHandlers, botGatewayData, } from "./client.ts"; import { delay } from "https://deno.land/std@0.67.0/async/delay.ts"; -import { cache } from "../utils/cache.ts"; import { inflate } from "https://deno.land/x/zlib.es@v1.0.0/mod.ts"; const basicShards = new Map(); @@ -78,7 +76,7 @@ export async function createBasicShard( // These error codes should just crash the projects if ([4004, 4005, 4012, 4013, 4014].includes(message.code)) { - logRed(`Close :( ${JSON.stringify(message)}`); + console.error(`Close :( ${JSON.stringify(message)}`); eventHandlers.debug?.( { type: "websocketErrored", diff --git a/src/module/requestManager.ts b/src/module/requestManager.ts index b79b06b33..bea0086cb 100644 --- a/src/module/requestManager.ts +++ b/src/module/requestManager.ts @@ -4,7 +4,6 @@ import { baseEndpoints } from "../constants/discord.ts"; import type { RequestMethods } from "../types/fetch.ts"; import { Errors } from "../types/errors.ts"; -import { logRed } from "../utils/logger.ts"; import { delay } from "https://deno.land/std@0.67.0/async/delay.ts"; const pathQueues: { [key: string]: QueuedRequest[] } = {}; @@ -290,7 +289,6 @@ function handleStatusCode(response: Response) { } console.error(response); - logRed(response); switch (status) { case HttpResponseCode.BadRequest: diff --git a/src/module/shard.ts b/src/module/shard.ts index 2b033db73..46ccec024 100644 --- a/src/module/shard.ts +++ b/src/module/shard.ts @@ -8,7 +8,6 @@ import type { FetchMembersOptions } from "../types/guild.ts"; import type { DebugArg } from "../types/options.ts"; import { GatewayOpcode } from "../types/discord.ts"; -import { logRed } from "../utils/logger.ts"; import { delay } from "https://deno.land/std@0.67.0/async/delay.ts"; import { connectWebSocket, @@ -172,7 +171,7 @@ const createShard = async ( // These error codes should just crash the projects if ([4004, 4005, 4012, 4013, 4014].includes(message.code)) { - logRed(`Close :( ${JSON.stringify(message)}`); + console.error(`Close :( ${JSON.stringify(message)}`); postDebug({ type: "websocketErrored", data: { shardID, message } }); throw new Error( diff --git a/src/utils/logger.ts b/src/utils/logger.ts deleted file mode 100644 index 13a8b8c45..000000000 --- a/src/utils/logger.ts +++ /dev/null @@ -1,49 +0,0 @@ -import { - blue, - green, - red, - yellow, -} from "https://deno.land/std@0.67.0/fmt/colors.ts"; - -export const getTime = () => { - const now = new Date(); - const hours = now.getHours(); - const minute = now.getMinutes(); - - let hour = hours; - let amOrPm = `AM`; - if (hour > 12) { - amOrPm = `PM`; - hour = hour - 12; - } - - return `${hour >= 10 ? hour : `0${hour}`}:${ - minute >= 10 ? minute : `0${minute}` - } ${amOrPm}`; -}; - -export const logGreen = (text: unknown) => { - console.log(green(`[${getTime()}] => ${JSON.stringify(text)}`)); -}; - -export const logBlue = (text: unknown) => { - console.log(blue(`[${getTime()}] => ${JSON.stringify(text)}`)); -}; - -export const logRed = (text: unknown) => { - console.log(red(`[${getTime()}] => ${JSON.stringify(text)}`)); -}; - -export const logYellow = (text: unknown) => { - console.log(yellow(`[${getTime()}] => ${JSON.stringify(text)}`)); -}; - -export const logger = { - getTime, - success: logGreen, - info: logBlue, - error: logRed, - warn: logYellow, -}; - -export default logger;