From 1161392d3bb633030eb8965c693c8e1df9ed0002 Mon Sep 17 00:00:00 2001 From: HF Date: Thu, 9 Jan 2020 17:09:29 +0100 Subject: [PATCH] fix some eslint errors --- src/actions/index.js | 7 +++---- src/components/RedirectionPage.jsx | 2 +- src/core/passport.js | 10 +++++----- src/core/ranking.js | 5 +++-- src/ui/ChunkRGB.js | 6 ++++-- src/utils/ip.js | 2 +- src/utils/validation.js | 1 + 7 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/actions/index.js b/src/actions/index.js index 0082ad7..568ba65 100644 --- a/src/actions/index.js +++ b/src/actions/index.js @@ -439,7 +439,6 @@ export function fetchChunk(canvasId, center: Cell): PromiseAction { dispatch(receiveBigChunkFailure(center, error)); } } catch (error) { - console.log(`Error at requesting chunk ${cx}/${cy}`); dispatch(receiveBigChunkFailure(center, error)); } }; @@ -558,7 +557,7 @@ export function fetchStats(): PromiseAction { } export function fetchMe(): PromiseAction { - return async (dispatch, getState) => { + return async (dispatch) => { const response = await fetch('/api/me', { credentials: 'include', }); @@ -666,13 +665,13 @@ export function onViewFinishChange(): Action { } export function urlChange(): PromiseAction { - return (dispatch, getState) => { + return (dispatch) => { dispatch(reloadUrl()); }; } export function switchCanvas(canvasId: number): PromiseAction { - return async (dispatch, getState) => { + return async (dispatch) => { await dispatch(selectCanvas(canvasId)); dispatch(onViewFinishChange()); }; diff --git a/src/components/RedirectionPage.jsx b/src/components/RedirectionPage.jsx index e5592fa..0b5f794 100644 --- a/src/components/RedirectionPage.jsx +++ b/src/components/RedirectionPage.jsx @@ -19,7 +19,7 @@ export function getHtml(description, text, host) { const data = { title: 'PixelPlanet.fun Accounts', description, - body: , + body: , code: `window.setTimeout(function(){window.location.href="${host}";},4000)`, }; const index = `${ReactDOM.renderToStaticMarkup()}`; diff --git a/src/core/passport.js b/src/core/passport.js index 37cafaf..08b3ecd 100644 --- a/src/core/passport.js +++ b/src/core/passport.js @@ -105,7 +105,7 @@ async function oauth_login(email, name, discordid = null) { */ passport.use(new FacebookStrategy({ ...auth.facebook, - callbackURL: `/api/auth/facebook/return`, + callbackURL: '/api/auth/facebook/return', proxy: true, profileFields: ['displayName', 'email'], }, async (req, accessToken, refreshToken, profile, done) => { @@ -120,7 +120,7 @@ passport.use(new FacebookStrategy({ */ passport.use(new DiscordStrategy({ ...auth.discord, - callbackURL: `/api/auth/discord/return`, + callbackURL: '/api/auth/discord/return', proxy: true, }, async (accessToken, refreshToken, profile, done) => { // TODO get discord id @@ -135,7 +135,7 @@ passport.use(new DiscordStrategy({ */ passport.use(new GoogleStrategy({ ...auth.google, - callbackURL: `/api/auth/google/return`, + callbackURL: '/api/auth/google/return', proxy: true, }, async (accessToken, refreshToken, profile, done) => { const { displayName: name, emails } = profile; @@ -149,7 +149,7 @@ passport.use(new GoogleStrategy({ */ passport.use(new RedditStrategy({ ...auth.reddit, - callbackURL: `/api/auth/reddit/return`, + callbackURL: '/api/auth/reddit/return', proxy: true, }, async (accessToken, refreshToken, profile, done) => { console.log({ profile, refreshToken, accessToken }); @@ -181,7 +181,7 @@ passport.use(new RedditStrategy({ */ passport.use(new VkontakteStrategy({ ...auth.vk, - callbackURL: `/api/auth/vk/return`, + callbackURL: '/api/auth/vk/return', proxy: true, scope: ['email'], profileFields: ['displayName', 'email'], diff --git a/src/core/ranking.js b/src/core/ranking.js index 4da82b0..5de420e 100644 --- a/src/core/ranking.js +++ b/src/core/ranking.js @@ -1,5 +1,6 @@ /* * timers and cron for account related actions + * @flow */ import Sequelize from 'sequelize'; @@ -7,7 +8,7 @@ import Model from '../data/sequelize'; import RegUser from '../data/models/RegUser'; import logger from './logger'; -import { HOUR, MINUTE } from './constants'; +import { MINUTE } from './constants'; import { DailyCron } from '../utils/cron'; class Ranks { @@ -53,5 +54,5 @@ class Ranks { } -export const rankings = new Ranks(); +const rankings = new Ranks(); export default rankings; diff --git a/src/ui/ChunkRGB.js b/src/ui/ChunkRGB.js index ebf6205..d055635 100644 --- a/src/ui/ChunkRGB.js +++ b/src/ui/ChunkRGB.js @@ -90,8 +90,10 @@ class ChunkRGB { empty() { this.ready = true; - const ctx = this.image.getContext('2d'); - ctx.fillStyle = this.palette.colors[0]; + const { image, palette } = this; + const ctx = image.getContext('2d'); + // eslint-disable-next-line prefer-destructuring + ctx.fillStyle = palette.colors[0]; ctx.fillRect(0, 0, TILE_SIZE, TILE_SIZE); } diff --git a/src/utils/ip.js b/src/utils/ip.js index a3f46d7..ac472cb 100644 --- a/src/utils/ip.js +++ b/src/utils/ip.js @@ -19,7 +19,7 @@ function isTrustedProxy(ip: string): boolean { export function getHostFromRequest(req): ?string { const { headers } = req; - const host = headers['x-forwarded-host'] || headers['host']; + const host = headers['x-forwarded-host'] || headers.host; const proto = headers['x-forwarded-proto'] || 'http'; return `${proto}://${host}`; diff --git a/src/utils/validation.js b/src/utils/validation.js index 6ccd9f4..fd778f8 100644 --- a/src/utils/validation.js +++ b/src/utils/validation.js @@ -3,6 +3,7 @@ * @flow */ +// eslint-disable-next-line no-useless-escape, max-len const mailTester = /^[-!#$%&'*+\/0-9=?A-Z^_a-z{|}~](\.?[-!#$%&'*+\/0-9=?A-Z^_a-z`{|}~])*@[a-zA-Z0-9](-*\.?[a-zA-Z0-9])*\.[a-zA-Z](-?[a-zA-Z0-9])+$/; export function validateEMail(email) {