diff --git a/app.js b/app.js index c0962d3aa..225b5b480 100644 --- a/app.js +++ b/app.js @@ -6,11 +6,11 @@ const merge = require('lodash/merge'); const helmet = require('helmet'); const plugins = require('./services/plugins'); const compression = require('compression'); -const {HELMET_CONFIGURATION} = require('./config'); -const {MOUNT_PATH} = require('./url'); +const { HELMET_CONFIGURATION } = require('./config'); +const { MOUNT_PATH } = require('./url'); const routes = require('./routes'); const debug = require('debug')('talk:app'); -const {ENABLE_TRACING, APOLLO_ENGINE_KEY, PORT} = require('./config'); +const { ENABLE_TRACING, APOLLO_ENGINE_KEY, PORT } = require('./config'); const app = express(); @@ -26,7 +26,7 @@ app.use((req, res, next) => { //============================================================================== // Inject server route plugins. -plugins.get('server', 'app').forEach(({plugin, app: callback}) => { +plugins.get('server', 'app').forEach(({ plugin, app: callback }) => { debug(`added plugin '${plugin.name}'`); // Pass the app to the plugin to mount it's routes. @@ -43,11 +43,11 @@ if (process.env.NODE_ENV !== 'test') { } if (ENABLE_TRACING && APOLLO_ENGINE_KEY) { - const {Engine} = require('apollo-engine'); + const { Engine } = require('apollo-engine'); const engine = new Engine({ engineConfig: { - apiKey: APOLLO_ENGINE_KEY + apiKey: APOLLO_ENGINE_KEY, }, graphqlPort: PORT, endpoint: `${MOUNT_PATH}api/v1/graph/ql`, @@ -64,9 +64,13 @@ app.set('trust proxy', 1); // Enable a suite of security good practices through helmet. We disable // frameguard to allow crossdomain injection of the embed. -app.use(helmet(merge(HELMET_CONFIGURATION, { - frameguard: false, -}))); +app.use( + helmet( + merge(HELMET_CONFIGURATION, { + frameguard: false, + }) + ) +); // Compress the responses if appropriate. app.use(compression()); diff --git a/bin/cli b/bin/cli index 707f41032..6237d4740 100755 --- a/bin/cli +++ b/bin/cli @@ -6,7 +6,7 @@ require('./util'); const program = require('commander'); -const {head, map} = require('lodash'); +const { head, map } = require('lodash'); const Matcher = require('did-you-mean'); program @@ -19,7 +19,10 @@ program .command('users', 'work with the application auth') .command('migration', 'provides utilities for migrating the database') .command('verify', 'provides utilities for performing data verification') - .command('plugins', 'provides utilities for interacting with the plugin system') + .command( + 'plugins', + 'provides utilities for interacting with the plugin system' + ) .parse(process.argv); // If the command wasn't found, output help. @@ -29,9 +32,11 @@ if (!commands.includes(command)) { const m = new Matcher(commands); const similarCommands = m.list(command); - console.error(`cli '${command}' is not a talk cli command. See 'cli --help'.`); + console.error( + `cli '${command}' is not a talk cli command. See 'cli --help'.` + ); if (similarCommands.length > 0) { - const sc = similarCommands.map(({value}) => `\t${value}\n`).join(''); + const sc = similarCommands.map(({ value }) => `\t${value}\n`).join(''); console.error(`\nThe most similar commands are\n${sc}`); } process.exit(1); diff --git a/bin/cli-assets b/bin/cli-assets index 5c1780c5d..d14df320b 100755 --- a/bin/cli-assets +++ b/bin/cli-assets @@ -16,30 +16,24 @@ const scraper = require('../services/scraper'); const inquirer = require('inquirer'); // Register the shutdown criteria. -util.onshutdown([ - () => mongoose.disconnect() -]); +util.onshutdown([() => mongoose.disconnect()]); /** * Lists all the assets registered in the database. */ async function listAssets() { try { - let assets = await AssetModel.find({}).sort({'created_at': 1}); + let assets = await AssetModel.find({}).sort({ created_at: 1 }); let table = new Table({ - head: [ - 'ID', - 'Title', - 'URL' - ] + head: ['ID', 'Title', 'URL'], }); - assets.forEach((asset) => { + assets.forEach(asset => { table.push([ asset.id, asset.title ? asset.title : '', - asset.url ? asset.url : '' + asset.url ? asset.url : '', ]); }); @@ -61,13 +55,13 @@ async function refreshAssets(ageString) { $or: [ { scraped: { - $lte: age - } + $lte: age, + }, }, { - scraped: null - } - ] + scraped: null, + }, + ], }); // Queue all the assets for scraping. @@ -95,7 +89,6 @@ async function updateURL(assetID, assetURL) { async function merge(srcID, dstID) { try { - // Grab the assets... let [srcAsset, dstAsset] = await AssetsService.findByIDs([srcID, dstID]); if (!srcAsset || !dstAsset) { @@ -103,21 +96,22 @@ async function merge(srcID, dstID) { } // Count the affected resources... - let srcCommentCount = await CommentModel.find({asset_id: srcID}).count(); + let srcCommentCount = await CommentModel.find({ asset_id: srcID }).count(); - console.log(`Now going to update ${srcCommentCount} comments and delete the source Asset[${srcID}].`); + console.log( + `Now going to update ${srcCommentCount} comments and delete the source Asset[${srcID}].` + ); - let {confirm} = await inquirer.prompt([ + let { confirm } = await inquirer.prompt([ { type: 'confirm', name: 'confirm', message: 'Proceed with merge', - default: false - } + default: false, + }, ]); if (confirm) { - // Perform the merge! await AssetsService.merge(srcID, dstID); } else { @@ -152,7 +146,9 @@ program program .command('merge ') - .description('merges two assets together by moving comments from src to dst and deleting the src asset') + .description( + 'merges two assets together by moving comments from src to dst and deleting the src asset' + ) .action(merge); program.parse(process.argv); diff --git a/bin/cli-jobs b/bin/cli-jobs index 26eeab147..672a5a70d 100755 --- a/bin/cli-jobs +++ b/bin/cli-jobs @@ -11,20 +11,15 @@ const mailer = require('../services/mailer'); const mongoose = require('../services/mongoose'); const kue = require('../services/kue'); -util.onshutdown([ - () => mongoose.disconnect(), -]); +util.onshutdown([() => mongoose.disconnect()]); /** * Starts the job processor. */ function processJobs() { - // The scraper only needs to shutdown when the scraper has actually been // started. - util.onshutdown([ - () => kue.Task.shutdown() - ]); + util.onshutdown([() => kue.Task.shutdown()]); // Start the scraper processor. scraper.process(); @@ -39,13 +34,15 @@ function processJobs() { * @return {Promise} */ function removeJob(job) { - return new Promise((resolve, reject) => job.remove((err) => { - if (err) { - return reject(err); - } + return new Promise((resolve, reject) => + job.remove(err => { + if (err) { + return reject(err); + } - return resolve(job); - })); + return resolve(job); + }) + ); } /** @@ -82,17 +79,13 @@ async function getJobBatch(n, includeStuck) { * Cleans up the jobs that are in the queue. */ async function cleanupJobs(options) { - // The scraper only needs to shutdown when the scraper has actually been // started. - util.onshutdown([ - () => kue.Task.shutdown() - ]); + util.onshutdown([() => kue.Task.shutdown()]); const n = 100; try { - // Connect to redis by establishing a queue. kue.Task.connect(); @@ -100,9 +93,8 @@ async function cleanupJobs(options) { let jobs = await getJobBatch(n, options.stuck); while (jobs.length > 0) { - // Remove all the jobs. - await Promise.all(jobs.map((job) => removeJob(job))); + await Promise.all(jobs.map(job => removeJob(job))); jobCount += jobs.length; diff --git a/bin/cli-migration b/bin/cli-migration index 18a8c012a..ca93360ad 100755 --- a/bin/cli-migration +++ b/bin/cli-migration @@ -11,13 +11,10 @@ const mongoose = require('../services/mongoose'); const MigrationService = require('../services/migration'); // Register shutdown hooks. -util.onshutdown([ - () => mongoose.disconnect() -]); +util.onshutdown([() => mongoose.disconnect()]); async function createMigration(name) { try { - // Create the migration. await MigrationService.create(name); @@ -29,20 +26,20 @@ async function createMigration(name) { } async function runMigrations() { - try { - - let {backedUp} = await inquirer.prompt([ + let { backedUp } = await inquirer.prompt([ { type: 'confirm', name: 'backedUp', message: 'Did you perform a database backup', - default: false - } + default: false, + }, ]); if (!backedUp) { - throw new Error('Please backup your databases prior to migrations occuring'); + throw new Error( + 'Please backup your databases prior to migrations occuring' + ); } // Get the migrations to run. @@ -50,21 +47,20 @@ async function runMigrations() { console.log('Now going to run the following migrations:\n'); - for (let {filename} of migrations) { + for (let { filename } of migrations) { console.log(`\tmigrations/${filename}`); } - let {confirm} = await inquirer.prompt([ + let { confirm } = await inquirer.prompt([ { type: 'confirm', name: 'confirm', message: 'Proceed with migrations', - default: false - } + default: false, + }, ]); if (confirm) { - // Run the migrations. await MigrationService.run(migrations); } else { diff --git a/bin/cli-plugins b/bin/cli-plugins index bf4014e51..8609ca5ff 100755 --- a/bin/cli-plugins +++ b/bin/cli-plugins @@ -21,11 +21,11 @@ const path = require('path'); const spawn = require('cross-spawn'); const semver = require('semver'); const resolve = require('resolve'); -const {plugins, iteratePlugins, isInternal} = require('../plugins'); +const { plugins, iteratePlugins, isInternal } = require('../plugins'); function existsInNodeModules(name) { try { - resolve.sync(name, {basedir: dir}); + resolve.sync(name, { basedir: dir }); return true; } catch (e) { @@ -39,13 +39,13 @@ function versionMatch(name, version) { resolve.sync(name, { basedir: dir, - packageFilter: (pkg) => { + packageFilter: pkg => { if (pkg && pkg.version && semver.satisfies(pkg.version, version)) { matched = true; } return pkg; - } + }, }); return matched; @@ -56,7 +56,7 @@ function versionMatch(name, version) { const EXTERNAL = /^\w[a-z\-0-9.]+$/; // Match "react", "path", "fs", "lodash.random", etc. -function reconcilePackages({quiet = false, upgradeRemote = false}) { +function reconcilePackages({ quiet = false, upgradeRemote = false }) { const fetchable = []; const local = []; const upgradable = []; @@ -74,10 +74,11 @@ function reconcilePackages({quiet = false, upgradeRemote = false}) { let section = iteratePlugins(plugins[i]); for (let j in section) { - let {name, version} = section[j]; + let { name, version } = section[j]; let namespaced = name.charAt(0) === '@'; - let dep = name.split('/') + let dep = name + .split('/') .slice(0, namespaced ? 2 : 1) .join('/'); @@ -91,7 +92,7 @@ function reconcilePackages({quiet = false, upgradeRemote = false}) { console.log(` l ${name}`); } - local.push({name, version}); + local.push({ name, version }); continue; } @@ -99,9 +100,8 @@ function reconcilePackages({quiet = false, upgradeRemote = false}) { if (!quiet) { console.log(` m ${name}`); } - fetchable.push({name, version}); + fetchable.push({ name, version }); } else if (!versionMatch(dep, version)) { - // A plugin was found, yet the current version does not match the // current version installed. We should warn if upgradeRemote is // not enabled that it is currently not supported. @@ -115,14 +115,14 @@ function reconcilePackages({quiet = false, upgradeRemote = false}) { console.log(` oe ${name} (package upgrade may be required)`); - upgradable.push({name, version}); + upgradable.push({ name, version }); } else { if (!quiet) { console.log(` e ${name}`); } if (upgradeRemote) { - upgradable.push({name, version}); + upgradable.push({ name, version }); } } } @@ -132,33 +132,44 @@ function reconcilePackages({quiet = false, upgradeRemote = false}) { console.log(); } - return {local, fetchable, upgradable}; + return { local, fetchable, upgradable }; } -async function reconcileRemotePlugins({skipLocal, dryRun, upgradeRemote}) { - console.log(`\n[${skipLocal ? '1/2' : '2/3'}] ${emoji.get('mag')} Reconciling plugins...`.yellow); - const {fetchable, upgradable} = reconcilePackages({upgradeRemote}); +async function reconcileRemotePlugins({ skipLocal, dryRun, upgradeRemote }) { + console.log( + `\n[${skipLocal ? '1/2' : '2/3'}] ${emoji.get( + 'mag' + )} Reconciling plugins...`.yellow + ); + const { fetchable, upgradable } = reconcilePackages({ upgradeRemote }); - console.log(`[${skipLocal ? '2/2' : '3/3'}] ${emoji.get('truck')} Fetching plugins...\n`.yellow); + console.log( + `[${skipLocal ? '2/2' : '3/3'}] ${emoji.get('truck')} Fetching plugins...\n` + .yellow + ); if (fetchable.length > 0) { - - console.log(`$ yarn add --ignore-scripts ${fetchable.map(({name, version}) => `${name}@${version}`.cyan)}`); + console.log( + `$ yarn add --ignore-scripts ${fetchable.map( + ({ name, version }) => `${name}@${version}`.cyan + )}` + ); if (!dryRun) { - let args = [ 'add', '--ignore-scripts', - ...fetchable.map(({name, version}) => `${name}@${version}`) + ...fetchable.map(({ name, version }) => `${name}@${version}`), ]; let output = spawn.sync('yarn', args, { - stdio: ['ignore', 'pipe', 'inherit'] + stdio: ['ignore', 'pipe', 'inherit'], }); if (output.status) { - throw new Error('Could not install external plugins, errors occured during install'); + throw new Error( + 'Could not install external plugins, errors occured during install' + ); } console.log(output.stdout.toString()); @@ -166,36 +177,45 @@ async function reconcileRemotePlugins({skipLocal, dryRun, upgradeRemote}) { } if (upgradable.length > 0) { - console.log(`$ yarn upgrade ${upgradable.map(({name, version}) => `${name}@${version}`.cyan)}`); + console.log( + `$ yarn upgrade ${upgradable.map( + ({ name, version }) => `${name}@${version}`.cyan + )}` + ); if (!dryRun) { - let args = [ 'upgrade', - ...upgradable.map(({name, version}) => `${name}@${version}`) + ...upgradable.map(({ name, version }) => `${name}@${version}`), ]; let output = spawn.sync('yarn', args, { - stdio: ['ignore', 'pipe', 'inherit'] + stdio: ['ignore', 'pipe', 'inherit'], }); if (output.status) { - throw new Error('Could not install external plugins, errors occured during install'); + throw new Error( + 'Could not install external plugins, errors occured during install' + ); } console.log(output.stdout.toString()); } } - return {upgradable, fetchable}; + return { upgradable, fetchable }; } -async function reconcileLocalPlugins({skipRemote, dryRun}) { - console.log(`\n[${skipRemote ? '1/1' : '1/3'}] ${emoji.get('pick')} Installing local plugin dependencies...\n`.yellow); - const {local} = reconcilePackages({quiet: true}); +async function reconcileLocalPlugins({ skipRemote, dryRun }) { + console.log( + `\n[${skipRemote ? '1/1' : '1/3'}] ${emoji.get( + 'pick' + )} Installing local plugin dependencies...\n`.yellow + ); + const { local } = reconcilePackages({ quiet: true }); for (let i in local) { - let {name} = local[i]; + let { name } = local[i]; if (!fs.existsSync(path.join(dir, 'plugins', name, 'package.json'))) { continue; @@ -210,11 +230,13 @@ async function reconcileLocalPlugins({skipRemote, dryRun}) { let output = spawn.sync('yarn', args, { stdio: ['ignore', 'pipe', 'inherit'], - cwd: wd + cwd: wd, }); if (output.status) { - throw new Error('Could not install local plugin dependencies, errors occured during install'); + throw new Error( + 'Could not install local plugin dependencies, errors occured during install' + ); } console.log(output.stdout.toString()); @@ -225,7 +247,12 @@ async function reconcileLocalPlugins({skipRemote, dryRun}) { // This traverses the local plugins and installs any dependencies listed there, // this only is really needed for plugins that are installed via docker because // core plugins will have their dependencies already included in core. -async function reconcilePluginDeps({skipLocal, skipRemote, dryRun, upgradeRemote}) { +async function reconcilePluginDeps({ + skipLocal, + skipRemote, + dryRun, + upgradeRemote, +}) { let startTime = new Date(); // We don't need to do anything if we skip everything.... @@ -235,14 +262,19 @@ async function reconcilePluginDeps({skipLocal, skipRemote, dryRun, upgradeRemote // Traverse local plugins and install dependencies if enabled. if (!skipLocal) { - await reconcileLocalPlugins({skipRemote, dryRun}); + await reconcileLocalPlugins({ skipRemote, dryRun }); } // Locate any external plugins and install them. if (!skipRemote) { let results = []; try { - results = await reconcileRemotePlugins({skipLocal, skipRemote, dryRun, upgradeRemote}); + results = await reconcileRemotePlugins({ + skipLocal, + skipRemote, + dryRun, + upgradeRemote, + }); } catch (e) { throw e; } @@ -262,7 +294,9 @@ async function reconcilePluginDeps({skipLocal, skipRemote, dryRun, upgradeRemote } else if (results.fetchable.length === 0) { message = `Upgraded ${results.upgradable.length} new plugins.`; } else { - message = `Fetched ${results.fetchable.length} new plugins, upgraded ${results.upgradable.length} plugins.`; + message = `Fetched ${results.fetchable.length} new plugins, upgraded ${ + results.upgradable.length + } plugins.`; } console.log(`\n${status} ${message}`); @@ -279,8 +313,7 @@ async function createSeedPlugin() { function pluginNameExists(pluginName) { const pluginNames = fs.readdirSync(pluginsDir); - return !!pluginNames - .filter((pn) => pn === pluginName).length; + return !!pluginNames.filter(pn => pn === pluginName).length; } let answers = await inquirer.prompt([ @@ -288,8 +321,7 @@ async function createSeedPlugin() { type: 'input', name: 'pluginName', message: 'Plugin Name:', - validate: (input) => { - + validate: input => { if (pluginNameExists(input)) { return 'Please, choose another name. That name already exists'; } @@ -299,23 +331,23 @@ async function createSeedPlugin() { } return 'Plugin Name is required.'; - } + }, }, { type: 'confirm', name: 'server', - message: 'Is this plugin extending the server capabilities?' + message: 'Is this plugin extending the server capabilities?', }, { type: 'confirm', name: 'client', - message: 'Is this plugin extending the client capabilities?' + message: 'Is this plugin extending the client capabilities?', }, { type: 'confirm', name: 'addPluginsJson', - message: 'Should we add it to the plugins.json?' - } + message: 'Should we add it to the plugins.json?', + }, ]); //============================================================================== @@ -326,41 +358,41 @@ async function createSeedPlugin() { const newPluginPath = path.join(pluginsDir, answers.pluginName); if (fs.existsSync(seedPlugin)) { - if (answers.server && answers.client) { - // This is a server-side and client-side plugin!, let's copy the template fs.copySync(seedPlugin, newPluginPath); - } else { + } else { + fs.copySync(seedPlugin, newPluginPath, { + filter: p => { + // Allowing plugin folder and files with no subfolders + const rootRx = /plugin$|plugin\/[^/]*(\.).{2,3}/gim; + if ( + rootRx.test(p) && + (fs.lstatSync(p).isDirectory() || fs.lstatSync(p).isFile()) + ) { + return true; + } - fs.copySync(seedPlugin, newPluginPath, {filter: (p) => { + // If it's a client-side plugin, copying client folder + if (answers.client) { + return /client/.test(p); + } - // Allowing plugin folder and files with no subfolders - const rootRx = /plugin$|plugin\/[^/]*(\.).{2,3}/igm; - if (rootRx.test(p) && (fs.lstatSync(p).isDirectory() || fs.lstatSync(p).isFile())) { - return true; - } - - // If it's a client-side plugin, copying client folder - if (answers.client) { - return /client/.test(p); - } - - // If it's a server-side plugin, copying server folder - if (answers.server) { - return /server/.test(p); - } - - }}); + // If it's a server-side plugin, copying server folder + if (answers.server) { + return /server/.test(p); + } + }, + }); } // Let's add this to the plugins.json if (answers.addPluginsJson) { const pluginsJson = path.resolve(__dirname, '..', 'plugins.json'); - fs.readJson(pluginsJson) - .then((j) => { - + fs + .readJson(pluginsJson) + .then(j => { // This is a client-side plugin, let's push this. if (answers.client) { j.client.push(answers.pluginName); @@ -377,14 +409,17 @@ async function createSeedPlugin() { fs.writeFileSync(pluginsJson, output); } }) - .catch((err) => { + .catch(err => { console.error(err); }); } - console.log(`✨ Yay! Plugin created! Find your plugin: ${answers.pluginName} in the ./plugins folder`); + console.log( + `✨ Yay! Plugin created! Find your plugin: ${ + answers.pluginName + } in the ./plugins folder` + ); } - } //============================================================================== @@ -403,9 +438,14 @@ program program .command('reconcile') - .description('reconciles local plugin dependencies and downloads external plugins') + .description( + 'reconciles local plugin dependencies and downloads external plugins' + ) .option('-u, --upgrade-remote', 'upgrades remote dependencies') - .option('-d, --dry-run', 'does not actually change anything on the filesystem acts only as a simulation') + .option( + '-d, --dry-run', + 'does not actually change anything on the filesystem acts only as a simulation' + ) .option('--skip-local', 'skips the local dependancy reconciliation') .option('--skip-remote', 'skips the remote plugin reconciliation') .action(reconcilePluginDeps); diff --git a/bin/cli-serve b/bin/cli-serve index 3e356d829..b8dbd4594 100755 --- a/bin/cli-serve +++ b/bin/cli-serve @@ -10,12 +10,14 @@ const serve = require('../serve'); program .option('-j, --jobs', 'enable job processing on this thread') - .option('-w, --websockets', 'enable the websocket (subscriptions) handler on this thread') + .option( + '-w, --websockets', + 'enable the websocket (subscriptions) handler on this thread' + ) .parse(process.argv); // Start serving. -serve({jobs: program.jobs, websockets: program.websockets}).catch((err) => { +serve({ jobs: program.jobs, websockets: program.websockets }).catch(err => { console.error(err); util.shutdown(1); }); - diff --git a/bin/cli-settings b/bin/cli-settings index 6ffacbeaf..7f449e0d5 100755 --- a/bin/cli-settings +++ b/bin/cli-settings @@ -16,12 +16,12 @@ async function changeOrgName() { try { let settings = await SettingsService.retrieve(); - let {organizationName} = await inquirer.prompt([ + let { organizationName } = await inquirer.prompt([ { name: 'organizationName', message: 'Organization Name', - default: settings.organizationName - } + default: settings.organizationName, + }, ]); if (settings.organizationName !== organizationName) { diff --git a/bin/cli-setup b/bin/cli-setup index 0f14add55..b0f5e2efa 100755 --- a/bin/cli-setup +++ b/bin/cli-setup @@ -16,9 +16,7 @@ const UsersService = require('../services/users'); const errors = require('../errors'); // Register the shutdown criteria. -util.onshutdown([ - () => mongoose.disconnect() -]); +util.onshutdown([() => mongoose.disconnect()]); //============================================================================== // Setting up the program command line arguments. @@ -34,19 +32,15 @@ program //============================================================================== const performSetup = async () => { - // Get the current settings, we are expecing an error here. try { - // Try to get the settings. await SettingsService.retrieve(); // We should NOT have gotten a settings object, this means that the // application is already setup. Error out here. throw errors.ErrSettingsInit; - } catch (e) { - // If the error is `not init`, then we're good, otherwise, it's something // else. if (e !== errors.ErrSettingsNotInit) { @@ -66,7 +60,9 @@ const performSetup = async () => { // Create the base settings model. let settings = new SettingModel(); - console.log('\nWe\'ll ask you some questions in order to setup your installation of Talk.\n'); + console.log( + "\nWe'll ask you some questions in order to setup your installation of Talk.\n" + ); let answers = await inquirer.prompt([ { @@ -74,31 +70,31 @@ const performSetup = async () => { name: 'organizationName', message: 'Organization Name', default: settings.organizationName, - validate: (input) => { + validate: input => { if (input && input.length > 0) { return true; } return 'Organization Name is required.'; - } + }, }, { type: 'list', choices: MODERATION_OPTIONS, name: 'moderation', default: settings.moderation, - message: 'Select a moderation mode' + message: 'Select a moderation mode', }, { type: 'confirm', name: 'requireEmailConfirmation', default: settings.requireEmailConfirmation, - message: 'Should emails always be confirmed' + message: 'Should emails always be confirmed', }, ]); // Update the settings that were changed. - Object.keys(answers).forEach((key) => { + Object.keys(answers).forEach(key => { if (answers[key] !== undefined) { settings[key] = answers[key]; } @@ -109,97 +105,93 @@ const performSetup = async () => { type: 'confirm', name: 'inputWhitelistedDomains', default: true, - message: 'Would you like to specify a whitelisted domain' + message: 'Would you like to specify a whitelisted domain', }, { type: 'input', name: 'whitelistedDomain', message: 'Whitelisted Domain', - when: ({inputWhitelistedDomains}) => inputWhitelistedDomains, - validate: (input) => { + when: ({ inputWhitelistedDomains }) => inputWhitelistedDomains, + validate: input => { if (input && input.length > 0) { return true; } return 'Whitelisted Domain cannot be empty.'; - } - } + }, + }, ]); if (answers.inputWhitelistedDomains) { settings.domains.whitelist = [answers.whitelistedDomain]; } - console.log('\nWe\'ll ask you some questions about your first admin user.\n'); + console.log("\nWe'll ask you some questions about your first admin user.\n"); let user = await inquirer.prompt([ { type: 'input', name: 'username', message: 'Username', - filter: (username) => { - return UsersService - .isValidUsername(username, false) - .catch((err) => { - throw err.message; - }); - } + filter: username => { + return UsersService.isValidUsername(username, false).catch(err => { + throw err.message; + }); + }, }, { name: 'email', message: 'Email', format: 'email', - validate: (value) => { + validate: value => { if (value && value.length >= 3) { return true; } return 'Email is required'; - } + }, }, { name: 'password', message: 'Password', type: 'password', - filter: (password) => { - return UsersService - .isValidPassword(password) - .catch((err) => { - throw err.message; - }); - } + filter: password => { + return UsersService.isValidPassword(password).catch(err => { + throw err.message; + }); + }, }, { name: 'confirmPassword', message: 'Confirm Password', type: 'password', - filter: (confirmPassword, {password}) => { + filter: (confirmPassword, { password }) => { if (password !== confirmPassword) { return Promise.reject(new Error('Passwords do not match')); } - return UsersService - .isValidPassword(confirmPassword) - .catch((err) => { - throw err.message; - }); - } + return UsersService.isValidPassword(confirmPassword).catch(err => { + throw err.message; + }); + }, }, ]); - let {user: newUser} = await SetupService.setup({ + let { user: newUser } = await SetupService.setup({ settings: settings.toObject(), user: { email: user.email, username: user.username, - password: user.password - } + password: user.password, + }, }); console.log('Settings created.'); console.log(`User ${newUser.id} created.`); console.log('\nTalk is now installed!'); - console.log('\nWe recommend adding TALK_INSTALL_LOCK=TRUE to your environment to turn off the dynamic setup.'); + console.log( + '\nWe recommend adding TALK_INSTALL_LOCK=TRUE to your environment to turn off the dynamic setup.' + ); }; // Start tthe setup process. @@ -207,7 +199,7 @@ performSetup() .then(() => { util.shutdown(); }) - .catch((e) => { + .catch(e => { console.error(e); util.shutdown(1); }); diff --git a/bin/cli-token b/bin/cli-token index dc1b09e6f..b131728e6 100755 --- a/bin/cli-token +++ b/bin/cli-token @@ -11,28 +11,18 @@ const TokensService = require('../services/tokens'); const Table = require('cli-table'); // Register the shutdown criteria. -util.onshutdown([ - () => mongoose.disconnect() -]); +util.onshutdown([() => mongoose.disconnect()]); async function listTokens(userID) { try { let tokens = await TokensService.list(userID); let table = new Table({ - head: [ - 'ID', - 'Name', - 'Status' - ] + head: ['ID', 'Name', 'Status'], }); - tokens.forEach((token) => { - table.push([ - token.id, - token.name, - token.active ? 'Active' : 'Revoked' - ]); + tokens.forEach(token => { + table.push([token.id, token.name, token.active ? 'Active' : 'Revoked']); }); console.log(table.toString()); @@ -46,7 +36,6 @@ async function listTokens(userID) { async function revokeToken(tokenID) { try { - await TokensService.revoke(null, tokenID); console.log(`Revoked Token[${tokenID}]`); @@ -60,8 +49,7 @@ async function revokeToken(tokenID) { async function createToken(userID, tokenName) { try { - - let {pat: {id}, jwt} = await TokensService.create(userID, tokenName); + let { pat: { id }, jwt } = await TokensService.create(userID, tokenName); console.log(`Created Token[${id}] for User[${userID}] = ${jwt}`); diff --git a/bin/cli-users b/bin/cli-users index fc50319b5..64d51e3b4 100755 --- a/bin/cli-users +++ b/bin/cli-users @@ -7,15 +7,18 @@ const util = require('./util'); const program = require('commander'); const inquirer = require('inquirer'); -const {graphql} = require('graphql'); -const {stripIndent} = require('common-tags'); +const { graphql } = require('graphql'); +const { stripIndent } = require('common-tags'); const Table = require('cli-table'); // Make things colorful! require('colors'); // Register the autocomplete plugin. -inquirer.registerPrompt('autocomplete', require('inquirer-autocomplete-prompt')); +inquirer.registerPrompt( + 'autocomplete', + require('inquirer-autocomplete-prompt') +); const schema = require('../graph/schema'); const Context = require('../graph/context'); @@ -28,19 +31,15 @@ const mongoose = require('../services/mongoose'); const databaseVerifications = require('./verifications/database'); // Register the shutdown criteria. -util.onshutdown([ - () => mongoose.disconnect() -]); +util.onshutdown([() => mongoose.disconnect()]); /** * Deletes a user and cleans up their associated verifications. */ async function deleteUser(userID) { - try { - // Find the user we're removing. - const user = await UserModel.findOne({id: userID}); + const user = await UserModel.findOne({ id: userID }); if (!user) { throw new Error(`user with id ${userID} not found`); } @@ -54,7 +53,7 @@ async function deleteUser(userID) { This might take a long time if there is a lot of data, please confirm that you want to continue. `); - const {confirm} = await inquirer.prompt({ + const { confirm } = await inquirer.prompt({ type: 'confirm', name: 'confirm', message: 'Continue', @@ -64,27 +63,25 @@ async function deleteUser(userID) { return util.shutdown(); } - console.warn('Removing user\'s actions'); + console.warn("Removing user's actions"); // Remove all the user's actions. - await ActionModel - .where({user_id: user.id}) - .setOptions({multi: true}) + await ActionModel.where({ user_id: user.id }) + .setOptions({ multi: true }) .remove(); - console.warn('Removing user\'s comments'); + console.warn("Removing user's comments"); // Remove all the user's comments. - await CommentModel - .where({author_id: user.id}) - .setOptions({multi: true}) + await CommentModel.where({ author_id: user.id }) + .setOptions({ multi: true }) .remove(); console.warn('Updating the database indexes'); // Update the counts that might have changed. for (const verification of databaseVerifications) { - await verification({fix: true, limit: Infinity, batch: 1000}); + await verification({ fix: true, limit: Infinity, batch: 1000 }); } console.warn('Removing the user'); @@ -103,15 +100,19 @@ function printUserAsTable(user) { let table = new Table({}); table.push( - {'ID': user.id.gray}, - {'Username': user.username}, - {'Emails': user.emails}, - {'Tags': user.tags ? user.tags.map(({tag: {name}}) => name) : ''}, - {'Role': user.role}, - {'Verified': user.hasVerifiedEmail}, - {'Username': user.status.username.status}, - {'Banned': user.banned}, - {'Suspension': user.suspended ? `Until ${user.status.suspension.until}` : false}, + { ID: user.id.gray }, + { Username: user.username }, + { Emails: user.emails }, + { Tags: user.tags ? user.tags.map(({ tag: { name } }) => name) : '' }, + { Role: user.role }, + { Verified: user.hasVerifiedEmail }, + { Username: user.status.username.status }, + { Banned: user.banned }, + { + Suspension: user.suspended + ? `Until ${user.status.suspension.until}` + : false, + } ); console.log(table.toString()); @@ -148,7 +149,7 @@ async function searchUsers() { value = ''; } - const {data, errors} = await graphql(schema, searchQuery, {}, ctx, { + const { data, errors } = await graphql(schema, searchQuery, {}, ctx, { value, }); if (errors && errors.length > 0) { @@ -159,18 +160,20 @@ async function searchUsers() { return []; } - return data.users.nodes.map((user) => { + return data.users.nodes.map(user => { const emails = user.emails.join(', '); return { - name: `${user.username} (${emails}) ${user.id.gray} - ${user.role.gray}`, + name: `${user.username} (${emails}) ${user.id.gray} - ${ + user.role.gray + }`, value: user.id, }; }); - } + }, }); - const {userID} = answers; - const user = await UserModel.findOne({id: userID}); + const { userID } = answers; + const user = await UserModel.findOne({ id: userID }); printUserAsTable(user); util.shutdown(0); @@ -187,13 +190,13 @@ async function searchUsers() { */ async function setUserRole(userID) { try { - const {role} = await inquirer.prompt([ + const { role } = await inquirer.prompt([ { name: 'role', message: 'User Role', type: 'list', - choices: USER_ROLES - } + choices: USER_ROLES, + }, ]); await UsersService.setRole(userID, role); @@ -204,7 +207,6 @@ async function setUserRole(userID) { console.error(err); util.shutdown(1); } - } /** @@ -217,9 +219,8 @@ async function setUserRole(userID) { */ async function verifyUserEmail(userID, email) { try { - // Get the user. - const user = await UserModel.findOne({id: userID}); + const user = await UserModel.findOne({ id: userID }); if (!user) { throw new Error(`user with ID ${userID} cannot be found`); } @@ -231,23 +232,20 @@ async function verifyUserEmail(userID, email) { } if (!email && emails.length === 1) { - // The email wasn't passed, and there is only one option. email = emails[0]; - } else if (!emails.includes(email)){ - + } else if (!emails.includes(email)) { // The email passed doesn't belong to this user. throw new Error(`user does not have the email ${email}`); } else if (emails.length > 1) { - // The email wasn't passed, and there is more than one choice. const answers = await inquirer.prompt([ { name: 'email', message: 'Select Email to Verify', type: 'list', - choices: emails - } + choices: emails, + }, ]); email = answers.email; @@ -284,7 +282,7 @@ program program .command('verify ') - .description('verifies the given user\'s email address') + .description("verifies the given user's email address") .action(verifyUserEmail); program.parse(process.argv); diff --git a/bin/cli-verify b/bin/cli-verify index 5a55f2bd2..e32c7d169 100755 --- a/bin/cli-verify +++ b/bin/cli-verify @@ -10,17 +10,18 @@ const mongoose = require('../services/mongoose'); const databaseVerifications = require('./verifications/database'); // Register the shutdown criteria. -util.onshutdown([ - () => mongoose.disconnect() -]); +util.onshutdown([() => mongoose.disconnect()]); -async function database({fix = false, limit = Infinity, batch = 1000}) { +async function database({ fix = false, limit = Infinity, batch = 1000 }) { try { for (const verification of databaseVerifications) { - await verification({fix, limit, batch}); + await verification({ fix, limit, batch }); } } catch (err) { - console.error(`Failed to process all the ${databaseVerifications.length} verifications`, err); + console.error( + `Failed to process all the ${databaseVerifications.length} verifications`, + err + ); util.shutdown(1); return; } @@ -36,8 +37,16 @@ program .command('db') .description('verifies the database integrity') .option('-f, --fix', 'fix the problems found with database inconsistencies') - .option('-l, --limit [size]', 'limit the amount of documents to process in a single pass, this will ensure only a maximum number of batch operations are issued [default: inf]', parseInt) - .option('-b, --batch [size]', 'batch size to process verifications and repairs of documents [default: 1000]', parseInt) + .option( + '-l, --limit [size]', + 'limit the amount of documents to process in a single pass, this will ensure only a maximum number of batch operations are issued [default: inf]', + parseInt + ) + .option( + '-b, --batch [size]', + 'batch size to process verifications and repairs of documents [default: 1000]', + parseInt + ) .action(database); program.parse(process.argv); diff --git a/bin/templates/plugin/client/components/MyPluginComponent.js b/bin/templates/plugin/client/components/MyPluginComponent.js index 89e274e1a..98488b133 100644 --- a/bin/templates/plugin/client/components/MyPluginComponent.js +++ b/bin/templates/plugin/client/components/MyPluginComponent.js @@ -1,12 +1,12 @@ import React from 'react'; -import {CoralLogo} from 'plugin-api/beta/client/components/ui'; +import { CoralLogo } from 'plugin-api/beta/client/components/ui'; import styles from './MyPluginComponent.css'; class MyPluginComponent extends React.Component { render() { return (
- +

Plugin created by Talk CLI

diff --git a/bin/templates/plugin/client/index.js b/bin/templates/plugin/client/index.js index acd0910be..72a7fe6a7 100644 --- a/bin/templates/plugin/client/index.js +++ b/bin/templates/plugin/client/index.js @@ -1,4 +1,3 @@ - /** This is a client index example file and it could look like this: @@ -21,6 +20,6 @@ import MyPluginComponent from './components/MyPluginComponent'; export default { slots: { - stream: [MyPluginComponent] - } + stream: [MyPluginComponent], + }, }; diff --git a/bin/util.js b/bin/util.js index 546607c20..0a9adb966 100644 --- a/bin/util.js +++ b/bin/util.js @@ -1,10 +1,9 @@ - // Setup the environment. require('../services/env'); const debug = require('debug')('talk:util'); -const util = module.exports = {}; +const util = (module.exports = {}); /** * Stores an array of functions that should be executed in the event that the @@ -18,20 +17,22 @@ util.toshutdown = []; * @param {Number} [defaultCode=0] default return code upon sucesfull shutdown. */ util.shutdown = (defaultCode = 0, signal = null) => { - if (signal) { debug(`Reached ${signal} signal`); } debug(`${util.toshutdown.length} jobs now being called`); - Promise - .all(util.toshutdown.map((func) => func ? func(signal) : null).filter((func) => func)) + Promise.all( + util.toshutdown + .map(func => (func ? func(signal) : null)) + .filter(func => func) + ) .then(() => { debug('Shutdown complete, now exiting'); process.exit(defaultCode); }) - .catch((err) => { + .catch(err => { console.error(err); process.exit(1); @@ -44,8 +45,7 @@ util.shutdown = (defaultCode = 0, signal = null) => { * @param {Array} jobs Array of promise capable shutdown functions that are * executed. */ -util.onshutdown = (jobs) => { - +util.onshutdown = jobs => { debug(`${jobs.length} jobs registered to be called during shutdown`); // Add the new jobs to shutdown to the object reference. @@ -55,13 +55,13 @@ util.onshutdown = (jobs) => { // Attach to the SIGTERM + SIGINT handles to ensure a clean shutdown in the // event that we have an external event. SIGUSR2 is called when the app is asked // to be 'killed', same procedure here. -process.on('SIGTERM', () => util.shutdown(0, 'SIGTERM')); -process.on('SIGINT', () => util.shutdown(0, 'SIGINT')); +process.on('SIGTERM', () => util.shutdown(0, 'SIGTERM')); +process.on('SIGINT', () => util.shutdown(0, 'SIGINT')); process.once('SIGUSR2', () => util.shutdown(0, 'SIGUSR2')); // Makes the script crash on unhandled rejections instead of silently // ignoring them. In the future, promise rejections that are not handled will // terminate the Node.js process with a non-zero exit code. -process.on('unhandledRejection', (err) => { +process.on('unhandledRejection', err => { throw err; }); diff --git a/bin/verifications/database/action_counts.js b/bin/verifications/database/action_counts.js index 2aa47a9a7..684c17bca 100644 --- a/bin/verifications/database/action_counts.js +++ b/bin/verifications/database/action_counts.js @@ -1,28 +1,24 @@ const UserModel = require('../../../models/user'); const CommentModel = require('../../../models/comment'); const ActionsService = require('../../../services/actions'); -const {arrayJoinBy} = require('../../../graph/loaders/util'); -const {get} = require('lodash'); +const { arrayJoinBy } = require('../../../graph/loaders/util'); +const { get } = require('lodash'); const debug = require('debug')('talk:cli:verify'); -const MODELS = [ - UserModel, - CommentModel, -]; +const MODELS = [UserModel, CommentModel]; async function processBatch(Model, documents) { - // Get an array of all the document id's. - const documentIDs = documents.map(({id}) => id); + const documentIDs = documents.map(({ id }) => id); // Store all the operations on this batch in this array that we'll return // later. const operations = []; // Get the action summaries for this batch. - const totalActionSummaries = await ActionsService - .getActionSummaries(documentIDs) - .then(arrayJoinBy(documentIDs, 'item_id')); + const totalActionSummaries = await ActionsService.getActionSummaries( + documentIDs + ).then(arrayJoinBy(documentIDs, 'item_id')); // Iterate over the documents. for (let i = 0; i < documents.length; i++) { @@ -49,8 +45,10 @@ async function processBatch(Model, documents) { const ACTION_COUNT_FIELD = `${ACTION_TYPE}_${GROUP_ID}`; // Check that the action summaries match the cached counts. - if (get(document, ['action_counts', ACTION_COUNT_FIELD]) !== actionSummary.count) { - + if ( + get(document, ['action_counts', ACTION_COUNT_FIELD]) !== + actionSummary.count + ) { // Batch updates for those changes. ops.push({ [`action_counts.${ACTION_COUNT_FIELD}`]: actionSummary.count, @@ -60,27 +58,28 @@ async function processBatch(Model, documents) { // Group all the action summaries together from all the different group // ids. - const groupedActionSummaries = actionSummaries.reduce((acc, actionSummary) => { + const groupedActionSummaries = actionSummaries.reduce( + (acc, actionSummary) => { + // action_type is already snake cased (as it would have had to be when it + // was inserted in the database). + const ACTION_TYPE = actionSummary.action_type.toLowerCase(); - // action_type is already snake cased (as it would have had to be when it - // was inserted in the database). - const ACTION_TYPE = actionSummary.action_type.toLowerCase(); + if (!(ACTION_TYPE in acc)) { + acc[ACTION_TYPE] = 0; + } - if (!(ACTION_TYPE in acc)) { - acc[ACTION_TYPE] = 0; - } + acc[ACTION_TYPE] += actionSummary.count; - acc[ACTION_TYPE] += actionSummary.count; - - return acc; - }, {}); + return acc; + }, + {} + ); for (const ACTION_COUNT_FIELD of Object.keys(groupedActionSummaries)) { const count = groupedActionSummaries[ACTION_COUNT_FIELD]; // Check that the action summaries match the cached counts. if (get(document, ['action_counts', ACTION_COUNT_FIELD]) !== count) { - // Batch updates for those changes. ops.push({ [`action_counts.${ACTION_COUNT_FIELD}`]: count, @@ -94,7 +93,7 @@ async function processBatch(Model, documents) { operations.push({ updateOne: { filter: { - id: document.id + id: document.id, }, update: { $set: Object.assign({}, ...ops), @@ -107,23 +106,21 @@ async function processBatch(Model, documents) { return operations; } -module.exports = async ({fix, batch}) => { +module.exports = async ({ fix, batch }) => { for (const Model of MODELS) { - const cursor = Model - .collection + const cursor = Model.collection .find({}) .project({ id: 1, - action_counts: 1 + action_counts: 1, }) - .sort({created_at: 1}); + .sort({ created_at: 1 }); let operations = []; let documents = []; // While there are documents to process. while (await cursor.hasNext()) { - // Load the document. const document = await cursor.next(); @@ -133,7 +130,6 @@ module.exports = async ({fix, batch}) => { // Check to see if the length of the documents array requires us to // process it. if (documents.length > batch) { - // Process this batch. let batchOperations = await processBatch(Model, documents); @@ -147,7 +143,6 @@ module.exports = async ({fix, batch}) => { // Check to see if there are any documents left over. if (documents.length > 0) { - // Process this batch. let batchOperations = await processBatch(Model, documents); @@ -157,24 +152,43 @@ module.exports = async ({fix, batch}) => { const OPERATIONS_LENGTH = operations.length; - console.log(`action_counts.js: ${OPERATIONS_LENGTH} ${Model.collection.name} need their action counts fixed.`); + console.log( + `action_counts.js: ${OPERATIONS_LENGTH} ${ + Model.collection.name + } need their action counts fixed.` + ); // If fix was enabled, execute the batch writes. if (OPERATIONS_LENGTH > 0) { if (fix) { - debug(`action_counts.js: fixing ${OPERATIONS_LENGTH} ${Model.collection.name}...`); + debug( + `action_counts.js: fixing ${OPERATIONS_LENGTH} ${ + Model.collection.name + }...` + ); while (operations.length) { - let result = await Model.collection.bulkWrite(operations.splice(0, batch)); + let result = await Model.collection.bulkWrite( + operations.splice(0, batch) + ); - debug(`action_counts.js: fixed batch of ${result.modifiedCount} ${Model.collection.name}.`); + debug( + `action_counts.js: fixed batch of ${result.modifiedCount} ${ + Model.collection.name + }.` + ); } - console.log(`action_counts.js: applied all ${OPERATIONS_LENGTH} fixes to ${Model.collection.name}.`); + console.log( + `action_counts.js: applied all ${OPERATIONS_LENGTH} fixes to ${ + Model.collection.name + }.` + ); } else { - console.warn('Skipping fixing, --fix was not enabled, pass --fix to fix these errors'); + console.warn( + 'Skipping fixing, --fix was not enabled, pass --fix to fix these errors' + ); } } } }; - diff --git a/bin/verifications/database/comment_replies.js b/bin/verifications/database/comment_replies.js index 03a3a4ac6..309023c75 100644 --- a/bin/verifications/database/comment_replies.js +++ b/bin/verifications/database/comment_replies.js @@ -1,15 +1,15 @@ const CommentModel = require('../../../models/comment'); -const {singleJoinBy} = require('../../../graph/loaders/util'); +const { singleJoinBy } = require('../../../graph/loaders/util'); const debug = require('debug')('talk:cli:verify'); -const getBatch = async (limit, offset) => CommentModel - .find({}) - .select({'id': 1, 'action_counts': 1, 'reply_count': 1}) - .limit(limit) - .skip(offset) - .sort('created_at'); +const getBatch = async (limit, offset) => + CommentModel.find({}) + .select({ id: 1, action_counts: 1, reply_count: 1 }) + .limit(limit) + .skip(offset) + .sort('created_at'); -module.exports = async ({fix, limit, batch}) => { +module.exports = async ({ fix, limit, batch }) => { let operations = []; // Count how many comments there are to process. @@ -23,35 +23,33 @@ module.exports = async ({fix, limit, batch}) => { // Keep processing documents until there are is none left. while (offset < totalCount) { - // Get a batch of comments. comments = await getBatch(batch, offset); - commentIDs = comments.map(({id}) => id); + commentIDs = comments.map(({ id }) => id); // Get their reply counts. - let allReplyCounts = await CommentModel - .aggregate([ - { - $match: { - parent_id: { - $in: commentIDs, - }, - status: { - $in: ['NONE', 'ACCEPTED'] - } - } + let allReplyCounts = await CommentModel.aggregate([ + { + $match: { + parent_id: { + $in: commentIDs, + }, + status: { + $in: ['NONE', 'ACCEPTED'], + }, }, - { - $group: { - _id: '$parent_id', - count: { - $sum: 1 - } - } - } - ]) + }, + { + $group: { + _id: '$parent_id', + count: { + $sum: 1, + }, + }, + }, + ]) .then(singleJoinBy(commentIDs, '_id')) - .then((results) => results.map((result) => result ? result.count : 0)); + .then(results => results.map(result => (result ? result.count : 0))); // Loop over the comments, with their action summaries. for (let i = 0; i < comments.length; i++) { @@ -75,7 +73,7 @@ module.exports = async ({fix, limit, batch}) => { operations.push({ updateOne: { filter: { - id: comment.id + id: comment.id, }, update: { $set: Object.assign({}, ...commentOperations), @@ -88,10 +86,17 @@ module.exports = async ({fix, limit, batch}) => { debug(`Processed batch of ${comments.length} comments.`); if (operations.length >= limit) { - debug(`Queued operations are ${operations.length}, reached limit of ${limit}, not processing any more.`); + debug( + `Queued operations are ${ + operations.length + }, reached limit of ${limit}, not processing any more.` + ); if (operations.length > limit) { - debug(`${operations.length - limit} operations have been truncated to enforce the limit`); + debug( + `${operations.length - + limit} operations have been truncated to enforce the limit` + ); } break; @@ -103,7 +108,10 @@ module.exports = async ({fix, limit, batch}) => { const OPERATIONS_LENGTH = operations.length; if (limit < Infinity && offset + comments.length < totalCount) { - console.log(`Processed ${offset + comments.length}/${totalCount} comments because we reached the update limit of ${limit}.`); + console.log( + `Processed ${offset + + comments.length}/${totalCount} comments because we reached the update limit of ${limit}.` + ); } else { console.log(`Processed all ${totalCount} comments.`); } @@ -124,7 +132,9 @@ module.exports = async ({fix, limit, batch}) => { console.log(`Applied all ${OPERATIONS_LENGTH} fixes.`); } else { - console.warn('Skipping fixing, --fix was not enabled, pass --fix to fix these errors'); + console.warn( + 'Skipping fixing, --fix was not enabled, pass --fix to fix these errors' + ); } } }; diff --git a/bin/verifications/database/index.js b/bin/verifications/database/index.js index 2a599cfac..58a46bd85 100644 --- a/bin/verifications/database/index.js +++ b/bin/verifications/database/index.js @@ -7,7 +7,4 @@ // async ({fix = false, batch = 1000}) => {} // // where their options are derived. -module.exports = [ - require('./comment_replies'), - require('./action_counts'), -]; +module.exports = [require('./comment_replies'), require('./action_counts')]; diff --git a/client/coral-admin/src/AppRouter.js b/client/coral-admin/src/AppRouter.js index 362143d38..76291ac56 100644 --- a/client/coral-admin/src/AppRouter.js +++ b/client/coral-admin/src/AppRouter.js @@ -1,44 +1,44 @@ import React from 'react'; import PropTypes from 'prop-types'; -import {Router, Route, IndexRedirect, IndexRoute} from 'react-router'; +import { Router, Route, IndexRedirect, IndexRoute } from 'react-router'; import Configure from 'routes/Configure'; import Install from 'routes/Install'; import Stories from 'routes/Stories'; import Community from 'routes/Community/containers/Community'; -import {ModerationLayout, Moderation} from 'routes/Moderation'; +import { ModerationLayout, Moderation } from 'routes/Moderation'; import Layout from 'containers/Layout'; const routes = (
- - - - - + + + + + {/* Community Routes */} - - - + + + - - + + - + {/* Moderation Routes */} - + - + - - + + diff --git a/client/coral-admin/src/actions/auth.js b/client/coral-admin/src/actions/auth.js index 422258f50..332d756c0 100644 --- a/client/coral-admin/src/actions/auth.js +++ b/client/coral-admin/src/actions/auth.js @@ -7,26 +7,29 @@ import jwtDecode from 'jwt-decode'; // SIGN IN //============================================================================== -export const handleLogin = (email, password, recaptchaResponse) => (dispatch, _, {rest, client, storage}) => { - dispatch({type: actions.LOGIN_REQUEST}); +export const handleLogin = (email, password, recaptchaResponse) => ( + dispatch, + _, + { rest, client, storage } +) => { + dispatch({ type: actions.LOGIN_REQUEST }); const params = { method: 'POST', body: { email, - password - } + password, + }, }; if (recaptchaResponse) { params.headers = { - 'X-Recaptcha-Response': recaptchaResponse + 'X-Recaptcha-Response': recaptchaResponse, }; } return rest('/auth/local', params) - .then(({user, token}) => { - + .then(({ user, token }) => { if (!user) { if (!bowser.safari && !bowser.ios && storage) { storage.removeItem('token'); @@ -38,19 +41,19 @@ export const handleLogin = (email, password, recaptchaResponse) => (dispatch, _, client.resetWebsocket(); dispatch(checkLoginSuccess(user)); }) - .catch((error) => { + .catch(error => { console.error(error); - const errorMessage = error.translation_key ? t(`error.${error.translation_key}`) : error.toString(); + const errorMessage = error.translation_key + ? t(`error.${error.translation_key}`) + : error.toString(); if (error.translation_key === 'NOT_AUTHORIZED') { - // invalid credentials dispatch({ type: actions.LOGIN_FAILURE, - message: t('error.email_password') + message: t('error.email_password'), }); - } - else if (error.translation_key === 'LOGIN_MAXIMUM_EXCEEDED') { + } else if (error.translation_key === 'LOGIN_MAXIMUM_EXCEEDED') { dispatch({ type: actions.LOGIN_MAXIMUM_EXCEEDED, message: t(`error.${error.translation_key}`), @@ -69,27 +72,32 @@ export const handleLogin = (email, password, recaptchaResponse) => (dispatch, _, //============================================================================== const forgotPasswordRequest = () => ({ - type: actions.FETCH_FORGOT_PASSWORD_REQUEST + type: actions.FETCH_FORGOT_PASSWORD_REQUEST, }); const forgotPasswordSuccess = () => ({ - type: actions.FETCH_FORGOT_PASSWORD_SUCCESS + type: actions.FETCH_FORGOT_PASSWORD_SUCCESS, }); -const forgotPasswordFailure = (error) => ({ +const forgotPasswordFailure = error => ({ type: actions.FETCH_FORGOT_PASSWORD_FAILURE, error, }); -export const requestPasswordReset = (email) => (dispatch, _, {rest}) => { +export const requestPasswordReset = email => (dispatch, _, { rest }) => { dispatch(forgotPasswordRequest(email)); const redirectUri = location.href; - return rest('/account/password/reset', {method: 'POST', body: {email, loc: redirectUri}}) + return rest('/account/password/reset', { + method: 'POST', + body: { email, loc: redirectUri }, + }) .then(() => dispatch(forgotPasswordSuccess())) - .catch((error) => { + .catch(error => { console.error(error); - const errorMessage = error.translation_key ? t(`error.${error.translation_key}`) : error.toString(); + const errorMessage = error.translation_key + ? t(`error.${error.translation_key}`) + : error.toString(); dispatch(forgotPasswordFailure(errorMessage)); }); }; @@ -99,24 +107,24 @@ export const requestPasswordReset = (email) => (dispatch, _, {rest}) => { //============================================================================== const checkLoginRequest = () => ({ - type: actions.CHECK_LOGIN_REQUEST + type: actions.CHECK_LOGIN_REQUEST, }); const checkLoginSuccess = (user, isAdmin) => ({ type: actions.CHECK_LOGIN_SUCCESS, user, - isAdmin + isAdmin, }); -const checkLoginFailure = (error) => ({ +const checkLoginFailure = error => ({ type: actions.CHECK_LOGIN_FAILURE, - error + error, }); -export const checkLogin = () => (dispatch, _, {rest, client, storage}) => { +export const checkLogin = () => (dispatch, _, { rest, client, storage }) => { dispatch(checkLoginRequest()); return rest('/auth') - .then(({user}) => { + .then(({ user }) => { if (!user) { if (!bowser.safari && !bowser.ios && storage) { storage.removeItem('token'); @@ -127,9 +135,11 @@ export const checkLogin = () => (dispatch, _, {rest, client, storage}) => { client.resetWebsocket(); dispatch(checkLoginSuccess(user)); }) - .catch((error) => { + .catch(error => { console.error(error); - const errorMessage = error.translation_key ? t(`error.${error.translation_key}`) : error.toString(); + const errorMessage = error.translation_key + ? t(`error.${error.translation_key}`) + : error.toString(); dispatch(checkLoginFailure(errorMessage)); }); }; @@ -138,8 +148,8 @@ export const checkLogin = () => (dispatch, _, {rest, client, storage}) => { // LOGOUT //============================================================================== -export const logout = () => (dispatch, _, {rest, client, storage}) => { - return rest('/auth', {method: 'DELETE'}).then(() => { +export const logout = () => (dispatch, _, { rest, client, storage }) => { + return rest('/auth', { method: 'DELETE' }).then(() => { if (storage) { storage.removeItem('token'); } @@ -147,7 +157,7 @@ export const logout = () => (dispatch, _, {rest, client, storage}) => { // Reset the websocket. client.resetWebsocket(); - dispatch({type: actions.LOGOUT}); + dispatch({ type: actions.LOGOUT }); }); }; @@ -155,11 +165,10 @@ export const logout = () => (dispatch, _, {rest, client, storage}) => { // AUTH TOKEN //============================================================================== -export const handleAuthToken = (token) => (dispatch, _, {storage}) => { +export const handleAuthToken = token => (dispatch, _, { storage }) => { if (storage) { storage.setItem('exp', jwtDecode(token).exp); storage.setItem('token', token); } - dispatch({type: 'HANDLE_AUTH_TOKEN'}); + dispatch({ type: 'HANDLE_AUTH_TOKEN' }); }; - diff --git a/client/coral-admin/src/actions/banUserDialog.js b/client/coral-admin/src/actions/banUserDialog.js index 8134318cb..aac904a2b 100644 --- a/client/coral-admin/src/actions/banUserDialog.js +++ b/client/coral-admin/src/actions/banUserDialog.js @@ -1,6 +1,19 @@ -import {SHOW_BAN_USER_DIALOG, HIDE_BAN_USER_DIALOG} from '../constants/banUserDialog'; +import { + SHOW_BAN_USER_DIALOG, + HIDE_BAN_USER_DIALOG, +} from '../constants/banUserDialog'; -export const showBanUserDialog = ({userId, username, commentId, commentStatus}) => - ({type: SHOW_BAN_USER_DIALOG, userId, username, commentId, commentStatus}); +export const showBanUserDialog = ({ + userId, + username, + commentId, + commentStatus, +}) => ({ + type: SHOW_BAN_USER_DIALOG, + userId, + username, + commentId, + commentStatus, +}); -export const hideBanUserDialog = () => ({type: HIDE_BAN_USER_DIALOG}); +export const hideBanUserDialog = () => ({ type: HIDE_BAN_USER_DIALOG }); diff --git a/client/coral-admin/src/actions/community.js b/client/coral-admin/src/actions/community.js index 669ff2f95..d2b8f1a3f 100644 --- a/client/coral-admin/src/actions/community.js +++ b/client/coral-admin/src/actions/community.js @@ -10,54 +10,61 @@ import { SHOW_BANUSER_DIALOG, HIDE_BANUSER_DIALOG, SHOW_REJECT_USERNAME_DIALOG, - HIDE_REJECT_USERNAME_DIALOG + HIDE_REJECT_USERNAME_DIALOG, } from '../constants/community'; import t from 'coral-framework/services/i18n'; -export const fetchUsers = (query = {}) => (dispatch, _, {rest}) => { +export const fetchUsers = (query = {}) => (dispatch, _, { rest }) => { dispatch(requestFetchUsers()); rest(`/users?${queryString.stringify(query)}`) - .then(({result, page, count, limit, totalPages}) =>{ + .then(({ result, page, count, limit, totalPages }) => { dispatch({ type: FETCH_USERS_SUCCESS, users: result, page, count, limit, - totalPages + totalPages, }); }) - .catch((error) => { + .catch(error => { console.error(error); - const errorMessage = error.translation_key ? t(`error.${error.translation_key}`) : error.toString(); - dispatch({type: FETCH_USERS_FAILURE, error: errorMessage}); + const errorMessage = error.translation_key + ? t(`error.${error.translation_key}`) + : error.toString(); + dispatch({ type: FETCH_USERS_FAILURE, error: errorMessage }); }); }; const requestFetchUsers = () => ({ - type: FETCH_USERS_REQUEST + type: FETCH_USERS_REQUEST, }); -export const updateSorting = (sort) => ({ +export const updateSorting = sort => ({ type: SORT_UPDATE, - sort + sort, }); -export const setPage = (page) => ({ +export const setPage = page => ({ type: SET_PAGE, page, }); -export const setSearchValue = (value) => ({ +export const setSearchValue = value => ({ type: SET_SEARCH_VALUE, value, }); // Ban User Dialog -export const showBanUserDialog = (user) => ({type: SHOW_BANUSER_DIALOG, user}); -export const hideBanUserDialog = () => ({type: HIDE_BANUSER_DIALOG}); +export const showBanUserDialog = user => ({ type: SHOW_BANUSER_DIALOG, user }); +export const hideBanUserDialog = () => ({ type: HIDE_BANUSER_DIALOG }); // Reject Username Dialog -export const showRejectUsernameDialog = (user) => ({type: SHOW_REJECT_USERNAME_DIALOG, user}); -export const hideRejectUsernameDialog = () => ({type: HIDE_REJECT_USERNAME_DIALOG}); +export const showRejectUsernameDialog = user => ({ + type: SHOW_REJECT_USERNAME_DIALOG, + user, +}); +export const hideRejectUsernameDialog = () => ({ + type: HIDE_REJECT_USERNAME_DIALOG, +}); diff --git a/client/coral-admin/src/actions/config.js b/client/coral-admin/src/actions/config.js index 4f3528be0..5e2995e85 100644 --- a/client/coral-admin/src/actions/config.js +++ b/client/coral-admin/src/actions/config.js @@ -1,7 +1,7 @@ export const CONFIG_UPDATED = 'CONFIG_UPDATED'; -export const fetchConfig = () => (dispatch) => { +export const fetchConfig = () => dispatch => { let json = document.getElementById('data'); let data = JSON.parse(json.textContent); - dispatch({type: CONFIG_UPDATED, data}); + dispatch({ type: CONFIG_UPDATED, data }); }; diff --git a/client/coral-admin/src/actions/configure.js b/client/coral-admin/src/actions/configure.js index 128de75bc..acc30be1b 100644 --- a/client/coral-admin/src/actions/configure.js +++ b/client/coral-admin/src/actions/configure.js @@ -1,13 +1,13 @@ import * as actions from 'constants/configure'; -export const updatePending = ({updater, errorUpdater}) => { - return {type: actions.UPDATE_PENDING, updater, errorUpdater}; +export const updatePending = ({ updater, errorUpdater }) => { + return { type: actions.UPDATE_PENDING, updater, errorUpdater }; }; export const clearPending = () => { - return {type: actions.CLEAR_PENDING}; + return { type: actions.CLEAR_PENDING }; }; -export const setActiveSection = (section) => { - return {type: actions.SET_ACTIVE_SECTION, section}; +export const setActiveSection = section => { + return { type: actions.SET_ACTIVE_SECTION, section }; }; diff --git a/client/coral-admin/src/actions/install.js b/client/coral-admin/src/actions/install.js index 02d562d65..2f8c8c250 100644 --- a/client/coral-admin/src/actions/install.js +++ b/client/coral-admin/src/actions/install.js @@ -3,17 +3,17 @@ import validate from 'coral-framework/helpers/validate'; import errorMsj from 'coral-framework/helpers/error'; import t from 'coral-framework/services/i18n'; -export const nextStep = () => ({type: actions.NEXT_STEP}); -export const previousStep = () => ({type: actions.PREVIOUS_STEP}); -export const goToStep = (step) => ({type: actions.GO_TO_STEP, step}); +export const nextStep = () => ({ type: actions.NEXT_STEP }); +export const previousStep = () => ({ type: actions.PREVIOUS_STEP }); +export const goToStep = step => ({ type: actions.GO_TO_STEP, step }); -const installRequest = () => ({type: actions.INSTALL_REQUEST}); -const installSuccess = () => ({type: actions.INSTALL_SUCCESS}); -const installFailure = (error) => ({type: actions.INSTALL_FAILURE, error}); +const installRequest = () => ({ type: actions.INSTALL_REQUEST }); +const installSuccess = () => ({ type: actions.INSTALL_SUCCESS }); +const installFailure = error => ({ type: actions.INSTALL_FAILURE, error }); -const addError = (name, error) => ({type: actions.ADD_ERROR, name, error}); -const hasError = (error) => ({type: actions.HAS_ERROR, error}); -const clearErrors = () => ({type: actions.CLEAR_ERRORS}); +const addError = (name, error) => ({ type: actions.ADD_ERROR, name, error }); +const hasError = error => ({ type: actions.HAS_ERROR, error }); +const clearErrors = () => ({ type: actions.CLEAR_ERRORS }); const validation = (formData, dispatch, next) => { if (!(formData != null)) { @@ -21,24 +21,21 @@ const validation = (formData, dispatch, next) => { return; } - const validKeys = Object.keys(formData) - .filter((name) => name !== 'domains'); + const validKeys = Object.keys(formData).filter(name => name !== 'domains'); // Required Validation - const empty = validKeys - .filter((name) => { - const cond = !formData[name].length; + const empty = validKeys.filter(name => { + const cond = !formData[name].length; - if (cond) { + if (cond) { + // Adding Error + dispatch(addError(name, 'This field is required.')); + } else { + dispatch(addError(name, '')); + } - // Adding Error - dispatch(addError(name, 'This field is required.')); - } else { - dispatch(addError(name, '')); - } - - return cond; - }); + return cond; + }); if (empty.length) { dispatch(hasError()); @@ -46,19 +43,17 @@ const validation = (formData, dispatch, next) => { } // RegExp Validation - const validation = validKeys - .filter((name) => { - const cond = !validate[name](formData[name]); - if (cond) { - + const validation = validKeys.filter(name => { + const cond = !validate[name](formData[name]); + if (cond) { // Adding Error - dispatch(addError(name, errorMsj[name])); - } else { - dispatch(addError(name, '')); - } + dispatch(addError(name, errorMsj[name])); + } else { + dispatch(addError(name, '')); + } - return cond; - }); + return cond; + }); if (validation.length) { dispatch(hasError()); @@ -67,20 +62,21 @@ const validation = (formData, dispatch, next) => { // Confirm Validation const prefixLength = 'confirm'.length; - const confirm = validKeys - .filter((name) => { - if (!name.startsWith('confirm')) { - return false; - } + const confirm = validKeys.filter(name => { + if (!name.startsWith('confirm')) { + return false; + } - // Check that 'confirmX' equals 'X'. - const other = name.substr(prefixLength, 1).toLowerCase() + name.substr(prefixLength + 1); - const cond = formData[other] !== formData[name]; - if (cond) { - dispatch(addError(name, errorMsj[name])); - } - return cond; - }); + // Check that 'confirmX' equals 'X'. + const other = + name.substr(prefixLength, 1).toLowerCase() + + name.substr(prefixLength + 1); + const cond = formData[other] !== formData[name]; + if (cond) { + dispatch(addError(name, errorMsj[name])); + } + return cond; + }); if (confirm.length) { dispatch(hasError()); @@ -105,41 +101,62 @@ export const submitUser = () => (dispatch, getState) => { }); }; -export const finishInstall = () => (dispatch, getState, {rest}) => { +export const finishInstall = () => (dispatch, getState, { rest }) => { const data = getState().install.data; dispatch(installRequest()); - return rest('/setup', {method: 'POST', body: data}) + return rest('/setup', { method: 'POST', body: data }) .then(() => { dispatch(installSuccess()); dispatch(nextStep()); }) - .catch((error) => { + .catch(error => { console.error(error); - const errorMessage = error.translation_key ? t(`error.${error.translation_key}`) : error.toString(); + const errorMessage = error.translation_key + ? t(`error.${error.translation_key}`) + : error.toString(); dispatch(installFailure(errorMessage)); }); }; -export const updateSettingsFormData = (name, value) => ({type: actions.UPDATE_FORMDATA_SETTINGS, name, value}); -export const updateUserFormData = (name, value) => ({type: actions.UPDATE_FORMDATA_USER, name, value}); -export const updatePermittedDomains = (value) => ({type: actions.UPDATE_PERMITTED_DOMAINS_SETTINGS, value}); +export const updateSettingsFormData = (name, value) => ({ + type: actions.UPDATE_FORMDATA_SETTINGS, + name, + value, +}); +export const updateUserFormData = (name, value) => ({ + type: actions.UPDATE_FORMDATA_USER, + name, + value, +}); +export const updatePermittedDomains = value => ({ + type: actions.UPDATE_PERMITTED_DOMAINS_SETTINGS, + value, +}); -const checkInstallRequest = () => ({type: actions.CHECK_INSTALL_REQUEST}); -const checkInstallSuccess = (installed) => ({type: actions.CHECK_INSTALL_SUCCESS, installed}); -const checkInstallFailure = (error) => ({type: actions.CHECK_INSTALL_FAILURE, error}); +const checkInstallRequest = () => ({ type: actions.CHECK_INSTALL_REQUEST }); +const checkInstallSuccess = installed => ({ + type: actions.CHECK_INSTALL_SUCCESS, + installed, +}); +const checkInstallFailure = error => ({ + type: actions.CHECK_INSTALL_FAILURE, + error, +}); -export const checkInstall = (next) => async (dispatch, _, {rest}) => { +export const checkInstall = next => async (dispatch, _, { rest }) => { dispatch(checkInstallRequest()); try { - const {installed} = await rest('/setup'); + const { installed } = await rest('/setup'); dispatch(checkInstallSuccess(installed)); if (installed) { next(); } } catch (error) { console.error(error); - const errorMessage = error.translation_key ? t(`error.${error.translation_key}`) : error.toString(); + const errorMessage = error.translation_key + ? t(`error.${error.translation_key}`) + : error.toString(); dispatch(checkInstallFailure(errorMessage)); } }; diff --git a/client/coral-admin/src/actions/moderation.js b/client/coral-admin/src/actions/moderation.js index 18e31091f..cd09b04b2 100644 --- a/client/coral-admin/src/actions/moderation.js +++ b/client/coral-admin/src/actions/moderation.js @@ -1,41 +1,40 @@ import * as actions from 'constants/moderation'; -export const toggleModal = (open) => ({type: actions.TOGGLE_MODAL, open}); -export const singleView = () => ({type: actions.SINGLE_VIEW}); +export const toggleModal = open => ({ type: actions.TOGGLE_MODAL, open }); +export const singleView = () => ({ type: actions.SINGLE_VIEW }); // hide shortcuts note -export const hideShortcutsNote = () => (dispatch, _, {storage}) => { +export const hideShortcutsNote = () => (dispatch, _, { storage }) => { try { if (storage) { storage.setItem('coral:shortcutsNote', 'hide'); } } catch (e) { - // above will fail in Safari private mode } - dispatch({type: actions.HIDE_SHORTCUTS_NOTE}); + dispatch({ type: actions.HIDE_SHORTCUTS_NOTE }); }; -export const setSortOrder = (order) => ({ +export const setSortOrder = order => ({ type: actions.SET_SORT_ORDER, - order + order, }); -export const toggleStorySearch = (active) => ({ - type: active ? actions.SHOW_STORY_SEARCH : actions.HIDE_STORY_SEARCH +export const toggleStorySearch = active => ({ + type: active ? actions.SHOW_STORY_SEARCH : actions.HIDE_STORY_SEARCH, }); -export const storySearchChange = (value) => ({ +export const storySearchChange = value => ({ type: actions.STORY_SEARCH_CHANGE_VALUE, - value + value, }); export const clearState = () => ({ - type: actions.MODERATION_CLEAR_STATE + type: actions.MODERATION_CLEAR_STATE, }); -export const selectCommentId = (id) => ({ +export const selectCommentId = id => ({ type: actions.MODERATION_SELECT_COMMENT, id, }); diff --git a/client/coral-admin/src/actions/stories.js b/client/coral-admin/src/actions/stories.js index 2524b0c3c..ab610ae20 100644 --- a/client/coral-admin/src/actions/stories.js +++ b/client/coral-admin/src/actions/stories.js @@ -10,7 +10,7 @@ import { UPDATE_ASSET_STATE_REQUEST, UPDATE_ASSET_STATE_SUCCESS, UPDATE_ASSET_STATE_FAILURE, - UPDATE_ASSETS + UPDATE_ASSETS, } from '../constants/stories'; import t from 'coral-framework/services/i18n'; @@ -21,53 +21,58 @@ import t from 'coral-framework/services/i18n'; // Fetch a page of assets // Get comments to fill each of the three lists on the mod queue -export const fetchAssets = (query = {}) => (dispatch, _, {rest}) => { - dispatch({type: FETCH_ASSETS_REQUEST}); +export const fetchAssets = (query = {}) => (dispatch, _, { rest }) => { + dispatch({ type: FETCH_ASSETS_REQUEST }); return rest(`/assets?${queryString.stringify(query)}`) - .then(({result, page, count, limit, totalPages}) => - dispatch({type: FETCH_ASSETS_SUCCESS, + .then(({ result, page, count, limit, totalPages }) => + dispatch({ + type: FETCH_ASSETS_SUCCESS, assets: result, page, count, limit, totalPages, - })) - .catch((error) => { + }) + ) + .catch(error => { console.error(error); - const errorMessage = error.translation_key ? t(`error.${error.translation_key}`) : error.toString(); - dispatch({type: FETCH_ASSETS_FAILURE, error: errorMessage}); + const errorMessage = error.translation_key + ? t(`error.${error.translation_key}`) + : error.toString(); + dispatch({ type: FETCH_ASSETS_FAILURE, error: errorMessage }); }); }; // Update an asset state // Get comments to fill each of the three lists on the mod queue -export const updateAssetState = (id, closedAt) => (dispatch, _, {rest}) => { - dispatch({type: UPDATE_ASSET_STATE_REQUEST, id, closedAt}); - return rest(`/assets/${id}/status`, {method: 'PUT', body: {closedAt}}) - .then(() => dispatch({type: UPDATE_ASSET_STATE_SUCCESS})) - .catch((error) => { +export const updateAssetState = (id, closedAt) => (dispatch, _, { rest }) => { + dispatch({ type: UPDATE_ASSET_STATE_REQUEST, id, closedAt }); + return rest(`/assets/${id}/status`, { method: 'PUT', body: { closedAt } }) + .then(() => dispatch({ type: UPDATE_ASSET_STATE_SUCCESS })) + .catch(error => { console.error(error); - const errorMessage = error.translation_key ? t(`error.${error.translation_key}`) : error.toString(); - dispatch({type: UPDATE_ASSET_STATE_FAILURE, error: errorMessage}); + const errorMessage = error.translation_key + ? t(`error.${error.translation_key}`) + : error.toString(); + dispatch({ type: UPDATE_ASSET_STATE_FAILURE, error: errorMessage }); }); }; -export const updateAssets = (assets) => (dispatch) => { - dispatch({type: UPDATE_ASSETS, assets}); +export const updateAssets = assets => dispatch => { + dispatch({ type: UPDATE_ASSETS, assets }); }; -export const setPage = (page) => ({ +export const setPage = page => ({ type: SET_PAGE, page, }); -export const setSearchValue = (value) => ({ +export const setSearchValue = value => ({ type: SET_SEARCH_VALUE, value, }); -export const setCriteria = (criteria) => ({ +export const setCriteria = criteria => ({ type: SET_CRITERIA, criteria, }); - diff --git a/client/coral-admin/src/actions/suspendUserDialog.js b/client/coral-admin/src/actions/suspendUserDialog.js index 06913147d..f81b76dd3 100644 --- a/client/coral-admin/src/actions/suspendUserDialog.js +++ b/client/coral-admin/src/actions/suspendUserDialog.js @@ -1,7 +1,19 @@ -import {SHOW_SUSPEND_USER_DIALOG, HIDE_SUSPEND_USER_DIALOG} from '../constants/suspendUserDialog.js'; +import { + SHOW_SUSPEND_USER_DIALOG, + HIDE_SUSPEND_USER_DIALOG, +} from '../constants/suspendUserDialog.js'; -export const showSuspendUserDialog = ({userId, username, commentId, commentStatus}) => - ({type: SHOW_SUSPEND_USER_DIALOG, userId, username, commentId, commentStatus}); - -export const hideSuspendUserDialog = () => ({type: HIDE_SUSPEND_USER_DIALOG}); +export const showSuspendUserDialog = ({ + userId, + username, + commentId, + commentStatus, +}) => ({ + type: SHOW_SUSPEND_USER_DIALOG, + userId, + username, + commentId, + commentStatus, +}); +export const hideSuspendUserDialog = () => ({ type: HIDE_SUSPEND_USER_DIALOG }); diff --git a/client/coral-admin/src/actions/userDetail.js b/client/coral-admin/src/actions/userDetail.js index 1d0a20def..f34f8e7a8 100644 --- a/client/coral-admin/src/actions/userDetail.js +++ b/client/coral-admin/src/actions/userDetail.js @@ -1,28 +1,37 @@ import * as actions from 'constants/userDetail'; -export const viewUserDetail = (userId) => ({type: actions.VIEW_USER_DETAIL, userId}); -export const hideUserDetail = () => ({type: actions.HIDE_USER_DETAIL}); +export const viewUserDetail = userId => ({ + type: actions.VIEW_USER_DETAIL, + userId, +}); +export const hideUserDetail = () => ({ type: actions.HIDE_USER_DETAIL }); -export const changeTab = (tab) => { +export const changeTab = tab => { let statuses = null; if (tab === 'rejected') { statuses = ['REJECTED']; } - return {type: actions.CHANGE_TAB_USER_DETAIL, tab, statuses}; + return { type: actions.CHANGE_TAB_USER_DETAIL, tab, statuses }; }; -export const clearUserDetailSelections = () => ({type: actions.CLEAR_USER_DETAIL_SELECTIONS}); +export const clearUserDetailSelections = () => ({ + type: actions.CLEAR_USER_DETAIL_SELECTIONS, +}); export const toggleSelectCommentInUserDetail = (id, active) => { return { - type: active ? actions.SELECT_USER_DETAIL_COMMENT : actions.UNSELECT_USER_DETAIL_COMMENT, - id + type: active + ? actions.SELECT_USER_DETAIL_COMMENT + : actions.UNSELECT_USER_DETAIL_COMMENT, + id, }; }; export const toggleSelectAllCommentInUserDetail = (ids, active) => { return { - type: active ? actions.SELECT_ALL_USER_DETAIL_COMMENT : actions.CLEAR_USER_DETAIL_SELECTIONS, - ids + type: active + ? actions.SELECT_ALL_USER_DETAIL_COMMENT + : actions.CLEAR_USER_DETAIL_SELECTIONS, + ids, }; }; diff --git a/client/coral-admin/src/actions/users.js b/client/coral-admin/src/actions/users.js index 994a79a79..c538d7384 100644 --- a/client/coral-admin/src/actions/users.js +++ b/client/coral-admin/src/actions/users.js @@ -6,38 +6,56 @@ import t from 'coral-framework/services/i18n'; */ // change status of a user export const userStatusUpdate = (status, userId, commentId) => { - return (dispatch, _, {rest}) => { - dispatch({type: userTypes.UPDATE_STATUS_REQUEST}); - return rest(`/users/${userId}/status`, {method: 'POST', body: {status: status, comment_id: commentId}}) - .then((res) => dispatch({type: userTypes.UPDATE_STATUS_SUCCESS, res})) - .catch((error) => { + return (dispatch, _, { rest }) => { + dispatch({ type: userTypes.UPDATE_STATUS_REQUEST }); + return rest(`/users/${userId}/status`, { + method: 'POST', + body: { status: status, comment_id: commentId }, + }) + .then(res => dispatch({ type: userTypes.UPDATE_STATUS_SUCCESS, res })) + .catch(error => { console.error(error); - const errorMessage = error.translation_key ? t(`error.${error.translation_key}`) : error.toString(); - dispatch({type: userTypes.UPDATE_STATUS_FAILURE, error: errorMessage}); + const errorMessage = error.translation_key + ? t(`error.${error.translation_key}`) + : error.toString(); + dispatch({ + type: userTypes.UPDATE_STATUS_FAILURE, + error: errorMessage, + }); }); }; }; // change status of a user export const sendNotificationEmail = (userId, subject, body) => { - return (dispatch, _, {rest}) => { - return rest(`/users/${userId}/email`, {method: 'POST', body: {subject, body}}) - .catch((error) => { - console.error(error); - const errorMessage = error.translation_key ? t(`error.${error.translation_key}`) : error.toString(); - dispatch({type: userTypes.USER_EMAIL_FAILURE, error: errorMessage}); - }); + return (dispatch, _, { rest }) => { + return rest(`/users/${userId}/email`, { + method: 'POST', + body: { subject, body }, + }).catch(error => { + console.error(error); + const errorMessage = error.translation_key + ? t(`error.${error.translation_key}`) + : error.toString(); + dispatch({ type: userTypes.USER_EMAIL_FAILURE, error: errorMessage }); + }); }; }; // let a user edit their username -export const enableUsernameEdit = (userId) => { - return (dispatch, _, {rest}) => { - return rest(`/users/${userId}/username-enable`, {method: 'POST'}) - .catch((error) => { +export const enableUsernameEdit = userId => { + return (dispatch, _, { rest }) => { + return rest(`/users/${userId}/username-enable`, { method: 'POST' }).catch( + error => { console.error(error); - const errorMessage = error.translation_key ? t(`error.${error.translation_key}`) : error.toString(); - dispatch({type: userTypes.USERNAME_ENABLE_FAILURE, error: errorMessage}); - }); + const errorMessage = error.translation_key + ? t(`error.${error.translation_key}`) + : error.toString(); + dispatch({ + type: userTypes.USERNAME_ENABLE_FAILURE, + error: errorMessage, + }); + } + ); }; }; diff --git a/client/coral-admin/src/components/AccountHistory.js b/client/coral-admin/src/components/AccountHistory.js index ec3bbca2f..04df552be 100644 --- a/client/coral-admin/src/components/AccountHistory.js +++ b/client/coral-admin/src/components/AccountHistory.js @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import {murmur3} from 'murmurhash-js'; +import { murmur3 } from 'murmurhash-js'; import styles from './AccountHistory.css'; import cn from 'classnames'; import flatten from 'lodash/flatten'; @@ -8,21 +8,27 @@ import orderBy from 'lodash/orderBy'; import moment from 'moment'; const buildUserHistory = (userState = {}) => { - return orderBy(flatten(Object.keys(userState.status) - .filter((k) => k !== '__typename') - .map((k) => userState.status[k].history)), 'created_at', 'desc'); + return orderBy( + flatten( + Object.keys(userState.status) + .filter(k => k !== '__typename') + .map(k => userState.status[k].history) + ), + 'created_at', + 'desc' + ); }; const buildActionResponse = (typename, until, status) => { switch (typename) { - case 'UsernameStatusHistory': - return `Username ${status}`; - case 'BannedStatusHistory': - return status ? 'User banned' : 'Ban removed'; - case 'SuspensionStatusHistory': - return until ? 'Account Suspended' : 'Suspension removed' ; - default: - return '-'; + case 'UsernameStatusHistory': + return `Username ${status}`; + case 'BannedStatusHistory': + return status ? 'User banned' : 'Ban removed'; + case 'SuspensionStatusHistory': + return until ? 'Account Suspended' : 'Suspension removed'; + default: + return '-'; } }; @@ -35,31 +41,55 @@ const getModerationValue = (userId, assignedBy = {}) => { class AccountHistory extends React.Component { render() { - const {user} = this.props; + const { user } = this.props; const userHistory = buildUserHistory(user.state); return (
-
+
Date
Action
Moderation
- { - userHistory.map(({__typename, created_at, assigned_by, until, status}) => ( -
-
+ {userHistory.map( + ({ __typename, created_at, assigned_by, until, status }) => ( +
+
{moment(new Date(created_at)).format('MMM DD, YYYY')}
-
+
{buildActionResponse(__typename, until, status)}
-
+
{getModerationValue(user.id, assigned_by)}
- )) - } + ) + )}
); diff --git a/client/coral-admin/src/components/ActionsMenu.js b/client/coral-admin/src/components/ActionsMenu.js index ef4e46573..fed143859 100644 --- a/client/coral-admin/src/components/ActionsMenu.js +++ b/client/coral-admin/src/components/ActionsMenu.js @@ -1,9 +1,9 @@ import React from 'react'; import PropTypes from 'prop-types'; -import {Button, Icon} from 'coral-ui'; -import {Menu} from 'react-mdl'; +import { Button, Icon } from 'coral-ui'; +import { Menu } from 'react-mdl'; import cn from 'classnames'; -import {findDOMNode} from 'react-dom'; +import { findDOMNode } from 'react-dom'; import styles from './ActionsMenu.css'; import t from 'coral-framework/services/i18n'; @@ -13,36 +13,41 @@ let count = 0; class ActionsMenu extends React.Component { id = `actions-dropdown-${count++}`; menu = null; - state = {open: false}; + state = { open: false }; timeout = null; componentWillUnmount() { clearTimeout(this.timeout); } - handleRef = (ref) => { + handleRef = ref => { this.menu = ref ? findDOMNode(ref).parentNode : null; - } + }; syncOpenState = () => { clearTimeout(this.timeout); this.timeout = setTimeout(() => { - this.setState({open: this.menu.className.indexOf('is-visible') >= 0}); + this.setState({ open: this.menu.className.indexOf('is-visible') >= 0 }); }, 150); }; render() { - const {className = '', buttonClassNames = '', label = ''} = this.props; + const { className = '', buttonClassNames = '', label = '' } = this.props; return ( -
+
+ onClick={this.handleSignIn} + > + Sign In +

- Forgot your password? { - e.preventDefault(); - this.setState({requestPassword: true}); - }}>Request a new one. + Forgot your password?{' '} + { + e.preventDefault(); + this.setState({ requestPassword: true }); + }} + > + Request a new one. +

- { - loginMaxExceeded && + {loginMaxExceeded && ( - } + verifyCallback={this.onRecaptchaVerify} + /> + )} ); - const requestPasswordForm = ( - this.props.passwordRequestSuccess - ?

{ + const requestPasswordForm = this.props.passwordRequestSuccess ? ( +

{ location.href = location.href; - }}> - {this.props.passwordRequestSuccess} Sign in - -

- :
- this.setState({email: e.target.value})} /> - - + }} + > + {this.props.passwordRequestSuccess}{' '} + + Sign in + + +

+ ) : ( +
+ this.setState({ email: e.target.value })} + /> + + ); return (

Team sign in

-

Sign in to interact with your community.

- { this.state.requestPassword ? requestPasswordForm : signInForm } +

+ Sign in to interact with your community. +

+ {this.state.requestPassword ? requestPasswordForm : signInForm}
); diff --git a/client/coral-admin/src/components/App.js b/client/coral-admin/src/components/App.js index 1a15c72c3..52535f91a 100644 --- a/client/coral-admin/src/components/App.js +++ b/client/coral-admin/src/components/App.js @@ -5,7 +5,7 @@ import 'material-design-lite'; import AppRouter from '../AppRouter'; export default class App extends React.Component { - render () { + render() { return (
diff --git a/client/coral-admin/src/components/ApproveButton.js b/client/coral-admin/src/components/ApproveButton.js index 8ab455510..97a674221 100644 --- a/client/coral-admin/src/components/ApproveButton.js +++ b/client/coral-admin/src/components/ApproveButton.js @@ -3,15 +3,19 @@ import PropTypes from 'prop-types'; import cn from 'classnames'; import styles from './ApproveButton.css'; -import {Icon} from 'coral-ui'; +import { Icon } from 'coral-ui'; import t from 'coral-framework/services/i18n'; -const ApproveButton = ({active, minimal, onClick, className}) => { +const ApproveButton = ({ active, minimal, onClick, className }) => { const text = active ? t('modqueue.approved') : t('modqueue.approve'); return ( -
@@ -73,22 +63,19 @@ class BanUserDialog extends React.Component { } renderStep1() { - const { - onCancel, - onPerform, - } = this.props; - const {message} = this.state; + const { onCancel, onPerform } = this.props; + const { message } = this.state; return (
-

- {t('bandialog.notify_ban_headline')} -

+

{t('bandialog.notify_ban_headline')}

{t('bandialog.notify_ban_description')}

- {t('bandialog.write_a_message')} + + {t('bandialog.write_a_message')} +