From d521a8a93157c10283fd9aa15ed2d6691cd0c565 Mon Sep 17 00:00:00 2001 From: plane000 Date: Thu, 25 Oct 2018 17:37:02 +0100 Subject: [PATCH] Migrated the term 'Server' to use the term 'Guild(s)' throughout the project --- src/database/basedatabase.js | 8 ++++---- src/database/database.js | 2 +- src/database/server.js | 13 ++++++++++--- src/index.js | 2 +- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/database/basedatabase.js b/src/database/basedatabase.js index e19589c..6e4c65e 100644 --- a/src/database/basedatabase.js +++ b/src/database/basedatabase.js @@ -3,11 +3,11 @@ import Sequelize from 'sequelize'; import {Logger} from '../logger'; let Connection; -let Server; +let Guild; export class BaseDatabase { static get Connection() { return Connection; } - static get Server() { return Server; } + static get Guild() { return Guild; } static async init() { Logger.info('Connecting to SQLite Database'); @@ -20,7 +20,7 @@ export class BaseDatabase { storage: './resources/database.sqlite', }); - Server = Connection.define('server', { + Guild = Connection.define('Guild', { id: { type: Sequelize.BIGINT, primaryKey: true, @@ -28,7 +28,7 @@ export class BaseDatabase { }, name: Sequelize.BIGINT }, { - tableName: 'server' + tableName: 'guild' }); try { diff --git a/src/database/database.js b/src/database/database.js index 132bc3a..24ea4ca 100644 --- a/src/database/database.js +++ b/src/database/database.js @@ -17,4 +17,4 @@ export class Database extends BaseDatabase { } } -Database.server = require('./server').ServerTools; +Database.Guilds = require('./server').GuildTools; diff --git a/src/database/server.js b/src/database/server.js index 572deb8..bf7f2a3 100644 --- a/src/database/server.js +++ b/src/database/server.js @@ -3,8 +3,15 @@ import Sequelize from 'sequelize'; import {BaseDatabase} from './baseDatabase'; import {Logger} from '../logger'; -export class ServerTools extends BaseDatabase { - static lolxd() { - console.log('lolcx') +export class GuildTools extends BaseDatabase { + static async newGuild(id, serverName) { + const Guild = super.Guild; + + try { + + } catch (e) { + Logger.error(`An error occured inserting guild id: ${id}`); + return -1; + } } } diff --git a/src/index.js b/src/index.js index 45cae21..87ddb07 100644 --- a/src/index.js +++ b/src/index.js @@ -15,7 +15,7 @@ async function init() { config.load(); await Database.init(); - Database.server.lolxd(); + new Database.Guilds.newGuild(); client = new Discord.Client(); }