Resolve channels #150

2017-08-25T18:35:30+02:00

bones7242 commented

2017-08-25 18:35:30 +02:00

(Migrated from github.com)

added support for channel resolutions

resolves to a list of the channels assets:
- spee.ch/@channel
- spee.ch/@channel:shortid
- spee.ch/@channel:longclaimid
resolves to a specific asset (show)
- spee.ch/@channel/name
- spee.ch/@channel:shortid/name
- spee.ch/@channel:longclaimid/name
serves an asset
- spee.ch/@channel/name.ext
- spee.ch/@channel:shortid/name.ext
- spee.ch/@channel:longclaimid/name.ext

reorganized router functions

still to do: (will be a separate pr): add channel information to the asset's info page

added support for channel resolutions - resolves to a list of the channels assets: - spee.ch/@channel - spee.ch/@channel:shortid - spee.ch/@channel:longclaimid - resolves to a specific asset (show) - spee.ch/@channel/name - spee.ch/@channel:shortid/name - spee.ch/@channel:longclaimid/name - serves an asset - spee.ch/@channel/name.ext - spee.ch/@channel:shortid/name.ext - spee.ch/@channel:longclaimid/name.ext reorganized router functions still to do: (will be a separate pr): add channel information to the asset's info page

kauffj (Migrated from github.com) reviewed

2017-08-25 19:35:21 +02:00

kauffj (Migrated from github.com) left a comment

Some clean-up would be good here.

controllers/serveController.js

					
				@ -3,2 +3,3 @@

				const logger = require('winston');

				const { getTopFreeClaim, getFullClaimIdFromShortId, resolveAgainstClaimTable } = require('../helpers/serveHelpers.js');

				const { resolveAgainstClaimTable, serveFile, showFile, showFileLite, getShortClaimIdFromLongClaimId, getClaimIdByLongChannelId, getAllChannelClaims, getLongChannelId, getShortChannelIdFromLongChannelId, getLongClaimId } = require('../helpers/serveHelpers.js');

				const { postToStats, sendGoogleAnalytics } = require('../controllers/statsController.js');

This looks like it could use better organization. I'd be inclined to put a lot of these inside of the modal folder, but I'd suggest looking at what other conventions are used in this framework before doing that.

This looks like it could use better organization. I'd be inclined to put a lot of these inside of the `modal` folder, but I'd suggest looking at what other conventions are used in this framework before doing that.

controllers/serveController.js

This is shared across all 3 cases and could be pulled above/out.

controllers/statsController.js

					
				@ -159,0 +160,4 @@

				    logger.debug('retrieving most recent claims');

				    return new Promise((resolve, reject) => {

				      // get the raw requests data

				      db.sequelize.query(`SELECT * FROM File WHERE nsfw != 1 AND trendingEligible = 1 ORDER BY createdAt DESC LIMIT 25;`, { type: db.sequelize.QueryTypes.SELECT })

Try to avoid SQL in your controllers and keep it located in the modal layer. This helps facilitates future modal refactoring/redesign and keeps controllers simpler (controllers are typically then thinnest of the 3 MVC layers).

helpers/constants.js

					
				@ -0,0 +1,8 @@

				module.exports = {

I'd be more inclined to keep these where they were, or to put them on the object/class they relate to, then to create a single constants file like this.

routes/page-routes.js

					
				@ -21,6 +21,19 @@ module.exports = (app) => {

				        errorHandlers.handleRequestError(error, res);

The old URL ought to be 301 redirect to the new one.

routes/serve-routes.js

Conventionally, the extension would not include the period (e.g. "gifv" not ".gifv").