From a75baef45068d35c5c1d2c2d6478a426a61b1341 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 9 Apr 2014 15:39:26 -0400 Subject: [PATCH] removed socket emits for post errors --- src/socket.io/index.js | 30 +----------------------------- src/socket.io/posts.js | 16 ++++------------ 2 files changed, 5 insertions(+), 41 deletions(-) diff --git a/src/socket.io/index.js b/src/socket.io/index.js index e64ec2bbe1..713951cfea 100644 --- a/src/socket.io/index.js +++ b/src/socket.io/index.js @@ -314,37 +314,9 @@ function emitOnlineUserCount(callback) { } } -Sockets.emitAlert = emitAlert; -function emitAlert(socket, title, message) { - socket.emit('event:alert', { - type: 'danger', - timeout: 2000, - title: title, - message: message, - alert_id: 'post_error' - }); -} -Sockets.emitContentTooShortAlert = emitContentTooShortAlert; -function emitContentTooShortAlert(socket) { - socket.emit('event:alert', { - type: 'danger', - timeout: 2000, - title: 'Content too short', - message: "Please enter a longer post. At least " + meta.config.minimumPostLength + " characters.", - alert_id: 'post_error' - }); -} -Sockets.emitTooManyPostsAlert = emitTooManyPostsAlert; -function emitTooManyPostsAlert(socket) { - socket.emit('event:alert', { - title: 'Too many posts!', - message: 'You can only post every ' + meta.config.postDelay + ' seconds.', - type: 'danger', - timeout: 2000 - }); -} + /* Exporting */ module.exports = Sockets; \ No newline at end of file diff --git a/src/socket.io/posts.js b/src/socket.io/posts.js index d1e39a53f8..71bc1ab030 100644 --- a/src/socket.io/posts.js +++ b/src/socket.io/posts.js @@ -126,21 +126,13 @@ SocketPosts.getRawPost = function(socket, pid, callback) { SocketPosts.edit = function(socket, data, callback) { if(!socket.uid) { - socket.emit('event:alert', { - title: 'Can't edit', - message: 'Guests can't edit posts!', - type: 'warning', - timeout: 2000 - }); - return callback(new Error('not-logged-in')); + return callback(new Error('[[error:not-logged-in]]')); } else if(!data || !data.pid || !data.title || !data.content) { - return callback(new Error('invalid data')); + return callback(new Error('[[error:invalid-data]]')); } else if (!data.title || data.title.length < parseInt(meta.config.minimumTitleLength, 10)) { - topics.emitTitleTooShortAlert(socket); - return callback(new Error('title-too-short')); + return callback(new Error('[[error:title-too-short, ' + meta.config.minimumTitleLength + ']]')); } else if (!data.content || data.content.length < parseInt(meta.config.minimumPostLength, 10)) { - module.parent.exports.emitContentTooShortAlert(socket); - return callback(new Error('content-too-short')); + return callback(new Error('[[error:content-too-short, ' + meta.config.minimumPostLength + ']]')); } postTools.edit(socket.uid, data.pid, data.title, data.content, {topic_thumb: data.topic_thumb}, function(err, results) {