run eslint pre-hook

This commit is contained in:
Niko Storni 2018-11-10 19:11:12 -05:00
parent 88013cf0cc
commit ed37996d68
No known key found for this signature in database
GPG key ID: F37FE63398800368
45 changed files with 215 additions and 226 deletions

View file

@ -3,3 +3,4 @@ node_modules/
public/bundle
server/render/build
test/
server/chainquery

View file

@ -13,7 +13,7 @@ export function onHandleShowPageUri (params, url) {
data: {
...params,
url,
}
},
};
}
@ -23,7 +23,7 @@ export function onHandleShowHomepage (params, url) {
data: {
...params,
url,
}
},
};
}

View file

@ -1,6 +1,6 @@
import Request from '../utils/request';
export function getSpecialAssetClaims(host, name, page) {
export function getSpecialAssetClaims (host, name, page) {
if (!page) page = 1;
const url = `${host}/api/special/${name}/${page}`;
return Request(url);

View file

@ -1,6 +1,6 @@
import React from 'react';
import Row from '@components/Row';
import {Link} from "react-router-dom";
import {Link} from 'react-router-dom';
const AboutSpeechDetails = () => {
return (

View file

@ -20,6 +20,6 @@ const ChooseChannelPublishRadio = ({ publishInChannel, toggleAnonymousPublish })
</label>
</div>
);
}
};
export default ChooseChannelPublishRadio;

View file

@ -6,6 +6,6 @@ const DropzoneDropItDisplay = () => {
Drop it.
</div>
);
}
};
export default DropzoneDropItDisplay;

View file

@ -8,5 +8,5 @@ const Label = ({ value }) => {
{value}
</label>
);
}
};
export default Label;

View file

@ -75,7 +75,7 @@ class ChannelCreateForm extends React.Component {
value={'Create Channel'}
onClickHandler={this.handleSubmit}
/>
</form>
</form>
) : (
<div>
<span className={'text--small text--secondary'}>{status}</span>

View file

@ -64,7 +64,7 @@ class ChannelLoginForm extends React.Component {
value={'Authenticate'}
onClickHandler={this.loginToChannel}
/>
</form>
</form>
);
}
}

View file

@ -5,10 +5,10 @@ import View from './view';
const mapStateToProps = ({ show, publish }) => {
return {
file: publish.file,
isUpdate: publish.isUpdate,
file : publish.file,
isUpdate : publish.isUpdate,
hasChanged: publish.hasChanged,
asset: selectAsset(show),
asset : selectAsset(show),
};
};

View file

@ -1,7 +1,7 @@
import {connect} from 'react-redux';
import View from './view';
import {selectAsset} from "../../selectors/show";
import {buildURI} from "../../utils/buildURI";
import {selectAsset} from '../../selectors/show';
import {buildURI} from '../../utils/buildURI';
const mapStateToProps = props => {
const { show, publish } = props;
@ -11,10 +11,10 @@ const mapStateToProps = props => {
uri = `lbry://${buildURI(asset)}`;
}
return {
disabled: publish.disabled,
file: publish.file,
status: publish.status.status,
isUpdate: publish.isUpdate,
disabled : publish.disabled,
file : publish.file,
status : publish.status.status,
isUpdate : publish.isUpdate,
hasChanged: publish.hasChanged,
uri,
};

View file

@ -34,7 +34,7 @@ class PublishUrlInput extends React.Component {
value = this.cleanseInput(value);
this.updateAndValidateClaimInput(value);
}
updateAndValidateClaimInput(value) {
updateAndValidateClaimInput (value) {
if (value) {
this.props.validateClaim(value);
} else {

View file

@ -24,7 +24,7 @@ class SEO extends React.Component {
const canonicalLink = `${host}${createCanonicalLink({
asset: asset ? { ...asset.claimData, shortId: asset.shortId } : undefined,
channel,
page: pageUri,
page : pageUri,
})}`;
// render results
return (

View file

@ -14,20 +14,20 @@ class FaqPage extends React.Component {
</Row>
<Row>
<h3>What is spee.ch?</h3>
<p>Spee.ch is a media-hosting site that reads from and publishes content to the <a href="http://lbry.io/">LBRY blockchain</a>.</p>
<p>Spee.ch is a media-hosting site that reads from and publishes content to the <a href='http://lbry.io/'>LBRY blockchain</a>.</p>
</Row>
<Row>
<h3>OK But Why Should I Care?</h3>
<p>Spee.ch is a fast and easy way to host your images, videos, and other content. What makes this different from other similar sites is that Speech is hosted on the LBRY blockchain. That means it is impossible for your content to be censored via digital means. Even if we took down Speech today, all content would remain immutably stored on the LBRY blockchain.</p>
<p>Blockchain technology doesnt solve <a href="https://xkcd.com/538/">the 5 dollar wrench attack</a>, but it solves just about every other problem in media hosting and distribution.</p>
<p>Even better - you can host your own clone of Speech to get even more control over your content. <a href="https://github.com/lbryio/spee.ch/blob/master/README.md">CLICK HERE FOR INFO</a>.</p>
<p>Blockchain technology doesnt solve <a href='https://xkcd.com/538/'>the 5 dollar wrench attack</a>, but it solves just about every other problem in media hosting and distribution.</p>
<p>Even better - you can host your own clone of Speech to get even more control over your content. <a href='https://github.com/lbryio/spee.ch/blob/master/README.md'>CLICK HERE FOR INFO</a>.</p>
<p>Speech is just the beginning of what will soon be a vibrant ecosystem of LBRY-powered apps. Use LBRY and youre one step closer to true freedom.</p>
</Row>
<Row>
<h3>How to Use spee.ch</h3>
<p>Its easy. Drag the image or video file of your choice into the center of the spee.ch homepage.</p>
<p>Spee.ch is currently best suited for web optimized MP4 video and standard image filetypes (JPEG, GIF).</p>
<p>If you want to refer to a piece of content repeatedly, or to build a collection of related content, you could create a channel. Channels work both for private collections and for public repositories. Theres more info about how to do this <a href="https://spee.ch/login">on the channel page</a>.</p>
<p>If you want to refer to a piece of content repeatedly, or to build a collection of related content, you could create a channel. Channels work both for private collections and for public repositories. Theres more info about how to do this <a href='https://spee.ch/login'>on the channel page</a>.</p>
<p>Published files will be wiewable and embeddable with any web browser and accesible in the LBRY app. You can also use spee.ch to view free and non-NSFW content published on LBRY network from LBRY app. You just need to replace "lbry://" with "http://spee.ch/" in the URL.</p>
</Row>
<Row>
@ -36,8 +36,8 @@ class FaqPage extends React.Component {
</Row>
<Row>
<h3>Contribute</h3>
<p>If you have an idea for your own spee.ch-like site on top of LBRY, fork our <a href="https://github.com/lbryio/spee.ch">github repo</a> and go to town!</p>
<p>If you want to improve spee.ch, join <a href="https://chat.lbry.io/">our discord channel</a> or solve one of our <a href="https://github.com/lbryio/spee.ch/issues">github issues</a>.</p>
<p>If you have an idea for your own spee.ch-like site on top of LBRY, fork our <a href='https://github.com/lbryio/spee.ch'>github repo</a> and go to town!</p>
<p>If you want to improve spee.ch, join <a href='https://chat.lbry.io/'>our discord channel</a> or solve one of our <a href='https://github.com/lbryio/spee.ch/issues'>github issues</a>.</p>
</Row>
</PageLayout>
);

View file

@ -16,7 +16,7 @@ class PopularPage extends React.Component {
const { homeChannel } = this.props;
return (
<ContentPageWrapper homeChannel={homeChannel} />
)
);
}
};

View file

@ -41,9 +41,9 @@ const initialState = {
license : '',
nsfw : false,
},
isUpdate: false,
isUpdate : false,
hasChanged: false,
thumbnail: null,
thumbnail : null,
thumbnailChannel,
thumbnailChannelId,
};
@ -52,7 +52,7 @@ export default function (state = initialState, action) {
switch (action.type) {
case actions.FILE_SELECTED:
return Object.assign({}, state.isUpdate ? state : initialState, { // note: clears to initial state
file: action.data,
file : action.data,
hasChanged: true,
});
case actions.FILE_CLEAR:
@ -66,13 +66,13 @@ export default function (state = initialState, action) {
});
case actions.CLAIM_UPDATE:
return Object.assign({}, state, {
claim: action.data,
claim : action.data,
hasChanged: true,
});
case actions.SET_PUBLISH_IN_CHANNEL:
return Object.assign({}, state, {
publishInChannel: action.channel,
hasChanged: true,
hasChanged : true,
});
case actions.PUBLISH_STATUS_UPDATE:
return Object.assign({}, state, {
@ -96,7 +96,7 @@ export default function (state = initialState, action) {
case actions.THUMBNAIL_NEW:
return {
...state,
thumbnail: action.data,
thumbnail : action.data,
hasChanged: true,
};
case actions.SET_UPDATE_TRUE:

View file

@ -59,9 +59,9 @@ export function * newAssetRequest (action) {
try {
const { loggedInChannel } = yield select(selectChannelState);
if(loggedInChannel && loggedInChannel.longId) {
if (loggedInChannel && loggedInChannel.longId) {
const {
data: claimViewData
data: claimViewData,
} = yield call(getClaimViews, longId);
claimViews = claimViewData[longId] || 0;
@ -82,18 +82,18 @@ export function * updateAssetViews (action) {
const channelId = loggedInChannel.longId;
for(let key in showState.assetList) {
for (let key in showState.assetList) {
let asset = showState.assetList[key];
if(asset.claimData && asset.claimData.certificateId === channelId) {
if (asset.claimData && asset.claimData.certificateId === channelId) {
const longId = asset.claimId;
const assetKey = `a#${asset.name}#${longId}`;
let claimViews = null;
if(longId) {
if (longId) {
const {
data: claimViewData
data: claimViewData,
} = yield call(getClaimViews, longId);
claimViews = claimViewData[longId] || 0;
@ -103,12 +103,12 @@ export function * updateAssetViews (action) {
}
}
} catch (error) {
console.log(error)
console.log(error);
}
};
export function * watchUpdateAssetViews (action) {
yield takeLatest(channelActions.CHANNEL_UPDATE, updateAssetViews)
yield takeLatest(channelActions.CHANNEL_UPDATE, updateAssetViews);
};
export function * watchNewAssetRequest () {

View file

@ -1,7 +1,7 @@
import {call, put, select, takeLatest} from 'redux-saga/effects';
import * as actions from '../constants/show_action_types';
import { addNewChannelToChannelList, addRequestToRequestList, onRequestError, onRequestUpdate, updateChannelClaims } from '../actions/show';
//import { getChannelClaims, getChannelData } from '../api/channelApi';
// import { getChannelClaims, getChannelData } from '../api/channelApi';
import { getSpecialAssetClaims } from '../api/specialAssetApi';
import { selectShowState } from '../selectors/show';
import { selectSiteHost } from '../selectors/site';

View file

@ -30,7 +30,7 @@ function * parseAndUpdateIdentifierAndClaim (modifier, claim) {
}
function * parseAndUpdateClaimOnly (claim) {
if(/^special\:/.test(claim) === true) {
if (/^special\:/.test(claim) === true) {
const assetName = /special\:(.*)/.exec(claim)[1];
return yield call(newSpecialAssetRequest, onNewSpecialAssetRequest(assetName));
} else {

View file

@ -4,14 +4,14 @@ const chainquery = require('chainquery');
const getChannelData = async (channelName, channelClaimId) => {
let longChannelClaimId = await chainquery.claim.queries.getLongClaimId(channelName, channelClaimId).catch(() => false);
if(!longChannelClaimId) {
if (!longChannelClaimId) {
// Allow an error to throw here if this fails
longChannelClaimId = await db.Certificate.getLongChannelId(channelName, channelClaimId);
}
let shortChannelClaimId = await chainquery.claim.queries.getShortClaimIdFromLongClaimId(longChannelClaimId, channelName).catch(() => false);
if(!shortChannelClaimId) {
if (!shortChannelClaimId) {
shortChannelClaimId = await db.Certificate.getShortChannelIdFromLongChannelId(longChannelClaimId, channelName);
}

View file

@ -12,7 +12,7 @@ const channelShortIdRoute = async ({ ip, originalUrl, params }, res) => {
try {
let shortId = await chainquery.claim.queries.getShortClaimIdFromLongClaimId(params.longId, params.name).catch(() => false);
if(!shortId) {
if (!shortId) {
shortId = await db.Certificate.getShortChannelIdFromLongChannelId(params.longId, params.name);
}

View file

@ -10,7 +10,6 @@ const db = require('server/models');
*/
const claimData = async ({ ip, originalUrl, body, params }, res) => {
try {
const resolvedClaim = await fetchClaimData(params);
@ -25,7 +24,7 @@ const claimData = async ({ ip, originalUrl, body, params }, res) => {
success: true,
data : await getClaimData(resolvedClaim),
});
} catch(error) {
} catch (error) {
handleErrorResponse(originalUrl, ip, error, res);
}
};

View file

@ -18,16 +18,16 @@ const claimGet = async ({ ip, originalUrl, params }, res) => {
try {
let claimData = await chainquery.claim.queries.resolveClaim(name, claimId).catch(() => {});
if(!claimData) {
if (!claimData) {
claimData = await db.Claim.resolveClaim(name, claimId);
}
if(!claimData) {
if (!claimData) {
throw new Error('No matching uri found in Claim table');
}
let lbrynetResult = await getClaim(`${name}#${claimId}`);
if(!lbrynetResult) {
if (!lbrynetResult) {
throw new Error(`Unable to Get ${name}#${claimId}`);
}
@ -38,8 +38,8 @@ const claimGet = async ({ ip, originalUrl, params }, res) => {
try {
await waitOn({
resources: [ lbrynetResult.file_name ],
delay: 100,
timeout: 10000, // 10 seconds
delay : 100,
timeout : 10000, // 10 seconds
});
} catch (e) {}
@ -49,7 +49,7 @@ const claimGet = async ({ ip, originalUrl, params }, res) => {
message,
completed,
});
} catch(error) {
} catch (error) {
handleErrorResponse(originalUrl, ip, error, res);
}
};

View file

@ -125,7 +125,7 @@ const claimPublish = ({ body, files, headers, ip, originalUrl, user, tor }, res)
if (channelName) {
canonicalUrl = createCanonicalLink({ asset: { ...claimData, channelShortId: shortId } });
} else {
canonicalUrl = createCanonicalLink({ asset: { ...claimData, shortId } })
canonicalUrl = createCanonicalLink({ asset: { ...claimData, shortId } });
}
res.status(200).json({

View file

@ -12,12 +12,12 @@ const claimShortId = async ({ ip, originalUrl, body, params }, res) => {
try {
let shortId = await chainquery.claim.queries.getShortClaimIdFromLongClaimId(params.longId, params.name).catch(() => {});
if(!shortId) {
if (!shortId) {
shortId = await db.Claim.getShortClaimIdFromLongClaimId(params.longId, params.name);
}
res.status(200).json({success: true, data: shortId});
} catch(error) {
} catch (error) {
handleErrorResponse(originalUrl, ip, error, res);
}
};

View file

@ -107,7 +107,6 @@ const claimUpdate = ({ body, files, headers, ip, originalUrl, user, tor }, res)
return [null, null];
})
.then(([fileResult, resolution]) => {
metadata = Object.assign({}, {
title : claimRecord.title,
description: claimRecord.description,
@ -164,7 +163,7 @@ const claimUpdate = ({ body, files, headers, ip, originalUrl, user, tor }, res)
if (channelName) {
canonicalUrl = createCanonicalLink({ asset: { ...publishResult, channelShortId: shortId } });
} else {
canonicalUrl = createCanonicalLink({ asset: { ...publishResult, shortId } })
canonicalUrl = createCanonicalLink({ asset: { ...publishResult, shortId } });
}
if (publishResult.error) {
@ -181,10 +180,10 @@ const claimUpdate = ({ body, files, headers, ip, originalUrl, user, tor }, res)
data : {
name,
claimId,
url : `${details.host}${canonicalUrl}`, // for backwards compatability with app
showUrl : `${details.host}${canonicalUrl}`,
serveUrl: `${details.host}${canonicalUrl}${fileExtension}`,
pushTo : canonicalUrl,
url : `${details.host}${canonicalUrl}`, // for backwards compatability with app
showUrl : `${details.host}${canonicalUrl}`,
serveUrl : `${details.host}${canonicalUrl}${fileExtension}`,
pushTo : canonicalUrl,
claimData: publishResult,
},
});

View file

@ -20,7 +20,7 @@ const claimViews = async ({ ip, originalUrl, body, params }, res) => {
[claimId]: viewCount,
},
});
} catch(error) {
} catch (error) {
handleErrorResponse(originalUrl, ip, error, res);
}
};

View file

@ -14,21 +14,21 @@ const channelClaims = async ({ ip, originalUrl, body, params }, res) => {
page,
} = params;
if(name === 'trending') {
if (name === 'trending') {
const result = await db.Trending.getTrendingClaims();
const claims = await Promise.all(result.map((claim) => getClaimData(claim)));
return res.status(200).json({
success: true,
data: {
channelName: name,
data : {
channelName : name,
claims,
longChannelClaimId: name,
currentPage: 1,
nextPage: null,
previousPage: null,
totalPages: 1,
totalResults: claims.length,
}
currentPage : 1,
nextPage : null,
previousPage : null,
totalPages : 1,
totalResults : claims.length,
},
});
}

View file

@ -28,7 +28,7 @@ const getClaimIdAndServeAsset = (channelName, channelClaimId, claimName, claimId
logger.debug('Full claim id:', claimId);
return db.Claim.findOne({
where: {
name : claimName,
name: claimName,
claimId,
},
});
@ -47,17 +47,15 @@ const getClaimIdAndServeAsset = (channelName, channelClaimId, claimName, claimId
logger.debug('Outpoint:', outpoint);
return db.Blocked.isNotBlocked(outpoint).then(() => {
// If content was found, is approved, and not blocked - log a view.
if(headers && headers['user-agent'] && /LBRY/.test(headers['user-agent']) === false) {
if (headers && headers['user-agent'] && /LBRY/.test(headers['user-agent']) === false) {
db.Views.create({
time: Date.now(),
isChannel: false,
claimId: claimDataValues.claim_id || claimDataValues.claimId,
time : Date.now(),
isChannel : false,
claimId : claimDataValues.claim_id || claimDataValues.claimId,
publisherId: claimDataValues.publisher_id || claimDataValues.certificateId,
ip,
});
}
return;
});
})
.then(() => {

View file

@ -4,57 +4,52 @@ const {
} = require('@config/siteConfig');
const padSizes = {
small: 'padSmall',
small : 'padSmall',
medium: 'padMedium',
large: 'padLarge',
large : 'padLarge',
};
const argumentProcessors = {
'bottom': async (config) => {
config.classNames.push('bottom');
return;
},
'right': async (config) => {
config.classNames.push('right');
return;
},
'pad': async (config, val) => {
config.classNames.push(padSizes[val]);
return;
},
'logoClaim': async (config, val) => {
config.logoUrl = `${host}/${val}`;
return;
},
'link': async (config, val) => {
config.logoLink = val;
return;
}
},
};
const parseLogoConfigParam = async (rawConfig) => {
if(rawConfig) {
if (rawConfig) {
let parsedConfig = {
classNames: ['logoLink'],
logoUrl: thumbnail,
logoUrl : thumbnail,
};
let splitConfig;
try {
splitConfig = rawConfig.split(',');
} catch(e) { }
} catch (e) { }
if(!splitConfig) {
if (!splitConfig) {
return false;
}
for(let i = 0; i < splitConfig.length; i++) {
for (let i = 0; i < splitConfig.length; i++) {
let currentArgument = splitConfig[i];
if(argumentProcessors[currentArgument]) {
if (argumentProcessors[currentArgument]) {
await argumentProcessors[currentArgument](parsedConfig);
} else {
const splitArgument = currentArgument.split(':');
if(argumentProcessors[splitArgument[0]]) {
if (argumentProcessors[splitArgument[0]]) {
await argumentProcessors[splitArgument[0]](parsedConfig, splitArgument[1]);
}
}
@ -66,7 +61,7 @@ const parseLogoConfigParam = async (rawConfig) => {
}
return false;
}
};
const sendVideoEmbedPage = async ({ params }, res) => {
let {

View file

@ -8,13 +8,13 @@ const getClaimIdByChannel = async (channelName, channelClaimId, claimName) => {
let channelId = await chainquery.claim.queries.getLongClaimId(channelName, channelClaimId);
if(channelId === null) {
if (channelId === null) {
channelId = await db.Certificate.getLongChannelId(channelName, channelClaimId);
}
let claimId = await chainquery.claim.queries.getClaimIdByLongChannelId(channelId, claimName);
if(claimId === null) {
if (claimId === null) {
claimId = db.Claim.getClaimIdByLongChannelId(channelId, claimName);
}
@ -28,7 +28,7 @@ const getClaimId = async (channelName, channelClaimId, name, claimId) => {
} else {
let claimIdResult = await chainquery.claim.queries.getLongClaimId(name, claimId);
if(!claimIdResult) {
if (!claimIdResult) {
claimIdResult = await db.Claim.getLongClaimId(name, claimId);
}

View file

@ -48,7 +48,7 @@ function Server () {
app.enable('trust proxy');
app.use((req, res, next) => {
if(req.get('User-Agent') === 'Mozilla/5.0 (Windows NT 5.1; rv:14.0) Gecko/20120405 Firefox/14.0a1') {
if (req.get('User-Agent') === 'Mozilla/5.0 (Windows NT 5.1; rv:14.0) Gecko/20120405 Firefox/14.0a1') {
res.status(403).send('<h1>Forbidden</h1>If you are seeing this by mistake, please contact us using <a href="https://chat.lbry.io/">https://chat.lbry.io/</a>');
res.end();
} else {
@ -182,7 +182,7 @@ function Server () {
.then(() => {
logger.info('Spee.ch startup is complete');
setInterval(processTrending, 30 * 60000) // 30 minutes
setInterval(processTrending, 30 * 60000); // 30 minutes
})
.catch(error => {
if (error.code === 'ECONNREFUSED') {

View file

@ -8,13 +8,13 @@ const forbiddenMessage = '<h1>Forbidden</h1>If you are seeing this by mistake, p
let ipCounts = {};
let blockedAddresses = [];
if(fs.existsSync(ipBanFile)) {
if (fs.existsSync(ipBanFile)) {
const lineReader = require('readline').createInterface({
input: require('fs').createReadStream(ipBanFile),
});
lineReader.on('line', (line) => {
if(line && line !== '') {
if (line && line !== '') {
blockedAddresses.push(line);
}
});
@ -23,7 +23,7 @@ if(fs.existsSync(ipBanFile)) {
const autoblockPublishMiddleware = (req, res, next) => {
let ip = (req.headers['x-forwarded-for'] || req.connection.remoteAddress).split(/,\s?/)[0];
if(blockedAddresses.indexOf(ip) !== -1) {
if (blockedAddresses.indexOf(ip) !== -1) {
res.status(403).send(forbiddenMessage);
res.end();
@ -33,15 +33,15 @@ const autoblockPublishMiddleware = (req, res, next) => {
let count = ipCounts[ip] = (ipCounts[ip] || 0) + 1;
setTimeout(() => {
if(ipCounts[ip]) {
if (ipCounts[ip]) {
ipCounts[ip]--;
if(ipCounts[ip] === 0) {
if (ipCounts[ip] === 0) {
delete ipCounts[ip];
}
}
}, 600000 /* 10 minute retainer */)
}, 600000 /* 10 minute retainer */);
if(count === 10) {
if (count === 10) {
logger.error(`Banning IP: ${ip}`);
blockedAddresses.push(ip);
res.status(403).send(forbiddenMessage);
@ -51,19 +51,19 @@ const autoblockPublishMiddleware = (req, res, next) => {
} else {
next();
}
}
};
const autoblockPublishBodyMiddleware = (req, res, next) => {
if(req.body && publishingChannelWhitelist) {
if (req.body && publishingChannelWhitelist) {
let ip = (req.headers['x-forwarded-for'] || req.connection.remoteAddress).split(/,\s?/)[0];
const { channelName } = req.body;
if(channelName && publishingChannelWhitelist.indexOf(channelName) !== -1) {
if (channelName && publishingChannelWhitelist.indexOf(channelName) !== -1) {
delete ipCounts[ip];
}
}
next();
}
};
module.exports = {
autoblockPublishMiddleware,

View file

@ -2,39 +2,39 @@ const logger = require('winston');
const db = require('../models');
const httpContext = require('express-http-context');
function logMetricsMiddleware(req, res, next) {
function logMetricsMiddleware (req, res, next) {
res.on('finish', () => {
const userAgent = req.get('user-agent');
const routePath = httpContext.get('routePath');
let referrer = req.get('referrer');
if(referrer && referrer.length > 255) {
if (referrer && referrer.length > 255) {
try {
// Attempt to "safely" clamp long URLs
referrer = /(.*?)#.*/.exec(referrer)[1];
} catch(e) {
} catch (e) {
// Cheap forced string conversion & clamp
referrer = new String(referrer);
referrer = referrer.substr(0, 255);
}
if(referrer.length > 255) {
if (referrer.length > 255) {
logger.warn('Request refferer exceeds 255 characters:', referrer);
referrer = referrer.substring(0, 255);
}
}
db.Metrics.create({
time: Date.now(),
time : Date.now(),
isInternal: /node\-fetch/.test(userAgent),
isChannel: res.isChannel,
claimId: res.claimId,
routePath: httpContext.get('routePath'),
params: JSON.stringify(req.params),
ip: req.headers['x-forwarded-for'] || req.connection.remoteAddress,
request: req.url,
routeData: JSON.stringify(httpContext.get('routeData')),
isChannel : res.isChannel,
claimId : res.claimId,
routePath : httpContext.get('routePath'),
params : JSON.stringify(req.params),
ip : req.headers['x-forwarded-for'] || req.connection.remoteAddress,
request : req.url,
routeData : JSON.stringify(httpContext.get('routeData')),
referrer,
userAgent,
});
@ -43,7 +43,7 @@ function logMetricsMiddleware(req, res, next) {
next();
}
function setRouteDataInContextMiddleware(routePath, routeData) {
function setRouteDataInContextMiddleware (routePath, routeData) {
return function (req, res, next) {
httpContext.set('routePath', routePath);
httpContext.set('routeData', routeData);

View file

@ -3,49 +3,49 @@ module.exports = (sequelize, { BOOLEAN, DATE, STRING }) => {
'Metrics',
{
time: {
type: DATE(6),
type : DATE(6),
defaultValue: sequelize.NOW,
},
isInternal: {
type: BOOLEAN,
},
isChannel: {
type: BOOLEAN,
type : BOOLEAN,
defaultValue: false,
},
claimId: {
type: STRING,
type : STRING,
defaultValue: null,
},
ip: {
type: STRING,
type : STRING,
defaultValue: null,
},
request: {
type: STRING,
type : STRING,
defaultValue: null,
},
userAgent: {
type: STRING,
type : STRING,
defaultValue: null,
},
referrer: {
type: STRING,
type : STRING,
defaultValue: null,
},
routePath: {
type: STRING,
type : STRING,
defaultValue: null,
},
params: {
type: STRING,
type : STRING,
defaultValue: null,
}
},
},
{
freezeTableName: true,
timestamps: false, // don't use default timestamps columns
indexes: [
timestamps : false, // don't use default timestamps columns
indexes : [
{
fields: ['isInternal', 'isChannel', 'time', 'claimId', 'routePath'],
},

View file

@ -5,43 +5,43 @@ module.exports = (sequelize, { BOOLEAN, DATE, FLOAT, INTEGER, STRING }) => {
'Trending',
{
time: { /* TODO: Historical analysis and log roll */
type: DATE(6),
type : DATE(6),
defaultValue: sequelize.NOW,
},
isChannel: {
type: BOOLEAN,
type : BOOLEAN,
defaultValue: false,
},
claimId: {
type: STRING,
type : STRING,
defaultValue: null,
},
publisherId: {
type: STRING,
type : STRING,
defaultValue: null,
},
intervalViews: {
type: INTEGER,
type : INTEGER,
defaultValue: 0,
},
weight: {
type: FLOAT,
type : FLOAT,
defaultValue: 0,
},
zScore: {
type: FLOAT,
type : FLOAT,
defaultValue: 0,
},
pValue: {
type: FLOAT,
type : FLOAT,
defaultValue: 0,
},
// TODO: Calculate t-statistics
},
{
freezeTableName: true,
timestamps: false, // don't use default timestamps columns
indexes: [
timestamps : false, // don't use default timestamps columns
indexes : [
{
fields: ['claimId'],
},
@ -55,7 +55,7 @@ module.exports = (sequelize, { BOOLEAN, DATE, FLOAT, INTEGER, STRING }) => {
Trending.getTrendingWeightData = async ({
hours = 2,
minutes = 0,
limit = 20
limit = 20,
} = {}) => {
let time = new Date();
time.setHours(time.getHours() - hours);
@ -65,7 +65,7 @@ module.exports = (sequelize, { BOOLEAN, DATE, FLOAT, INTEGER, STRING }) => {
const selectString = 'DISTINCT(claimId), weight';
const whereString = `isChannel = false and time > '${sqlTime}'`;
const query = `SELECT ${selectString} FROM Trending WHERE ${whereString} ORDER BY weight DESC LIMIT ${limit}`
const query = `SELECT ${selectString} FROM Trending WHERE ${whereString} ORDER BY weight DESC LIMIT ${limit}`;
return await sequelize.query(query, { type: sequelize.QueryTypes.SELECT });
};
@ -77,7 +77,7 @@ module.exports = (sequelize, { BOOLEAN, DATE, FLOAT, INTEGER, STRING }) => {
const trendingClaims = trendingWeightData.reduce((claims, trendingData) => {
trendingClaimIds.push(trendingData.claimId);
claims[trendingData.claimId] = {
...trendingData
...trendingData,
};
return claims;

View file

@ -9,7 +9,7 @@ const getMean = (numArr) => {
let total = 0;
let length = numArr.length; // store local to reduce potential prop lookups
for(let i = 0; i < length; i++) {
for (let i = 0; i < length; i++) {
total += numArr[i];
}
@ -28,17 +28,17 @@ const getInformationFromValues = (numArr) => {
return {
mean,
standardDeviation: getStandardDeviation(numArr, mean),
}
};
};
const getZScore = (value, mean, sDeviation) => ( sDeviation !== 0 ? (value - mean) / sDeviation : 0 );
const getZScore = (value, mean, sDeviation) => (sDeviation !== 0 ? (value - mean) / sDeviation : 0);
const getFastPValue = (zScore) => {
if(zScore <= MIN_P) {
return 0;
if (zScore <= MIN_P) {
return 0;
}
if(zScore >= MAX_P) {
return 1;
if (zScore >= MAX_P) {
return 1;
}
let factorialK = 1;
@ -46,8 +46,8 @@ const getFastPValue = (zScore) => {
let sum = 0;
let term = 1;
while(Math.abs(term) > MAX_P_PRECISION) {
term = ONE_DIV_SQRT_2PI * Math.pow(-1 , k) * Math.pow(zScore , k) / (2 * k + 1) / Math.pow(2 , k) * Math.pow(zScore, k + 1) / factorialK;
while (Math.abs(term) > MAX_P_PRECISION) {
term = ONE_DIV_SQRT_2PI * Math.pow(-1, k) * Math.pow(zScore, k) / (2 * k + 1) / Math.pow(2, k) * Math.pow(zScore, k + 1) / factorialK;
sum += term;
k++;
factorialK *= k;
@ -57,7 +57,6 @@ const getFastPValue = (zScore) => {
return sum;
};
const getWeight = (zScore, pValue) => (zScore * pValue);
module.exports = {

View file

@ -3,30 +3,30 @@ module.exports = (sequelize, { BOOLEAN, DATE, STRING }) => {
'Views',
{
time: {
type: DATE(6),
type : DATE(6),
defaultValue: sequelize.NOW,
},
isChannel: {
type: BOOLEAN,
type : BOOLEAN,
defaultValue: false,
},
claimId: {
type: STRING,
type : STRING,
defaultValue: null,
},
publisherId: {
type: STRING,
type : STRING,
defaultValue: null,
},
ip: {
type: STRING,
type : STRING,
defaultValue: null,
},
},
{
freezeTableName: true,
timestamps: false, // don't use default timestamps columns
indexes: [
timestamps : false, // don't use default timestamps columns
indexes : [
{
fields: ['time', 'isChannel', 'claimId', 'publisherId', 'ip'],
},
@ -59,8 +59,8 @@ module.exports = (sequelize, { BOOLEAN, DATE, STRING }) => {
claimId,
},
distinct: true,
col: 'ip'
})
col : 'ip',
});
};
return Views;

View file

@ -26,42 +26,40 @@ const getTorList = require('../../controllers/api/tor');
const getBlockedList = require('../../controllers/api/blocked');
const getOEmbedData = require('../../controllers/api/oEmbed');
module.exports = {
// homepage routes
'/api/homepage/data/channels': { controller: [ torCheckMiddleware, channelData ] },
'/api/homepage/data/channels' : { controller: [ torCheckMiddleware, channelData ] },
// channel routes
'/api/channel/availability/:name': { controller: [ torCheckMiddleware, channelAvailability ] },
'/api/channel/short-id/:longId/:name': { controller: [ torCheckMiddleware, channelShortId ] },
'/api/channel/data/:channelName/:channelClaimId': { controller: [ torCheckMiddleware, channelData ] },
'/api/channel/availability/:name' : { controller: [ torCheckMiddleware, channelAvailability ] },
'/api/channel/short-id/:longId/:name' : { controller: [ torCheckMiddleware, channelShortId ] },
'/api/channel/data/:channelName/:channelClaimId' : { controller: [ torCheckMiddleware, channelData ] },
'/api/channel/claims/:channelName/:channelClaimId/:page': { controller: [ torCheckMiddleware, channelClaims ] },
// sepcial routes
'/api/special/:name/:page': { controller: [ torCheckMiddleware, specialClaims ] },
// claim routes
'/api/claim/availability/:name': { controller: [ torCheckMiddleware, claimAvailability ] },
'/api/claim/data/:claimName/:claimId': { controller: [ torCheckMiddleware, claimData ] },
'/api/claim/get/:name/:claimId': { controller: [ torCheckMiddleware, claimGet ] },
'/api/claim/list/:name': { controller: [ torCheckMiddleware, claimList ] },
'/api/claim/long-id': { method: 'post', controller: [ torCheckMiddleware, claimLongId ] }, // note: should be a 'get'
'/api/claim/publish': { method: 'post', controller: [ torCheckMiddleware, autoblockPublishMiddleware, multipartMiddleware, autoblockPublishBodyMiddleware, claimPublish ] },
'/api/claim/update': { method: 'post', controller: [ torCheckMiddleware, multipartMiddleware, claimUpdate ] },
'/api/claim/abandon': { method: 'post', controller: [ torCheckMiddleware, multipartMiddleware, claimAbandon ] },
'/api/claim/resolve/:name/:claimId': { controller: [ torCheckMiddleware, claimResolve ] },
'/api/claim/short-id/:longId/:name': { controller: [ torCheckMiddleware, claimShortId ] },
'/api/claim/views/:claimId': { controller: [ torCheckMiddleware, claimViews ] },
'/api/claim/availability/:name' : { controller: [ torCheckMiddleware, claimAvailability ] },
'/api/claim/data/:claimName/:claimId' : { controller: [ torCheckMiddleware, claimData ] },
'/api/claim/get/:name/:claimId' : { controller: [ torCheckMiddleware, claimGet ] },
'/api/claim/list/:name' : { controller: [ torCheckMiddleware, claimList ] },
'/api/claim/long-id' : { method: 'post', controller: [ torCheckMiddleware, claimLongId ] }, // note: should be a 'get'
'/api/claim/publish' : { method: 'post', controller: [ torCheckMiddleware, autoblockPublishMiddleware, multipartMiddleware, autoblockPublishBodyMiddleware, claimPublish ] },
'/api/claim/update' : { method: 'post', controller: [ torCheckMiddleware, multipartMiddleware, claimUpdate ] },
'/api/claim/abandon' : { method: 'post', controller: [ torCheckMiddleware, multipartMiddleware, claimAbandon ] },
'/api/claim/resolve/:name/:claimId' : { controller: [ torCheckMiddleware, claimResolve ] },
'/api/claim/short-id/:longId/:name' : { controller: [ torCheckMiddleware, claimShortId ] },
'/api/claim/views/:claimId' : { controller: [ torCheckMiddleware, claimViews ] },
// file routes
'/api/file/availability/:name/:claimId': { controller: [ torCheckMiddleware, fileAvailability ] },
// user routes
'/api/user/password/': { method: 'put', controller: [ torCheckMiddleware, userPassword ] },
'/api/user/password/' : { method: 'put', controller: [ torCheckMiddleware, userPassword ] },
// configs
'/api/config/site/publishing': { controller: [ torCheckMiddleware, publishingConfig ] },
'/api/config/site/publishing' : { controller: [ torCheckMiddleware, publishingConfig ] },
// tor
'/api/tor': { controller: [ torCheckMiddleware, getTorList ] },
'/api/tor' : { controller: [ torCheckMiddleware, getTorList ] },
// blocked
'/api/blocked': { controller: [ torCheckMiddleware, getBlockedList ] },
'/api/blocked' : { controller: [ torCheckMiddleware, getBlockedList ] },
// open embed
'/api/oembed': { controller: [ torCheckMiddleware, getOEmbedData ] },
'/api/oembed' : { controller: [ torCheckMiddleware, getOEmbedData ] },
};

View file

@ -7,5 +7,5 @@ const Sagas = require('@sagas').default;
module.exports = {
'/:identifier/:claim': { controller: serveByIdentifierAndClaim, action: Actions.onHandleShowPageUri, saga: Sagas.handleShowPageUri },
'/:claim': { controller: serveByClaim, action: Actions.onHandleShowPageUri, saga: Sagas.handleShowPageUri },
'/:claim' : { controller: serveByClaim, action: Actions.onHandleShowPageUri, saga: Sagas.handleShowPageUri },
};

View file

@ -6,7 +6,7 @@ const handleUserRequest = require('../../controllers/auth/user');
module.exports = {
'/signup': { method: 'post', controller: [ speechPassport.authenticate('local-signup'), handleSignupRequest ] },
'/auth': { method: 'post', controller: handleLoginRequest },
'/auth' : { method: 'post', controller: handleLoginRequest },
'/logout': { controller: handleLogoutRequest },
'/user': { controller: handleUserRequest },
'/user' : { controller: handleUserRequest },
};

View file

@ -7,15 +7,15 @@ const Actions = require('@actions').default;
const Sagas = require('@sagas').default;
module.exports = {
'/': { controller: handlePageRequest, action: Actions.onHandleShowHomepage, saga: Sagas.handleShowHomepage },
'/login': { controller: handlePageRequest },
'/about': { controller: handlePageRequest },
'/tos': { controller: handlePageRequest },
'/faq': { controller: handlePageRequest },
'/trending': { controller: redirect('/popular') },
'/popular': { controller: handlePageRequest },
'/new': { controller: handlePageRequest },
'/edit/:claimId': { controller: handlePageRequest },
'/multisite': { controller: handlePageRequest },
'/' : { controller: handlePageRequest, action: Actions.onHandleShowHomepage, saga: Sagas.handleShowHomepage },
'/login' : { controller: handlePageRequest },
'/about' : { controller: handlePageRequest },
'/tos' : { controller: handlePageRequest },
'/faq' : { controller: handlePageRequest },
'/trending' : { controller: redirect('/popular') },
'/popular' : { controller: handlePageRequest },
'/new' : { controller: handlePageRequest },
'/edit/:claimId' : { controller: handlePageRequest },
'/multisite' : { controller: handlePageRequest },
'/video-embed/:name/:claimId/:config?': { controller: handleVideoEmbedRequest }, // for twitter
};

View file

@ -6,8 +6,8 @@ module.exports = async (data) => {
const certificateId = data.publisher_id || data.certificateId;
let channelName = data.channelName;
if(certificateId && !channelName) {
channelName = await chainquery.claim.queries.getClaimChannelName(certificateId).catch(()=>{});
if (certificateId && !channelName) {
channelName = await chainquery.claim.queries.getClaimChannelName(certificateId).catch(() => {});
}
let channelShortId = null;
@ -16,17 +16,17 @@ module.exports = async (data) => {
}
return ({
name: data.name,
title: data.title,
name : data.name,
title : data.title,
certificateId,
channelName,
channelShortId,
contentType: data.content_type || data.contentType,
claimId: data.claim_id || data.claimId,
fileExt: data.generated_extension || data.fileExt,
claimId : data.claim_id || data.claimId,
fileExt : data.generated_extension || data.fileExt,
description: data.description,
thumbnail: data.generated_thumbnail || data.thumbnail_url || data.thumbnail,
outpoint: data.transaction_hash_id || data.outpoint,
thumbnail : data.generated_thumbnail || data.thumbnail_url || data.thumbnail,
outpoint : data.transaction_hash_id || data.outpoint,
host,
})
}
});
};

View file

@ -1,6 +1,6 @@
module.exports = function(req) {
let reqIp = req.connection.remoteAddress;
let host = req.get('host');
module.exports = function (req) {
let reqIp = req.connection.remoteAddress;
let host = req.get('host');
return reqIp === '127.0.0.1' || reqIp === '::ffff:127.0.0.1' || reqIp === '::1' || host.indexOf('localhost') !== -1;
}
return reqIp === '127.0.0.1' || reqIp === '::ffff:127.0.0.1' || reqIp === '::1' || host.indexOf('localhost') !== -1;
};

View file

@ -13,7 +13,7 @@ module.exports = async () => {
const claims = await db.Trending.getTrendingClaims();
const claimViews = await db.Views.getUniqueViews();
if(claimViews.length <= 1) {
if (claimViews.length <= 1) {
return;
}
@ -26,7 +26,7 @@ module.exports = async () => {
standardDeviation,
} = getInformationFromValues(viewsNumArray);
for(let i = 0; i < claimViews.length; i++) {
for (let i = 0; i < claimViews.length; i++) {
let claimViewsEntry = claimViews[i];
const {
@ -41,9 +41,9 @@ module.exports = async () => {
const trendingData = {
time,
isChannel: claimViewsEntry.isChannel,
claimId: claimViewsEntry.claimId,
publisherId: claimViewsEntry.publisherId,
isChannel : claimViewsEntry.isChannel,
claimId : claimViewsEntry.claimId,
publisherId : claimViewsEntry.publisherId,
intervalViews: claimViewsEntry.views,
weight,
zScore,
@ -52,7 +52,7 @@ module.exports = async () => {
db.Trending.create(trendingData);
}
} catch(e) {
} catch (e) {
logger.error('Error processing trending content:', e);
}
}
};