Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-08 06:55:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #4706

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2016-05-29 22:45:12 +03:00
parent 71b3a42bed
commit d839f291ac
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/language/en_GB/notifications.json
View File

@@ -18,9 +18,6 @@
"upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.", "upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
"moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>", "moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
"moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>", "moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
"favourited_your_post_in": "<strong>%1</strong> has bookmarked your post in <strong>%2</strong>.",
"favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have bookmarked your post in <strong>%3</strong>.",
"favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have bookmarked your post in <strong>%3</strong>.",
"user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>", "user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
"user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>", "user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
"user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>", "user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",

3
src/notifications.js
View File

@@ -428,7 +428,6 @@ var utils = require('../public/src/utils');
Notifications.merge = function(notifications, callback) { Notifications.merge = function(notifications, callback) {
// When passed a set of notification objects, merge any that can be merged // When passed a set of notification objects, merge any that can be merged
var mergeIds = [ var mergeIds = [
'notifications:favourited_your_post_in',
'notifications:upvoted_your_post_in', 'notifications:upvoted_your_post_in',
'notifications:user_started_following_you', 'notifications:user_started_following_you',
'notifications:user_posted_to', 'notifications:user_posted_to',
@@ -475,7 +474,7 @@ var utils = require('../public/src/utils');
} }
switch(mergeId) { switch(mergeId) {
case 'notifications:favourited_your_post_in': // intentional fall-through // intentional fall-through
case 'notifications:upvoted_your_post_in': case 'notifications:upvoted_your_post_in':
case 'notifications:user_started_following_you': case 'notifications:user_started_following_you':
case 'notifications:user_posted_to': case 'notifications:user_posted_to':

4
src/socket.io/posts/favourites.js
View File

@@ -92,7 +92,7 @@ module.exports = function(SocketPosts) {
}; };
SocketPosts.favourite = function(socket, data, callback) { SocketPosts.favourite = function(socket, data, callback) {
favouriteCommand(socket, 'favourite', 'favourited', 'notifications:favourited_your_post_in', data, callback); favouriteCommand(socket, 'favourite', 'favourited', '', data, callback);
}; };
SocketPosts.unfavourite = function(socket, data, callback) { SocketPosts.unfavourite = function(socket, data, callback) {
@@ -103,7 +103,7 @@ module.exports = function(SocketPosts) {
if (!socket.uid) { if (!socket.uid) {
return callback(new Error('[[error:not-logged-in]]')) return callback(new Error('[[error:not-logged-in]]'))
} }
if(!data || !data.pid || !data.room_id) { if (!data || !data.pid || !data.room_id) {
return callback(new Error('[[error:invalid-data]]')); return callback(new Error('[[error:invalid-data]]'));
} }
async.parallel({ async.parallel({