From e74bca224f55dc78c0556a98146cd1e5aa334bda Mon Sep 17 00:00:00 2001 From: Skillz Date: Thu, 20 Feb 2020 15:20:43 -0500 Subject: [PATCH] latest --- structures/channel.ts | 1 + structures/guild.ts | 10 +++--- structures/member.ts | 13 +++++--- tsconfig.json | 71 ++++++------------------------------------- 4 files changed, 23 insertions(+), 72 deletions(-) diff --git a/structures/channel.ts b/structures/channel.ts index c66f60d35..2420ae6a3 100644 --- a/structures/channel.ts +++ b/structures/channel.ts @@ -15,6 +15,7 @@ import { Message_Create_Options } from '../types/message' import { Permission, Permissions } from '../types/permission' import { Guild } from '../types/guild' + export const create_channel = (data: Channel_Create_Options, guild: Guild, client: Client) => { const base_channel = { /** The unique id of the channel */ diff --git a/structures/guild.ts b/structures/guild.ts index 98a39454b..c7437cde4 100644 --- a/structures/guild.ts +++ b/structures/guild.ts @@ -1,6 +1,6 @@ -import Client from '../module/client' -import { endpoints } from '../constants/discord' -import { format_image_url } from '../utils/cdn' +import Client from '../module/client.ts' +import { endpoints } from '../constants/discord.ts' +import { format_image_url } from '../utils/cdn.ts' import { Create_Guild_Payload, ChannelTypes, @@ -14,7 +14,7 @@ import { Edit_Emojis_Options, Create_Role_Options } from '../types/guild' -import { create_role, Role } from './role' +import { create_role, Role } from './role.ts' import { create_member } from './member' import { create_channel } from './channel' import { Channel_Create_Options, Channel } from '../types/channel' @@ -285,7 +285,7 @@ export const create_guild = (data: Create_Guild_Payload, client: Client) => { } data.roles.forEach(r => guild.roles.set(r.id, create_role(r))) - data.members.forEach(m => guild.members.set(m.user.id, create_member(m, guild, client))) + data.members.forEach(m => guild.members.set(m.user.id, create_member(m, data.id, client))) data.channels.forEach(c => guild.channels.set(c.id, create_channel(c, guild, client))) return guild } diff --git a/structures/member.ts b/structures/member.ts index 657d5599c..c8c9dfc10 100644 --- a/structures/member.ts +++ b/structures/member.ts @@ -4,8 +4,11 @@ import { format_image_url } from '../utils/cdn' import { Member_Create_Payload, Edit_Member_Options } from '../types/member' import { Image_Size, Image_Formats } from '../types/cdn' import { Permission, Permissions } from '../types/permission' +import { cache } from '../utils/cache' + +export const create_member = (data: Member_Create_Payload, guild_id: string, client: Client) => { + const guild = cache.guilds.get(guild_id) -export const create_member = (data: Member_Create_Payload, guild: Guild, client: Client) => { return { /** The complete raw data from the member create payload */ raw: () => data, @@ -41,17 +44,17 @@ export const create_member = (data: Member_Create_Payload, guild: Guild, client: /** Add a role to the member */ add_role: (role_id: string, reason?: string) => { // TODO: check if the bot has MANAGE_ROLE and its highest role is above this one - return client.RequestManager.put(endpoints.GUILD_MEMBER_ROLE(guild.id, data.user.id, role_id), { reason }) + return client.RequestManager.put(endpoints.GUILD_MEMBER_ROLE(guild_id, data.user.id, role_id), { reason }) }, /** Remove a role from the member */ remove_role: (role_id: string, reason?: string) => { // TODO: check if the bot has MANAGE_ROLE permissions and its highest role is above this role - return client.RequestManager.delete(endpoints.GUILD_MEMBER_ROLE(guild.id, data.user.id, role_id), { reason }) + return client.RequestManager.delete(endpoints.GUILD_MEMBER_ROLE(guild_id, data.user.id, role_id), { reason }) }, /** Kick a member from the server */ kick: (reason?: string) => { // TODO: check if bot has KICK_MEMBER permissions - return client.RequestManager.delete(endpoints.GUILD_MEMBER(guild.id, data.user.id), { reason }) + return client.RequestManager.delete(endpoints.GUILD_MEMBER(guild_id, data.user.id), { reason }) }, /** Ban a member from the server */ ban: (delete_message_days = 0, reason?: string) => { @@ -89,7 +92,7 @@ export const create_member = (data: Member_Create_Payload, guild: Guild, client: // TODO: if channel id is provided check if the bot has CONNECT and MOVE in channel and current channel options.channel_id = undefined - return client.RequestManager.patch(endpoints.GUILD_MEMBER(guild.id, data.user.id), options) + return client.RequestManager.patch(endpoints.GUILD_MEMBER(guild_id, data.user.id), options) } } } diff --git a/tsconfig.json b/tsconfig.json index 54cdc8971..ee0129cf1 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,66 +1,13 @@ { "compilerOptions": { - /* Basic Options */ - // "incremental": true, /* Enable incremental compilation */ - "target": "ESNext", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */ - "module": "ESNext", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */ - "lib": ["ES7", "DOM"], /* Specify library files to be included in the compilation. */ - // "allowJs": true, /* Allow javascript files to be compiled. */ - // "checkJs": true, /* Report errors in .js files. */ - // "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */ - // "declaration": true, /* Generates corresponding '.d.ts' file. */ - // "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */ - // "sourceMap": true, /* Generates corresponding '.map' file. */ - // "outFile": "./", /* Concatenate and emit output to single file. */ - // "outDir": "./", /* Redirect output structure to the directory. */ - // "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */ - // "composite": true, /* Enable project compilation */ - // "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */ - // "removeComments": true, /* Do not emit comments to output. */ - // "noEmit": true, /* Do not emit outputs. */ - // "importHelpers": true, /* Import emit helpers from 'tslib'. */ - "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */ - // "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */ - - /* Strict Type-Checking Options */ - "strict": true, /* Enable all strict type-checking options. */ - // "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */ - // "strictNullChecks": true, /* Enable strict null checks. */ - // "strictFunctionTypes": true, /* Enable strict checking of function types. */ - // "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */ - // "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */ - // "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */ - // "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */ - - /* Additional Checks */ - "noUnusedLocals": true, /* Report errors on unused locals. */ - "noUnusedParameters": true, /* Report errors on unused parameters. */ - "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */ - "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */ - - /* Module Resolution Options */ - // "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */ - // Hack to stop VSCode from suggesting imports without ./ or ../ as a prefix. - "baseUrl": "../../", /* Base directory to resolve non-absolute module names. */ - // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */ - // "typeRoots": [], /* List of folders to include type definitions from. */ - // "types": [], /* Type declaration files to be included in compilation. */ - // "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */ - "esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */ - // "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */ - // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ - - /* Source Map Options */ - // "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */ - // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ - // "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */ - // "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */ - - /* Experimental Options */ - "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */ - "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */ - - /* Advanced Options */ - "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */ + "target": "ESNext" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */, + "module": "ESNext" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */, + "strict": true /* Enable all strict type-checking options. */, + "noUnusedLocals": true /* Report errors on unused locals. */, + "noUnusedParameters": true /* Report errors on unused parameters. */, + "noImplicitReturns": true /* Report error when not all code paths in function return a value. */, + "noFallthroughCasesInSwitch": true /* Report errors for fallthrough cases in switch statement. */, + "experimentalDecorators": true /* Enables experimental support for ES7 decorators. */, + "emitDecoratorMetadata": true /* Enables experimental support for emitting type metadata for decorators. */ } }