From 11cf1d4805e673b62ff5d2567ca7200728e6b9ee Mon Sep 17 00:00:00 2001
From: Kata <git@kat.cafe>
Date: Mon, 25 Feb 2019 00:44:59 -0600
Subject: [PATCH] styling: standard.js enforcement.

---
 .eslintrc.json        |  4 ++++
 .vscode/settings.json |  3 ---
 api/auth.js           |  1 -
 api/servers.js        |  2 +-
 api/servers_test.js   |  1 -
 api/ui.js             |  8 ++++----
 models/index.js       |  2 +-
 services/discord.js   | 11 +++++------
 services/sessions.js  |  4 ++--
 9 files changed, 17 insertions(+), 19 deletions(-)
 create mode 100644 .eslintrc.json
 delete mode 100644 .vscode/settings.json

diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 0000000..b4a10d9
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,4 @@
+{
+  "extends": [ "standard" ],
+  "parser": "babel-eslint"
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index ed94f44..0000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "git.ignoreLimitWarning": true
-}
\ No newline at end of file
diff --git a/api/auth.js b/api/auth.js
index a426ef5..a97b2f6 100644
--- a/api/auth.js
+++ b/api/auth.js
@@ -72,7 +72,6 @@ module.exports = (R, $) => {
     ctx.redirect(url)
   })
 
-
   R.get('/api/oauth/bot/callback', ctx => {
     console.log(ctx.request)
   })
diff --git a/api/servers.js b/api/servers.js
index 3861c0a..e22eb0b 100644
--- a/api/servers.js
+++ b/api/servers.js
@@ -39,7 +39,7 @@ module.exports = (R, $) => {
   })
 
   R.get('/api/server/:id/slug', async (ctx) => {
-    const { userId } = ctx.session
+    // const { userId } = ctx.session
     const { id } = ctx.params
 
     const srv = $.discord.client.guilds.get(id)
diff --git a/api/servers_test.js b/api/servers_test.js
index 605c021..92c116d 100644
--- a/api/servers_test.js
+++ b/api/servers_test.js
@@ -3,7 +3,6 @@ module.exports = (R, $) => {
     // ctx.body = 'ok'
     const srv = $.discord.getRelevantServers(ctx.params.user)
     ctx.body = $.discord.presentableServers(srv, ctx.params.user)
-    return
   })
 
   R.get('/api/~/roles/:id/:userId', (ctx, next) => {
diff --git a/api/ui.js b/api/ui.js
index 5f67bc8..8b91ba8 100644
--- a/api/ui.js
+++ b/api/ui.js
@@ -4,14 +4,14 @@ module.exports = (R, $) => {
   const processMappings = mapping => {
     for (let p in mapping) {
       R.get(p, ctx => {
-        $.ui.render(ctx.req, ctx.res, mapping[p], {...ctx.params, ...ctx.query})
+        return $.ui.render(ctx.req, ctx.res, mapping[p], { ...ctx.query, ...ctx.params })
       })
     }
   }
 
   processMappings({
-    "/s/add": "/_server_add",
-    "/s/:id": "/_server",
-    "/help/:page": "/_help"
+    '/s/add': '/_internal/_server_add',
+    '/s/:id': '/_internal/_server',
+    '/test': '/test'
   })
 }
diff --git a/models/index.js b/models/index.js
index cdd176e..8d17ca2 100644
--- a/models/index.js
+++ b/models/index.js
@@ -1,7 +1,7 @@
 const log = new (require('../logger'))('models/index')
 const glob = require('glob')
 const path = require('path')
-const util = require('../util/model-methods')
+// const util = require('../util/model-methods')
 
 module.exports = (sql) => {
   const models = {}
diff --git a/services/discord.js b/services/discord.js
index 214f3e6..1af5b4e 100644
--- a/services/discord.js
+++ b/services/discord.js
@@ -13,7 +13,7 @@ class DiscordService extends Service {
     this.botCallback = `${ctx.config.appUrl}/api/oauth/bot/callback`
     this.appUrl = process.env.APP_URL
     this.isBot = process.env.IS_BOT === 'true' || false
-    this.rootUsers = new Set((process.env.ROOT_USERS||'').split(','))
+    this.rootUsers = new Set((process.env.ROOT_USERS || '').split(','))
 
     this.client = new discord.Client()
     this.client.options.disableEveryone = true
@@ -27,11 +27,11 @@ class DiscordService extends Service {
     return this.gm(server, this.client.user.id)
   }
 
-  fakeGm({id = 0, nickname = '[none]', displayHexColor = '#ffffff'}) {
-    return { id, nickname, displayHexColor, __faked: true, roles: { has() {return false} } }
+  fakeGm ({ id = 0, nickname = '[none]', displayHexColor = '#ffffff' }) {
+    return { id, nickname, displayHexColor, __faked: true, roles: { has () { return false } } }
   }
 
-  isRoot(id) {
+  isRoot (id) {
     return this.rootUsers.has(id)
   }
 
@@ -191,7 +191,7 @@ class DiscordService extends Service {
       }
     ]
       // prefix regex with ^ for ease of code
-      .map(({regex, ...rest}) => ({ regex: new RegExp(`^${regex.source}`, regex.flags), ...rest }))
+      .map(({ regex, ...rest }) => ({ regex: new RegExp(`^${regex.source}`, regex.flags), ...rest }))
 
     return cmds
   }
@@ -235,7 +235,6 @@ class DiscordService extends Service {
   async handleJoin (guild) {
     await this.ctx.server.ensure(guild)
   }
-
 }
 
 module.exports = DiscordService
diff --git a/services/sessions.js b/services/sessions.js
index bc91039..86e8a7e 100644
--- a/services/sessions.js
+++ b/services/sessions.js
@@ -6,7 +6,7 @@ class SessionsService extends Service {
     this.Session = ctx.M.Session
   }
 
-  async get (id, {rolling}) {
+  async get (id, { rolling }) {
     const user = await this.Session.findOne({ where: { id } })
 
     if (user === null) {
@@ -16,7 +16,7 @@ class SessionsService extends Service {
     return user.data
   }
 
-  async set (id, data, {maxAge, rolling, changed}) {
+  async set (id, data, { maxAge, rolling, changed }) {
     let session = await this.Session.findOne({ where: { id } })
     if (session === null) {
       session = this.Session.build({ id })