hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'socketAL-fix'

Browse Source
v1.18.x
Julian Lam 11 years ago
parent 48c22567c2 e884ff1f59
commit 51abf60b3a
47 changed files with 1234 additions and 1149 deletions
Show Stats Download Patch File Download Diff File

49
public/src/app.js
Unescape Escape View File

@ -36,7 +36,7 @@ var socket,
app.uid = data.uid; app.uid = data.uid;
app.showLoginMessage(); app.showLoginMessage();
socket.emit('api:meta.updateHeader', { socket.emit('meta.updateHeader', {
fields: ['username', 'picture', 'userslug'] fields: ['username', 'picture', 'userslug']
}, app.updateHeader); }, app.updateHeader);
}); });
@ -77,14 +77,14 @@ var socket,
} }
app.enterRoom(room, true); app.enterRoom(room, true);
socket.emit('api:meta.reconnected'); socket.emit('meta.reconnected');
setTimeout(function() { setTimeout(function() {
reconnectEl.removeClass('active').addClass("hide"); reconnectEl.removeClass('active').addClass("hide");
}, 3000); }, 3000);
} }
socket.emit('api:meta.updateHeader', { socket.emit('meta.updateHeader', {
fields: ['username', 'picture', 'userslug'] fields: ['username', 'picture', 'userslug']
}, app.updateHeader); }, app.updateHeader);
}); });
@ -122,6 +122,8 @@ var socket,
setTimeout(app.logout, 1000); setTimeout(app.logout, 1000);
}); });
socket.on('meta.updateHeader', app.updateHeader);
app.enterRoom('global'); app.enterRoom('global');
} }
}, },
@ -235,7 +237,7 @@ var socket,
return; return;
} }
socket.emit('api:meta.rooms.enter', { socket.emit('meta.rooms.enter', {
'enter': room, 'enter': room,
'leave': app.currentRoom 'leave': app.currentRoom
}); });
@ -248,42 +250,22 @@ var socket,
var uids = []; var uids = [];
jQuery('.post-row').each(function () { jQuery('.post-row').each(function () {
uids.push(this.getAttribute('data-uid')); var uid = $(this).attr('data-uid');
}); if(uids.indexOf(uid) === -1) {
uids.push(uid);
socket.emit('api:user.get_online_users', uids, function (users) {
jQuery('a.username-field').each(function () {
if (this.processed === true)
return;
var el = jQuery(this),
uid = el.parents('li').attr('data-uid');
if (uid && jQuery.inArray(uid, users) !== -1) {
el.find('i').remove();
el.prepend('<i class="fa fa-circle"></i>');
} else {
el.find('i').remove();
el.prepend('<i class="fa fa-circle-o"></i>');
} }
el.processed = true;
}); });
jQuery('button .username-field').each(function () {
//DRY FAIL
if (this.processed === true)
return;
socket.emit('user.getOnlineUsers', uids, function (err, users) {
jQuery('button .username-field').each(function (index, element) {
var el = jQuery(this), var el = jQuery(this),
uid = el.parents('li').attr('data-uid'); uid = el.parents('li').attr('data-uid');
if (uid && jQuery.inArray(uid, users) !== -1) { if (uid && jQuery.inArray(uid, users) !== -1) {
el.parent().addClass('btn-success'); el.parent().addClass('btn-success').removeClass('btn-danger');
} else { } else {
el.parent().addClass('btn-danger'); el.parent().addClass('btn-danger').removeClass('btn-success');
} }
el.processed = true;
}); });
}); });
}; };
@ -419,6 +401,7 @@ var socket,
interval: undefined, interval: undefined,
titles: [] titles: []
}; };
app.alternatingTitle = function (title) { app.alternatingTitle = function (title) {
if (typeof title !== 'string') { if (typeof title !== 'string') {
return; return;
@ -449,13 +432,13 @@ var socket,
url = a.pathname.slice(1); url = a.pathname.slice(1);
} }
socket.emit('api:meta.buildTitle', url, function(title, numNotifications) { socket.emit('meta.buildTitle', url, function(err, title, numNotifications) {
titleObj.titles[0] = (numNotifications > 0 ? '(' + numNotifications + ') ' : '') + title; titleObj.titles[0] = (numNotifications > 0 ? '(' + numNotifications + ') ' : '') + title;
app.alternatingTitle(''); app.alternatingTitle('');
}); });
}; };
app.updateHeader = function(data) { app.updateHeader = function(err, data) {
$('#search-button').off().on('click', function(e) { $('#search-button').off().on('click', function(e) {
e.stopPropagation(); e.stopPropagation();
$('#search-fields').removeClass('hide').show(); $('#search-fields').removeClass('hide').show();

30
public/src/forum/account.js
Unescape Escape View File

@ -35,31 +35,31 @@ define(['forum/accountheader'], function(header) {
} }
followBtn.on('click', function() { followBtn.on('click', function() {
socket.emit('api:user.follow', { socket.emit('user.follow', {
uid: theirid uid: theirid
}, function(success) { }, function(err) {
if (success) { if(err) {
return app.alertError('There was an error following' + username + '!');
}
followBtn.addClass('hide'); followBtn.addClass('hide');
unfollowBtn.removeClass('hide'); unfollowBtn.removeClass('hide');
app.alertSuccess('You are now following ' + username + '!'); app.alertSuccess('You are now following ' + username + '!');
} else {
app.alertError('There was an error following' + username + '!');
}
}); });
return false; return false;
}); });
unfollowBtn.on('click', function() { unfollowBtn.on('click', function() {
socket.emit('api:user.unfollow', { socket.emit('user.unfollow', {
uid: theirid uid: theirid
}, function(success) { }, function(err) {
if (success) { if(err) {
return app.alertError('There was an error unfollowing ' + username + '!');
}
followBtn.removeClass('hide'); followBtn.removeClass('hide');
unfollowBtn.addClass('hide'); unfollowBtn.addClass('hide');
app.alertSuccess('You are no longer following ' + username + '!'); app.alertSuccess('You are no longer following ' + username + '!');
} else {
app.alertError('There was an error unfollowing ' + username + '!');
}
}); });
return false; return false;
}); });
@ -72,9 +72,9 @@ define(['forum/accountheader'], function(header) {
ajaxify.go($(this).attr('topic-url')); ajaxify.go($(this).attr('topic-url'));
}); });
socket.on('api:user.isOnline', Account.handleUserOnline); socket.on('user.isOnline', Account.handleUserOnline);
socket.emit('api:user.isOnline', theirid, Account.handleUserOnline); socket.emit('user.isOnline', theirid, Account.handleUserOnline);
socket.on('event:new_post', function(data) { socket.on('event:new_post', function(data) {
var html = templates.prepare(templates['account'].blocks['posts']).parse(data); var html = templates.prepare(templates['account'].blocks['posts']).parse(data);
@ -85,7 +85,7 @@ define(['forum/accountheader'], function(header) {
}); });
}; };
Account.handleUserOnline = function(data) { Account.handleUserOnline = function(err, data) {
var onlineStatus = $('.account-online-status'); var onlineStatus = $('.account-online-status');
if (data.online) { if (data.online) {

16
public/src/forum/accountedit.js
Unescape Escape View File

@ -24,7 +24,7 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
signature: $('#inputSignature').val() signature: $('#inputSignature').val()
}; };
socket.emit('api:user.updateProfile', userData, function(err, data) { socket.emit('user.updateProfile', userData, function(err, data) {
if (data.success) { if (data.success) {
app.alertSuccess('Your profile has been updated successfully!'); app.alertSuccess('Your profile has been updated successfully!');
if (data.picture) { if (data.picture) {
@ -36,7 +36,7 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
gravatarPicture = data.gravatarpicture; gravatarPicture = data.gravatarpicture;
} }
} else { } else {
app.alertError('There was an error updating your profile! ' + err.error); app.alertError('There was an error updating your profile! ' + err.message);
} }
}); });
return false; return false;
@ -108,7 +108,7 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
uploadedPicture = imageUrlOnServer; uploadedPicture = imageUrlOnServer;
socket.emit('api:meta.updateHeader', { socket.emit('meta.updateHeader', {
fields: ['username', 'picture', 'userslug'] fields: ['username', 'picture', 'userslug']
}, app.updateHeader); }, app.updateHeader);
}); });
@ -174,7 +174,7 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
$('#changePasswordBtn').on('click', function() { $('#changePasswordBtn').on('click', function() {
if (passwordvalid && passwordsmatch && currentPassword.val()) { if (passwordvalid && passwordsmatch && currentPassword.val()) {
socket.emit('api:user.changePassword', { socket.emit('user.changePassword', {
'currentPassword': currentPassword.val(), 'currentPassword': currentPassword.val(),
'newPassword': password.val() 'newPassword': password.val()
}, function(err) { }, function(err) {
@ -186,7 +186,7 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
passwordvalid = false; passwordvalid = false;
if (err) { if (err) {
app.alertError(err.error); app.alertError(err.message);
return; return;
} }
@ -206,9 +206,9 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
type: type type: type
}; };
socket.emit('api:user.changePicture', userData, function(success) { socket.emit('user.changePicture', userData, function(err) {
if (!success) { if(err) {
app.alertError('There was an error changing picture!'); app.alertError(err.message);
} }
}); });
} }

9
public/src/forum/accountsettings.js
Unescape Escape View File

@ -10,12 +10,11 @@ define(['forum/accountheader'], function(header) {
showemail: $('#showemailCheckBox').is(':checked') ? 1 : 0 showemail: $('#showemailCheckBox').is(':checked') ? 1 : 0
}; };
socket.emit('api:user.saveSettings', settings, function(err) { socket.emit('user.saveSettings', settings, function(err) {
if (!err) { if (err) {
app.alertSuccess('Settings saved!'); return app.alertError('There was an error saving settings!');
} else {
app.alertError('There was an error saving settings!');
} }
app.alertSuccess('Settings saved!');
}); });
return false; return false;
}); });

43
public/src/forum/admin/categories.js
Unescape Escape View File

@ -13,7 +13,7 @@ define(['uploader'], function(uploader) {
} }
function save() { function save() {
socket.emit('api:admin.categories.update', modified_categories); socket.emit('admin.categories.update', modified_categories);
modified_categories = {}; modified_categories = {};
} }
@ -86,8 +86,11 @@ define(['uploader'], function(uploader) {
order: $('.admin-categories #entry-container').children().length + 1 order: $('.admin-categories #entry-container').children().length + 1
}; };
socket.emit('api:admin.categories.create', category, function(err, data) { socket.emit('admin.categories.create', category, function(err, data) {
if (!err) { if(err) {
return app.alertError(err.message);
}
app.alert({ app.alert({
alert_id: 'category_created', alert_id: 'category_created',
title: 'Created', title: 'Created',
@ -99,10 +102,10 @@ define(['uploader'], function(uploader) {
var html = templates.prepare(templates['admin/categories'].blocks['categories']).parse({ var html = templates.prepare(templates['admin/categories'].blocks['categories']).parse({
categories: [data] categories: [data]
}); });
$('#entry-container').append(html);
$('#entry-container').append(html);
$('#new-category-modal').modal('hide'); $('#new-category-modal').modal('hide');
}
}); });
} }
@ -223,7 +226,14 @@ define(['uploader'], function(uploader) {
clearTimeout(searchDelay); clearTimeout(searchDelay);
searchDelay = setTimeout(function() { searchDelay = setTimeout(function() {
socket.emit('api:admin.categories.search', searchEl.value, cid, function(err, results) { socket.emit('admin.categories.search', {
username: searchEl.value,
cid: cid
}, function(err, results) {
if(err) {
return app.alertError(err.message);
}
var numResults = results.length, var numResults = results.length,
resultObj; resultObj;
for(var x=0;x<numResults;x++) { for(var x=0;x<numResults;x++) {
@ -254,7 +264,12 @@ define(['uploader'], function(uploader) {
privilege = this.getAttribute('data-priv'); privilege = this.getAttribute('data-priv');
e.preventDefault(); e.preventDefault();
socket.emit('api:admin.categories.setPrivilege', cid, uid, privilege, !btnEl.hasClass('active'), function(err, privileges) { socket.emit('admin.categories.setPrivilege', {
cid: cid,
uid: uid,
privilege: privilege,
set: !btnEl.hasClass('active')
}, function(err, privileges) {
btnEl.toggleClass('active', privileges[privilege]); btnEl.toggleClass('active', privileges[privilege]);
Categories.refreshPrivilegeList(cid); Categories.refreshPrivilegeList(cid);
@ -267,7 +282,10 @@ define(['uploader'], function(uploader) {
}); });
// User Groups and privileges // User Groups and privileges
socket.emit('api:admin.categories.groupsList', cid, function(err, results) { socket.emit('admin.categories.groupsList', cid, function(err, results) {
if(err) {
return app.alertError(err.message);
}
var groupsFrag = document.createDocumentFragment(), var groupsFrag = document.createDocumentFragment(),
numResults = results.length, numResults = results.length,
trEl = document.createElement('tr'), trEl = document.createElement('tr'),
@ -295,7 +313,12 @@ define(['uploader'], function(uploader) {
gid = btnEl.parents('tr[data-gid]').attr('data-gid'), gid = btnEl.parents('tr[data-gid]').attr('data-gid'),
privilege = this.getAttribute('data-gpriv'); privilege = this.getAttribute('data-gpriv');
e.preventDefault(); e.preventDefault();
socket.emit('api:admin.categories.setGroupPrivilege', cid, gid, privilege, !btnEl.hasClass('active'), function(err) { socket.emit('admin.categories.setGroupPrivilege', {
cid: cid,
gid: gid,
privilege: privilege,
set: !btnEl.hasClass('active')
}, function(err) {
if (!err) { if (!err) {
btnEl.toggleClass('active'); btnEl.toggleClass('active');
} }
@ -309,7 +332,7 @@ define(['uploader'], function(uploader) {
var modalEl = $('#category-permissions-modal'), var modalEl = $('#category-permissions-modal'),
readMembers = modalEl.find('#category-permissions-read'), readMembers = modalEl.find('#category-permissions-read'),
writeMembers = modalEl.find('#category-permissions-write'); writeMembers = modalEl.find('#category-permissions-write');
socket.emit('api:admin.categories.getPrivilegeSettings', cid, function(err, privilegeList) { socket.emit('admin.categories.getPrivilegeSettings', cid, function(err, privilegeList) {
var readLength = privilegeList['+r'].length, var readLength = privilegeList['+r'].length,
writeLength = privilegeList['+w'].length, writeLength = privilegeList['+w'].length,
readFrag = document.createDocumentFragment(), readFrag = document.createDocumentFragment(),

11
public/src/forum/admin/footer.js
Unescape Escape View File

@ -15,6 +15,15 @@ jQuery('document').ready(function() {
}, false); }, false);
}); });
socket.emit('api:admin.config.get', function(config) { socket.emit('admin.config.get', function(err, config) {
if(err) {
return app.alert({
alert_id: 'config_status',
timeout: 2500,
title: 'Error',
message: 'NodeBB encountered a problem getting config',
type: 'danger'
});
}
app.config = config; app.config = config;
}); });

21
public/src/forum/admin/groups.js
Unescape Escape View File

@ -29,7 +29,7 @@ define(function() {
errorEl = $('#create-modal-error'), errorEl = $('#create-modal-error'),
errorText; errorText;
socket.emit('api:admin.groups.create', submitObj, function(err, data) { socket.emit('admin.groups.create', submitObj, function(err, data) {
if (err) { if (err) {
switch (err) { switch (err) {
case 'group-exists': case 'group-exists':
@ -63,14 +63,19 @@ define(function() {
case 'delete': case 'delete':
bootbox.confirm('Are you sure you wish to delete this group?', function(confirm) { bootbox.confirm('Are you sure you wish to delete this group?', function(confirm) {
if (confirm) { if (confirm) {
socket.emit('api:admin.groups.delete', gid, function(err, data) { socket.emit('admin.groups.delete', gid, function(err, data) {
if (data === 'OK') ajaxify.go('admin/groups'); console.log(err, data);
if(err) {
return app.alertError(err.message);
}
ajaxify.go('admin/groups');
}); });
} }
}); });
break; break;
case 'members': case 'members':
socket.emit('api:admin.groups.get', gid, function(err, groupObj) { socket.emit('admin.groups.get', gid, function(err, groupObj) {
var formEl = detailsModal.find('form'), var formEl = detailsModal.find('form'),
nameEl = formEl.find('#change-group-name'), nameEl = formEl.find('#change-group-name'),
descEl = formEl.find('#change-group-desc'), descEl = formEl.find('#change-group-desc'),
@ -120,7 +125,7 @@ define(function() {
foundUserImg = foundUser.getElementsByTagName('img')[0]; foundUserImg = foundUser.getElementsByTagName('img')[0];
foundUserLabel = foundUser.getElementsByTagName('span')[0]; foundUserLabel = foundUser.getElementsByTagName('span')[0];
socket.emit('api:admin.user.search', searchText, function(err, results) { socket.emit('admin.user.search', searchText, function(err, results) {
if (!err && results && results.length > 0) { if (!err && results && results.length > 0) {
var numResults = results.length, var numResults = results.length,
resultsSlug = document.createDocumentFragment(), resultsSlug = document.createDocumentFragment(),
@ -152,7 +157,7 @@ define(function() {
}); });
if (members.indexOf(uid) === -1) { if (members.indexOf(uid) === -1) {
socket.emit('api:admin.groups.join', { socket.emit('admin.groups.join', {
gid: gid, gid: gid,
uid: uid uid: uid
}, function(err, data) { }, function(err, data) {
@ -167,7 +172,7 @@ define(function() {
var uid = this.getAttribute('data-uid'), var uid = this.getAttribute('data-uid'),
gid = detailsModal.attr('data-gid'); gid = detailsModal.attr('data-gid');
socket.emit('api:admin.groups.leave', { socket.emit('admin.groups.leave', {
gid: gid, gid: gid,
uid: uid uid: uid
}, function(err, data) { }, function(err, data) {
@ -183,7 +188,7 @@ define(function() {
descEl = formEl.find('#change-group-desc'), descEl = formEl.find('#change-group-desc'),
gid = detailsModal.attr('data-gid'); gid = detailsModal.attr('data-gid');
socket.emit('api:admin.groups.update', { socket.emit('admin.groups.update', {
gid: gid, gid: gid,
values: { values: {
name: nameEl.val(), name: nameEl.val(),

10
public/src/forum/admin/index.js
Unescape Escape View File

@ -2,10 +2,10 @@ define(function() {
var Admin = {}; var Admin = {};
Admin.init = function() { Admin.init = function() {
ajaxify.register_events(['api:meta.rooms.getAll']); ajaxify.register_events(['meta.rooms.getAll']);
app.enterRoom('admin'); app.enterRoom('admin');
socket.emit('api:meta.rooms.getAll', Admin.updateRoomUsage); socket.emit('meta.rooms.getAll', Admin.updateRoomUsage);
socket.on('event:meta.rooms.update', Admin.updateRoomUsage); socket.on('event:meta.rooms.update', Admin.updateRoomUsage);
$('#logout-link').on('click', function() { $('#logout-link').on('click', function() {
@ -17,15 +17,15 @@ define(function() {
}) })
}; };
Admin.updateRoomUsage = function(data) { Admin.updateRoomUsage = function(err, data) {
console.log('room usage updating', data); console.log(arguments);
var active_users = document.getElementById('active_users'), var active_users = document.getElementById('active_users'),
total = 0; total = 0;
active_users.innerHTML = ''; active_users.innerHTML = '';
for (var room in data) { for (var room in data) {
if (room !== '') { if (room !== '') {
var count = data[room].length; var count = $(data[room]).length;
total += count; total += count;
active_users.innerHTML = active_users.innerHTML + "<div class='alert alert-success'><strong>" + room + "</strong> " + count + " active user" + (count > 1 ? "s" : "") + "</div>"; active_users.innerHTML = active_users.innerHTML + "<div class='alert alert-success'><strong>" + room + "</strong> " + count + " active user" + (count > 1 ? "s" : "") + "</div>";
} }

4
public/src/forum/admin/plugins.js
Unescape Escape View File

@ -8,10 +8,10 @@ define(function() {
if (numPlugins > 0) { if (numPlugins > 0) {
pluginsList.on('click', 'button[data-action="toggleActive"]', function() { pluginsList.on('click', 'button[data-action="toggleActive"]', function() {
pluginID = $(this).parents('li').attr('data-plugin-id'); pluginID = $(this).parents('li').attr('data-plugin-id');
socket.emit('api:admin.plugins.toggle', pluginID); socket.emit('admin.plugins.toggle', pluginID);
}); });
socket.on('api:admin.plugins.toggle', function(status) { socket.on('admin.plugins.toggle', function(status) {
pluginTgl = document.querySelector('.plugins li[data-plugin-id="' + status.id + '"] button'); pluginTgl = document.querySelector('.plugins li[data-plugin-id="' + status.id + '"] button');
pluginTgl.innerHTML = '<i class="fa fa-power-off"></i> ' + (status.active ? 'Dea' : 'A') + 'ctivate'; pluginTgl.innerHTML = '<i class="fa fa-power-off"></i> ' + (status.active ? 'Dea' : 'A') + 'ctivate';

27
public/src/forum/admin/settings.js
Unescape Escape View File

@ -70,20 +70,12 @@ define(['uploader'], function(uploader) {
value = fields[x].value; value = fields[x].value;
} }
socket.emit('api:admin.config.set', { socket.emit('admin.config.set', {
key: key, key: key,
value: value value: value
}, function(data) { }, function(err) {
if (data.status === 'ok') { if(err) {
app.alert({ return app.alert({
alert_id: 'config_status',
timeout: 2500,
title: 'Changes Saved',
message: 'Your changes to the NodeBB configuration have been saved.',
type: 'success'
});
} else {
app.alert({
alert_id: 'config_status', alert_id: 'config_status',
timeout: 2500, timeout: 2500,
title: 'Changes Not Saved', title: 'Changes Not Saved',
@ -91,6 +83,15 @@ define(['uploader'], function(uploader) {
type: 'danger' type: 'danger'
}); });
} }
app.alert({
alert_id: 'config_status',
timeout: 2500,
title: 'Changes Saved',
message: 'Your changes to the NodeBB configuration have been saved.',
type: 'success'
});
}); });
} }
}); });
@ -119,7 +120,7 @@ define(['uploader'], function(uploader) {
}; };
Settings.remove = function(key) { Settings.remove = function(key) {
socket.emit('api:admin.config.remove', key); socket.emit('admin.config.remove', key);
}; };
return Settings; return Settings;

10
public/src/forum/admin/themes.js
Unescape Escape View File

@ -23,7 +23,7 @@ define(function() {
cssSrc = parentEl.attr('data-css'), cssSrc = parentEl.attr('data-css'),
themeId = parentEl.attr('data-theme'); themeId = parentEl.attr('data-theme');
socket.emit('api:admin.themes.set', { socket.emit('admin.themes.set', {
type: themeType, type: themeType,
id: themeId, id: themeId,
src: cssSrc src: cssSrc
@ -47,7 +47,7 @@ define(function() {
revertEl.addEventListener('click', function() { revertEl.addEventListener('click', function() {
bootbox.confirm('Are you sure you wish to remove the custom theme and restore the NodeBB default theme?', function(confirm) { bootbox.confirm('Are you sure you wish to remove the custom theme and restore the NodeBB default theme?', function(confirm) {
if (confirm) { if (confirm) {
socket.emit('api:admin.themes.set', { socket.emit('admin.themes.set', {
type: 'local', type: 'local',
id: 'nodebb-theme-cerulean' id: 'nodebb-theme-cerulean'
}, function(err) { }, function(err) {
@ -64,7 +64,11 @@ define(function() {
}, false); }, false);
// Installed Themes // Installed Themes
socket.emit('api:admin.themes.getInstalled', function(themes) { socket.emit('admin.themes.getInstalled', function(err, themes) {
if(err) {
return app.alertError(err.message);
}
var instListEl = document.getElementById('installed_themes'), var instListEl = document.getElementById('installed_themes'),
themeFrag = document.createDocumentFragment(), themeFrag = document.createDocumentFragment(),
liEl = document.createElement('li'); liEl = document.createElement('li');

81
public/src/forum/admin/topics.js
Unescape Escape View File

@ -15,37 +15,25 @@ define(function() {
switch (action) { switch (action) {
case 'pin': case 'pin':
if (!$this.hasClass('active')) { if (!$this.hasClass('active')) {
socket.emit('api:topics.pin', { socket.emit('topics.pin', tid, Topics.pin);
tid: tid
}, Topics.pin);
} else { } else {
socket.emit('api:topics.unpin', { socket.emit('topics.unpin', tid, Topics.unpin);
tid: tid
}, Topics.unpin);
} }
break; break;
case 'lock': case 'lock':
if (!$this.hasClass('active')) { if (!$this.hasClass('active')) {
socket.emit('api:topics.lock', { socket.emit('topics.lock', tid, Topics.lock);
tid: tid
}, Topics.lock);
} else { } else {
socket.emit('api:topics.unlock', { socket.emit('topics.unlock', tid, Topics.unlock);
tid: tid
}, Topics.unlock);
} }
break; break;
case 'delete': case 'delete':
if (!$this.hasClass('active')) { if (!$this.hasClass('active')) {
socket.emit('api:topics.delete', { socket.emit('topics.delete', tid, Topics.setDeleted);
tid: tid
}, Topics.setDeleted);
} else { } else {
socket.emit('api:topics.restore', { socket.emit('topics.restore', tid, Topics.restore);
tid: tid
}, Topics.restore);
} }
break; break;
@ -63,13 +51,16 @@ define(function() {
var lastTid = parseInt(topics[topics.length - 1].getAttribute('data-tid')); var lastTid = parseInt(topics[topics.length - 1].getAttribute('data-tid'));
this.innerHTML = '<i class="fa fa-refresh fa-spin"></i> Retrieving topics'; this.innerHTML = '<i class="fa fa-refresh fa-spin"></i> Retrieving topics';
socket.emit('api:admin.topics.getMore', { socket.emit('admin.topics.getMore', {
limit: 10, limit: 10,
after: lastTid after: lastTid
}, function(topics) { }, function(err, topics) {
if(err) {
return app.alertError(err.message);
}
var btnEl = document.getElementById('topics_loadmore'); var btnEl = document.getElementById('topics_loadmore');
topics = JSON.parse(topics);
if (topics.length > 0) { if (topics.length > 0) {
var html = templates.prepare(templates['admin/topics'].blocks['topics']).parse({ var html = templates.prepare(templates['admin/topics'].blocks['topics']).parse({
topics: topics topics: topics
@ -116,8 +107,12 @@ define(function() {
} }
} }
Topics.setDeleted = function(response) { Topics.setDeleted = function(err, response) {
if (response.status === 'ok') { if(err) {
return app.alert(err.message);
}
if (response && response.tid) {
var btnEl = document.querySelector('li[data-tid="' + response.tid + '"] button[data-action="delete"]'); var btnEl = document.querySelector('li[data-tid="' + response.tid + '"] button[data-action="delete"]');
$(btnEl).addClass('active'); $(btnEl).addClass('active');
@ -125,8 +120,12 @@ define(function() {
} }
}; };
Topics.restore = function(response) { Topics.restore = function(err, response) {
if (response.status === 'ok') { if(err) {
return app.alert(err.message);
}
if (response && response.tid) {
var btnEl = document.querySelector('li[data-tid="' + response.tid + '"] button[data-action="delete"]'); var btnEl = document.querySelector('li[data-tid="' + response.tid + '"] button[data-action="delete"]');
$(btnEl).removeClass('active'); $(btnEl).removeClass('active');
@ -134,16 +133,24 @@ define(function() {
} }
}; };
Topics.lock = function(response) { Topics.lock = function(err, response) {
if (response.status === 'ok') { if(err) {
return app.alert(err.message);
}
if (response && response.tid) {
var btnEl = document.querySelector('li[data-tid="' + response.tid + '"] button[data-action="lock"]'); var btnEl = document.querySelector('li[data-tid="' + response.tid + '"] button[data-action="lock"]');
$(btnEl).addClass('active'); $(btnEl).addClass('active');
} }
}; };
Topics.unlock = function(response) { Topics.unlock = function(err, response) {
if (response.status === 'ok') { if(err) {
return app.alert(err.message);
}
if (response && response.tid) {
var btnEl = document.querySelector('li[data-tid="' + response.tid + '"] button[data-action="lock"]'); var btnEl = document.querySelector('li[data-tid="' + response.tid + '"] button[data-action="lock"]');
$(btnEl).removeClass('active'); $(btnEl).removeClass('active');
@ -151,16 +158,24 @@ define(function() {
}; };
Topics.unpin = function(response) { Topics.unpin = function(err, response) {
if (response.status === 'ok') { if(err) {
return app.alert(err.message);
}
if (response && response.tid) {
var btnEl = document.querySelector('li[data-tid="' + response.tid + '"] button[data-action="pin"]'); var btnEl = document.querySelector('li[data-tid="' + response.tid + '"] button[data-action="pin"]');
$(btnEl).removeClass('active'); $(btnEl).removeClass('active');
} }
}; };
Topics.pin = function(response) { Topics.pin = function(err, response) {
if (response.status === 'ok') { if(err) {
return app.alert(err.message);
}
if (response && response.tid) {
var btnEl = document.querySelector('li[data-tid="' + response.tid + '"] button[data-action="pin"]'); var btnEl = document.querySelector('li[data-tid="' + response.tid + '"] button[data-action="pin"]');
$(btnEl).addClass('active'); $(btnEl).addClass('active');

33
public/src/forum/admin/users.js
Unescape Escape View File

@ -68,14 +68,14 @@ define(function() {
if (!isAdmin) { if (!isAdmin) {
if (isBanned) { if (isBanned) {
socket.emit('api:admin.user.unbanUser', uid); socket.emit('admin.user.unbanUser', uid);
banBtn.removeClass('btn-warning'); banBtn.removeClass('btn-warning');
parent.attr('data-banned', 0); parent.attr('data-banned', 0);
updateUserAdminButtons(); updateUserAdminButtons();
} else { } else {
bootbox.confirm('Do you really want to ban "' + parent.attr('data-username') + '"?', function(confirm) { bootbox.confirm('Do you really want to ban "' + parent.attr('data-username') + '"?', function(confirm) {
if (confirm) { if (confirm) {
socket.emit('api:admin.user.banUser', uid); socket.emit('admin.user.banUser', uid);
banBtn.addClass('btn-warning'); banBtn.addClass('btn-warning');
parent.attr('data-banned', 1); parent.attr('data-banned', 1);
updateUserAdminButtons(); updateUserAdminButtons();
@ -103,7 +103,7 @@ define(function() {
}); });
} }
else if (!isAdmin) { else if (!isAdmin) {
socket.emit('api:admin.user.makeAdmin', uid); socket.emit('admin.user.makeAdmin', uid);
adminBtn.attr('value', 'UnMake Admin').html('Remove Admin'); adminBtn.attr('value', 'UnMake Admin').html('Remove Admin');
parent.attr('data-admin', 1); parent.attr('data-admin', 1);
updateUserBanButtons(); updateUserBanButtons();
@ -111,7 +111,7 @@ define(function() {
} else if(uid !== yourid) { } else if(uid !== yourid) {
bootbox.confirm('Do you really want to remove this user as admin "' + parent.attr('data-username') + '"?', function(confirm) { bootbox.confirm('Do you really want to remove this user as admin "' + parent.attr('data-username') + '"?', function(confirm) {
if (confirm) { if (confirm) {
socket.emit('api:admin.user.removeAdmin', uid); socket.emit('admin.user.removeAdmin', uid);
adminBtn.attr('value', 'Make Admin').html('Make Admin'); adminBtn.attr('value', 'Make Admin').html('Make Admin');
parent.attr('data-admin', 0); parent.attr('data-admin', 0);
updateUserBanButtons(); updateUserBanButtons();
@ -126,16 +126,19 @@ define(function() {
} }
function handleUserCreate() { function handleUserCreate() {
var errorEl = $('#create-modal-error');
$('#createUser').on('click', function() { $('#createUser').on('click', function() {
$('#create-modal').modal('show'); $('#create-modal').modal('show');
$('#create-modal form')[0].reset();
errorEl.addClass('hide');
}); });
$('#create-modal-go').on('click', function() { $('#create-modal-go').on('click', function() {
var username = $('#create-user-name').val(), var username = $('#create-user-name').val(),
email = $('#create-user-email').val(), email = $('#create-user-email').val(),
password = $('#create-user-password').val(), password = $('#create-user-password').val(),
passwordAgain = $('#create-user-password-again').val(), passwordAgain = $('#create-user-password-again').val();
errorEl = $('#create-modal-error');
if(password !== passwordAgain) { if(password !== passwordAgain) {
return errorEl.html('<strong>Error</strong><p>Passwords must match!</p>').removeClass('hide'); return errorEl.html('<strong>Error</strong><p>Passwords must match!</p>').removeClass('hide');
@ -147,14 +150,16 @@ define(function() {
password: password password: password
}; };
socket.emit('api:admin.user.createUser', user, function(err, data) { socket.emit('admin.user.createUser', user, function(err) {
if(err) { if(err) {
return errorEl.html('<strong>Error</strong><p>' + err + '</p>').removeClass('hide'); return errorEl.html('<strong>Error</strong><p>' + err.message + '</p>').removeClass('hide');
} }
$('#create-modal').modal('hide'); $('#create-modal').modal('hide');
app.alertSuccess('User created!'); $('#create-modal').on('hidden.bs.modal', function() {
ajaxify.go('admin/users'); ajaxify.go('admin/users');
}); });
app.alertSuccess('User created!');
});
}); });
} }
@ -188,10 +193,10 @@ define(function() {
jQuery('.fa-spinner').removeClass('none'); jQuery('.fa-spinner').removeClass('none');
socket.emit('api:admin.user.search', username, function(err, data) { socket.emit('admin.user.search', username, function(err, data) {
if(err) { if(err) {
return app.alertError(err.message); return app.alertError(err.message);
} }console.log(data)
var html = templates.prepare(templates['admin/users'].blocks['users']).parse({ var html = templates.prepare(templates['admin/users'].blocks['users']).parse({
users: data users: data
@ -242,11 +247,11 @@ define(function() {
if (set) { if (set) {
loadingMoreUsers = true; loadingMoreUsers = true;
socket.emit('api:user.loadMore', { socket.emit('user.loadMore', {
set: set, set: set,
after: $('#users-container').children().length after: $('#users-container').children().length
}, function(data) { }, function(err, data) {
if (data.users.length) { if (data && data.users.length) {
onUsersLoaded(data.users); onUsersLoaded(data.users);
} }
loadingMoreUsers = false; loadingMoreUsers = false;

18
public/src/forum/category.js
Unescape Escape View File

@ -40,7 +40,7 @@ define(['composer'], function(composer) {
socket.on('event:new_topic', Category.onNewTopic); socket.on('event:new_topic', Category.onNewTopic);
socket.emit('api:categories.getRecentReplies', cid, renderRecentReplies); socket.emit('categories.getRecentReplies', cid, renderRecentReplies);
$(window).off('scroll').on('scroll', function (ev) { $(window).off('scroll').on('scroll', function (ev) {
var bottom = ($(document).height() - $(window).height()) * 0.9; var bottom = ($(document).height() - $(window).height()) * 0.9;
@ -81,7 +81,7 @@ define(['composer'], function(composer) {
} }
topic.hide().fadeIn('slow'); topic.hide().fadeIn('slow');
socket.emit('api:categories.getRecentReplies', templates.get('category_id'), renderRecentReplies); socket.emit('categories.getRecentReplies', templates.get('category_id'), renderRecentReplies);
addActiveUser(data); addActiveUser(data);
@ -129,19 +129,23 @@ define(['composer'], function(composer) {
} }
loadingMoreTopics = true; loadingMoreTopics = true;
socket.emit('api:categories.loadMore', { socket.emit('categories.loadMore', {
cid: cid, cid: cid,
after: $('#topics-container').children('.category-item').length after: $('#topics-container').children('.category-item').length
}, function (data) { }, function (err, data) {
if (data.topics.length) { if(err) {
return app.alertError(err.message);
}
if (data && data.topics.length) {
Category.onTopicsLoaded(data.topics); Category.onTopicsLoaded(data.topics);
} }
loadingMoreTopics = false; loadingMoreTopics = false;
}); });
} }
function renderRecentReplies(posts) { function renderRecentReplies(err, posts) {
if (!posts || posts.length === 0) { if (err || !posts || posts.length === 0) {
return; return;
} }

6
public/src/forum/footer.js
Unescape Escape View File

@ -1,6 +1,6 @@
define(['notifications', 'chat'], function(Notifications, Chat) { define(['notifications', 'chat'], function(Notifications, Chat) {
socket.emit('api:meta.updateHeader', { socket.emit('meta.updateHeader', {
fields: ['username', 'picture', 'userslug'] fields: ['username', 'picture', 'userslug']
}, app.updateHeader); }, app.updateHeader);
@ -8,11 +8,11 @@ define(['notifications', 'chat'], function(Notifications, Chat) {
Chat.prepareDOM(); Chat.prepareDOM();
translator.prepareDOM(); translator.prepareDOM();
function updateUnreadCount(count) { function updateUnreadCount(err, count) {
$('#unread-count').toggleClass('unread-count', count > 0); $('#unread-count').toggleClass('unread-count', count > 0);
$('#unread-count').attr('data-content', count > 20 ? '20+' : count); $('#unread-count').attr('data-content', count > 20 ? '20+' : count);
} }
socket.on('event:unread.updateCount', updateUnreadCount); socket.on('event:unread.updateCount', updateUnreadCount);
socket.emit('api:user.getUnreadCount', updateUnreadCount); socket.emit('user.getUnreadCount', updateUnreadCount);
}); });

27
public/src/forum/home.js
Unescape Escape View File

@ -4,23 +4,32 @@ define(function() {
home.init = function() { home.init = function() {
ajaxify.register_events([ ajaxify.register_events([
'api:user.count', 'user.count',
'post.stats', 'meta.getUsageStats',
'api:user.getActiveUsers' 'user.getActiveUsers'
]); ]);
socket.emit('api:user.count', function(data) { socket.emit('user.count', updateUserCount);
socket.on('user.count', updateUserCount);
function updateUserCount(err, data) {
$('#stats_users').html(utils.makeNumberHumanReadable(data.count)).attr('title', data.count); $('#stats_users').html(utils.makeNumberHumanReadable(data.count)).attr('title', data.count);
}); }
socket.emit('api:meta.getUsageStats', function(data) { socket.emit('meta.getUsageStats', updateUsageStats);
socket.on('meta.getUsageStats', updateUsageStats);
function updateUsageStats(err, data) {
$('#stats_topics').html(utils.makeNumberHumanReadable(data.topics)).attr('title', data.topics); $('#stats_topics').html(utils.makeNumberHumanReadable(data.topics)).attr('title', data.topics);
$('#stats_posts').html(utils.makeNumberHumanReadable(data.posts)).attr('title', data.posts); $('#stats_posts').html(utils.makeNumberHumanReadable(data.posts)).attr('title', data.posts);
}); }
socket.emit('user.getActiveUsers', updateActiveUsers);
socket.on('user.getActiveUsers', updateActiveUsers);
socket.emit('api:user.getActiveUsers', function(data) { function updateActiveUsers(err, data) {
$('#stats_online').html(data.users); $('#stats_online').html(data.users);
}); }
} }
return home; return home;

7
public/src/forum/recent.js
Unescape Escape View File

@ -99,10 +99,13 @@ define(function() {
Recent.loadMoreTopics = function() { Recent.loadMoreTopics = function() {
Recent.loadingMoreTopics = true; Recent.loadingMoreTopics = true;
socket.emit('api:topics.loadMoreRecentTopics', { socket.emit('topics.loadMoreRecentTopics', {
after: $('#topics-container').children('li').length, after: $('#topics-container').children('li').length,
term: active term: active
}, function(data) { }, function(err, data) {
if(err) {
return app.alertError(err.message);
}
if (data.topics && data.topics.length) { if (data.topics && data.topics.length) {
Recent.onTopicsLoaded(data.topics); Recent.onTopicsLoaded(data.topics);
} }

33
public/src/forum/register.js
Unescape Escape View File

@ -42,10 +42,14 @@ define(function() {
if (!utils.isEmailValid(emailEl.val())) { if (!utils.isEmailValid(emailEl.val())) {
showError(email_notify, 'Invalid email address.'); showError(email_notify, 'Invalid email address.');
} else { } else {
socket.emit('api:user.emailExists', { socket.emit('user.emailExists', {
email: emailEl.val() email: emailEl.val()
}, function(exists) { }, function(err, exists) {
if (exists === true) { if(err) {
return app.alertError(err.message);
}
if (exists) {
showError(email_notify, 'Email address already taken!'); showError(email_notify, 'Email address already taken!');
} else { } else {
showSuccess(email_notify, successIcon); showSuccess(email_notify, successIcon);
@ -71,8 +75,18 @@ define(function() {
} else if (!utils.isUserNameValid(username.val()) || !utils.slugify(username.val())) { } else if (!utils.isUserNameValid(username.val()) || !utils.slugify(username.val())) {
showError(username_notify, 'Invalid username!'); showError(username_notify, 'Invalid username!');
} else { } else {
socket.emit('api:user.exists', { socket.emit('user.exists', {
username: username.val() username: username.val()
}, function(err, exists) {
if(err) {
return app.alertError(err.message);
}
if (exists) {
showError(username_notify, 'Username already taken!');
} else {
showSuccess(username_notify, successIcon);
}
}); });
} }
} }
@ -80,6 +94,7 @@ define(function() {
username.on('keyup', function() { username.on('keyup', function() {
jQuery('#yourUsername').html(this.value.length > 0 ? this.value : 'username'); jQuery('#yourUsername').html(this.value.length > 0 ? this.value : 'username');
}); });
username.on('blur', function() { username.on('blur', function() {
validateUsername(); validateUsername();
}); });
@ -123,16 +138,6 @@ define(function() {
validatePasswordConfirm(); validatePasswordConfirm();
}); });
ajaxify.register_events(['api:user.exists', 'api:user.emailExists']);
socket.on('api:user.exists', function(data) {
if (data.exists === true) {
showError(username_notify, 'Username already taken!');
} else {
showSuccess(username_notify, successIcon);
}
});
function validateForm() { function validateForm() {
validationError = false; validationError = false;

29
public/src/forum/reset.js
Unescape Escape View File

@ -8,39 +8,26 @@ define(function() {
document.getElementById('reset').onclick = function() { document.getElementById('reset').onclick = function() {
if (inputEl.value.length > 0 && inputEl.value.indexOf('@') !== -1) { if (inputEl.value.length > 0 && inputEl.value.indexOf('@') !== -1) {
socket.emit('api:user.reset.send', { socket.emit('user.reset.send', {
email: inputEl.value email: inputEl.value
}); }, function(err, data) {
} else { if(err) {
jQuery('#success').hide(); return app.alertError(err.message);
jQuery(errorEl).show();
errorTextEl.innerHTML = 'Please enter a valid email';
} }
};
ajaxify.register_events(['user.send_reset']);
socket.on('user.send_reset', function(data) {
var submitEl = document.getElementById('reset'); var submitEl = document.getElementById('reset');
if (data.status === 'ok') {
jQuery('#error').hide(); jQuery('#error').hide();
jQuery('#success').show(); jQuery('#success').show();
jQuery('#success p').html('An email has been dispatched to "' + data.email + '" with instructions on setting a new password.'); jQuery('#success p').html('An email has been dispatched to "' + inputEl.value + '" with instructions on setting a new password.');
inputEl.value = ''; inputEl.value = '';
});
} else { } else {
jQuery('#success').hide(); jQuery('#success').hide();
jQuery(errorEl).show(); jQuery(errorEl).show();
switch (data.message) { errorTextEl.innerHTML = 'Please enter a valid email';
case 'invalid-email':
errorTextEl.innerHTML = 'The email you put in (<span>' + data.email + '</span>) is not registered with us. Please try again.';
break;
case 'send-failed':
errorTextEl.innerHTML = 'There was a problem sending the reset code. Please try again later.';
break;
}
} }
}); };
}; };
return ResetPassword; return ResetPassword;

33
public/src/forum/reset_code.js
Unescape Escape View File

@ -21,36 +21,37 @@ define(function() {
noticeEl.querySelector('p').innerHTML = 'The two passwords you\'ve entered do not match.'; noticeEl.querySelector('p').innerHTML = 'The two passwords you\'ve entered do not match.';
noticeEl.style.display = 'block'; noticeEl.style.display = 'block';
} else { } else {
socket.emit('api:user.reset.commit', { socket.emit('user.reset.commit', {
code: reset_code, code: reset_code,
password: password.value password: password.value
}, function(err) {
if(err) {
return app.alert(err.message);
}
$('#error').hide();
$('#notice').hide();
$('#success').show();
}); });
} }
}, false); }, false);
// Enable the form if the code is valid // Enable the form if the code is valid
socket.emit('api:user.reset.valid', { socket.emit('user.reset.valid', {
code: reset_code code: reset_code
}); }, function(err, valid) {
if(err) {
return app.alertError(err.message);
}
ajaxify.register_events(['api:user.reset.valid', 'api:user.reset.commit']); if (valid) {
socket.on('api:user.reset.valid', function(data) { resetEl.disabled = false;
if ( !! data.valid) resetEl.disabled = false; } else {
else {
var formEl = document.getElementById('reset-form'); var formEl = document.getElementById('reset-form');
// Show error message // Show error message
$('#error').show(); $('#error').show();
formEl.parentNode.removeChild(formEl); formEl.parentNode.removeChild(formEl);
} }
})
socket.on('api:user.reset.commit', function(data) {
if (data.status === 'ok') {
$('#error').hide();
$('#notice').hide();
$('#success').show();
}
}); });
}; };

156
public/src/forum/topic.js
Unescape Escape View File

@ -52,16 +52,14 @@ define(['composer'], function(composer) {
if (thread_state.deleted !== '1') { if (thread_state.deleted !== '1') {
bootbox.confirm('Are you sure you want to delete this thread?', function(confirm) { bootbox.confirm('Are you sure you want to delete this thread?', function(confirm) {
if (confirm) { if (confirm) {
socket.emit('api:topics.delete', { socket.emit('topics.delete', tid);
tid: tid
}, null);
} }
}); });
} else { } else {
bootbox.confirm('Are you sure you want to restore this thread?', function(confirm) { bootbox.confirm('Are you sure you want to restore this thread?', function(confirm) {
if (confirm) socket.emit('api:topics.restore', { if (confirm) {
tid: tid socket.emit('topics.restore', tid);
}, null); }
}); });
} }
return false; return false;
@ -69,26 +67,18 @@ define(['composer'], function(composer) {
$('.lock_thread').on('click', function(e) { $('.lock_thread').on('click', function(e) {
if (thread_state.locked !== '1') { if (thread_state.locked !== '1') {
socket.emit('api:topics.lock', { socket.emit('topics.lock', tid);
tid: tid
}, null);
} else { } else {
socket.emit('api:topics.unlock', { socket.emit('topics.unlock', tid);
tid: tid
}, null);
} }
return false; return false;
}); });
$('.pin_thread').on('click', function(e) { $('.pin_thread').on('click', function(e) {
if (thread_state.pinned !== '1') { if (thread_state.pinned !== '1') {
socket.emit('api:topics.pin', { socket.emit('topics.pin', tid);
tid: tid
}, null);
} else { } else {
socket.emit('api:topics.unpin', { socket.emit('topics.unpin', tid);
tid: tid
}, null);
} }
return false; return false;
}); });
@ -102,7 +92,7 @@ define(['composer'], function(composer) {
var loadingEl = document.getElementById('categories-loading'); var loadingEl = document.getElementById('categories-loading');
if (loadingEl) { if (loadingEl) {
socket.emit('api:categories.get', function(data) { socket.emit('categories.get', function(err, data) {
// Render categories // Render categories
var categoriesFrag = document.createDocumentFragment(), var categoriesFrag = document.createDocumentFragment(),
categoryEl = document.createElement('li'), categoryEl = document.createElement('li'),
@ -145,21 +135,13 @@ define(['composer'], function(composer) {
$(moveThreadModal).find('.modal-header button').fadeOut(250); $(moveThreadModal).find('.modal-header button').fadeOut(250);
commitEl.innerHTML = 'Moving <i class="fa-spin fa-refresh"></i>'; commitEl.innerHTML = 'Moving <i class="fa-spin fa-refresh"></i>';
socket.emit('api:topics.move', { socket.emit('topics.move', {
tid: tid, tid: tid,
cid: targetCid cid: targetCid
}, function(data) { }, function(err) {
moveThreadModal.modal('hide'); moveThreadModal.modal('hide');
if (data.status === 'ok') { if(err) {
app.alert({ return app.alert({
'alert_id': 'thread_move',
type: 'success',
title: 'Topic Successfully Moved',
message: 'This topic has been successfully moved to ' + targetCatLabel,
timeout: 5000
});
} else {
app.alert({
'alert_id': 'thread_move', 'alert_id': 'thread_move',
type: 'danger', type: 'danger',
title: 'Unable to Move Topic', title: 'Unable to Move Topic',
@ -167,6 +149,14 @@ define(['composer'], function(composer) {
timeout: 5000 timeout: 5000
}); });
} }
app.alert({
'alert_id': 'thread_move',
type: 'success',
title: 'Topic Successfully Moved',
message: 'This topic has been successfully moved to ' + targetCatLabel,
timeout: 5000
});
}); });
} }
}); });
@ -192,7 +182,7 @@ define(['composer'], function(composer) {
forkCommit.on('click', createTopicFromPosts); forkCommit.on('click', createTopicFromPosts);
function createTopicFromPosts() { function createTopicFromPosts() {
socket.emit('api:topics.createTopicFromPosts', { socket.emit('topics.createTopicFromPosts', {
title: forkModal.find('#fork-title').val(), title: forkModal.find('#fork-title').val(),
pids: pids pids: pids
}, function(err) { }, function(err) {
@ -298,15 +288,15 @@ define(['composer'], function(composer) {
} }
}; };
socket.emit('api:topics.followCheck', tid, function(state) { socket.emit('topics.followCheck', tid, function(err, state) {
set_follow_state(state, true); set_follow_state(state, true);
}); });
if (followEl[0]) { if (followEl[0]) {
followEl[0].addEventListener('click', function() { followEl[0].addEventListener('click', function() {
socket.emit('api:topics.follow', tid, function(data) { socket.emit('topics.follow', tid, function(err, state) {
if (data.status && data.status === 'ok') set_follow_state(data.follow); if(err) {
else { return app.alert({
app.alert({
type: 'danger', type: 'danger',
alert_id: 'topic_follow', alert_id: 'topic_follow',
title: 'Please Log In', title: 'Please Log In',
@ -314,6 +304,8 @@ define(['composer'], function(composer) {
timeout: 5000 timeout: 5000
}); });
} }
set_follow_state(state);
}); });
}, false); }, false);
} }
@ -375,9 +367,14 @@ define(['composer'], function(composer) {
username = '@' + post.attr('data-username'); username = '@' + post.attr('data-username');
} }
socket.emit('api:posts.getRawPost', {pid: pid}, function(data) { socket.emit('posts.getRawPost', pid, function(err, post) {
if(err) {
quoted = '> ' + data.post.replace(/\n/g, '\n> ') + '\n\n'; return app.alert(err.message);
}
var quoted = '';
if(post) {
quoted = '> ' + post.replace(/\n/g, '\n> ') + '\n\n';
}
composer.newReply(tid, topic_name, username + ' said:\n' + quoted); composer.newReply(tid, topic_name, username + ' said:\n' + quoted);
}); });
@ -389,12 +386,12 @@ define(['composer'], function(composer) {
var uid = $(this).parents('li').attr('data-uid'); var uid = $(this).parents('li').attr('data-uid');
if ($(this).attr('data-favourited') == 'false') { if ($(this).attr('data-favourited') == 'false') {
socket.emit('api:posts.favourite', { socket.emit('posts.favourite', {
pid: pid, pid: pid,
room_id: app.currentRoom room_id: app.currentRoom
}); });
} else { } else {
socket.emit('api:posts.unfavourite', { socket.emit('posts.unfavourite', {
pid: pid, pid: pid,
room_id: app.currentRoom room_id: app.currentRoom
}); });
@ -436,30 +433,20 @@ define(['composer'], function(composer) {
$('#post-container').on('click', '.delete', function(e) { $('#post-container').on('click', '.delete', function(e) {
var pid = $(this).parents('li').attr('data-pid'), var pid = $(this).parents('li').attr('data-pid'),
postEl = $(document.querySelector('#post-container li[data-pid="' + pid + '"]')), postEl = $(document.querySelector('#post-container li[data-pid="' + pid + '"]')),
deleteAction = !postEl.hasClass('deleted') ? true : false, action = !postEl.hasClass('deleted') ? 'delete' : 'restore';
confirmDel = confirm((deleteAction ? 'Delete' : 'Restore') + ' this post?');
if (confirmDel) { bootbox.confirm('Are you sure you want to ' + action + ' this post?', function(confirm) {
if(deleteAction) { if (confirm) {
socket.emit('api:posts.delete', { socket.emit('posts.' + action, {
pid: pid, pid: pid,
tid: tid tid: tid
}, function(err) { }, function(err) {
if(err) { if(err) {
return app.alertError('Can\'t delete post!'); return app.alertError('Can\'t ' + action + ' post!');
} }
}); });
} else {
socket.emit('api:posts.restore', {
pid: pid,
tid: tid
}, function(err) {
if(err) {
return app.alertError('Can\'t restore post!');
} }
}); });
}
}
}); });
$('#post-container').on('click', '.move', function(e) { $('#post-container').on('click', '.move', function(e) {
@ -488,7 +475,7 @@ define(['composer'], function(composer) {
}); });
moveBtn.on('click', function() { moveBtn.on('click', function() {
socket.emit('api:topics.movePost', {pid: pid, tid: topicId.val()}, function(err) { socket.emit('topics.movePost', {pid: pid, tid: topicId.val()}, function(err) {
if(err) { if(err) {
return app.alertError(err.message); return app.alertError(err.message);
} }
@ -515,15 +502,15 @@ define(['composer'], function(composer) {
}); });
ajaxify.register_events([ ajaxify.register_events([
'event:rep_up', 'event:rep_down', 'event:new_post', 'api:get_users_in_room', 'event:rep_up', 'event:rep_down', 'event:new_post', 'get_users_in_room',
'event:topic_deleted', 'event:topic_restored', 'event:topic:locked', 'event:topic_deleted', 'event:topic_restored', 'event:topic:locked',
'event:topic_unlocked', 'event:topic_pinned', 'event:topic_unpinned', 'event:topic_unlocked', 'event:topic_pinned', 'event:topic_unpinned',
'event:topic_moved', 'event:post_edited', 'event:post_deleted', 'event:post_restored', 'event:topic_moved', 'event:post_edited', 'event:post_deleted', 'event:post_restored',
'api:posts.favourite' 'posts.favourite'
]); ]);
socket.on('api:get_users_in_room', function(data) { socket.on('get_users_in_room', function(data) {
if(data) { if(data) {
var activeEl = $('.thread_active_users'); var activeEl = $('.thread_active_users');
@ -629,45 +616,47 @@ define(['composer'], function(composer) {
}); });
socket.on('event:topic_deleted', function(data) { socket.on('event:topic_deleted', function(data) {
if (data.tid === tid && data.status === 'ok') { if (data && data.tid === tid) {
set_locked_state(true); set_locked_state(true);
set_delete_state(true); set_delete_state(true);
} }
}); });
socket.on('event:topic_restored', function(data) { socket.on('event:topic_restored', function(data) {
if (data.tid === tid && data.status === 'ok') { if (data && data.tid === tid) {
set_locked_state(false); set_locked_state(false);
set_delete_state(false); set_delete_state(false);
} }
}); });
socket.on('event:topic_locked', function(data) { socket.on('event:topic_locked', function(data) {
if (data.tid === tid && data.status === 'ok') { if (data && data.tid === tid) {
set_locked_state(true, 1); set_locked_state(true, 1);
} }
}); });
socket.on('event:topic_unlocked', function(data) { socket.on('event:topic_unlocked', function(data) {
if (data.tid === tid && data.status === 'ok') { if (data && data.tid === tid) {
set_locked_state(false, 1); set_locked_state(false, 1);
} }
}); });
socket.on('event:topic_pinned', function(data) { socket.on('event:topic_pinned', function(data) {
if (data.tid === tid && data.status === 'ok') { if (data && data.tid === tid) {
set_pinned_state(true, 1); set_pinned_state(true, 1);
} }
}); });
socket.on('event:topic_unpinned', function(data) { socket.on('event:topic_unpinned', function(data) {
if (data.tid === tid && data.status === 'ok') { if (data && data.tid === tid) {
set_pinned_state(false, 1); set_pinned_state(false, 1);
} }
}); });
socket.on('event:topic_moved', function(data) { socket.on('event:topic_moved', function(data) {
if (data && data.tid > 0) ajaxify.go('topic/' + data.tid); if (data && data.tid > 0) {
ajaxify.go('topic/' + data.tid);
}
}); });
socket.on('event:post_edited', function(data) { socket.on('event:post_edited', function(data) {
@ -689,8 +678,8 @@ define(['composer'], function(composer) {
}); });
socket.on('api:posts.favourite', function(data) { socket.on('posts.favourite', function(data) {
if (data.status === 'ok' && data.pid) { if (data && data.pid) {
var favBtn = $('li[data-pid="' + data.pid + '"] .favourite'); var favBtn = $('li[data-pid="' + data.pid + '"] .favourite');
if(favBtn.length) { if(favBtn.length) {
favBtn.addClass('btn-warning') favBtn.addClass('btn-warning')
@ -700,8 +689,8 @@ define(['composer'], function(composer) {
} }
}); });
socket.on('api:posts.unfavourite', function(data) { socket.on('posts.unfavourite', function(data) {
if (data.status === 'ok' && data.pid) { if (data && data.pid) {
var favBtn = $('li[data-pid="' + data.pid + '"] .favourite'); var favBtn = $('li[data-pid="' + data.pid + '"] .favourite');
if(favBtn.length) { if(favBtn.length) {
favBtn.removeClass('btn-warning') favBtn.removeClass('btn-warning')
@ -861,7 +850,11 @@ define(['composer'], function(composer) {
favEl = postEl.find('.favourite'), favEl = postEl.find('.favourite'),
replyEl = postEl.find('.post_reply'); replyEl = postEl.find('.post_reply');
socket.emit('api:posts.getPrivileges', pid, function(privileges) { socket.emit('posts.getPrivileges', pid, function(err, privileges) {
if(err) {
return app.alert(err.message);
}
if (privileges.editable) { if (privileges.editable) {
if (!postEl.hasClass('deleted')) { if (!postEl.hasClass('deleted')) {
toggle_post_tools(pid, false); toggle_post_tools(pid, false);
@ -1056,7 +1049,10 @@ define(['composer'], function(composer) {
.fadeIn('slow'); .fadeIn('slow');
for (var x = 0, numPosts = data.posts.length; x < numPosts; x++) { for (var x = 0, numPosts = data.posts.length; x < numPosts; x++) {
socket.emit('api:posts.getPrivileges', data.posts[x].pid, function(privileges) { socket.emit('posts.getPrivileges', data.posts[x].pid, function(err, privileges) {
if(err) {
return app.alertError(err.message);
}
toggle_mod_tools(privileges.pid, privileges.editable); toggle_mod_tools(privileges.pid, privileges.editable);
}); });
} }
@ -1087,7 +1083,7 @@ define(['composer'], function(composer) {
} }
function updatePostCount() { function updatePostCount() {
socket.emit('api:topics.postcount', templates.get('topic_id'), function(err, postcount) { socket.emit('topics.postcount', templates.get('topic_id'), function(err, postcount) {
if(!err) { if(!err) {
Topic.postCount = postcount; Topic.postCount = postcount;
$('#topic-post-count').html(Topic.postCount); $('#topic-post-count').html(Topic.postCount);
@ -1109,12 +1105,16 @@ define(['composer'], function(composer) {
indicatorEl.fadeIn(); indicatorEl.fadeIn();
} }
socket.emit('api:topics.loadMore', { socket.emit('topics.loadMore', {
tid: tid, tid: tid,
after: parseInt($('#post-container .post-row.infiniteloaded').last().attr('data-index'), 10) + 1 after: parseInt($('#post-container .post-row.infiniteloaded').last().attr('data-index'), 10) + 1
}, function (data) { }, function (err, data) {
if(err) {
return app.alertError(err.message);
}
infiniteLoaderActive = false; infiniteLoaderActive = false;
if (data.posts.length) { if (data && data.posts && data.posts.length) {
indicatorEl.attr('done', '0'); indicatorEl.attr('done', '0');
createNewPosts(data, true); createNewPosts(data, true);
} else { } else {

20
public/src/forum/unread.js
Unescape Escape View File

@ -8,7 +8,7 @@ define(function() {
ajaxify.register_events([ ajaxify.register_events([
'event:new_topic', 'event:new_topic',
'event:new_post', 'event:new_post',
'api:topics.markAllRead' 'topics.markAllRead'
]); ]);
var newTopicCount = 0, var newTopicCount = 0,
@ -55,8 +55,11 @@ define(function() {
$('#mark-allread-btn').on('click', function() { $('#mark-allread-btn').on('click', function() {
var btn = $(this); var btn = $(this);
socket.emit('api:topics.markAllRead', {}, function(success) { socket.emit('topics.markAllRead', function(err) {
if (success) { if(err) {
return app.alertError('There was an error marking topics read!');
}
btn.remove(); btn.remove();
$('#topics-container').empty(); $('#topics-container').empty();
$('#category-no-topics').removeClass('hidden'); $('#category-no-topics').removeClass('hidden');
@ -65,9 +68,6 @@ define(function() {
.removeClass('badge-important') .removeClass('badge-important')
.addClass('badge-inverse') .addClass('badge-inverse')
.html('0'); .html('0');
} else {
app.alertError('There was an error marking topics read!');
}
}); });
}); });
@ -91,9 +91,13 @@ define(function() {
function loadMoreTopics() { function loadMoreTopics() {
loadingMoreTopics = true; loadingMoreTopics = true;
socket.emit('api:topics.loadMoreUnreadTopics', { socket.emit('topics.loadMoreUnreadTopics', {
after: parseInt($('#topics-container').attr('data-next-start'), 10) after: parseInt($('#topics-container').attr('data-next-start'), 10)
}, function(data) { }, function(err, data) {
if(err) {
return app.alertError(err.message);
}
if (data.topics && data.topics.length) { if (data.topics && data.topics.length) {
onTopicsLoaded(data.topics); onTopicsLoaded(data.topics);
$('#topics-container').attr('data-next-start', data.nextStart); $('#topics-container').attr('data-next-start', data.nextStart);

12
public/src/forum/users.js
Unescape Escape View File

@ -47,7 +47,7 @@ define(function() {
jQuery('#user-notfound-notify').html('<i class="fa fa-spinner fa-spin"></i>'); jQuery('#user-notfound-notify').html('<i class="fa fa-spinner fa-spin"></i>');
setTimeout(function() { setTimeout(function() {
socket.emit('api:admin.user.search', username, function(err, data) { socket.emit('admin.user.search', username, function(err, data) {
if(err) { if(err) {
return app.alert(err.message); return app.alert(err.message);
} }
@ -80,10 +80,10 @@ define(function() {
}, 250); }, 250);
}); });
socket.on('api:user.isOnline', function(data) { socket.on('user.isOnline', function(err, data) {
if(getActiveSection() == 'online' && !loadingMoreUsers) { if(getActiveSection() == 'online' && !loadingMoreUsers) {
startLoading('users:online', 0, true); startLoading('users:online', 0, true);
socket.emit('api:user.getOnlineAnonCount', {} , function(anonCount) { socket.emit('user.getOnlineAnonCount', {} , function(err, anonCount) {
if(parseInt(anonCount, 10) > 0) { if(parseInt(anonCount, 10) > 0) {
$('#users-container .anon-user').removeClass('hide'); $('#users-container .anon-user').removeClass('hide');
$('#online_anon_count').html(anonCount); $('#online_anon_count').html(anonCount);
@ -123,11 +123,11 @@ define(function() {
function startLoading(set, after, emptyContainer) { function startLoading(set, after, emptyContainer) {
loadingMoreUsers = true; loadingMoreUsers = true;
socket.emit('api:user.loadMore', { socket.emit('user.loadMore', {
set: set, set: set,
after: after after: after
}, function(data) { }, function(err, data) {
if (data.users.length) { if (data && data.users.length) {
onUsersLoaded(data.users, emptyContainer); onUsersLoaded(data.users, emptyContainer);
$('#load-more-users-btn').removeClass('disabled'); $('#load-more-users-btn').removeClass('disabled');
} else { } else {

10
public/src/modules/chat.js
Unescape Escape View File

@ -13,13 +13,13 @@ define(['taskbar', 'string'], function(taskbar, S) {
return; return;
} }
socket.emit('api:modules.chats.list', function(chats) { socket.emit('modules.chats.list', function(err, chats) {
var chatsFrag = document.createDocumentFragment(), var chatsFrag = document.createDocumentFragment(),
chatEl = document.createElement('li'), chatEl = document.createElement('li'),
numChats = chats.length, numChats = chats.length,
x, userObj; x, userObj;
if (numChats > 0) { if (!err && numChats > 0) {
for(x=0;x<numChats;x++) { for(x=0;x<numChats;x++) {
userObj = chats[x]; userObj = chats[x];
chatEl.setAttribute('data-uid', userObj.uid); chatEl.setAttribute('data-uid', userObj.uid);
@ -90,7 +90,7 @@ define(['taskbar', 'string'], function(taskbar, S) {
} }
function checkStatus(chatModal, callback) { function checkStatus(chatModal, callback) {
socket.emit('api:user.isOnline', chatModal.touid, function(data) { socket.emit('user.isOnline', chatModal.touid, function(err, data) {
if(data.online !== chatModal.online) { if(data.online !== chatModal.online) {
if(data.online) { if(data.online) {
module.appendChatMessage(chatModal, chatModal.username + ' is currently online.\n', data.timestamp); module.appendChatMessage(chatModal, chatModal.username + ' is currently online.\n', data.timestamp);
@ -191,7 +191,7 @@ define(['taskbar', 'string'], function(taskbar, S) {
} }
function getChatMessages(chatModal, callback) { function getChatMessages(chatModal, callback) {
socket.emit('api:modules.chats.get', {touid:chatModal.touid}, function(messages) { socket.emit('modules.chats.get', {touid:chatModal.touid}, function(err, messages) {
for(var i = 0; i<messages.length; ++i) { for(var i = 0; i<messages.length; ++i) {
module.appendChatMessage(chatModal, messages[i].content, messages[i].timestamp); module.appendChatMessage(chatModal, messages[i].content, messages[i].timestamp);
} }
@ -218,7 +218,7 @@ define(['taskbar', 'string'], function(taskbar, S) {
var msg = S(chatModal.find('#chat-message-input').val()).stripTags().s; var msg = S(chatModal.find('#chat-message-input').val()).stripTags().s;
if(msg.length) { if(msg.length) {
msg = msg +'\n'; msg = msg +'\n';
socket.emit('api:modules.chats.send', { touid:chatModal.touid, message:msg}); socket.emit('modules.chats.send', { touid:chatModal.touid, message:msg});
chatModal.find('#chat-message-input').val(''); chatModal.find('#chat-message-input').val('');
} }
} }

23
public/src/modules/composer.js
Unescape Escape View File

@ -45,9 +45,10 @@ define(['taskbar'], function(taskbar) {
composer.editPost = function(pid) { composer.editPost = function(pid) {
if(allowed()) { if(allowed()) {
socket.emit('api:modules.composer.push', { socket.emit('modules.composer.push', pid, function(err, threadData) {
pid: pid if(err) {
}, function(threadData) { return app.alertError(err.message);
}
push({ push({
pid: pid, pid: pid,
title: threadData.title, title: threadData.title,
@ -108,8 +109,8 @@ define(['taskbar'], function(taskbar) {
} else if (parseInt(postData.pid) > 0) { } else if (parseInt(postData.pid) > 0) {
titleEl.val(postData.title); titleEl.val(postData.title);
titleEl.prop('readOnly', true); titleEl.prop('readOnly', true);
socket.emit('api:modules.composer.editCheck', postData.pid, function(editCheck) { socket.emit('modules.composer.editCheck', postData.pid, function(err, editCheck) {
if (editCheck.titleEditable) { if (!err && editCheck.titleEditable) {
postContainer.find('input').prop('readonly', false); postContainer.find('input').prop('readonly', false);
} }
}); });
@ -434,7 +435,7 @@ define(['taskbar'], function(taskbar) {
// Still here? Let's post. // Still here? Let's post.
if (parseInt(postData.cid) > 0) { if (parseInt(postData.cid) > 0) {
socket.emit('api:topics.post', { socket.emit('topics.post', {
'title' : titleEl.val(), 'title' : titleEl.val(),
'content' : bodyEl.val(), 'content' : bodyEl.val(),
'category_id' : postData.cid 'category_id' : postData.cid
@ -442,14 +443,14 @@ define(['taskbar'], function(taskbar) {
composer.discard(post_uuid); composer.discard(post_uuid);
}); });
} else if (parseInt(postData.tid) > 0) { } else if (parseInt(postData.tid) > 0) {
socket.emit('api:posts.reply', { socket.emit('posts.reply', {
'topic_id' : postData.tid, 'topic_id' : postData.tid,
'content' : bodyEl.val() 'content' : bodyEl.val()
}, function() { }, function() {
composer.discard(post_uuid); composer.discard(post_uuid);
}); });
} else if (parseInt(postData.pid) > 0) { } else if (parseInt(postData.pid) > 0) {
socket.emit('api:posts.edit', { socket.emit('posts.edit', {
pid: postData.pid, pid: postData.pid,
content: bodyEl.val(), content: bodyEl.val(),
title: titleEl.val() title: titleEl.val()
@ -568,12 +569,12 @@ define(['taskbar'], function(taskbar) {
dropDiv.hide(); dropDiv.hide();
if(file.type.match('image.*')) { if(file.type.match('image.*')) {
uploadFile('api:posts.uploadImage', post_uuid, fileData); uploadFile('posts.uploadImage', post_uuid, fileData);
} else { } else {
if(file.size > parseInt(config.maximumFileSize, 10) * 1024) { if(file.size > parseInt(config.maximumFileSize, 10) * 1024) {
return composerAlert('File too big', 'Maximum allowed file size is ' + config.maximumFileSize + 'kbs'); return composerAlert('File too big', 'Maximum allowed file size is ' + config.maximumFileSize + 'kbs');
} }
uploadFile('api:posts.uploadFile', post_uuid, fileData); uploadFile('posts.uploadFile', post_uuid, fileData);
} }
}); });
@ -582,7 +583,7 @@ define(['taskbar'], function(taskbar) {
function uploadFile(method, post_uuid, img) { function uploadFile(method, post_uuid, img) {
var linkStart = method === 'api:posts.uploadImage' ? '!' : '', var linkStart = method === 'posts.uploadImage' ? '!' : '',
postContainer = $('#cmp-uuid-' + post_uuid), postContainer = $('#cmp-uuid-' + post_uuid),
textarea = postContainer.find('textarea'), textarea = postContainer.find('textarea'),
text = textarea.val(), text = textarea.val(),

12
public/src/modules/notifications.js
Unescape Escape View File

@ -11,14 +11,14 @@ define(function() {
notifTrigger.addEventListener('click', function(e) { notifTrigger.addEventListener('click', function(e) {
e.preventDefault(); e.preventDefault();
if (notifContainer.className.indexOf('open') === -1) { if (notifContainer.className.indexOf('open') === -1) {
socket.emit('api:notifications.get', null, function(data) { socket.emit('notifications.get', null, function(err, data) {
var notifFrag = document.createDocumentFragment(), var notifFrag = document.createDocumentFragment(),
notifEl = document.createElement('li'), notifEl = document.createElement('li'),
numRead = data.read.length, numRead = data.read.length,
numUnread = data.unread.length, numUnread = data.unread.length,
x; x;
notifList.innerHTML = ''; notifList.innerHTML = '';
if ((data.read.length + data.unread.length) > 0) { if (!err && (data.read.length + data.unread.length) > 0) {
for (x = 0; x < numUnread; x++) { for (x = 0; x < numUnread; x++) {
notifEl.setAttribute('data-nid', data.unread[x].nid); notifEl.setAttribute('data-nid', data.unread[x].nid);
notifEl.className = 'unread'; notifEl.className = 'unread';
@ -51,13 +51,15 @@ define(function() {
notifIcon.toggleClass('active', false); notifIcon.toggleClass('active', false);
} }
socket.emit('api:modules.notifications.mark_all_read', null, function() { socket.emit('modules.notifications.mark_all_read', null, function(err) {
if (!err) {
notifIcon.toggleClass('active', false); notifIcon.toggleClass('active', false);
app.refreshTitle(); app.refreshTitle();
// Update favicon + local count // Update favicon + local count
Tinycon.setBubble(0); Tinycon.setBubble(0);
localStorage.setItem('notifications:count', 0); localStorage.setItem('notifications:count', 0);
}
}); });
}); });
} }
@ -78,7 +80,7 @@ define(function() {
} }
if (target) { if (target) {
var nid = parseInt(target.getAttribute('data-nid')); var nid = parseInt(target.getAttribute('data-nid'));
if (nid > 0) socket.emit('api:modules.notifications.mark_read', nid); if (nid > 0) socket.emit('modules.notifications.mark_read', nid);
} }
}); });
@ -95,7 +97,7 @@ define(function() {
localStorage.setItem('notifications:count', count); localStorage.setItem('notifications:count', count);
}; };
socket.emit('api:notifications.getCount', function(err, count) { socket.emit('notifications.getCount', function(err, count) {
if (!err) { if (!err) {
updateNotifCount(count); updateNotifCount(count);
} else { } else {

2
public/templates/unread.tpl
Unescape Escape View File

@ -15,7 +15,7 @@
</a> </a>
<div class="category row"> <div class="category row">
<div class="{topic_row_size}"> <div class="col-md-12">
<ul id="topics-container" data-next-start="{nextStart}"> <ul id="topics-container" data-next-start="{nextStart}">
<!-- BEGIN topics --> <!-- BEGIN topics -->
<li class="category-item {topics.deleted-class}"> <li class="category-item {topics.deleted-class}">

7
src/admin/user.js
Unescape Escape View File

@ -6,11 +6,16 @@ var utils = require('../../public/src/utils'),
UserAdmin.createUser = function(uid, userData, callback) { UserAdmin.createUser = function(uid, userData, callback) {
user.isAdministrator(uid, function(err, isAdmin) { user.isAdministrator(uid, function(err, isAdmin) {
if(err) {
return callback(err);
}
if (isAdmin) { if (isAdmin) {
user.create(userData.username, userData.password, userData.email, function(err) { user.create(userData.username, userData.password, userData.email, function(err) {
if(err) { if(err) {
return callback(err.message); return callback(err);
} }
callback(null); callback(null);
}); });
} else { } else {

13
src/categories.js
Unescape Escape View File

@ -86,9 +86,7 @@ var db = require('./database.js'),
}; };
function getTopics(next) { function getTopics(next) {
topics.getTopicsByTids(tids, current_user, function(topicsData) { topics.getTopicsByTids(tids, category_id, current_user, next);
next(null, topicsData);
}, category_id);
} }
function getModerators(next) { function getModerators(next) {
@ -126,9 +124,11 @@ var db = require('./database.js'),
Categories.getCategoryTopics = function(cid, start, stop, uid, callback) { Categories.getCategoryTopics = function(cid, start, stop, uid, callback) {
Categories.getTopicIds(cid, start, stop, function(err, tids) { Categories.getTopicIds(cid, start, stop, function(err, tids) {
topics.getTopicsByTids(tids, uid, function(topicsData) { if(err) {
callback(topicsData); return callback(err);
}, cid); }
topics.getTopicsByTids(tids, cid, uid, callback);
}); });
}; };
@ -137,7 +137,6 @@ var db = require('./database.js'),
}; };
Categories.getAllCategories = function(current_user, callback) { Categories.getAllCategories = function(current_user, callback) {
db.getListRange('categories:cid', 0, -1, function(err, cids) { db.getListRange('categories:cid', 0, -1, function(err, cids) {
if(err) { if(err) {

6
src/favourites.js
Unescape Escape View File

@ -46,8 +46,7 @@ var db = require('./database'),
}); });
} }
socket.emit('api:posts.favourite', { socket.emit('posts.favourite', {
status: 'ok',
pid: pid pid: pid
}); });
} }
@ -83,8 +82,7 @@ var db = require('./database'),
}); });
} }
socket.emit('api:posts.unfavourite', { socket.emit('posts.unfavourite', {
status: 'ok',
pid: pid pid: pid
}); });
} }

2
src/meta.js
Unescape Escape View File

@ -122,7 +122,7 @@ var fs = require('fs'),
'theme:templates': '', 'theme:templates': '',
'theme:src': '' 'theme:src': ''
}; };
console.log(themeData);
switch(data.type) { switch(data.type) {
case 'local': case 'local':
async.waterfall([ async.waterfall([

12
src/postTools.js
Unescape Escape View File

@ -51,7 +51,11 @@ var winston = require('winston'),
} }
// [getThreadPrivileges, isOwnPost, hasEnoughRep] // [getThreadPrivileges, isOwnPost, hasEnoughRep]
}, function(err, results) { }, function(err, results) {
callback({ if(err) {
return callback(err);
}
callback(null, {
read: results.topicPrivs.read, read: results.topicPrivs.read,
editable: results.topicPrivs.editable || results.isOwner || results.hasEnoughRep, editable: results.topicPrivs.editable || results.isOwner || results.hasEnoughRep,
view_deleted: results.topicPrivs.view_deleted || results.isOwner || results.hasEnoughRep view_deleted: results.topicPrivs.view_deleted || results.isOwner || results.hasEnoughRep
@ -111,7 +115,7 @@ var winston = require('winston'),
}); });
}; };
PostTools.privileges(pid, uid, function(privileges) { PostTools.privileges(pid, uid, function(err, privileges) {
if (privileges.editable) { if (privileges.editable) {
plugins.fireHook('filter:post.save', content, function(err, parsedContent) { plugins.fireHook('filter:post.save', content, function(err, parsedContent) {
if (!err) content = parsedContent; if (!err) content = parsedContent;
@ -169,7 +173,7 @@ var winston = require('winston'),
return callback(new Error('Post already deleted!')); return callback(new Error('Post already deleted!'));
} }
PostTools.privileges(pid, uid, function(privileges) { PostTools.privileges(pid, uid, function(err, privileges) {
if (privileges.editable) { if (privileges.editable) {
success(); success();
} }
@ -223,7 +227,7 @@ var winston = require('winston'),
return callback(new Error('Post already restored')); return callback(new Error('Post already restored'));
} }
PostTools.privileges(pid, uid, function(privileges) { PostTools.privileges(pid, uid, function(err, privileges) {
if (privileges.editable) { if (privileges.editable) {
success(); success();
} }

26
src/posts.js
Unescape Escape View File

@ -368,41 +368,41 @@ var db = require('./database'),
Posts.uploadPostImage = function(image, callback) { Posts.uploadPostImage = function(image, callback) {
if(meta.config.imgurClientID) { if(meta.config.imgurClientID) {
if(!image) { if(!image || !image.data) {
return callback('invalid image', null); return callback('invalid image', null);
} }
require('./imgur').upload(meta.config.imgurClientID, image.data, 'base64', function(err, data) { require('./imgur').upload(meta.config.imgurClientID, image.data, 'base64', function(err, data) {
if(err) { if(err) {
callback(err.message, null); return callback(err);
} else { }
callback(null, { callback(null, {
url: data.link, url: data.link,
name: image.name name: image.name
}); });
}
}); });
} else if (meta.config.allowFileUploads) { } else if (meta.config.allowFileUploads) {
Posts.uploadPostFile(image, callback); Posts.uploadPostFile(image, callback);
} else { } else {
callback('Uploads are disabled!'); callback(new Error('Uploads are disabled!'));
} }
} }
Posts.uploadPostFile = function(file, callback) { Posts.uploadPostFile = function(file, callback) {
if(!meta.config.allowFileUploads) { if(!meta.config.allowFileUploads) {
return callback('File uploads are not allowed'); return callback(new Error('File uploads are not allowed'));
} }
if(!file) { if(!file || !file.data) {
return callback('invalid file'); return callback(new Error('invalid file'));
} }
var buffer = new Buffer(file.data, 'base64'); var buffer = new Buffer(file.data, 'base64');
if(buffer.length > parseInt(meta.config.maximumFileSize, 10) * 1024) { if(buffer.length > parseInt(meta.config.maximumFileSize, 10) * 1024) {
return callback('File too big'); return callback(new Error('File too big'));
} }
var filename = 'upload-' + utils.generateUUID() + path.extname(file.name); var filename = 'upload-' + utils.generateUUID() + path.extname(file.name);
@ -410,13 +410,13 @@ var db = require('./database'),
fs.writeFile(uploadPath, buffer, function (err) { fs.writeFile(uploadPath, buffer, function (err) {
if(err) { if(err) {
callback(err.message, null); return callback(err);
} else { }
callback(null, { callback(null, {
url: nconf.get('upload_url') + filename, url: nconf.get('upload_url') + filename,
name: file.name name: file.name
}); });
}
}); });
} }
@ -427,7 +427,7 @@ var db = require('./database'),
} }
async.filter(pids, function(pid, next) { async.filter(pids, function(pid, next) {
postTools.privileges(pid, 0, function(privileges) { postTools.privileges(pid, 0, function(err, privileges) {
next(privileges.read); next(privileges.read);
}); });
}, function(pids) { }, function(pids) {

20
src/routes/api.js
Unescape Escape View File

@ -189,16 +189,24 @@ var path = require('path'),
}); });
}); });
app.get('/unread', function (req, res) { app.get('/unread', function (req, res, next) {
var uid = (req.user) ? req.user.uid : 0; var uid = (req.user) ? req.user.uid : 0;
topics.getUnreadTopics(uid, 0, 19, function (data) { topics.getUnreadTopics(uid, 0, 19, function (err, data) {
if(err) {
return next(err);
}
res.json(data); res.json(data);
}); });
}); });
app.get('/unread/total', function (req, res) { app.get('/unread/total', function (req, res, next) {
var uid = (req.user) ? req.user.uid : 0; var uid = (req.user) ? req.user.uid : 0;
topics.getTotalUnread(uid, function (data) { topics.getTotalUnread(uid, function (err, data) {
if(err) {
return next(err);
}
res.json(data); res.json(data);
}); });
}); });
@ -286,9 +294,9 @@ var path = require('path'),
return callback(err, null); return callback(err, null);
} }
topics.getTopicsByTids(tids, 0, function (topics) { topics.getTopicsByTids(tids, 0, 0, function (topics) {
callback(null, topics); callback(null, topics);
}, 0); });
}); });
} }

233
src/socket.io/admin.js
Unescape Escape View File

@ -15,16 +15,17 @@ var groups = require('../groups'),
async = require('async'), async = require('async'),
winston = require('winston'), winston = require('winston'),
index = require('./index'),
SocketAdmin = {}; SocketAdmin = {};
SocketAdmin.before = function(sessionData, next) { SocketAdmin.before = function(socket, next) {
// Verify administrative privileges // Verify administrative privileges
user.isAdministrator(sessionData.uid, function(err, isAdmin) { user.isAdministrator(socket.uid, function(err, isAdmin) {
if (isAdmin) { if (isAdmin) {
next(); next();
} else { } else {
winston.warn('[socket.io] Call to admin method blocked (accessed by uid ' + sessionData.uid + ')'); winston.warn('[socket.io] Call to admin method blocked (accessed by uid ' + socket.uid + ')');
} }
}); });
}; };
@ -33,54 +34,51 @@ SocketAdmin.before = function(sessionData, next) {
SocketAdmin.topics = {}; SocketAdmin.topics = {};
SocketAdmin.topics.getMore = function(data, callback) { SocketAdmin.topics.getMore = function(socket, data, callback) {
topics.getAllTopics(data.limit, data.after, function(err, topics) { if(!data) {
callback(JSON.stringify(topics)); return callback(new Error('invalid data'));
}); }
topics.getAllTopics(data.limit, data.after, callback);
}; };
/* User */ /* User */
SocketAdmin.user = {}; SocketAdmin.user = {};
SocketAdmin.user.makeAdmin = function(theirid, sessionData) { SocketAdmin.user.makeAdmin = function(socket, theirid) {
if (sessionData.uid && sessionData.uid > 0) { admin.user.makeAdmin(socket.uid, theirid, socket);
admin.user.makeAdmin(sessionData.uid, theirid, sessionData.socket);
}
}; };
SocketAdmin.user.removeAdmin = function(theirid, sessionData) { SocketAdmin.user.removeAdmin = function(socket, theirid) {
if (sessionData.uid && sessionData.uid > 0) { admin.user.removeAdmin(socket.uid, theirid, socket);
admin.user.removeAdmin(sessionData.uid, theirid, sessionData.socket);
}
}; };
SocketAdmin.user.createUser = function(user, callback, sessionData) { SocketAdmin.user.createUser = function(socket, user, callback) {
if (sessionData.uid && sessionData.uid > 0) { if(!user) {
admin.user.createUser(sessionData.uid, user, callback); return callback(new Error('invalid data'));
} }
admin.user.createUser(socket.uid, user, callback);
}; };
SocketAdmin.user.banUser = function(theirid, sessionData) { SocketAdmin.user.banUser = function(socket, theirid) {
if (sessionData.uid && sessionData.uid > 0) { admin.user.banUser(socket.uid, theirid, socket, function(isBanned) {
admin.user.banUser(sessionData.uid, theirid, sessionData.socket, function(isBanned) {
if(isBanned) { if(isBanned) {
if(sessionData.userSockets[theirid]) { if(index.userSockets[theirid]) {
for(var i=0; i<sessionData.userSockets[theirid].length; ++i) { for(var i=0; i<index.userSockets[theirid].length; ++i) {
sessionData.userSockets[theirid][i].emit('event:banned'); index.userSockets[theirid][i].emit('event:banned');
} }
} }
module.parent.exports.logoutUser(theirid); module.parent.exports.logoutUser(theirid);
} }
}); });
}
}; };
SocketAdmin.user.unbanUser = function(theirid, sessionData) { SocketAdmin.user.unbanUser = function(socket, theirid) {
admin.user.unbanUser(sessionData.uid, theirid, sessionData.socket); admin.user.unbanUser(socket.uid, theirid, socket);
}; };
SocketAdmin.user.search = function(username, callback, sessionData) { SocketAdmin.user.search = function(socket, username, callback) {
user.search(username, function(data) { user.search(username, function(data) {
function isAdmin(userData, next) { function isAdmin(userData, next) {
user.isAdministrator(userData.uid, function(err, isAdmin) { user.isAdministrator(userData.uid, function(err, isAdmin) {
@ -94,11 +92,7 @@ SocketAdmin.user.search = function(username, callback, sessionData) {
} }
async.each(data, isAdmin, function(err) { async.each(data, isAdmin, function(err) {
if(err) { callback(err, data);
return callback({message: err.message});
}
callback(null, data);
}); });
}); });
}; };
@ -107,40 +101,57 @@ SocketAdmin.user.search = function(username, callback, sessionData) {
SocketAdmin.categories = {}; SocketAdmin.categories = {};
SocketAdmin.categories.create = function(data, callback) { SocketAdmin.categories.create = function(socket, data, callback) {
categories.create(data, function(err, data) { if(!data) {
callback(err, data); return callback(new Error('invalid data'));
}); }
categories.create(data, callback);
}; };
SocketAdmin.categories.update = function(data, sessionData) { SocketAdmin.categories.update = function(socket, data) {
admin.categories.update(data, sessionData.socket); if(!data) {
return callback(new Error('invalid data'));
}
admin.categories.update(data, socket);
}; };
SocketAdmin.categories.search = function(username, cid, callback, sessionData) { SocketAdmin.categories.search = function(socket, data, callback) {
if(!data) {
return callback(new Error('invalid data'));
}
var username = data.username,
cid = data.cid;
user.search(username, function(data) { user.search(username, function(data) {
async.map(data, function(userObj, next) { async.map(data, function(userObj, next) {
CategoryTools.privileges(cid, userObj.uid, function(err, privileges) { CategoryTools.privileges(cid, userObj.uid, function(err, privileges) {
if (!err) { if(err) {
userObj.privileges = privileges; return next(err);
} else {
winston.error('[socket api:admin.categories.search] Could not retrieve permissions');
} }
userObj.privileges = privileges;
next(null, userObj); next(null, userObj);
}); });
}, function(err, data) { }, callback);
if (!callback) {
sessionData.socket.emit('api:admin.categories.search', data);
} else {
callback(null, data);
}
});
}); });
}; };
SocketAdmin.categories.setPrivilege = function(cid, uid, privilege, set, callback) { SocketAdmin.categories.setPrivilege = function(socket, data, callback) {
var cb = function(err) { if(!data) {
return callback(new Error('invalid data'));
}
var cid = data.cid,
uid = data.uid,
privilege = data.privilege,
set = data.set,
cb = function(err) {
if(err) {
return callback(err);
}
CategoryTools.privileges(cid, uid, callback); CategoryTools.privileges(cid, uid, callback);
}; };
@ -151,7 +162,7 @@ SocketAdmin.categories.setPrivilege = function(cid, uid, privilege, set, callbac
} }
}; };
SocketAdmin.categories.getPrivilegeSettings = function(cid, callback) { SocketAdmin.categories.getPrivilegeSettings = function(socket, cid, callback) {
async.parallel({ async.parallel({
"+r": function(next) { "+r": function(next) {
groups.getByGroupName('cid:' + cid + ':privileges:+r', { expand: true }, function(err, groupObj) { groups.getByGroupName('cid:' + cid + ':privileges:+r', { expand: true }, function(err, groupObj) {
@ -176,6 +187,10 @@ SocketAdmin.categories.getPrivilegeSettings = function(cid, callback) {
}); });
} }
}, function(err, data) { }, function(err, data) {
if(err) {
return callback(err);
}
callback(null, { callback(null, {
"+r": data['+r'].members, "+r": data['+r'].members,
"+w": data['+w'].members "+w": data['+w'].members
@ -183,29 +198,34 @@ SocketAdmin.categories.getPrivilegeSettings = function(cid, callback) {
}); });
}; };
SocketAdmin.categories.setGroupPrivilege = function(cid, gid, privilege, set, callback) { SocketAdmin.categories.setGroupPrivilege = function(socket, data, callback) {
if (set) { if(!data) {
groups.joinByGroupName('cid:' + cid + ':privileges:' + privilege, gid, callback); return callback(new Error('invalid data'));
}
if (data.set) {
groups.joinByGroupName('cid:' + data.cid + ':privileges:' + data.privilege, data.gid, callback);
} else { } else {
groups.leaveByGroupName('cid:' + cid + ':privileges:' + privilege, gid, callback); groups.leaveByGroupName('cid:' + data.cid + ':privileges:' + data.privilege, data.gid, callback);
} }
}; };
SocketAdmin.categories.groupsList = function(cid, callback) { SocketAdmin.categories.groupsList = function(socket, cid, callback) {
groups.list({expand:false}, function(err, data){ groups.list({expand:false}, function(err, data){
if(err) {
return callback(err);
}
async.map(data, function(groupObj, next) { async.map(data, function(groupObj, next) {
CategoryTools.groupPrivileges(cid, groupObj.gid, function(err, privileges) { CategoryTools.groupPrivileges(cid, groupObj.gid, function(err, privileges) {
if (!err) { if(err) {
groupObj.privileges = privileges; return next(err);
} else {
winston.error('[socket api:admin.categories.groupsList] Could not retrieve permissions');
} }
groupObj.privileges = privileges;
next(null, groupObj); next(null, groupObj);
}); });
}, function(err, data) { }, callback);
callback(null, data);
});
}); });
}; };
@ -214,17 +234,20 @@ SocketAdmin.categories.groupsList = function(cid, callback) {
SocketAdmin.themes = {}; SocketAdmin.themes = {};
SocketAdmin.plugins = {}; SocketAdmin.plugins = {};
SocketAdmin.themes.getInstalled = function(callback) { SocketAdmin.themes.getInstalled = function(socket, data, callback) {
meta.themes.get(function(err, themeArr) { meta.themes.get(callback);
callback(themeArr);
});
}; };
SocketAdmin.themes.set = meta.themes.set; SocketAdmin.themes.set = function(socket, data, callback) {
if(!data) {
return callback(new Error('invalid data'));
}
meta.themes.set(data, callback);
}
SocketAdmin.plugins.toggle = function(plugin_id, sessionData) { SocketAdmin.plugins.toggle = function(socket, plugin_id) {
plugins.toggleActive(plugin_id, function(status) { plugins.toggleActive(plugin_id, function(status) {
sessionData.socket.emit('api:admin.plugins.toggle', status); socket.emit('admin.plugins.toggle', status);
}); });
}; };
@ -232,32 +255,32 @@ SocketAdmin.plugins.toggle = function(plugin_id, sessionData) {
SocketAdmin.config = {}; SocketAdmin.config = {};
SocketAdmin.config.get = function(callback, sessionData) { SocketAdmin.config.get = function(socket, data, callback) {
meta.configs.list(function(err, config) { meta.configs.list(callback);
if (!err) {
callback(config);
}
});
}; };
SocketAdmin.config.set = function(data, callback, sessionData) { SocketAdmin.config.set = function(socket, data, callback) {
if(!data) {
return callback(new Error('invalid data'));
}
meta.configs.set(data.key, data.value, function(err) { meta.configs.set(data.key, data.value, function(err) {
if (!err) { if(err) {
callback({ return callback(err);
status: 'ok' }
});
callback(null);
plugins.fireHook('action:config.set', { plugins.fireHook('action:config.set', {
key: data.key, key: data.key,
value: data.value value: data.value
}); });
}
logger.monitorConfig({io: sessionData.server}, data); logger.monitorConfig({io: index.server}, data);
}); });
}; };
SocketAdmin.config.remove = function(key) { SocketAdmin.config.remove = function(socket, key) {
meta.configs.remove(key); meta.configs.remove(key);
}; };
@ -265,35 +288,49 @@ SocketAdmin.config.remove = function(key) {
SocketAdmin.groups = {}; SocketAdmin.groups = {};
SocketAdmin.groups.create = function(data, callback) { SocketAdmin.groups.create = function(socket, data, callback) {
if(!data) {
return callback(new Error('invalid data'));
}
groups.create(data.name, data.description, function(err, groupObj) { groups.create(data.name, data.description, function(err, groupObj) {
callback(err ? err.message : null, groupObj || undefined); callback(err, groupObj || undefined);
}); });
}; };
SocketAdmin.groups.delete = function(gid, callback) { SocketAdmin.groups.delete = function(socket, gid, callback) {
groups.destroy(gid, function(err) { groups.destroy(gid, callback);
callback(err ? err.message : null, err ? null : 'OK');
});
}; };
SocketAdmin.groups.get = function(gid, callback) { SocketAdmin.groups.get = function(socket, gid, callback) {
groups.get(gid, { groups.get(gid, {
expand: true expand: true
}, function(err, groupObj) { }, function(err, groupObj) {
callback(err ? err.message : null, groupObj || undefined); callback(err, groupObj || undefined);
}); });
}; };
SocketAdmin.groups.join = function(data, callback) { SocketAdmin.groups.join = function(socket, data, callback) {
if(!data) {
return callback(new Error('invalid data'));
}
groups.join(data.gid, data.uid, callback); groups.join(data.gid, data.uid, callback);
}; };
SocketAdmin.groups.leave = function(data, callback) { SocketAdmin.groups.leave = function(socket, data, callback) {
if(!data) {
return callback(new Error('invalid data'));
}
groups.leave(data.gid, data.uid, callback); groups.leave(data.gid, data.uid, callback);
}; };
SocketAdmin.groups.update = function(data, callback) { SocketAdmin.groups.update = function(socket, data, callback) {
if(!data) {
return callback(new Error('invalid data'));
}
groups.update(data.gid, data.values, function(err) { groups.update(data.gid, data.values, function(err) {
callback(err ? err.message : null); callback(err ? err.message : null);
}); });

24
src/socket.io/categories.js
Unescape Escape View File

@ -2,26 +2,24 @@ var categories = require('../categories'),
SocketCategories = {}; SocketCategories = {};
SocketCategories.getRecentReplies = function(tid, callback, sessionData) { SocketCategories.getRecentReplies = function(socket, tid, callback) {
categories.getRecentReplies(tid, sessionData.uid, 4, function(err, replies) { categories.getRecentReplies(tid, socket.uid, 4, callback);
callback(replies);
});
}; };
SocketCategories.get = function(callback) { SocketCategories.get = function(socket, data, callback) {
categories.getAllCategories(0, function(err, categories) { categories.getAllCategories(0, callback);
if(callback) {
callback(categories);
}
});
}; };
SocketCategories.loadMore = function(data, callback, sessionData) { SocketCategories.loadMore = function(socket, data, callback) {
if(!data) {
return callback(new Error('invalid data'));
}
var start = data.after, var start = data.after,
end = start + 9; end = start + 9;
categories.getCategoryTopics(data.cid, start, end, sessionData.uid, function(topics) { categories.getCategoryTopics(data.cid, start, end, socket.uid, function(err, topics) {
callback({ callback(err, {
topics: topics topics: topics
}); });
}); });

129
src/socket.io/index.js
Unescape Escape View File

@ -23,10 +23,13 @@ var SocketIO = require('socket.io'),
/* === */ /* === */
var users = {}, var users = {},
userSockets = {},
rooms = {},
io; io;
Sockets.userSockets = {};
Sockets.rooms = {};
Sockets.init = function() { Sockets.init = function() {
io = socketioWildcard(SocketIO).listen(global.server, { io = socketioWildcard(SocketIO).listen(global.server, {
@ -35,6 +38,8 @@ Sockets.init = function() {
'browser client minification': true 'browser client minification': true
}); });
Sockets.server = io;
fs.readdir(__dirname, function(err, files) { fs.readdir(__dirname, function(err, files) {
files.splice(files.indexOf('index.js'), 1); files.splice(files.indexOf('index.js'), 1);
@ -59,8 +64,10 @@ Sockets.init = function() {
uid = users[sessionID] = 0; uid = users[sessionID] = 0;
} }
userSockets[uid] = userSockets[uid] || []; socket.uid = parseInt(uid, 10);
userSockets[uid].push(socket);
Sockets.userSockets[uid] = Sockets.userSockets[uid] || [];
Sockets.userSockets[uid].push(socket);
/* Need to save some state for the logger & maybe some other modules later on */ /* Need to save some state for the logger & maybe some other modules later on */
socket.state = { socket.state = {
@ -87,36 +94,36 @@ Sockets.init = function() {
}); });
} }
io.sockets.in('global').emit('api:user.isOnline', isUserOnline(uid)); io.sockets.in('global').emit('user.isOnline', isUserOnline(uid));
}); });
}); });
socket.on('disconnect', function() { socket.on('disconnect', function() {
var index = (userSockets[uid] || []).indexOf(socket); var index = (Sockets.userSockets[uid] || []).indexOf(socket);
if (index !== -1) { if (index !== -1) {
userSockets[uid].splice(index, 1); Sockets.userSockets[uid].splice(index, 1);
} }
if (userSockets[uid] && userSockets[uid].length === 0) { if (Sockets.userSockets[uid] && Sockets.userSockets[uid].length === 0) {
delete users[sessionID]; delete users[sessionID];
delete userSockets[uid]; delete Sockets.userSockets[uid];
if (uid) { if (uid) {
db.sortedSetRemove('users:online', uid, function(err, data) { db.sortedSetRemove('users:online', uid, function(err, data) {
}); });
} }
} }
io.sockets.in('global').emit('api:user.isOnline', isUserOnline(uid)); io.sockets.in('global').emit('user.isOnline', isUserOnline(uid));
emitOnlineUserCount(); emitOnlineUserCount();
for (var roomName in rooms) { for (var roomName in Sockets.rooms) {
if (rooms.hasOwnProperty(roomName)) { if (Sockets.rooms.hasOwnProperty(roomName)) {
socket.leave(roomName); socket.leave(roomName);
if (rooms[roomName][socket.id]) { if (Sockets.rooms[roomName][socket.id]) {
delete rooms[roomName][socket.id]; delete Sockets.rooms[roomName][socket.id];
} }
updateRoomBrowsingText(roomName); updateRoomBrowsingText(roomName);
@ -125,12 +132,19 @@ Sockets.init = function() {
}); });
socket.on('*', function(payload, callback) { socket.on('*', function(payload, callback) {
// Ignore all non-api messages function callMethod(method) {
if (payload.name.substr(0, 4) !== 'api:') { method.call(null, socket, payload.args.length ? payload.args[0] : null, function(err, result) {
return; if (callback) {
} else { callback(err?{message:err.message}:null, result);
// Deconstruct the message }
var parts = payload.name.slice(4).split('.'), });
}
if(!payload.name) {
return winston.warn('[socket.io] Empty method name');
}
var parts = payload.name.toString().split('.'),
namespace = parts.slice(0, 1), namespace = parts.slice(0, 1),
methodToCall = parts.reduce(function(prev, cur) { methodToCall = parts.reduce(function(prev, cur) {
if (prev !== null && prev[cur]) { if (prev !== null && prev[cur]) {
@ -140,57 +154,28 @@ Sockets.init = function() {
} }
}, Namespaces); }, Namespaces);
if (methodToCall !== null) { if(!methodToCall) {
var sessionData = { return winston.warn('[socket.io] Unrecognized message: ' + payload.name);
uid: uid,
socket: socket,
rooms: rooms,
server: io,
userSockets: userSockets
},
socketArgs = [];
// Construct the arguments that'll get passed into each socket method
if (payload.args.length) {
socketArgs = socketArgs.concat(payload.args);
}
if (callback !== undefined) {
socketArgs.push(callback);
} }
socketArgs.push(sessionData);
// Call the requested method
if (Namespaces[namespace].before) { if (Namespaces[namespace].before) {
Namespaces[namespace].before(sessionData, function() { Namespaces[namespace].before(socket, function() {
try { callMethod(methodToCall);
methodToCall.apply(Namespaces, socketArgs);
} catch (e) {
winston.error(e.message);
}
}); });
} else { } else {
try { callMethod(methodToCall);
methodToCall.apply(Namespaces, socketArgs);
} catch (e) {
winston.error(e.message);
}
}
// winston.info('[socket.io] Executing: ' + payload.name);
} else {
winston.warn('[socket.io] Unrecognized message: ' + payload.name);
}
} }
}); });
}); });
}; };
Sockets.logoutUser = function(uid) { Sockets.logoutUser = function(uid) {
if(userSockets[uid] && userSockets[uid].length) { if(Sockets.userSockets[uid] && Sockets.userSockets[uid].length) {
for(var i=0; i< userSockets[uid].length; ++i) { for(var i=0; i< Sockets.userSockets[uid].length; ++i) {
userSockets[uid][i].emit('event:disconnect'); Sockets.userSockets[uid][i].emit('event:disconnect');
userSockets[uid][i].disconnect(); Sockets.userSockets[uid][i].disconnect();
if(!userSockets[uid]) { if(!Sockets.userSockets[uid]) {
return; return;
} }
} }
@ -199,7 +184,7 @@ Sockets.logoutUser = function(uid) {
Sockets.emitUserCount = function() { Sockets.emitUserCount = function() {
db.getObjectField('global', 'userCount', function(err, count) { db.getObjectField('global', 'userCount', function(err, count) {
io.sockets.emit('user.count', { io.sockets.emit('user.count', err?{message:err.message}:null, {
count: count count: count
}); });
}); });
@ -211,18 +196,18 @@ Sockets.in = function(room) {
}; };
Sockets.getConnectedClients = function() { Sockets.getConnectedClients = function() {
return userSockets; return Sockets.userSockets;
}; };
Sockets.getOnlineAnonCount = function () { Sockets.getOnlineAnonCount = function () {
return userSockets[0] ? userSockets[0].length : 0; return Sockets.userSockets[0] ? Sockets.userSockets[0].length : 0;
}; };
/* Helpers */ /* Helpers */
Sockets.isUserOnline = isUserOnline; Sockets.isUserOnline = isUserOnline;
function isUserOnline(uid) { function isUserOnline(uid) {
return !!userSockets[uid] && userSockets[uid].length > 0; return !!Sockets.userSockets[uid] && Sockets.userSockets[uid].length > 0;
} }
Sockets.updateRoomBrowsingText = updateRoomBrowsingText; Sockets.updateRoomBrowsingText = updateRoomBrowsingText;
@ -251,15 +236,15 @@ function updateRoomBrowsingText(roomName) {
return anonCount; return anonCount;
} }
var uids = getUidsInRoom(rooms[roomName]), var uids = getUidsInRoom(Sockets.rooms[roomName]),
anonymousCount = getAnonymousCount(roomName); anonymousCount = getAnonymousCount(roomName);
if (uids.length === 0) { if (uids.length === 0) {
io.sockets.in(roomName).emit('api:get_users_in_room', { users: [], anonymousCount: anonymousCount }); io.sockets.in(roomName).emit('get_users_in_room', { users: [], anonymousCount: anonymousCount });
} else { } else {
user.getMultipleUserFields(uids, ['uid', 'username', 'userslug', 'picture'], function(err, users) { user.getMultipleUserFields(uids, ['uid', 'username', 'userslug', 'picture'], function(err, users) {
if(!err) { if(!err) {
io.sockets.in(roomName).emit('api:get_users_in_room', { users: users, anonymousCount: anonymousCount }); io.sockets.in(roomName).emit('get_users_in_room', { users: users, anonymousCount: anonymousCount });
} }
}); });
} }
@ -278,17 +263,17 @@ function emitTopicPostStats(callback) {
}; };
if (!callback) { if (!callback) {
io.sockets.emit('post.stats', stats); io.sockets.emit('post.stats', null, stats);
} else { } else {
callback(stats); callback(null, stats);
} }
}); });
} }
Sockets.emitOnlineUserCount = emitOnlineUserCount; Sockets.emitOnlineUserCount = emitOnlineUserCount;
function emitOnlineUserCount(callback) { function emitOnlineUserCount(callback) {
var anon = userSockets[0] ? userSockets[0].length : 0; var anon = Sockets.userSockets[0] ? Sockets.userSockets[0].length : 0;
var registered = Object.keys(userSockets).length; var registered = Object.keys(Sockets.userSockets).length;
if (anon) { if (anon) {
registered = registered - 1; registered = registered - 1;
} }
@ -299,9 +284,9 @@ function emitOnlineUserCount(callback) {
}; };
if (callback) { if (callback) {
callback(returnObj); callback(null, returnObj);
} else { } else {
io.sockets.emit('api:user.active.get', returnObj); io.sockets.emit('user.getActiveUsers', null, returnObj);
} }
} }

65
src/socket.io/meta.js
Unescape Escape View File

@ -7,12 +7,13 @@ var meta = require('../meta'),
nconf = require('nconf'), nconf = require('nconf'),
gravatar = require('gravatar'), gravatar = require('gravatar'),
winston = require('winston'), winston = require('winston'),
server = require('./'),
SocketMeta = {}; SocketMeta = {};
SocketMeta.reconnected = function(sessionData) { SocketMeta.reconnected = function(socket) {
var uid = sessionData.uid, var uid = socket.uid,
sessionID = sessionData.socket.id; sessionID = socket.id;
if (uid) { if (uid) {
topics.pushUnreadCount(uid); topics.pushUnreadCount(uid);
@ -28,22 +29,30 @@ SocketMeta.reconnected = function(sessionData) {
} }
}; };
SocketMeta.buildTitle = function(text, callback) { SocketMeta.buildTitle = function(socket, text, callback) {
meta.title.build(text, function(err, title) { meta.title.build(text, callback);
callback(title);
});
}; };
SocketMeta.updateHeader = function(data, callback, sessionData) { SocketMeta.updateHeader = function(socket, data, callback) {
if (sessionData.uid) { if(!data) {
user.getUserFields(sessionData.uid, data.fields, function(err, fields) { return callback(new Error('invalid data'));
if (!err && fields) { }
fields.uid = sessionData.uid;
callback(fields); if (socket.uid) {
user.getUserFields(socket.uid, data.fields, function(err, fields) {
if(err) {
return callback(err);
}
if (fields) {
fields.uid = socket.uid;
callback(null, fields);
} else {
callback(null, []);
} }
}); });
} else { } else {
callback({ callback(null, {
uid: 0, uid: 0,
username: "Anonymous User", username: "Anonymous User",
email: '', email: '',
@ -57,7 +66,7 @@ SocketMeta.updateHeader = function(data, callback, sessionData) {
} }
}; };
SocketMeta.getUsageStats = function(callback) { SocketMeta.getUsageStats = function(socket, data, callback) {
module.parent.exports.emitTopicPostStats(callback); module.parent.exports.emitTopicPostStats(callback);
}; };
@ -65,19 +74,23 @@ SocketMeta.getUsageStats = function(callback) {
SocketMeta.rooms = {}; SocketMeta.rooms = {};
SocketMeta.rooms.enter = function(data, sessionData) { SocketMeta.rooms.enter = function(socket, data) {
if(!data) {
return callback(new Error('invalid data'));
}
if (data.leave !== null) { if (data.leave !== null) {
sessionData.socket.leave(data.leave); socket.leave(data.leave);
} }
sessionData.socket.join(data.enter); socket.join(data.enter);
sessionData.rooms[data.enter] = sessionData.rooms[data.enter] || {}; server.rooms[data.enter] = server.rooms[data.enter] || {};
if (sessionData.uid) { if (socket.uid) {
sessionData.rooms[data.enter][sessionData.socket.id] = sessionData.uid; server.rooms[data.enter][socket.id] = socket.uid;
if (data.leave && sessionData.rooms[data.leave] && sessionData.rooms[data.leave][sessionData.socket.id] && data.enter !== data.leave) { if (data.leave && server.rooms[data.leave] && server.rooms[data.leave][socket.id] && data.enter !== data.leave) {
delete sessionData.rooms[data.leave][sessionData.socket.id]; delete server.rooms[data.leave][socket.id];
} }
} }
@ -88,12 +101,12 @@ SocketMeta.rooms.enter = function(data, sessionData) {
module.parent.exports.updateRoomBrowsingText(data.enter); module.parent.exports.updateRoomBrowsingText(data.enter);
if (data.enter != 'admin') { if (data.enter != 'admin') {
sessionData.server.sockets.in('admin').emit('event:meta.rooms.update', sessionData.server.sockets.manager.rooms); server.in('admin').emit('event:meta.rooms.update', null, server.rooms);
} }
}; };
SocketMeta.rooms.getAll = function(callback, sessionData) { SocketMeta.rooms.getAll = function(socket, data, callback) {
callback(sessionData.server.sockets.manager.rooms); callback(null, server.rooms);
}; };
/* Exports */ /* Exports */

93
src/socket.io/modules.js
Unescape Escape View File

@ -11,6 +11,7 @@ var posts = require('../posts'),
async = require('async'), async = require('async'),
S = require('string'), S = require('string'),
winston = require('winston'), winston = require('winston'),
server = require('./'),
SocketModules = {}; SocketModules = {};
@ -18,38 +19,44 @@ var posts = require('../posts'),
SocketModules.composer = {}; SocketModules.composer = {};
SocketModules.composer.push = function(data, callback, sessionData) { SocketModules.composer.push = function(socket, pid, callback) {
if (parseInt(sessionData.uid, 10) > 0 || parseInt(meta.config.allowGuestPosting, 10) === 1) { if (socket.uid || parseInt(meta.config.allowGuestPosting, 10)) {
if (parseInt(data.pid, 10) > 0) { if (parseInt(pid, 10) > 0) {
async.parallel([ async.parallel([
function(next) { function(next) {
posts.getPostFields(data.pid, ['content'], next); posts.getPostFields(pid, ['content'], next);
}, },
function(next) { function(next) {
topics.getTitleByPid(data.pid, function(title) { topics.getTitleByPid(pid, function(title) {
next(null, title); next(null, title);
}); });
} }
], function(err, results) { ], function(err, results) {
callback({ if(err) {
return callback(err);
}
callback(null, {
title: results[1], title: results[1],
pid: data.pid, pid: pid,
body: results[0].content body: results[0].content
}); });
}); });
} }
} else { } else {
callback({ callback(new Error('no-uid'));
error: 'no-uid'
});
} }
}; };
SocketModules.composer.editCheck = function(pid, callback) { SocketModules.composer.editCheck = function(socket, pid, callback) {
posts.getPostField(pid, 'tid', function(err, tid) { posts.getPostField(pid, 'tid', function(err, tid) {
if (err) {
return callback(err);
}
postTools.isMain(pid, tid, function(err, isMain) { postTools.isMain(pid, tid, function(err, isMain) {
callback({ callback(err, {
titleEditable: isMain titleEditable: isMain
}); });
}); });
@ -60,27 +67,27 @@ SocketModules.composer.editCheck = function(pid, callback) {
SocketModules.chats = {}; SocketModules.chats = {};
SocketModules.chats.get = function(data, callback, sessionData) { SocketModules.chats.get = function(socket, data, callback) {
var touid = data.touid; if(!data) {
Messaging.getMessages(sessionData.uid, touid, function(err, messages) { return callback(new Error('invalid data'));
if (err) {
return callback(null);
} }
callback(messages); Messaging.getMessages(socket.uid, data.touid, callback);
});
}; };
SocketModules.chats.send = function(data, sessionData) { SocketModules.chats.send = function(socket, data) {
if(!data) {
return callback(new Error('invalid data'));
}
var touid = data.touid; var touid = data.touid;
if (touid === sessionData.uid || sessionData.uid === 0) { if (touid === socket.uid || socket.uid === 0) {
return; return;
} }
var msg = S(data.message).stripTags().s; var msg = S(data.message).stripTags().s;
user.getMultipleUserFields([sessionData.uid, touid], ['username'], function(err, usersData) { user.getMultipleUserFields([socket.uid, touid], ['username'], function(err, usersData) {
if(err) { if(err) {
return; return;
} }
@ -91,23 +98,23 @@ SocketModules.chats.send = function(data, sessionData) {
notifText = 'New message from <strong>' + username + '</strong>'; notifText = 'New message from <strong>' + username + '</strong>';
if (!module.parent.exports.isUserOnline(touid)) { if (!module.parent.exports.isUserOnline(touid)) {
notifications.create(notifText, 'javascript:app.openChat(&apos;' + username + '&apos;, ' + sessionData.uid + ');', 'notification_' + sessionData.uid + '_' + touid, function(nid) { notifications.create(notifText, 'javascript:app.openChat(&apos;' + username + '&apos;, ' + socket.uid + ');', 'notification_' + socket.uid + '_' + touid, function(nid) {
notifications.push(nid, [touid], function(success) { notifications.push(nid, [touid], function(success) {
}); });
}); });
} }
Messaging.parse(msg, sessionData.uid, sessionData.uid, toUsername, function(parsed) { Messaging.parse(msg, socket.uid, socket.uid, toUsername, function(parsed) {
Messaging.addMessage(sessionData.uid, touid, msg, function(err, message) { Messaging.addMessage(socket.uid, touid, msg, function(err, message) {
var numSockets = 0, var numSockets = 0,
x; x;
if (sessionData.userSockets[touid]) { if (server.userSockets[touid]) {
numSockets = sessionData.userSockets[touid].length; numSockets = server.userSockets[touid].length;
for (x = 0; x < numSockets; ++x) { for (x = 0; x < numSockets; ++x) {
sessionData.userSockets[touid][x].emit('event:chats.receive', { server.userSockets[touid][x].emit('event:chats.receive', {
fromuid: sessionData.uid, fromuid: socket.uid,
username: username, username: username,
// todo this isnt very nice, but can't think of a better way atm // todo this isnt very nice, but can't think of a better way atm
message: parsed.replace("chat-user-you'>You", "'>" + username), message: parsed.replace("chat-user-you'>You", "'>" + username),
@ -116,12 +123,12 @@ SocketModules.chats.send = function(data, sessionData) {
} }
} }
if (sessionData.userSockets[sessionData.uid]) { if (server.userSockets[socket.uid]) {
numSockets = sessionData.userSockets[sessionData.uid].length; numSockets = server.userSockets[socket.uid].length;
for (x = 0; x < numSockets; ++x) { for (x = 0; x < numSockets; ++x) {
sessionData.userSockets[sessionData.uid][x].emit('event:chats.receive', { server.userSockets[socket.uid][x].emit('event:chats.receive', {
fromuid: touid, fromuid: touid,
username: toUsername, username: toUsername,
message: parsed, message: parsed,
@ -134,30 +141,20 @@ SocketModules.chats.send = function(data, sessionData) {
}); });
}; };
SocketModules.chats.list = function(callback, sessionData) { SocketModules.chats.list = function(socket, data, callback) {
Messaging.getRecentChats(sessionData.uid, function(err, uids) { Messaging.getRecentChats(socket.uid, callback);
if (err) {
winston.warn('[(socket) api:chats.list] Problem retrieving chats: ' + err.message);
}
callback(uids || []);
});
}; };
/* Notifications */ /* Notifications */
SocketModules.notifications = {}; SocketModules.notifications = {};
SocketModules.notifications.mark_read = function(nid, sessionData) { SocketModules.notifications.mark_read = function(socket, nid) {
notifications.mark_read(nid, sessionData.uid); notifications.mark_read(nid, socket.uid);
}; };
SocketModules.notifications.mark_all_read = function(data, callback, sessionData) { SocketModules.notifications.mark_all_read = function(socket, data, callback) {
notifications.mark_all_read(sessionData.uid, function(err) { notifications.mark_all_read(socket.uid, callback);
if (!err) {
callback();
}
});
}; };
module.exports = SocketModules; module.exports = SocketModules;

14
src/socket.io/notifications.js
Unescape Escape View File

@ -1,17 +1,15 @@
"use strict";
var user = require('../user'), var user = require('../user'),
SocketNotifs = {}; SocketNotifs = {};
SocketNotifs.get = function(data, callback, sessionData) { SocketNotifs.get = function(socket, data, callback) {
user.notifications.get(sessionData.uid, function(notifs) { user.notifications.get(socket.uid, callback);
callback(notifs);
});
}; };
SocketNotifs.getCount = function(callback, sessionData) { SocketNotifs.getCount = function(socket, data, callback) {
user.notifications.getUnreadCount(sessionData.uid, function(err, count) { user.notifications.getUnreadCount(socket.uid, callback);
callback(err ? err.message : null, count);
});
}; };
module.exports = SocketNotifs; module.exports = SocketNotifs;

108
src/socket.io/posts.js
Unescape Escape View File

@ -3,12 +3,13 @@ var posts = require('../posts'),
topics = require('../topics'), topics = require('../topics'),
favourites = require('../favourites'), favourites = require('../favourites'),
postTools = require('../postTools'), postTools = require('../postTools'),
index = require('./index'),
SocketPosts = {}; SocketPosts = {};
SocketPosts.reply = function(data, callback, sessionData) { SocketPosts.reply = function(socket, data, callback) {
if (sessionData.uid < 1 && parseInt(meta.config.allowGuestPosting, 10) === 0) { if (!socket.uid && !parseInt(meta.config.allowGuestPosting, 10)) {
sessionData.socket.emit('event:alert', { socket.emit('event:alert', {
title: 'Reply Unsuccessful', title: 'Reply Unsuccessful',
message: 'You don&apos;t seem to be logged in, so you cannot reply.', message: 'You don&apos;t seem to be logged in, so you cannot reply.',
type: 'danger', type: 'danger',
@ -17,35 +18,39 @@ SocketPosts.reply = function(data, callback, sessionData) {
return; return;
} }
topics.reply(data.topic_id, sessionData.uid, data.content, function(err, postData) { if(!data || !data.topic_id || !data.content) {
return callback(new Error('invalid data'));
}
topics.reply(data.topic_id, socket.uid, data.content, function(err, postData) {
if(err) { if(err) {
if (err.message === 'content-too-short') { if (err.message === 'content-too-short') {
module.parent.exports.emitContentTooShortAlert(sessionData.socket); module.parent.exports.emitContentTooShortAlert(socket);
} else if (err.message === 'too-many-posts') { } else if (err.message === 'too-many-posts') {
module.parent.exports.emitTooManyPostsAlert(sessionData.socket); module.parent.exports.emitTooManyPostsAlert(socket);
} else if (err.message === 'reply-error') { } else if (err.message === 'reply-error') {
sessionData.socket.emit('event:alert', { socket.emit('event:alert', {
title: 'Reply Unsuccessful', title: 'Reply Unsuccessful',
message: 'Your reply could not be posted at this time. Please try again later.', message: 'Your reply could not be posted at this time. Please try again later.',
type: 'warning', type: 'warning',
timeout: 2000 timeout: 2000
}); });
} else if (err.message === 'no-privileges') { } else if (err.message === 'no-privileges') {
sessionData.socket.emit('event:alert', { socket.emit('event:alert', {
title: 'Unable to post', title: 'Unable to post',
message: 'You do not have posting privileges in this category.', message: 'You do not have posting privileges in this category.',
type: 'danger', type: 'danger',
timeout: 7500 timeout: 7500
}); });
} }
return; return callback(err);
} }
if (postData) { if (postData) {
module.parent.exports.emitTopicPostStats(); module.parent.exports.emitTopicPostStats();
sessionData.socket.emit('event:alert', { socket.emit('event:alert', {
title: 'Reply Successful', title: 'Reply Successful',
message: 'You have successfully replied. Click here to view your reply.', message: 'You have successfully replied. Click here to view your reply.',
type: 'success', type: 'success',
@ -54,62 +59,71 @@ SocketPosts.reply = function(data, callback, sessionData) {
var socketData = { var socketData = {
posts: [postData] posts: [postData]
}; };
sessionData.server.sockets.in('topic_' + postData.tid).emit('event:new_post', socketData); index.server.sockets.in('topic_' + postData.tid).emit('event:new_post', socketData);
sessionData.server.sockets.in('recent_posts').emit('event:new_post', socketData); index.server.sockets.in('recent_posts').emit('event:new_post', socketData);
sessionData.server.sockets.in('user/' + postData.uid).emit('event:new_post', socketData); index.server.sockets.in('user/' + postData.uid).emit('event:new_post', socketData);
callback(); callback();
} }
}); });
}; };
SocketPosts.favourite = function(data, sessionData) { SocketPosts.favourite = function(socket, data) {
favourites.favourite(data.pid, data.room_id, sessionData.uid, sessionData.socket); if(data && data.pid && data.room_id) {
favourites.favourite(data.pid, data.room_id, socket.uid, socket);
}
}; };
SocketPosts.unfavourite = function(data, sessionData) { SocketPosts.unfavourite = function(socket, data) {
favourites.unfavourite(data.pid, data.room_id, sessionData.uid, sessionData.socket); if(data && data.pid && data.room_id) {
favourites.unfavourite(data.pid, data.room_id, socket.uid, socket);
}
}; };
SocketPosts.uploadImage = function(data, callback) { SocketPosts.uploadImage = function(socket, data, callback) {
if(data) {
posts.uploadPostImage(data, callback); posts.uploadPostImage(data, callback);
}
}; };
SocketPosts.uploadFile = function(data, callback) { SocketPosts.uploadFile = function(socket, data, callback) {
if(data) {
posts.uploadPostFile(data, callback); posts.uploadPostFile(data, callback);
}
}; };
SocketPosts.getRawPost = function(data, callback) { SocketPosts.getRawPost = function(socket, pid, callback) {
posts.getPostField(data.pid, 'content', function(err, raw) { posts.getPostField(pid, 'content', callback);
callback({
post: raw
});
});
}; };
SocketPosts.edit = function(data, callback, sessionData) { SocketPosts.edit = function(socket, data, callback) {
if(!sessionData.uid) { if(!socket.uid) {
sessionData.socket.emit('event:alert', { socket.emit('event:alert', {
title: 'Can&apos;t edit', title: 'Can&apos;t edit',
message: 'Guests can&apos;t edit posts!', message: 'Guests can&apos;t edit posts!',
type: 'warning', type: 'warning',
timeout: 2000 timeout: 2000
}); });
return; return;
} else if(!data || !data.pid || !data.title || !data.content) {
return callback(new Error('invalid data'));
} else if (!data.title || data.title.length < parseInt(meta.config.minimumTitleLength, 10)) { } else if (!data.title || data.title.length < parseInt(meta.config.minimumTitleLength, 10)) {
topics.emitTitleTooShortAlert(sessionData.socket); topics.emitTitleTooShortAlert(socket);
return; return;
} else if (!data.content || data.content.length < parseInt(meta.config.minimumPostLength, 10)) { } else if (!data.content || data.content.length < parseInt(meta.config.minimumPostLength, 10)) {
module.parent.exports.emitContentTooShortAlert(sessionData.socket); module.parent.exports.emitContentTooShortAlert(socket);
return; return;
} }
postTools.edit(sessionData.uid, data.pid, data.title, data.content, data.images); postTools.edit(socket.uid, data.pid, data.title, data.content);
callback(); callback();
}; };
SocketPosts.delete = function(data, callback, sessionData) { SocketPosts.delete = function(socket, data, callback) {
postTools.delete(sessionData.uid, data.pid, function(err) { if(!data) {
return callback(new Error('invalid data'));
}
postTools.delete(socket.uid, data.pid, function(err) {
if(err) { if(err) {
return callback(err); return callback(err);
@ -117,32 +131,40 @@ SocketPosts.delete = function(data, callback, sessionData) {
module.parent.exports.emitTopicPostStats(); module.parent.exports.emitTopicPostStats();
sessionData.server.sockets.in('topic_' + data.tid).emit('event:post_deleted', { index.server.sockets.in('topic_' + data.tid).emit('event:post_deleted', {
pid: data.pid pid: data.pid
}); });
callback(null); callback();
}); });
}; };
SocketPosts.restore = function(data, callback, sessionData) { SocketPosts.restore = function(socket, data, callback) {
postTools.restore(sessionData.uid, data.pid, function(err) { if(!data) {
return callback(new Error('invalid data'));
}
postTools.restore(socket.uid, data.pid, function(err) {
if(err) { if(err) {
return callback(err); return callback(err);
} }
module.parent.exports.emitTopicPostStats(); module.parent.exports.emitTopicPostStats();
sessionData.server.sockets.in('topic_' + data.tid).emit('event:post_restored', { index.server.sockets.in('topic_' + data.tid).emit('event:post_restored', {
pid: data.pid pid: data.pid
}); });
callback(null);
callback();
}); });
}; };
SocketPosts.getPrivileges = function(pid, callback, sessionData) { SocketPosts.getPrivileges = function(socket, pid, callback) {
postTools.privileges(pid, sessionData.uid, function(privileges) { postTools.privileges(pid, socket.uid, function(err, privileges) {
if(err) {
return callback(err);
}
privileges.pid = parseInt(pid); privileges.pid = parseInt(pid);
callback(privileges); callback(null, privileges);
}); });
}; };

212
src/socket.io/topics.js
Unescape Escape View File

@ -1,12 +1,15 @@
var topics = require('../topics'), var topics = require('../topics'),
threadTools = require('../threadTools'), threadTools = require('../threadTools'),
index = require('./index'),
SocketTopics = {}; SocketTopics = {};
SocketTopics.post = function(data, callback, sessionData) { SocketTopics.post = function(socket, data, callback) {
var socket = sessionData.socket;
if(!data) {
return callback(new Error('Invalid data'));
}
if (sessionData.uid < 1 && parseInt(meta.config.allowGuestPosting, 10) === 0) { if (!socket.uid && !parseInt(meta.config.allowGuestPosting, 10)) {
socket.emit('event:alert', { socket.emit('event:alert', {
title: 'Post Unsuccessful', title: 'Post Unsuccessful',
message: 'You don&apos;t seem to be logged in, so you cannot reply.', message: 'You don&apos;t seem to be logged in, so you cannot reply.',
@ -16,7 +19,7 @@ SocketTopics.post = function(data, callback, sessionData) {
return; return;
} }
topics.post(sessionData.uid, data.title, data.content, data.category_id, function(err, result) { topics.post(socket.uid, data.title, data.content, data.category_id, function(err, result) {
if(err) { if(err) {
if (err.message === 'title-too-short') { if (err.message === 'title-too-short') {
module.parent.exports.emitAlert(socket, 'Title too short', 'Please enter a longer title. At least ' + meta.config.minimumTitleLength + ' characters.'); module.parent.exports.emitAlert(socket, 'Title too short', 'Please enter a longer title. At least ' + meta.config.minimumTitleLength + ' characters.');
@ -45,9 +48,9 @@ SocketTopics.post = function(data, callback, sessionData) {
} }
if (result) { if (result) {
sessionData.server.sockets.in('category_' + data.category_id).emit('event:new_topic', result.topicData); index.server.sockets.in('category_' + data.category_id).emit('event:new_topic', result.topicData);
sessionData.server.sockets.in('recent_posts').emit('event:new_topic', result.topicData); index.server.sockets.in('recent_posts').emit('event:new_topic', result.topicData);
sessionData.server.sockets.in('user/' + sessionData.uid).emit('event:new_post', { index.server.sockets.in('user/' + socket.uid).emit('event:new_post', {
posts: result.postData posts: result.postData
}); });
@ -59,95 +62,73 @@ SocketTopics.post = function(data, callback, sessionData) {
type: 'success', type: 'success',
timeout: 2000 timeout: 2000
}); });
callback(); callback(null);
} }
}); });
}; };
SocketTopics.postcount = function(tid, callback) { SocketTopics.postcount = function(socket, tid, callback) {
topics.getTopicField(tid, 'postcount', callback); topics.getTopicField(tid, 'postcount', callback);
}; };
SocketTopics.markAllRead = function(data, callback, sessionData) { SocketTopics.markAllRead = function(socket, data, callback) {
topics.markAllRead(sessionData.uid, function(err, success) { topics.markAllRead(socket.uid, function(err) {
if (!err && success) { if(err) {
callback(true); return callback(err);
sessionData.server.sockets.in('uid_' + sessionData.uid).emit('event:unread.updateCount', 0);
} else {
callback(false);
} }
index.server.sockets.in('uid_' + socket.uid).emit('event:unread.updateCount', null, 0);
callback(null);
}); });
}; };
SocketTopics.delete = function(data, callback, sessionData) { function doTopicAction(action, socket, tid, callback) {
threadTools.privileges(data.tid, sessionData.uid, function(err, privileges) { if(!tid) {
if (!err && privileges.editable) { return callback(new Error('Invalid tid'));
threadTools.delete(data.tid, sessionData.uid, function(err) {
if (!err) {
module.parent.exports.emitTopicPostStats();
if (callback) {
callback('api:topic.delete', {
status: 'ok',
tid: data.tid
});
} }
threadTools.privileges(tid, socket.uid, function(err, privileges) {
if(err) {
return callback(err);
} }
});
}
});
};
SocketTopics.restore = function(data, callback, sessionData) { if(!privileges || !privileges.editable) {
threadTools.privileges(data.tid, sessionData.uid, function(err, privileges) { return callback(new Error('not-allowed'));
if (!err && privileges.editable) { }
threadTools.restore(data.tid, sessionData.uid, function(err) {
module.parent.exports.emitTopicPostStats();
if (callback) { if(threadTools[action]) {
callback('api:topic.restore', { threadTools[action](tid, socket.uid, callback);
status: 'ok',
tid: data.tid
});
} }
}); });
} }
});
SocketTopics.delete = function(socket, tid, callback) {
doTopicAction('delete', socket, tid, callback);
}; };
SocketTopics.lock = function(data, callback, sessionData) { SocketTopics.restore = function(socket, tid, callback) {
threadTools.privileges(data.tid, sessionData.uid, function(err, privileges) { doTopicAction('restore', socket, tid, callback);
if (!err && privileges.editable) {
threadTools.lock(data.tid, callback);
}
});
}; };
SocketTopics.unlock = function(data, callback, sessionData) { SocketTopics.lock = function(socket, tid, callback) {
threadTools.privileges(data.tid, sessionData.uid, function(err, privileges) { doTopicAction('lock', socket, tid, callback);
if (!err && privileges.editable) {
threadTools.unlock(data.tid, callback);
}
});
}; };
SocketTopics.pin = function(data, callback, sessionData) { SocketTopics.unlock = function(socket, tid, callback) {
threadTools.privileges(data.tid, sessionData.uid, function(err, privileges) { doTopicAction('unlock', socket, tid, callback);
if (!err && privileges.editable) {
threadTools.pin(data.tid, callback);
}
});
}; };
SocketTopics.unpin = function(data, callback, sessionData) { SocketTopics.pin = function(socket, tid, callback) {
threadTools.privileges(data.tid, sessionData.uid, function(err, privileges) { doTopicAction('pin', socket, tid, callback);
if (!err && privileges.editable) { };
threadTools.unpin(data.tid, callback);
} SocketTopics.unpin = function(socket, tid, callback) {
}); doTopicAction('unpin', socket, tid, callback);
}; };
SocketTopics.createTopicFromPosts = function(data, callback, sessionData) { SocketTopics.createTopicFromPosts = function(socket, data, callback) {
if(!sessionData.uid) { if(!socket.uid) {
socket.emit('event:alert', { socket.emit('event:alert', {
title: 'Can&apos;t fork', title: 'Can&apos;t fork',
message: 'Guests can&apos;t fork topics!', message: 'Guests can&apos;t fork topics!',
@ -157,13 +138,15 @@ SocketTopics.createTopicFromPosts = function(data, callback, sessionData) {
return; return;
} }
topics.createTopicFromPosts(sessionData.uid, data.title, data.pids, function(err, data) { if(!data || !data.title || !data.pids || !Array.isArray(data.pids)) {
callback(err?{message:err.message}:null, data); return callback(new Error('invalid data'));
}); }
topics.createTopicFromPosts(socket.uid, data.title, data.pids, callback);
}; };
SocketTopics.movePost = function(data, callback, sessionData) { SocketTopics.movePost = function(socket, data, callback) {
if(!sessionData.uid) { if(!socket.uid) {
socket.emit('event:alert', { socket.emit('event:alert', {
title: 'Can&apos;t fork', title: 'Can&apos;t fork',
message: 'Guests can&apos;t fork topics!', message: 'Guests can&apos;t fork topics!',
@ -173,65 +156,74 @@ SocketTopics.movePost = function(data, callback, sessionData) {
return; return;
} }
topics.movePostToTopic(data.pid, data.tid, function(err, data) { if(!data || !data.pid || !data.tid) {
callback(err?{message:err.message}:null, data); return callback(new Error('invalid data'));
}); }
};
SocketTopics.move = function(data, callback, sessionData) { topics.movePostToTopic(data.pid, data.tid, callback);
threadTools.move(data.tid, data.cid, callback, sessionData);
}; };
SocketTopics.followCheck = function(tid, callback, sessionData) { SocketTopics.move = function(socket, data, callback) {
threadTools.isFollowing(tid, sessionData.uid, function(following) {
callback(following);
});
};
SocketTopics.follow = function(tid, callback, sessionData) { if(!data || !data.tid || !data.cid) {
if (sessionData.uid && sessionData.uid > 0) { return callback(new Error('invalid data'));
threadTools.toggleFollow(tid, sessionData.uid, function(follow) { }
if (follow.status === 'ok') callback(follow);
threadTools.move(data.tid, data.cid, function(err) {
if(err) {
return callback(err);
}
index.server.sockets.in('topic_' + data.tid).emit('event:topic_moved', {
tid: data.tid
}); });
} else {
callback({ callback(null);
status: 'error',
error: 'not-logged-in'
}); });
};
SocketTopics.followCheck = function(socket, tid, callback) {
threadTools.isFollowing(tid, socket.uid, callback);
};
SocketTopics.follow = function(socket, tid, callback) {
if(!socket.uid) {
return callback(new Error('not-logged-in'));
} }
threadTools.toggleFollow(tid, socket.uid, callback);
}; };
SocketTopics.loadMore = function(data, callback, sessionData) { SocketTopics.loadMore = function(socket, data, callback) {
if(!data || !data.tid) {
return callback(new Error('invalid data'));
}
var start = data.after, var start = data.after,
end = start + 9; end = start + 9;
topics.getTopicPosts(data.tid, start, end, sessionData.uid, function(err, posts) { topics.getTopicPosts(data.tid, start, end, socket.uid, function(err, posts) {
callback({ callback(err, {posts: posts});
posts: posts
});
}); });
}; };
SocketTopics.loadMoreRecentTopics = function(data, callback, sessionData) { SocketTopics.loadMoreRecentTopics = function(socket, data, callback) {
if(!data || !data.term) {
return callback(new Error('invalid data'));
}
var start = data.after, var start = data.after,
end = start + 9; end = start + 9;
topics.getLatestTopics(sessionData.uid, start, end, data.term, function(err, latestTopics) { topics.getLatestTopics(socket.uid, start, end, data.term, callback);
if (!err) {
callback(latestTopics);
} else {
winston.error('[socket api:topics.loadMoreRecentTopics] ' + err.message);
}
});
}; };
SocketTopics.loadMoreUnreadTopics = function(data, callback, sessionData) { SocketTopics.loadMoreUnreadTopics = function(socket, data, callback) {
var start = data.after, var start = data.after,
end = start + 9; end = start + 9;
topics.getUnreadTopics(sessionData.uid, start, end, function(unreadTopics) { topics.getUnreadTopics(socket.uid, start, end, callback);
callback(unreadTopics);
});
}; };
module.exports = SocketTopics; module.exports = SocketTopics;

149
src/socket.io/user.js
Unescape Escape View File

@ -3,149 +3,164 @@ var user = require('../user'),
SocketUser = {}; SocketUser = {};
SocketUser.exists = function(data, sessionData) { SocketUser.exists = function(socket, data, callback) {
if (data.username) { if (data && data.username) {
user.exists(utils.slugify(data.username), function(exists) { user.exists(utils.slugify(data.username), callback);
sessionData.socket.emit('api:user.exists', {
exists: exists
});
});
} }
}; };
SocketUser.count = function(callback) { SocketUser.count = function(socket, data, callback) {
user.count(callback); user.count(callback);
}; };
SocketUser.emailExists = function(data, callback, sessionData) { SocketUser.emailExists = function(socket, data, callback) {
user.email.exists(undefined, data.email, callback); if(data && data.email) {
user.email.exists(data.email, callback);
}
}; };
// Password Reset // Password Reset
SocketUser.reset = {}; SocketUser.reset = {};
SocketUser.reset.send = function(data, sessionData) { SocketUser.reset.send = function(socket, data, callback) {
user.reset.send(sessionData.socket, data.email); if(data && data.email) {
user.reset.send(socket, data.email, callback);
}
}; };
SocketUser.reset.valid = function(data, sessionData) { SocketUser.reset.valid = function(socket, data, callback) {
user.reset.validate(sessionData.socket, data.code); if(data && data.code) {
user.reset.validate(socket, data.code, callback);
}
}; };
SocketUser.reset.commit = function(data, sessionData) { SocketUser.reset.commit = function(socket, data, callback) {
user.reset.commit(sessionData.socket, data.code, data.password); if(data && data.code && data.password) {
user.reset.commit(socket, data.code, data.password, callback);
}
}; };
SocketUser.isOnline = function(uid, callback) { SocketUser.isOnline = function(socket, uid, callback) {
callback({ callback(null, {
online: module.parent.exports.isUserOnline(uid), online: module.parent.exports.isUserOnline(uid),
uid: uid, uid: uid,
timestamp: Date.now() timestamp: Date.now()
}); });
}; };
SocketUser.changePassword = function(data, callback, sessionData) { SocketUser.changePassword = function(socket, data, callback) {
user.changePassword(sessionData.uid, data, callback); if(data) {
user.changePassword(socket.uid, data, callback);
}
}; };
SocketUser.updateProfile = function(data, callback, sessionData) { SocketUser.updateProfile = function(socket, data, callback) {
user.updateProfile(sessionData.uid, data, callback); if(data) {
user.updateProfile(socket.uid, data, callback);
}
}; };
SocketUser.changePicture = function(data, callback, sessionData) { SocketUser.changePicture = function(socket, data, callback) {
if(!data) {
return;
}
var type = data.type; var type = data.type;
function updateHeader() { function updateHeader() {
user.getUserFields(sessionData.uid, ['picture'], function(err, fields) { user.getUserFields(socket.uid, ['picture'], function(err, fields) {
if (!err && fields) { if(err) {
fields.uid = sessionData.uid; return callback(err);
sessionData.socket.emit('api:updateHeader', fields); }
callback(true);
} else { if (fields) {
callback(false); fields.uid = socket.uid;
socket.emit('meta.updateHeader', null, fields);
} }
callback(null);
}); });
} }
if (type === 'gravatar') { if (type === 'gravatar') {
user.getUserField(sessionData.uid, 'gravatarpicture', function(err, gravatar) { type = 'gravatarpicture';
user.setUserField(sessionData.uid, 'picture', gravatar);
updateHeader();
});
} else if (type === 'uploaded') { } else if (type === 'uploaded') {
user.getUserField(sessionData.uid, 'uploadedpicture', function(err, uploadedpicture) { type = 'uploadedpicture';
user.setUserField(sessionData.uid, 'picture', uploadedpicture);
updateHeader();
});
} else { } else {
callback(false); return callback(new Error('invalid-image-type'));
} }
user.getUserField(socket.uid, type, function(err, picture) {
user.setUserField(socket.uid, 'picture', picture);
updateHeader();
});
}; };
SocketUser.follow = function(data, callback, sessionData) { SocketUser.follow = function(socket, data, callback) {
if (sessionData.uid) { if (socket.uid && data) {
user.follow(sessionData.uid, data.uid, callback); user.follow(socket.uid, data.uid, callback);
} }
}; };
SocketUser.unfollow = function(data, callback, sessionData) { SocketUser.unfollow = function(socket, data, callback) {
if (sessionData.uid) { if (socket.uid && data) {
user.unfollow(sessionData.uid, data.uid, callback); user.unfollow(socket.uid, data.uid, callback);
} }
}; };
SocketUser.saveSettings = function(data, callback, sessionData) { SocketUser.saveSettings = function(socket, data, callback) {
if (sessionData.uid) { if (socket.uid && data) {
user.setUserFields(sessionData.uid, { user.setUserFields(socket.uid, {
showemail: data.showemail showemail: data.showemail
}, function(err, result) { }, callback);
callback(err);
});
} }
}; };
SocketUser.get_online_users = function(data, callback) { SocketUser.getOnlineUsers = function(socket, data, callback) {
var returnData = []; var returnData = [];
if(data) {
for (var i = 0; i < data.length; ++i) { for (var i = 0; i < data.length; ++i) {
var uid = data[i]; var uid = data[i];
if (module.parent.exports.isUserOnline(uid)) if (module.parent.exports.isUserOnline(uid)) {
returnData.push(uid); returnData.push(uid);
else } else {
returnData.push(0); returnData.push(0);
} }
}
}
callback(returnData); callback(null, returnData);
}; };
SocketUser.getOnlineAnonCount = function(data, callback) { SocketUser.getOnlineAnonCount = function(socket, data, callback) {
callback(module.parent.exports.getOnlineAnonCount()); callback(null, module.parent.exports.getOnlineAnonCount());
}; };
SocketUser.getUnreadCount = function(callback, sessionData) { SocketUser.getUnreadCount = function(socket, data, callback) {
topics.getUnreadTids(sessionData.uid, 0, 19, function(err, tids) { topics.getUnreadTids(socket.uid, 0, 19, function(err, tids) {
callback(tids.length); callback(err, tids?tids.length:0);
}); });
}; };
SocketUser.getActiveUsers = function(callback) { SocketUser.getActiveUsers = function(socket, data, callback) {
module.parent.exports.emitOnlineUserCount(callback); module.parent.exports.emitOnlineUserCount(callback);
}; };
SocketUser.loadMore = function(data, callback) { SocketUser.loadMore = function(socket, data, callback) {
if(data) {
var start = data.after, var start = data.after,
end = start + 19; end = start + 19;
user.getUsers(data.set, start, end, function(err, data) { user.getUsers(data.set, start, end, function(err, data) {
if(err) { if(err) {
winston.err(err); return callback(err);
} else { }
callback({
callback(null, {
users: data users: data
}); });
}
}); });
}
}; };
/* Exports */ /* Exports */

117
src/threadTools.js
Unescape Escape View File

@ -66,13 +66,16 @@ var winston = require('winston'),
events.logTopicDelete(uid, tid); events.logTopicDelete(uid, tid);
websockets.emitTopicPostStats();
websockets.in('topic_' + tid).emit('event:topic_deleted', { websockets.in('topic_' + tid).emit('event:topic_deleted', {
tid: tid, tid: tid
status: 'ok'
}); });
if (callback) { if (callback) {
callback(null); callback(null, {
tid: tid
});
} }
} }
@ -83,9 +86,10 @@ var winston = require('winston'),
events.logTopicRestore(uid, tid); events.logTopicRestore(uid, tid);
websockets.emitTopicPostStats();
websockets.in('topic_' + tid).emit('event:topic_restored', { websockets.in('topic_' + tid).emit('event:topic_restored', {
tid: tid, tid: tid
status: 'ok'
}); });
topics.getTopicField(tid, 'title', function(err, title) { topics.getTopicField(tid, 'title', function(err, title) {
@ -93,81 +97,75 @@ var winston = require('winston'),
}); });
if(callback) { if(callback) {
callback(null); callback(null, {
tid:tid
});
} }
} }
ThreadTools.lock = function(tid, callback) { ThreadTools.lock = function(tid, uid, callback) {
topics.setTopicField(tid, 'locked', 1); topics.setTopicField(tid, 'locked', 1);
websockets.in('topic_' + tid).emit('event:topic_locked', { websockets.in('topic_' + tid).emit('event:topic_locked', {
tid: tid, tid: tid
status: 'ok'
}); });
if (callback) { if (callback) {
callback({ callback(null, {
status: 'ok',
tid: tid tid: tid
}); });
} }
} }
ThreadTools.unlock = function(tid, callback) { ThreadTools.unlock = function(tid, uid, callback) {
topics.setTopicField(tid, 'locked', 0); topics.setTopicField(tid, 'locked', 0);
websockets.in('topic_' + tid).emit('event:topic_unlocked', { websockets.in('topic_' + tid).emit('event:topic_unlocked', {
tid: tid, tid: tid
status: 'ok'
}); });
if (callback) { if (callback) {
callback({ callback(null, {
status: 'ok',
tid: tid tid: tid
}); });
} }
} }
ThreadTools.pin = function(tid, callback) { ThreadTools.pin = function(tid, uid, callback) {
topics.setTopicField(tid, 'pinned', 1); topics.setTopicField(tid, 'pinned', 1);
topics.getTopicField(tid, 'cid', function(err, cid) { topics.getTopicField(tid, 'cid', function(err, cid) {
db.sortedSetAdd('categories:' + cid + ':tid', Math.pow(2, 53), tid); db.sortedSetAdd('categories:' + cid + ':tid', Math.pow(2, 53), tid);
}); });
websockets.in('topic_' + tid).emit('event:topic_pinned', { websockets.in('topic_' + tid).emit('event:topic_pinned', {
tid: tid, tid: tid
status: 'ok'
}); });
if (callback) { if (callback) {
callback({ callback(null, {
status: 'ok',
tid: tid tid: tid
}); });
} }
} }
ThreadTools.unpin = function(tid, callback) { ThreadTools.unpin = function(tid, uid, callback) {
topics.setTopicField(tid, 'pinned', 0); topics.setTopicField(tid, 'pinned', 0);
topics.getTopicFields(tid, ['cid', 'lastposttime'], function(err, topicData) { topics.getTopicFields(tid, ['cid', 'lastposttime'], function(err, topicData) {
db.sortedSetAdd('categories:' + topicData.cid + ':tid', topicData.lastposttime, tid); db.sortedSetAdd('categories:' + topicData.cid + ':tid', topicData.lastposttime, tid);
}); });
websockets.in('topic_' + tid).emit('event:topic_unpinned', { websockets.in('topic_' + tid).emit('event:topic_unpinned', {
tid: tid, tid: tid
status: 'ok'
}); });
if (callback) { if (callback) {
callback({ callback(null, {
status: 'ok',
tid: tid tid: tid
}); });
} }
} }
ThreadTools.move = function(tid, cid, callback, sessionData) { ThreadTools.move = function(tid, cid, callback) {
topics.getTopicFields(tid, ['cid', 'lastposttime'], function(err, topicData) { topics.getTopicFields(tid, ['cid', 'lastposttime'], function(err, topicData) {
var oldCid = topicData.cid; var oldCid = topicData.cid;
@ -175,9 +173,7 @@ var winston = require('winston'),
db.sortedSetAdd('categories:' + cid + ':tid', topicData.lastposttime, tid, function(err, result) { db.sortedSetAdd('categories:' + cid + ':tid', topicData.lastposttime, tid, function(err, result) {
if(err) { if(err) {
return callback({ return callback(err);
status: 'error'
});
} }
topics.setTopicField(tid, 'cid', cid); topics.setTopicField(tid, 'cid', cid);
@ -193,61 +189,46 @@ var winston = require('winston'),
categories.incrementCategoryFieldBy(oldCid, 'topic_count', -1); categories.incrementCategoryFieldBy(oldCid, 'topic_count', -1);
categories.incrementCategoryFieldBy(cid, 'topic_count', 1); categories.incrementCategoryFieldBy(cid, 'topic_count', 1);
callback({ callback(null);
status: 'ok'
});
sessionData.server.sockets.in('topic_' + tid).emit('event:topic_moved', {
tid: tid
});
}); });
}); });
}); });
} }
ThreadTools.isFollowing = function(tid, current_user, callback) { ThreadTools.isFollowing = function(tid, uid, callback) {
db.isSetMember('tid:' + tid + ':followers', current_user, function(err, following) { db.isSetMember('tid:' + tid + ':followers', uid, callback);
callback(following);
});
} }
ThreadTools.toggleFollow = function(tid, current_user, callback) { ThreadTools.toggleFollow = function(tid, uid, callback) {
ThreadTools.isFollowing(tid, current_user, function(following) { ThreadTools.isFollowing(tid, uid, function(err, following) {
if (!following) { if(err) {
db.setAdd('tid:' + tid + ':followers', current_user, function(err, success) { return callback(err);
if (callback) {
if (!err) {
callback({
status: 'ok',
follow: true
});
} else callback({
status: 'error'
});
} }
});
} else { db[following?'setRemove':'setAdd']('tid:' + tid + ':followers', uid, function(err, success) {
db.setRemove('tid:' + tid + ':followers', current_user, function(err, success) {
if (callback) { if (callback) {
if (!err) { if(err) {
callback({ return callback(err);
status: 'ok',
follow: false
});
} else callback({
status: 'error'
});
} }
});
callback(null, !following);
} }
}); });
});
} }
ThreadTools.getFollowers = function(tid, callback) { ThreadTools.getFollowers = function(tid, callback) {
db.getSetMembers('tid:' + tid + ':followers', function(err, followers) { db.getSetMembers('tid:' + tid + ':followers', function(err, followers) {
callback(err, followers.map(function(follower) { if(err) {
return callback(err);
}
if(followers) {
followers = followers.map(function(follower) {
return parseInt(follower, 10); return parseInt(follower, 10);
})); });
}
callback(null, followers);
}); });
} }

88
src/topics.js
Unescape Escape View File

@ -75,19 +75,24 @@ var async = require('async'),
return callback(new Error('no-privileges')); return callback(new Error('no-privileges'));
} else if (!cid) { } else if (!cid) {
return callback(new Error('invalid-cid')); return callback(new Error('invalid-cid'));
} else if (!title || title.length < parseInt(meta.config.minimumTitleLength, 10)) { }
if (title) {
title = title.trim();
}
if (!title || title.length < parseInt(meta.config.minimumTitleLength, 10)) {
return callback(new Error('title-too-short'), null); return callback(new Error('title-too-short'), null);
} else if(title.length > parseInt(meta.config.maximumTitleLength, 10)) { } else if(title.length > parseInt(meta.config.maximumTitleLength, 10)) {
return callback(new Error('title-too-long'), null); return callback(new Error('title-too-long'), null);
} else if (!content || content.length < meta.config.miminumPostLength) {
return callback(new Error('content-too-short'), null);
} }
if (content) { if (content) {
content = content.trim(); content = content.trim();
} }
if (title) {
title = title.trim(); if (!content || content.length < meta.config.miminumPostLength) {
return callback(new Error('content-too-short'), null);
} }
user.getUserField(uid, 'lastposttime', function(err, lastposttime) { user.getUserField(uid, 'lastposttime', function(err, lastposttime) {
@ -257,7 +262,7 @@ var async = require('async'),
}); });
function move(pid, next) { function move(pid, next) {
postTools.privileges(pid, uid, function(privileges) { postTools.privileges(pid, uid, function(err, privileges) {
if(privileges.editable) { if(privileges.editable) {
Topics.movePostToTopic(pid, tid, next); Topics.movePostToTopic(pid, tid, next);
} else { } else {
@ -379,9 +384,7 @@ var async = require('async'),
} }
function getPrivileges(next) { function getPrivileges(next) {
postTools.privileges(tid, current_user, function(privData) { postTools.privileges(tid, current_user, next);
next(null, privData);
});
} }
async.parallel([getFavouritesData, addUserInfoToPosts, getPrivileges], function(err, results) { async.parallel([getFavouritesData, addUserInfoToPosts, getPrivileges], function(err, results) {
@ -449,7 +452,7 @@ var async = require('async'),
} }
}); });
}, function(tids) { }, function(tids) {
Topics.getTopicsByTids(tids, current_user, function(topicData) { Topics.getTopicsByTids(tids, 0, current_user, function(err, topicData) {
latestTopics.topics = topicData; latestTopics.topics = topicData;
callback(err, latestTopics); callback(err, latestTopics);
}); });
@ -471,8 +474,9 @@ var async = require('async'),
function(callback) { function(callback) {
db.getSortedSetRevRange('topics:recent', start, stop, function(err, tids) { db.getSortedSetRevRange('topics:recent', start, stop, function(err, tids) {
if (err) if (err) {
return callback(err); return callback(err);
}
if (tids && !tids.length) { if (tids && !tids.length) {
done = true; done = true;
@ -494,7 +498,7 @@ var async = require('async'),
}); });
}, },
function(err) { function(err) {
callback({ callback(null, {
count: unreadTids.length count: unreadTids.length
}); });
} }
@ -564,19 +568,22 @@ var async = require('async'),
'show_topic_button': 'hidden', 'show_topic_button': 'hidden',
'show_markallread_button': 'show', 'show_markallread_button': 'show',
'no_topics_message': 'hidden', 'no_topics_message': 'hidden',
'topic_row_size': 'col-md-12',
'topics': [] 'topics': []
}; };
function noUnreadTopics() { function noUnreadTopics() {
unreadTopics.no_topics_message = 'show'; unreadTopics.no_topics_message = 'show';
unreadTopics.show_markallread_button = 'hidden'; unreadTopics.show_markallread_button = 'hidden';
callback(unreadTopics); callback(null, unreadTopics);
} }
function sendUnreadTopics(topicIds) { function sendUnreadTopics(topicIds) {
Topics.getTopicsByTids(topicIds, uid, function(topicData) { Topics.getTopicsByTids(topicIds, 0, uid, function(err, topicData) {
if(err) {
return callback(err);
}
unreadTopics.topics = topicData; unreadTopics.topics = topicData;
unreadTopics.nextStart = stop + 1; unreadTopics.nextStart = stop + 1;
if (!topicData || topicData.length === 0) { if (!topicData || topicData.length === 0) {
@ -586,13 +593,13 @@ var async = require('async'),
unreadTopics.show_markallread_button = 'hidden'; unreadTopics.show_markallread_button = 'hidden';
} }
callback(unreadTopics); callback(null, unreadTopics);
}); });
} }
Topics.getUnreadTids(uid, start, stop, function(err, unreadTids) { Topics.getUnreadTids(uid, start, stop, function(err, unreadTids) {
if (err) { if (err) {
return callback([]); return callback(err);
} }
if (unreadTids.length) { if (unreadTids.length) {
@ -615,7 +622,7 @@ var async = require('async'),
async.each(uids, function(uid, next) { async.each(uids, function(uid, next) {
Topics.getUnreadTids(uid, 0, 19, function(err, tids) { Topics.getUnreadTids(uid, 0, 19, function(err, tids) {
websockets.in('uid_' + uid).emit('event:unread.updateCount', tids.length); websockets.in('uid_' + uid).emit('event:unread.updateCount', null, tids.length);
next(); next();
}); });
}, function(err) { }, function(err) {
@ -629,13 +636,12 @@ var async = require('async'),
}); });
}; };
Topics.getTopicsByTids = function(tids, current_user, callback, category_id) { Topics.getTopicsByTids = function(tids, cid, current_user, callback) {
var retrieved_topics = []; var retrieved_topics = [];
if (!Array.isArray(tids) || tids.length === 0) { if (!Array.isArray(tids) || tids.length === 0) {
callback(retrieved_topics); return callback(null, retrieved_topics);
return;
} }
function getTopicInfo(topicData, callback) { function getTopicInfo(topicData, callback) {
@ -659,19 +665,19 @@ var async = require('async'),
// temporary. I don't think this call should belong here // temporary. I don't think this call should belong here
function getPrivileges(next) { function getPrivileges(next) {
categoryTools.privileges(category_id, current_user, function(err, user_privs) { categoryTools.privileges(cid, current_user, next);
next(err, user_privs);
});
} }
function getCategoryInfo(next) { function getCategoryInfo(next) {
categories.getCategoryFields(topicData.cid, ['name', 'slug', 'icon'], function(err, categoryData) { categories.getCategoryFields(topicData.cid, ['name', 'slug', 'icon'], next);
next(err, categoryData);
});
} }
async.parallel([getUserInfo, hasReadTopic, getTeaserInfo, getPrivileges, getCategoryInfo], function(err, results) { async.parallel([getUserInfo, hasReadTopic, getTeaserInfo, getPrivileges, getCategoryInfo], function(err, results) {
callback({ if(err) {
return callback(err);
}
callback(null, {
username: results[0].username, username: results[0].username,
userslug: results[0].userslug, userslug: results[0].userslug,
picture: results[0].picture, picture: results[0].picture,
@ -689,13 +695,20 @@ var async = require('async'),
return !deleted || (deleted && topicInfo.privileges.view_deleted) || topicData.uid === current_user; return !deleted || (deleted && topicInfo.privileges.view_deleted) || topicData.uid === current_user;
} }
function loadTopic(tid, callback) { function loadTopic(tid, next) {
Topics.getTopicData(tid, function(err, topicData) { Topics.getTopicData(tid, function(err, topicData) {
if(err) {
return next(err);
}
if (!topicData) { if (!topicData) {
return callback(null); return next();
} }
getTopicInfo(topicData, function(topicInfo) { getTopicInfo(topicData, function(err, topicInfo) {
if(err) {
return next(err);
}
topicData['pin-icon'] = parseInt(topicData.pinned, 10) === 1 ? 'fa-thumb-tack' : 'none'; topicData['pin-icon'] = parseInt(topicData.pinned, 10) === 1 ? 'fa-thumb-tack' : 'none';
topicData['lock-icon'] = parseInt(topicData.locked, 10) === 1 ? 'fa-lock' : 'none'; topicData['lock-icon'] = parseInt(topicData.locked, 10) === 1 ? 'fa-lock' : 'none';
@ -715,18 +728,17 @@ var async = require('async'),
topicData.teaser_pid = topicInfo.teaserInfo.pid; topicData.teaser_pid = topicInfo.teaserInfo.pid;
topicData.teaser_timestamp = topicInfo.teaserInfo.timestamp ? (new Date(parseInt(topicInfo.teaserInfo.timestamp, 10)).toISOString()) : ''; topicData.teaser_timestamp = topicInfo.teaserInfo.timestamp ? (new Date(parseInt(topicInfo.teaserInfo.timestamp, 10)).toISOString()) : '';
if (isTopicVisible(topicData, topicInfo)) if (isTopicVisible(topicData, topicInfo)) {
retrieved_topics.push(topicData); retrieved_topics.push(topicData);
}
callback(null); next(null);
}); });
}); });
} }
async.eachSeries(tids, loadTopic, function(err) { async.eachSeries(tids, loadTopic, function(err) {
if (!err) { callback(err, retrieved_topics);
callback(retrieved_topics);
}
}); });
} }
@ -888,7 +900,7 @@ var async = require('async'),
Topics.markAllRead = function(uid, callback) { Topics.markAllRead = function(uid, callback) {
db.getSetMembers('topics:tid', function(err, tids) { db.getSetMembers('topics:tid', function(err, tids) {
if (err) { if (err) {
return callback(err, null); return callback(err);
} }
if (tids && tids.length) { if (tids && tids.length) {
@ -897,7 +909,7 @@ var async = require('async'),
} }
} }
callback(null, true); callback(null);
}); });
} }

147
src/user.js
Unescape Escape View File

@ -46,7 +46,10 @@ var bcrypt = require('bcrypt'),
} }
}, },
function(next) { function(next) {
User.exists(userslug, function(exists) { User.exists(userslug, function(err, exists) {
if (err) {
return next(err);
}
next(exists ? new Error('Username taken!') : null); next(exists ? new Error('Username taken!') : null);
}); });
}, },
@ -193,9 +196,7 @@ var bcrypt = require('bcrypt'),
function isSignatureValid(next) { function isSignatureValid(next) {
if (data.signature !== undefined && data.signature.length > meta.config.maximumSignatureLength) { if (data.signature !== undefined && data.signature.length > meta.config.maximumSignatureLength) {
next({ next(new Error('Signature can\'t be longer than ' + meta.config.maximumSignatureLength + ' characters!'), false);
error: 'Signature can\'t be longer than ' + meta.config.maximumSignatureLength + ' characters!'
}, false);
} else { } else {
next(null, true); next(null, true);
} }
@ -217,9 +218,7 @@ var bcrypt = require('bcrypt'),
} }
if (!available) { if (!available) {
next({ next(new Error('Email not available!'), false);
error: 'Email not available!'
}, false);
} else { } else {
next(null, true); next(null, true);
} }
@ -237,16 +236,16 @@ var bcrypt = require('bcrypt'),
} }
if(!utils.isUserNameValid(data.username) || !userslug) { if(!utils.isUserNameValid(data.username) || !userslug) {
return next({ return next(new Error('Invalid Username!'), false);
error: 'Invalid Username!' }
}, false);
User.exists(userslug, function(err, exists) {
if(err) {
return next(err);
} }
User.exists(userslug, function(exists) {
if(exists) { if(exists) {
next({ next(new Error('Username not available!'), false);
error: 'Username not available!'
}, false);
} else { } else {
next(null, true); next(null, true);
} }
@ -348,13 +347,11 @@ var bcrypt = require('bcrypt'),
User.changePassword = function(uid, data, callback) { User.changePassword = function(uid, data, callback) {
if (!utils.isPasswordValid(data.newPassword)) { if (!utils.isPasswordValid(data.newPassword)) {
return callback({ return callback(new Error('Invalid password!'));
error: 'Invalid password!'
});
} }
User.getUserField(uid, 'password', function(err, user_password) { User.getUserField(uid, 'password', function(err, currentPassword) {
bcrypt.compare(data.currentPassword, user_password, function(err, res) { bcrypt.compare(data.currentPassword, currentPassword, function(err, res) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
@ -366,9 +363,7 @@ var bcrypt = require('bcrypt'),
callback(null); callback(null);
}); });
} else { } else {
callback({ callback(new Error('Your current password is not correct!'));
error: 'Your current password is not correct!'
});
} }
}); });
}); });
@ -542,31 +537,21 @@ var bcrypt = require('bcrypt'),
User.follow = function(uid, followid, callback) { User.follow = function(uid, followid, callback) {
db.setAdd('following:' + uid, followid, function(err, data) { db.setAdd('following:' + uid, followid, function(err, data) {
if (!err) { if(err) {
db.setAdd('followers:' + followid, uid, function(err, data) { return callback(err);
if (!err) {
callback(true);
} else {
console.log(err);
callback(false);
}
});
} else {
console.log(err);
callback(false);
} }
db.setAdd('followers:' + followid, uid, callback);
}); });
}; };
User.unfollow = function(uid, unfollowid, callback) { User.unfollow = function(uid, unfollowid, callback) {
db.setRemove('following:' + uid, unfollowid, function(err, data) { db.setRemove('following:' + uid, unfollowid, function(err, data) {
if (!err) { if(err) {
db.setRemove('followers:' + unfollowid, uid, function(err, data) { return callback(err);
callback(data);
});
} else {
console.log(err);
} }
db.setRemove('followers:' + unfollowid, uid, callback);
}); });
}; };
@ -667,17 +652,17 @@ var bcrypt = require('bcrypt'),
User.exists = function(userslug, callback) { User.exists = function(userslug, callback) {
User.getUidByUserslug(userslug, function(err, exists) { User.getUidByUserslug(userslug, function(err, exists) {
callback( !! exists); callback(err, !! exists);
}); });
}; };
User.count = function(callback) { User.count = function(callback) {
db.getObjectField('global', 'userCount', function(err, count) { db.getObjectField('global', 'userCount', function(err, count) {
if(err) { if(err) {
return; return callback(err);
} }
callback({ callback(null, {
count: count ? count : 0 count: count ? count : 0
}); });
}); });
@ -785,56 +770,41 @@ var bcrypt = require('bcrypt'),
User.reset = { User.reset = {
validate: function(socket, code, callback) { validate: function(socket, code, callback) {
if (typeof callback !== 'function') {
callback = null;
}
db.getObjectField('reset:uid', code, function(err, uid) { db.getObjectField('reset:uid', code, function(err, uid) {
if (err) { if (err) {
return callback(false); return callback(err);
} }
if (uid !== null) { if (uid !== null) {
db.getObjectField('reset:expiry', code, function(err, expiry) { db.getObjectField('reset:expiry', code, function(err, expiry) {
if (err) { if (err) {
return callback(false); return callback(err);
} }
if (expiry >= +Date.now() / 1000 | 0) { if (expiry >= +Date.now() / 1000 | 0) {
if (!callback) { callback(null, true);
socket.emit('user:reset.valid', {
valid: true
});
} else {
callback(true);
}
} else { } else {
// Expired, delete from db // Expired, delete from db
db.deleteObjectField('reset:uid', code); db.deleteObjectField('reset:uid', code);
db.deleteObjectField('reset:expiry', code); db.deleteObjectField('reset:expiry', code);
if (!callback) { callback(null, false);
socket.emit('user:reset.valid', {
valid: false
});
} else {
callback(false);
}
} }
}); });
} else { } else {
if (!callback) { callback(null, false);
socket.emit('user:reset.valid', {
valid: false
});
} else {
callback(false);
}
} }
}); });
}, },
send: function(socket, email) { send: function(socket, email, callback) {
User.getUidByEmail(email, function(err, uid) { User.getUidByEmail(email, function(err, uid) {
if (uid !== null) { if(err) {
return callback(err);
}
if(!uid) {
return callback(new Error('invalid-email'));
}
// Generate a new reset code // Generate a new reset code
var reset_code = utils.generateUUID(); var reset_code = utils.generateUUID();
db.setObjectField('reset:uid', reset_code, uid); db.setObjectField('reset:uid', reset_code, uid);
@ -851,26 +821,19 @@ var bcrypt = require('bcrypt'),
uid: uid uid: uid
}); });
socket.emit('user.send_reset', { callback(null);
status: "ok",
message: "code-sent",
email: email
});
} else {
socket.emit('user.send_reset', {
status: "error",
message: "invalid-email",
email: email
});
}
}); });
}, },
commit: function(socket, code, password) { commit: function(socket, code, password, callback) {
this.validate(socket, code, function(validated) { this.validate(socket, code, function(err, validated) {
if(err) {
return callback(err);
}
if (validated) { if (validated) {
db.getObjectField('reset:uid', code, function(err, uid) { db.getObjectField('reset:uid', code, function(err, uid) {
if (err) { if (err) {
return; return callback(err);
} }
User.hashPassword(password, function(err, hash) { User.hashPassword(password, function(err, hash) {
@ -881,9 +844,7 @@ var bcrypt = require('bcrypt'),
db.deleteObjectField('reset:uid', code); db.deleteObjectField('reset:uid', code);
db.deleteObjectField('reset:expiry', code); db.deleteObjectField('reset:expiry', code);
socket.emit('user:reset.commit', { callback(null);
status: 'ok'
});
}); });
} }
}); });
@ -932,9 +893,9 @@ var bcrypt = require('bcrypt'),
}); });
}); });
}, },
exists: function(socket, email, callback) { exists: function(email, callback) {
User.getUidByEmail(email, function(err, exists) { User.getUidByEmail(email, function(err, exists) {
callback(!!exists); callback(err, !!exists);
}); });
}, },
confirm: function(code, callback) { confirm: function(code, callback) {
@ -1031,7 +992,7 @@ var bcrypt = require('bcrypt'),
notifications.read.length = maxNotifs - notifications.unread.length; notifications.read.length = maxNotifs - notifications.unread.length;
} }
callback(notifications); callback(err, notifications);
}); });
}, },
getAll: function(uid, limit, before, callback) { getAll: function(uid, limit, before, callback) {

2
tests/categories.js
Unescape Escape View File

@ -44,7 +44,7 @@ describe('Categories', function() {
describe('.getCategoryTopics', function() { describe('.getCategoryTopics', function() {
it('should return a list of topics', function(done) { it('should return a list of topics', function(done) {
Categories.getCategoryTopics(categoryObj.cid, 0, 10, 0, function(topics) { Categories.getCategoryTopics(categoryObj.cid, 0, 10, 0, function(err, topics) {
assert(Array.isArray(topics)); assert(Array.isArray(topics));
assert(topics.every(function(topic) { assert(topics.every(function(topic) {
return topic instanceof Object; return topic instanceof Object;

Write Preview
Loading…
Cancel
Save