%1
", "alerts.create-success": "User created!", @@ -113,6 +120,10 @@ "alerts.prompt-email": "Emails: ", "alerts.email-sent-to": "An invitation email has been sent to %1", "alerts.x-users-found": "%1 user(s) found, (%2 seconds)", + "alerts.select-a-single-user-to-change-email": "Select a single user to change email", "export-users-started": "Exporting users as csv, this might take a while. You will receive a notification when it is complete.", - "export-users-completed": "Users exported as csv, click here to download." + "export-users-completed": "Users exported as csv, click here to download.", + "email": "Email", + "password": "Password", + "manage": "Manage" } \ No newline at end of file diff --git a/public/language/en-GB/admin/settings/reputation.json b/public/language/en-GB/admin/settings/reputation.json index 293aa5b440..53801c6662 100644 --- a/public/language/en-GB/admin/settings/reputation.json +++ b/public/language/en-GB/admin/settings/reputation.json @@ -11,6 +11,7 @@ "downvotes-per-day": "Downvotes per day (set to 0 for unlimited downvotes)", "downvotes-per-user-per-day": "Downvotes per user per day (set to 0 for unlimited downvotes)", "min-rep-chat": "Minimum reputation to send chat messages", + "min-rep-post-links": "Minimum reputation to post links", "min-rep-flag": "Minimum reputation to flag posts", "min-rep-website": "Minimum reputation to add \"Website\" to user profile", "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", diff --git a/public/language/en-GB/email.json b/public/language/en-GB/email.json index 3f8043cc67..3b6709697e 100644 --- a/public/language/en-GB/email.json +++ b/public/language/en-GB/email.json @@ -46,6 +46,7 @@ "digest.title.month": "Your Monthly Digest", "notif.chat.subject": "New chat message received from %1", + "notif.chat.public-chat-subject": "New message from %1 in room %2", "notif.chat.cta": "Click here to continue the conversation", "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.", diff --git a/public/language/en-GB/error.json b/public/language/en-GB/error.json index a374787ea6..af0b72e990 100644 --- a/public/language/en-GB/error.json +++ b/public/language/en-GB/error.json @@ -199,6 +199,7 @@ "not-enough-reputation-to-chat": "You need %1 reputation to chat", "not-enough-reputation-to-upvote": "You need %1 reputation to upvote", "not-enough-reputation-to-downvote": "You need %1 reputation to downvote", + "not-enough-reputation-to-post-links": "You need %1 reputation to post links", "not-enough-reputation-to-flag": "You need %1 reputation to flag this post", "not-enough-reputation-min-rep-website": "You need %1 reputation to add a website", "not-enough-reputation-min-rep-aboutme": "You need %1 reputation to add an about me", diff --git a/public/language/en-GB/modules.json b/public/language/en-GB/modules.json index 0fd767d049..d348e75e7c 100644 --- a/public/language/en-GB/modules.json +++ b/public/language/en-GB/modules.json @@ -1,4 +1,5 @@ { + "chat.room-id": "Room %1", "chat.chatting_with": "Chat with", "chat.placeholder": "Type chat message here, drag & drop images, press enter to send", "chat.placeholder.mobile": "Type chat message here", @@ -8,7 +9,10 @@ "chat.chat-with-usernames-and-x-others": "Chat with %1 & %2 others", "chat.send": "Send", "chat.no_active": "You have no active chats.", - "chat.user_typing": "%1 is typing ...", + "chat.user_typing_1": "%1 is typing ...", + "chat.user_typing_2": "%1 and %2 are typing ...", + "chat.user_typing_3": "%1, %2 and %3 are typing ...", + "chat.user_typing_n": "%1, %2 and %3 others are typing ...", "chat.user_has_messaged_you": "%1 has messaged you.", "chat.replying-to": "Replying to %1", "chat.see_all": "All chats", @@ -29,6 +33,10 @@ "chat.delete_message_confirm": "Are you sure you wish to delete this message?", "chat.retrieving-users": "Retrieving users...", "chat.view-users-list": "View users list", + "chat.pinned-messages": "Pinned Messages", + "chat.no-pinned-messages": "There are no pinned messages", + "chat.pin-message": "Pin Message", + "chat.unpin-message": "Unpin Message", "chat.public-rooms": "Public Rooms (%1)", "chat.private-rooms": "Private Rooms (%1)", "chat.create-room": "Create Chat Room", @@ -89,6 +97,7 @@ "composer.zen_mode": "Zen Mode", "composer.select_category": "Select a category", "composer.textarea.placeholder": "Enter your post content here, drag and drop images", + "composer.post-queue-alert": "Hello👋![[modules:chat.message-deleted]]
`; + return; + } + msg.content = await parseMessage(msg, uid, roomId, isNew); })); } async function parseMessage(message, uid, roomId, isNew) { diff --git a/src/messaging/edit.js b/src/messaging/edit.js index 438d43685a..62cf93de3e 100644 --- a/src/messaging/edit.js +++ b/src/messaging/edit.js @@ -28,9 +28,13 @@ module.exports = function (Messaging) { // Propagate this change to users in the room const messages = await Messaging.getMessagesData([mid], uid, roomId, true); - sockets.in(`chat_room_${roomId}`).emit('event:chats.edit', { - messages: messages, - }); + if (messages[0]) { + const roomName = messages[0].deleted ? `uid_${uid}` : `chat_room_${roomId}`; + sockets.in(roomName).emit('event:chats.edit', { + messages: messages, + }); + } + plugins.hooks.fire('action:messaging.edit', { message: { ...messages[0], content: payload.content }, }); @@ -86,4 +90,16 @@ module.exports = function (Messaging) { Messaging.canEdit = async (messageId, uid) => await canEditDelete(messageId, uid, 'edit'); Messaging.canDelete = async (messageId, uid) => await canEditDelete(messageId, uid, 'delete'); + + Messaging.canPin = async (roomId, uid) => { + const [isAdmin, isGlobalMod, inRoom, isRoomOwner] = await Promise.all([ + user.isAdministrator(uid), + user.isGlobalModerator(uid), + Messaging.isUserInRoom(uid, roomId), + Messaging.isRoomOwner(uid, roomId), + ]); + if (!isAdmin && !isGlobalMod && (!inRoom || !isRoomOwner)) { + throw new Error('[[error:no-privileges]]'); + } + }; }; diff --git a/src/messaging/index.js b/src/messaging/index.js index 5199345720..c012f858bc 100644 --- a/src/messaging/index.js +++ b/src/messaging/index.js @@ -24,6 +24,7 @@ require('./edit')(Messaging); require('./rooms')(Messaging); require('./unread')(Messaging); require('./notifications')(Messaging); +require('./pins')(Messaging); Messaging.notificationSettings = Object.create(null); Messaging.notificationSettings.NONE = 1; @@ -55,10 +56,6 @@ Messaging.getMessages = async (params) => { const messageData = await Messaging.getMessagesData(mids, uid, roomId, isNew); messageData.forEach((msg) => { msg.index = indices[msg.messageId.toString()]; - msg.isOwner = msg.fromuid === parseInt(uid, 10); - if (msg.deleted && !msg.isOwner) { - msg.content = `[[modules:chat.message-deleted]]
`; - } }); return messageData; @@ -130,11 +127,13 @@ Messaging.getPublicRooms = async (callerUid, uid) => { const allRoomIds = await Messaging.getPublicRoomIdsFromSet('chat:rooms:public:order'); const allRoomData = await Messaging.getRoomsData(allRoomIds); + const isAdmin = await privileges.users.isAdministrator(callerUid); const checks = await Promise.all( allRoomData.map( room => room && ( !Array.isArray(room.groups) || !room.groups.length || + isAdmin || groups.isMemberOfAny(uid, room && room.groups) ) ) @@ -373,11 +372,16 @@ Messaging.canMessageRoom = async (uid, roomId) => { throw new Error('[[error:chat-disabled]]'); } - const [inRoom, canChat] = await Promise.all([ + const [roomData, inRoom, canChat] = await Promise.all([ + Messaging.getRoomData(roomId), Messaging.isUserInRoom(uid, roomId), privileges.global.can('chat', uid), checkReputation(uid), + user.checkMuted(uid), ]); + if (!roomData) { + throw new Error('[[error:no-room]]'); + } if (!inRoom) { throw new Error('[[error:not-in-room]]'); diff --git a/src/messaging/notifications.js b/src/messaging/notifications.js index 2295dcd58a..ff1f98697f 100644 --- a/src/messaging/notifications.js +++ b/src/messaging/notifications.js @@ -100,7 +100,7 @@ module.exports = function (Messaging) { const [settings, roomData] = await Promise.all([ db.getObject(`chat:room:${roomId}:notification:settings`), - Messaging.getRoomData(roomId, ['notificationSetting']), + Messaging.getRoomData(roomId), ]); const roomDefault = roomData.notificationSetting; const uidsToNotify = []; @@ -121,15 +121,27 @@ module.exports = function (Messaging) { if (uidsToNotify.length) { const { displayname } = messageObj.fromUser; const isGroupChat = await Messaging.isGroupChat(roomId); - const notification = await notifications.create({ + const notifData = { type: isGroupChat ? 'new-group-chat' : 'new-chat', subject: `[[email:notif.chat.subject, ${displayname}]]`, bodyShort: `[[notifications:new_message_from, ${displayname}]]`, bodyLong: messageObj.content, nid: `chat_${roomId}_${fromUid}`, from: fromUid, + roomId: roomId, path: `/chats/${messageObj.roomId}`, - }); + }; + if (roomData.public) { + const icon = Messaging.getRoomIcon(roomData); + const roomName = roomData.roomName || `[[modules:chat.room-id, ${roomId}]]`; + notifData.type = 'new-public-chat'; + notifData.roomName = roomName; + notifData.roomIcon = icon; + notifData.subject = `[[email:notif.chat.public-chat-subject, ${displayname}, ${roomName}]]`; + notifData.bodyShort = `[[notifications:user_posted_in_public_room, ${displayname}, ${icon}, ${roomName}]]`; + notifData.mergeId = `notifications:user_posted_in_public_room|${roomId}`; + } + const notification = await notifications.create(notifData); await notifications.push(notification, uidsToNotify); } } diff --git a/src/messaging/pins.js b/src/messaging/pins.js new file mode 100644 index 0000000000..a2581487df --- /dev/null +++ b/src/messaging/pins.js @@ -0,0 +1,36 @@ +'use strict'; + +const db = require('../database'); + +module.exports = function (Messaging) { + Messaging.pinMessage = async (mid, roomId) => { + const isMessageInRoom = await db.isSortedSetMember(`chat:room:${roomId}:mids`, mid); + if (isMessageInRoom) { + await db.sortedSetAdd(`chat:room:${roomId}:mids:pinned`, Date.now(), mid); + await Messaging.setMessageFields(mid, { pinned: 1 }); + } + }; + + Messaging.unpinMessage = async (mid, roomId) => { + const isMessageInRoom = await db.isSortedSetMember(`chat:room:${roomId}:mids`, mid); + if (isMessageInRoom) { + await db.sortedSetRemove(`chat:room:${roomId}:mids:pinned`, mid); + await Messaging.setMessageFields(mid, { pinned: 0 }); + } + }; + + Messaging.getPinnedMessages = async (roomId, uid, start, stop) => { + const mids = await db.getSortedSetRevRange(`chat:room:${roomId}:mids:pinned`, start, stop); + if (!mids.length) { + return []; + } + + const messageData = await Messaging.getMessagesData(mids, uid, roomId, true); + messageData.forEach((msg, i) => { + if (msg) { + msg.index = start + i; + } + }); + return messageData; + }; +}; diff --git a/src/messaging/rooms.js b/src/messaging/rooms.js index 5428489f42..c78be73671 100644 --- a/src/messaging/rooms.js +++ b/src/messaging/rooms.js @@ -448,17 +448,17 @@ module.exports = function (Messaging) { user.isGlobalModerator(uid), ]); - if (!canChat) { - throw new Error('[[error:no-privileges]]'); - } if (!room || (!room.public && !inRoom) || (room.public && ( - Array.isArray(room.groups) && room.groups.length && !(await groups.isMemberOfAny(uid, room.groups))) + Array.isArray(room.groups) && room.groups.length && !isAdmin && !(await groups.isMemberOfAny(uid, room.groups))) ) ) { return null; } + if (!canChat) { + throw new Error('[[error:no-privileges]]'); + } // add user to public room onload if (room.public && !inRoom) { diff --git a/src/meta/css.js b/src/meta/css.js index 5b665f6d43..4b7e999383 100644 --- a/src/meta/css.js +++ b/src/meta/css.js @@ -260,7 +260,11 @@ CSS.getSkinSwitcherOptions = async function (uid) { CSS.getCustomSkins(), ]); - const defaultSkin = _.capitalize(meta.config.bootswatchSkin) || '[[user:no-skin]]'; + const foundCustom = customSkins.find(skin => skin.value === meta.config.bootswatchSkin); + const defaultSkin = foundCustom ? + foundCustom.name : + _.capitalize(meta.config.bootswatchSkin) || '[[user:no-skin]]'; + const defaultSkins = [ { name: `[[user:default, ${defaultSkin}]]`, value: '', selected: userSettings.bootswatchSkin === '' }, { name: '[[user:no-skin]]', value: 'noskin', selected: userSettings.bootswatchSkin === 'noskin' }, diff --git a/src/middleware/user.js b/src/middleware/user.js index c9713df9aa..710c121d52 100644 --- a/src/middleware/user.js +++ b/src/middleware/user.js @@ -206,7 +206,7 @@ module.exports = function (middleware) { } const path = req.url.replace(/^\/api/, '') .replace(`/uid/${uid}`, () => `/user/${userslug}`); - controllers.helpers.redirect(res, path); + controllers.helpers.redirect(res, path, true); }); middleware.redirectMeToUserslug = helpers.try(async (req, res) => { diff --git a/src/notifications.js b/src/notifications.js index b4a8aeff63..85fd2be0e1 100644 --- a/src/notifications.js +++ b/src/notifications.js @@ -26,6 +26,7 @@ Notifications.baseTypes = [ 'notificationType_follow', 'notificationType_new-chat', 'notificationType_new-group-chat', + 'notificationType_new-public-chat', 'notificationType_group-invite', 'notificationType_group-leave', 'notificationType_group-request-membership', @@ -365,6 +366,7 @@ Notifications.merge = async function (notifications) { 'notifications:user_posted_to', 'notifications:user_flagged_post_in', 'notifications:user_flagged_user', + 'notifications:user_posted_in_public_room', 'new_register', 'post-queue', ]; @@ -386,6 +388,14 @@ Notifications.merge = async function (notifications) { }, []); differentiators.forEach((differentiator) => { + function typeFromUsernames(usernames) { + if (usernames.length === 2) { + return 'dual'; + } else if (usernames.length === 3) { + return 'triple'; + } + return 'multiple'; + } let set; if (differentiator === 0 && differentiators.length === 1) { set = isolated; @@ -397,8 +407,19 @@ Notifications.merge = async function (notifications) { if (modifyIndex === -1 || set.length === 1) { return notifications; } - + const notifObj = notifications[modifyIndex]; switch (mergeId) { + case 'notifications:user_posted_in_public_room': { + const usernames = _.uniq(set.map(notifObj => notifObj && notifObj.user && notifObj.user.displayname)); + if (usernames.length === 2 || usernames.length === 3) { + notifObj.bodyShort = `[[${mergeId}_${typeFromUsernames(usernames)}, ${usernames.join(', ')}, ${notifObj.roomIcon}, ${notifObj.roomName}]]`; + } else if (usernames.length > 3) { + notifObj.bodyShort = `[[${mergeId}_${typeFromUsernames(usernames)}, ${usernames.slice(0, 2).join(', ')}, ${usernames.length - 2}, ${notifObj.roomIcon}, ${notifObj.roomName}]]`; + } + + notifObj.path = set[set.length - 1].path; + break; + } case 'notifications:upvoted_your_post_in': case 'notifications:user_started_following_you': case 'notifications:user_posted_to': @@ -411,10 +432,10 @@ Notifications.merge = async function (notifications) { let titleEscaped = title.replace(/%/g, '%').replace(/,/g, ','); titleEscaped = titleEscaped ? (`, ${titleEscaped}`) : ''; - if (numUsers === 2) { - notifications[modifyIndex].bodyShort = `[[${mergeId}_dual, ${usernames.join(', ')}${titleEscaped}]]`; + if (numUsers === 2 || numUsers === 3) { + notifications[modifyIndex].bodyShort = `[[${mergeId}_${typeFromUsernames(usernames)}, ${usernames.join(', ')}${titleEscaped}]]`; } else if (numUsers > 2) { - notifications[modifyIndex].bodyShort = `[[${mergeId}_multiple, ${usernames[0]}, ${numUsers - 1}${titleEscaped}]]`; + notifications[modifyIndex].bodyShort = `[[${mergeId}_${typeFromUsernames(usernames)}, ${usernames.slice(0, 2).join(', ')}, ${numUsers - 2}${titleEscaped}]]`; } notifications[modifyIndex].path = set[set.length - 1].path; diff --git a/src/posts/queue.js b/src/posts/queue.js index 2c485fb11e..7891dd4407 100644 --- a/src/posts/queue.js +++ b/src/posts/queue.js @@ -85,16 +85,44 @@ module.exports = function (Posts) { postData.data.content = result.postData.content; } - Posts.shouldQueue = async function (uid, data) { - const [userData, isMemberOfExempt, categoryQueueEnabled] = await Promise.all([ - user.getUserFields(uid, ['uid', 'reputation', 'postcount']), - groups.isMemberOfAny(uid, meta.config.groupsExemptFromPostQueue), - isCategoryQueueEnabled(data), + Posts.canUserPostContentWithLinks = async function (uid, content) { + if (!content) { + return true; + } + const [reputation, isPrivileged] = await Promise.all([ + user.getUserField(uid, 'reputation'), + user.isPrivileged(uid), ]); - const shouldQueue = meta.config.postQueue && categoryQueueEnabled && - !isMemberOfExempt && - (!userData.uid || userData.reputation < meta.config.postQueueReputationThreshold || userData.postcount <= 0); + if (!isPrivileged && reputation < meta.config['min:rep:post-links']) { + const parsed = await plugins.hooks.fire('filter:parse.raw', String(content)); + if (parsed.match(/