mirror of
https://github.com/vale981/Vulcan
synced 2025-03-10 04:26:41 -04:00
94c6121d91
This commit touch a lot of lines of code with the goal to be more rigorous about JavaScript code conventions defined in the `.jshintrc`. Some modification: * Add a list of used global symbols in the corresponding section of `.jshintrc` * Use local variables instead of global in a lot of places where the keyword `var` was mistakenly forgotten * Add missing semi-colons after instructions * Add new lines at the end of files * Remove trailing whitespaces * Use newer name of some Meteor APIs, eg `addFiles` instead of `add_files` * Add missing `break` statements in `switch` blocks * Use `===` instead of `==` and `!==` instead of `!=` * Remove unused variables This commit should also fix a few bugs due to this lack of rigor. One example of that was the test `typeof navElements === "array"` that was never true because in JavaScript, `typeof [] === "object"`, we replaced this test by the `_.isArray` method provided by underscore. It might also fix some potential collision related to global variables. There is still plenty of work until Telescope code base passes jsHint validation, but at least this commit is a step in the right direction.
65 lines
1.7 KiB
JavaScript
65 lines
1.7 KiB
JavaScript
|
|
var increasePostClicks = function(postId, ip){
|
|
|
|
var clickEvent = {
|
|
name: 'click',
|
|
properties: {
|
|
postId: postId,
|
|
ip: ip
|
|
}
|
|
};
|
|
|
|
// make sure this IP hasn't previously clicked on this post
|
|
var existingClickEvent = Events.findOne({name: 'click', 'properties.postId': postId, 'properties.ip': ip});
|
|
|
|
if(!existingClickEvent){
|
|
logEvent(clickEvent);
|
|
Posts.update(postId, { $inc: { clickCount: 1 }});
|
|
}
|
|
};
|
|
|
|
|
|
Meteor.startup(function (){
|
|
|
|
// Link Out
|
|
|
|
Router.route('/out', {
|
|
name: 'out',
|
|
where: 'server',
|
|
action: function(){
|
|
var query = this.request.query;
|
|
if(query.url){ // for some reason, query.url doesn't need to be decoded
|
|
var post = Posts.findOne({url: query.url});
|
|
if (post) {
|
|
var ip = this.request.connection.remoteAddress;
|
|
increasePostClicks(post._id, ip);
|
|
this.response.writeHead(302, {'Location': query.url});
|
|
} else {
|
|
// don't redirect if we can't find a post for that link
|
|
this.response.write('Invalid URL');
|
|
}
|
|
this.response.end();
|
|
}
|
|
}
|
|
});
|
|
|
|
// Account approved email
|
|
|
|
Router.route('/email/account-approved/:id?', {
|
|
name: 'accountApproved',
|
|
where: 'server',
|
|
action: function() {
|
|
var user = Meteor.users.findOne(this.params.id);
|
|
var emailProperties = {
|
|
profileUrl: Users.getProfileUrl(user),
|
|
username: Users.getUserName(user),
|
|
siteTitle: Settings.get('title'),
|
|
siteUrl: Telescope.utils.getSiteUrl()
|
|
};
|
|
var html = Handlebars.templates.emailAccountApproved(emailProperties);
|
|
this.response.write(buildEmailTemplate(html));
|
|
this.response.end();
|
|
}
|
|
});
|
|
|
|
});
|