StyAndCo/zeppelin
3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-05-11 04:45:02 +00:00
Code Releases Activity

Add custom logger. Fix a bunch of errors. Optimize imports.

Browse source
This commit is contained in:
Dragory 2020-07-22 22:56:21 +03:00
parent 0dae54745d
commit 1064a1ca46
No known key found for this signature in database
GPG key ID: 5F387BA66DF8AAC1
89 changed files with 198 additions and 229 deletions
Download patch file Download diff file Expand all files Collapse all files

20
backend/src/utils.ts
View file

@ -23,19 +23,17 @@ import emojiRegex from "emoji-regex";
import * as t from "io-ts";
import fs from "fs";
const fsp = fs.promises;
import https from "https";
import tmp from "tmp";
import { logger, helpers } from "knub";
import { helpers } from "knub";
import { SavedMessage } from "./data/entities/SavedMessage";
import { decodeAndValidateStrict, StrictValidationError } from "./validatorUtils";
import { either } from "fp-ts/lib/Either";
import safeRegex from "safe-regex";
import moment from "moment-timezone";
import { performance } from "perf_hooks";
import { ERRORS } from "./RecoverablePluginError";
import { SimpleCache } from "./SimpleCache";
import { logger } from "./logger";
const fsp = fs.promises;
const delayStringMultipliers = {
w: 1000 * 60 * 60 * 24 * 7,
@ -946,9 +944,9 @@ export function resolveUserId(bot: Client, value: string) {
* Finds a matching User for the passed user id, user mention, or full username (with discriminator).
* If a user is not found, returns an UnknownUser instead.
*/
export function getUser(userResolvable: string): User | UnknownUser {
const id = resolveUserId(this.client, userResolvable);
return id ? this.client.users.get(id) || new UnknownUser({ id }) : new UnknownUser();
export function getUser(client: Client, userResolvable: string): User | UnknownUser {
const id = resolveUserId(client, userResolvable);
return id ? client.users.get(id) || new UnknownUser({ id }) : new UnknownUser();
}
/**
@ -1058,12 +1056,12 @@ export async function resolveRoleId(bot: Client, guildId: string, value: string)
const inviteCache = new SimpleCache<Promise<ChannelInvite>>(10 * MINUTES, 200);
export async function resolveInvite(code: string): Promise<ChannelInvite | null> {
export async function resolveInvite(client: Client, code: string): Promise<ChannelInvite | null> {
if (inviteCache.has(code)) {
return inviteCache.get(code);
}
const promise = this.client.getInvite(code).catch(() => null);
const promise = client.getInvite(code).catch(() => null);
inviteCache.set(code, promise);
return promise;