Introduce config module

This commit is contained in:
Akihiko Odaki
2018-04-02 13:15:53 +09:00
parent 5b9f3701f5
commit 3fb6834f7d
50 changed files with 213 additions and 208 deletions

View File

@ -3,7 +3,7 @@ import * as express from 'express';
import * as request from 'request';
import * as crypto from 'crypto';
import User from '../../../../models/user';
import config from '../../../../conf';
import config from '../../../../config';
import BotCore from '../core';
import _redis from '../../../../db/redis';
import prominence = require('prominence');

View File

@ -1,4 +1,4 @@
import config from '../../../conf';
import config from '../../../config';
export default function(res, user, redirect: boolean) {
const expires = 1000 * 60 * 60 * 24 * 365; // One Year

View File

@ -5,7 +5,7 @@ import * as uuid from 'uuid';
import $ from 'cafy';
import App from '../../../../../models/app';
import AuthSess from '../../../../../models/auth-session';
import config from '../../../../../conf';
import config from '../../../../../config';
/**
* @swagger

View File

@ -6,7 +6,7 @@ import * as bcrypt from 'bcryptjs';
import * as speakeasy from 'speakeasy';
import * as QRCode from 'qrcode';
import User from '../../../../../models/user';
import config from '../../../../../conf';
import config from '../../../../../config';
module.exports = async (params, user) => new Promise(async (res, rej) => {
// Get 'password' parameter

View File

@ -4,7 +4,7 @@
import $ from 'cafy';
import User, { isValidName, isValidDescription, isValidLocation, isValidBirthday, pack } from '../../../../models/user';
import event from '../../../../event';
import config from '../../../../conf';
import config from '../../../../config';
/**
* Update myself

View File

@ -13,7 +13,7 @@ import publishUserStream from '../../../../../event';
import { publishMessagingStream, publishMessagingIndexStream, pushSw } from '../../../../../event';
import html from '../../../../../text/html';
import parse from '../../../../../text/parse';
import config from '../../../../../conf';
import config from '../../../../../config';
/**
* Create a message

View File

@ -3,7 +3,7 @@
*/
import * as os from 'os';
import version from '../../../version';
import config from '../../../conf';
import config from '../../../config';
import Meta from '../../../models/meta';
/**

View File

@ -19,7 +19,7 @@ import event, { pushSw, publishChannelStream } from '../../../../event';
import notify from '../../../../notify';
import getAcct from '../../../../user/get-acct';
import parseAcct from '../../../../user/parse-acct';
import config from '../../../../conf';
import config from '../../../../config';
/**
* Create a post

View File

@ -4,7 +4,7 @@
import * as mongo from 'mongodb';
import $ from 'cafy';
import User, { pack } from '../../../../models/user';
import config from '../../../../conf';
import config from '../../../../config';
const escapeRegexp = require('escape-regexp');
/**

View File

@ -5,7 +5,7 @@ import User, { ILocalUser } from '../../../models/user';
import Signin, { pack } from '../../../models/signin';
import event from '../../../event';
import signin from '../common/signin';
import config from '../../../conf';
import config from '../../../config';
export default async (req: express.Request, res: express.Response) => {
res.header('Access-Control-Allow-Origin', config.url);

View File

@ -5,7 +5,7 @@ import { generate as generateKeypair } from '../../../crypto_key';
import recaptcha = require('recaptcha-promise');
import User, { IUser, validateUsername, validatePassword, pack } from '../../../models/user';
import generateUserToken from '../common/generate-native-user-token';
import config from '../../../conf';
import config from '../../../config';
recaptcha.init({
secret_key: config.recaptcha.secret_key

View File

@ -2,7 +2,7 @@ import * as EventEmitter from 'events';
import * as express from 'express';
//const crypto = require('crypto');
import User from '../../../models/user';
import config from '../../../conf';
import config from '../../../config';
import queue from '../../../queue';
module.exports = async (app: express.Application) => {

View File

@ -7,7 +7,7 @@ import autwh from 'autwh';
import redis from '../../../db/redis';
import User, { pack } from '../../../models/user';
import event from '../../../event';
import config from '../../../conf';
import config from '../../../config';
import signin from '../common/signin';
module.exports = (app: express.Application) => {

View File

@ -1,7 +1,7 @@
import * as http from 'http';
import * as websocket from 'websocket';
import * as redis from 'redis';
import config from '../../conf';
import config from '../../config';
import { default as User, IUser } from '../../models/user';
import AccessToken from '../../models/access-token';
import isNativeToken from './common/is-native-token';