gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor resources.js to include meta description.

Browse Source
This commit is contained in:
Nathan Leniz
2015-03-09 18:21:41 +09:00
parent 77cf279f54
commit 55b047aa32
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
controllers/resources.js
View File

@ -4,7 +4,6 @@ var User = require('../models/User'),
Story = require('./../models/Story'), Story = require('./../models/Story'),
Comment = require('./../models/Comment'), Comment = require('./../models/Comment'),
resources = require('./resources.json'), resources = require('./resources.json'),
questions = resources.questions,
steps = resources.steps, steps = resources.steps,
secrets = require('./../config/secrets'), secrets = require('./../config/secrets'),
bonfires = require('../seed_data/bonfires.json'), bonfires = require('../seed_data/bonfires.json'),
@ -147,7 +146,7 @@ module.exports = {
}, },
bloggerCalls: function(req, res) { bloggerCalls: function(req, res) {
request('https://www.googleapis.com/blogger/v3/blogs/2421288658305323950/posts?key=' + secrets.blogger.key, function (err, status, blog) { request('https://www.googleapis.com/blogger/v3/blogs/2421288658305323950/posts?key=' + secrets.blogger.key, function (err, status, blog) {
var blog = blog.length > 100 ? JSON.parse(blog) : ""; blog = blog.length > 100 ? JSON.parse(blog) : '';
res.send({ res.send({
blog1Title: blog ? blog["items"][0]["title"] : "Can't connect to Blogger", blog1Title: blog ? blog["items"][0]["title"] : "Can't connect to Blogger",
blog1Link: blog ? blog["items"][0]["url"] : "http://blog.freecodecamp.com", blog1Link: blog ? blog["items"][0]["url"] : "http://blog.freecodecamp.com",
@ -218,10 +217,6 @@ module.exports = {
return compliments[Math.floor(Math.random() * compliments.length)]; return compliments[Math.floor(Math.random() * compliments.length)];
}, },
numberOfBonfires: function() {
return bonfires.length - 1;
},
allBonfireIds: function() { allBonfireIds: function() {
return bonfires.map(function(elem) { return bonfires.map(function(elem) {
return { return {
@ -285,14 +280,17 @@ module.exports = {
getURLTitle: function(url, callback) { getURLTitle: function(url, callback) {
debug('got url in meta scraping function', url); debug('got url in meta scraping function', url);
(function () { (function () {
var result = {title: '', image: '', url: ''}; var result = {title: '', image: '', url: '', description: ''};
request(url, function (error, response, body) { request(url, function (error, response, body) {
if (!error && response.statusCode === 200) { if (!error && response.statusCode === 200) {
var $ = cheerio.load(body); var $ = cheerio.load(body);
var urlImage = $("meta[property='og:image']").attr('content') ? $("meta[property='og:image']").attr('content') : ''; var metaDescription = $("meta[name='description']");
var title = $('title').text(); var metaImage = $("meta[property='og:image']");
result.title = title; var urlImage = metaImage.attr('content') ? metaImage.attr('content') : '';
var description = metaDescription.attr('content') ? metaDescription.attr('content') : '';
result.title = $('title').text();
result.image = urlImage; result.image = urlImage;
result.description = description;
callback(null, result); callback(null, result);
} else { } else {
callback('failed'); callback('failed');