diff --git a/public/vendor/tinycon/tinycon.js b/public/vendor/tinycon/tinycon.js
new file mode 100644
index 0000000000..c1164fa22d
--- /dev/null
+++ b/public/vendor/tinycon/tinycon.js
@@ -0,0 +1,267 @@
+/*!
+ * Tinycon - A small library for manipulating the Favicon
+ * Tom Moor, http://tommoor.com
+ * Copyright (c) 2012 Tom Moor
+ * MIT Licensed
+ * @version 0.6.1
+ */
+
+(function(){
+
+ var Tinycon = {};
+ var currentFavicon = null;
+ var originalFavicon = null;
+ var originalTitle = document.title;
+ var faviconImage = null;
+ var canvas = null;
+ var options = {};
+ var r = window.devicePixelRatio || 1;
+ var size = 16 * r;
+ var defaults = {
+ width: 7,
+ height: 9,
+ font: 10 * r + 'px arial',
+ colour: '#ffffff',
+ background: '#F03D25',
+ fallback: true,
+ crossOrigin: true,
+ abbreviate: true
+ };
+
+ var ua = (function () {
+ var agent = navigator.userAgent.toLowerCase();
+ // New function has access to 'agent' via closure
+ return function (browser) {
+ return agent.indexOf(browser) !== -1;
+ };
+ }());
+
+ var browser = {
+ ie: ua('msie'),
+ chrome: ua('chrome'),
+ webkit: ua('chrome') || ua('safari'),
+ safari: ua('safari') && !ua('chrome'),
+ mozilla: ua('mozilla') && !ua('chrome') && !ua('safari')
+ };
+
+ // private methods
+ var getFaviconTag = function(){
+
+ var links = document.getElementsByTagName('link');
+
+ for(var i=0, len=links.length; i < len; i++) {
+ if ((links[i].getAttribute('rel') || '').match(/\bicon\b/)) {
+ return links[i];
+ }
+ }
+
+ return false;
+ };
+
+ var removeFaviconTag = function(){
+
+ var links = document.getElementsByTagName('link');
+ var head = document.getElementsByTagName('head')[0];
+
+ for(var i=0, len=links.length; i < len; i++) {
+ var exists = (typeof(links[i]) !== 'undefined');
+ if (exists && (links[i].getAttribute('rel') || '').match(/\bicon\b/)) {
+ head.removeChild(links[i]);
+ }
+ }
+ };
+
+ var getCurrentFavicon = function(){
+
+ if (!originalFavicon || !currentFavicon) {
+ var tag = getFaviconTag();
+ originalFavicon = currentFavicon = tag ? tag.getAttribute('href') : '/favicon.ico';
+ }
+
+ return currentFavicon;
+ };
+
+ var getCanvas = function (){
+
+ if (!canvas) {
+ canvas = document.createElement("canvas");
+ canvas.width = size;
+ canvas.height = size;
+ }
+
+ return canvas;
+ };
+
+ var setFaviconTag = function(url){
+ removeFaviconTag();
+
+ var link = document.createElement('link');
+ link.type = 'image/x-icon';
+ link.rel = 'icon';
+ link.href = url;
+ document.getElementsByTagName('head')[0].appendChild(link);
+ };
+
+ var log = function(message){
+ if (window.console) window.console.log(message);
+ };
+
+ var drawFavicon = function(label, colour) {
+
+ // fallback to updating the browser title if unsupported
+ if (!getCanvas().getContext || browser.ie || browser.safari || options.fallback === 'force') {
+ return updateTitle(label);
+ }
+
+ var context = getCanvas().getContext("2d");
+ var colour = colour || '#000000';
+ var src = getCurrentFavicon();
+
+ faviconImage = document.createElement('img');
+ faviconImage.onload = function() {
+
+ // clear canvas
+ context.clearRect(0, 0, size, size);
+
+ // draw the favicon
+ context.drawImage(faviconImage, 0, 0, faviconImage.width, faviconImage.height, 0, 0, size, size);
+
+ // draw bubble over the top
+ if ((label + '').length > 0) drawBubble(context, label, colour);
+
+ // refresh tag in page
+ refreshFavicon();
+ };
+
+ // allow cross origin resource requests if the image is not a data:uri
+ // as detailed here: https://github.com/mrdoob/three.js/issues/1305
+ if (!src.match(/^data/) && options.crossOrigin) {
+ faviconImage.crossOrigin = 'anonymous';
+ }
+
+ faviconImage.src = src;
+ };
+
+ var updateTitle = function(label) {
+
+ if (options.fallback) {
+ if ((label + '').length > 0) {
+ document.title = '(' + label + ') ' + originalTitle;
+ } else {
+ document.title = originalTitle;
+ }
+ }
+ };
+
+ var drawBubble = function(context, label, colour) {
+
+ // automatic abbreviation for long (>2 digits) numbers
+ if (typeof label == 'number' && label > 99 && options.abbreviate) {
+ label = abbreviateNumber(label);
+ }
+
+ // bubble needs to be larger for double digits
+ var len = (label + '').length-1;
+
+ var width = options.width * r + (6 * r * len),
+ height = options.height * r;
+
+ var top = size - height,
+ left = size - width - r,
+ bottom = 16 * r,
+ right = 16 * r,
+ radius = 2 * r;
+
+ // webkit seems to render fonts lighter than firefox
+ context.font = (browser.webkit ? 'bold ' : '') + options.font;
+ context.fillStyle = options.background;
+ context.strokeStyle = options.background;
+ context.lineWidth = r;
+
+ // bubble
+ context.beginPath();
+ context.moveTo(left + radius, top);
+ context.quadraticCurveTo(left, top, left, top + radius);
+ context.lineTo(left, bottom - radius);
+ context.quadraticCurveTo(left, bottom, left + radius, bottom);
+ context.lineTo(right - radius, bottom);
+ context.quadraticCurveTo(right, bottom, right, bottom - radius);
+ context.lineTo(right, top + radius);
+ context.quadraticCurveTo(right, top, right - radius, top);
+ context.closePath();
+ context.fill();
+
+ // bottom shadow
+ context.beginPath();
+ context.strokeStyle = "rgba(0,0,0,0.3)";
+ context.moveTo(left + radius / 2.0, bottom);
+ context.lineTo(right - radius / 2.0, bottom);
+ context.stroke();
+
+ // label
+ context.fillStyle = options.colour;
+ context.textAlign = "right";
+ context.textBaseline = "top";
+
+ // unfortunately webkit/mozilla are a pixel different in text positioning
+ context.fillText(label, r === 2 ? 29 : 15, browser.mozilla ? 7*r : 6*r);
+ };
+
+ var refreshFavicon = function(){
+ // check support
+ if (!getCanvas().getContext) return;
+
+ setFaviconTag(getCanvas().toDataURL());
+ };
+
+ var abbreviateNumber = function(label) {
+ var metricPrefixes = [
+ ['G', 1000000000],
+ ['M', 1000000],
+ ['k', 1000]
+ ];
+
+ for(var i = 0; i < metricPrefixes.length; ++i) {
+ if (label >= metricPrefixes[i][1]) {
+ label = round(label / metricPrefixes[i][1]) + metricPrefixes[i][0];
+ break;
+ }
+ }
+
+ return label;
+ };
+
+ var round = function (value, precision) {
+ var number = new Number(value);
+ return number.toFixed(precision);
+ };
+
+ // public methods
+ Tinycon.setOptions = function(custom){
+ options = {};
+
+ for(var key in defaults){
+ options[key] = custom.hasOwnProperty(key) ? custom[key] : defaults[key];
+ }
+ return this;
+ };
+
+ Tinycon.setImage = function(url){
+ currentFavicon = url;
+ refreshFavicon();
+ return this;
+ };
+
+ Tinycon.setBubble = function(label, colour) {
+ label = label || '';
+ drawFavicon(label, colour);
+ return this;
+ };
+
+ Tinycon.reset = function(){
+ setFaviconTag(originalFavicon);
+ };
+
+ Tinycon.setOptions(defaults);
+ window.Tinycon = Tinycon;
+})();
\ No newline at end of file
diff --git a/src/meta.js b/src/meta.js
index d75ce18d43..fa50858515 100644
--- a/src/meta.js
+++ b/src/meta.js
@@ -201,9 +201,10 @@ var fs = require('fs'),
'vendor/jquery/js/jquery.timeago.js',
'vendor/jquery/js/jquery.form.js',
'vendor/bootstrap/js/bootstrap.min.js',
- 'src/app.js',
'vendor/requirejs/require.js',
'vendor/bootbox/bootbox.min.js',
+ 'vendor/tinycon/tinycon.js',
+ 'src/app.js',
'src/templates.js',
'src/ajaxify.js',
'src/translator.js',
diff --git a/src/notifications.js b/src/notifications.js
index 1c2a139252..b05c38a0ef 100644
--- a/src/notifications.js
+++ b/src/notifications.js
@@ -9,6 +9,7 @@ var async = require('async'),
(function(Notifications) {
+ "use strict";
Notifications.init = function() {
if (process.env.NODE_ENV === 'development') {
@@ -144,16 +145,16 @@ var async = require('async'),
}
Notifications.mark_read = function(nid, uid, callback) {
- if (parseInt(uid) > 0) {
- Notifications.get(nid, uid, function(notif_data) {
- db.sortedSetRemove('uid:' + uid + ':notifications:unread', nid);
- db.sortedSetAdd('uid:' + uid + ':notifications:read', notif_data.datetime, nid);
- if (callback) {
- callback();
- }
- });
- }
+ if (parseInt(uid, 10) > 0) {
+ Notifications.get(nid, uid, function(notif_data) {
+ db.sortedSetRemove('uid:' + uid + ':notifications:unread', nid);
+ db.sortedSetAdd('uid:' + uid + ':notifications:read', notif_data.datetime, nid);
+ if (callback) {
+ callback();
+ }
+ });
}
+ };
Notifications.mark_read_multiple = function(nids, uid, callback) {
if (!Array.isArray(nids) && parseInt(nids, 10) > 0) {
diff --git a/src/posts.js b/src/posts.js
index ec9ea207d1..8dc8900f97 100644
--- a/src/posts.js
+++ b/src/posts.js
@@ -223,7 +223,7 @@ var db = require('./database'),
}
}
- plugins.fireHook('filter:posts.custom_profile_info', {profile: "", uid: post.uid}, function(err, profile_info) {
+ plugins.fireHook('filter:posts.custom_profile_info', {profile: "", uid: post.uid, pid: post.pid}, function(err, profile_info) {
post.additional_profile_info = profile_info.profile;
if (post.editor !== '') {
diff --git a/src/routes/admin.js b/src/routes/admin.js
index 4e62b1a9a3..666877560c 100644
--- a/src/routes/admin.js
+++ b/src/routes/admin.js
@@ -48,9 +48,9 @@ var nconf = require('nconf'),
}
Admin.createRoutes = function (app) {
-
app.all('/api/admin/*', Admin.isAdmin);
app.all('/admin/*', Admin.isAdmin);
+ app.get('/admin', Admin.isAdmin);
(function () {
var routes = [
diff --git a/src/routes/authentication.js b/src/routes/authentication.js
index ba2aae842d..743ad9f9b0 100644
--- a/src/routes/authentication.js
+++ b/src/routes/authentication.js
@@ -36,7 +36,7 @@
passport.use(new passportTwitter({
consumerKey: meta.config['social:twitter:key'],
consumerSecret: meta.config['social:twitter:secret'],
- callbackURL: 'auth/twitter/callback'
+ callbackURL: nconf.get('url') + 'auth/twitter/callback'
}, function(token, tokenSecret, profile, done) {
login_module.loginViaTwitter(profile.id, profile.username, profile.photos, function(err, user) {
if (err) {
@@ -59,7 +59,7 @@
passport.use(new passportGoogle({
clientID: meta.config['social:google:id'],
clientSecret: meta.config['social:google:secret'],
- callbackURL: 'auth/google/callback'
+ callbackURL: nconf.get('url') + 'auth/google/callback'
}, function(accessToken, refreshToken, profile, done) {
login_module.loginViaGoogle(profile.id, profile.displayName, profile.emails[0].value, function(err, user) {
if (err) {
diff --git a/src/routes/debug.js b/src/routes/debug.js
index e431b34ed7..fd5e0db045 100644
--- a/src/routes/debug.js
+++ b/src/routes/debug.js
@@ -190,6 +190,13 @@ var DebugRoute = function(app) {
});*/
}
+ function sortedSetCount(callback) {
+ db.sortedSetCount('sortedSet3', -Infinity, Infinity, function(err, data) {
+ console.log('sortedSetCount return', data);
+ callback(err, {'sortedSetCount': data});
+ });
+ }
+
function listAppend(callback) {
db.listAppend('myList5', 5, function(err, data) {
console.log('listAppend return', data);
@@ -327,6 +334,7 @@ var DebugRoute = function(app) {
getSortedSetRange,
//sortedSetRemove,
getSortedSetRange,
+ sortedSetCount
];
var listTasks = [
diff --git a/src/user.js b/src/user.js
index 74c370d149..29f574174d 100644
--- a/src/user.js
+++ b/src/user.js
@@ -1035,7 +1035,7 @@ var bcrypt = require('bcrypt'),
},
getUnreadCount: function(uid, callback) {
- db.sortedSetCount('uid:' + uid + ':notifications:unread', 0, 10, callback);
+ db.sortedSetCount('uid:' + uid + ':notifications:unread', -Infinity, Infinity, callback);
},
getUnreadByUniqueId: function(uid, uniqueId, callback) {
db.getSortedSetRange('uid:' + uid + ':notifications:unread', 0, -1, function(err, nids) {
diff --git a/src/webserver.js b/src/webserver.js
index 6753548bda..e98f3fcfe3 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -120,6 +120,7 @@ var path = require('path'),
// Cache static files on production
if (global.env !== 'development') {
app.enable('cache');
+ app.enable('minification');
}
// Middlewares
@@ -135,7 +136,7 @@ var path = require('path'),
app.use(require('less-middleware')({
src: path.join(__dirname, '../', 'public'),
prefix: nconf.get('relative_path'),
- yuicompress: true
+ yuicompress: app.enabled('minification') ? true : false
}));
app.use(express.bodyParser()); // Puts POST vars in request.body
app.use(express.cookieParser()); // If you want to parse cookies (res.cookies)
@@ -204,7 +205,7 @@ var path = require('path'),
src: path.join(__dirname, '../node_modules/' + themeId),
dest: path.join(__dirname, '../public/css'),
prefix: nconf.get('relative_path') + '/css',
- yuicompress: true
+ yuicompress: app.enabled('minification') ? true : false
}));
next();
@@ -218,7 +219,7 @@ var path = require('path'),
src: path.join(__dirname, '../node_modules/nodebb-theme-vanilla'),
dest: path.join(__dirname, '../public/css'),
prefix: nconf.get('relative_path') + '/css',
- yuicompress: true
+ yuicompress: app.enabled('minification') ? true : false
}));
next();
@@ -743,7 +744,7 @@ var path = require('path'),
var custom_routes = {
'routes': [],
- 'api_methods': []
+ 'api': []
};
plugins.ready(function() {
@@ -765,6 +766,20 @@ var path = require('path'),
}(route));
}
}
+
+ var apiRoutes = custom_routes.api;
+ for (var route in apiRoutes) {
+ if (apiRoutes.hasOwnProperty(route)) {
+ (function(route) {
+ app[apiRoutes[route].method || 'get']('/api' + apiRoutes[route].route, function(req, res) {
+ apiRoutes[route].callback(req, res, function(data) {
+ res.json(data);
+ });
+ });
+ }(route));
+ }
+ }
+
});
});
diff --git a/src/websockets.js b/src/websockets.js
index 6a8d998c09..09667ca401 100644
--- a/src/websockets.js
+++ b/src/websockets.js
@@ -668,6 +668,12 @@ websockets.init = function(io) {
});
});
+ socket.on('api:notifications.getCount', function(callback) {
+ user.notifications.getUnreadCount(uid, function(err, count) {
+ callback(err ? err.message : null, count);
+ });
+ });
+
socket.on('api:categories.getRecentReplies', function(tid) {
categories.getRecentReplies(tid, 4, function(replies) {
socket.emit('api:categories.getRecentReplies', replies);