Files
NodeBB/src/messaging/data.js

158 lines
5.0 KiB
JavaScript
Raw Normal View History

2017-01-03 20:02:24 +03:00
'use strict';
const validator = require('validator');
2020-01-23 22:19:15 -05:00
const db = require('../database');
const user = require('../user');
const utils = require('../utils');
const plugins = require('../plugins');
2017-01-03 20:02:24 +03:00
const intFields = ['timestamp', 'edited', 'fromuid', 'roomId', 'deleted', 'system'];
2018-10-23 13:59:20 -04:00
2017-01-03 20:02:24 +03:00
module.exports = function (Messaging) {
2017-03-08 15:09:58 +03:00
Messaging.newMessageCutoff = 1000 * 60 * 3;
Messaging.getMessagesFields = async (mids, fields) => {
2018-10-23 13:59:20 -04:00
if (!Array.isArray(mids) || !mids.length) {
return [];
2018-10-23 13:59:20 -04:00
}
2021-02-03 23:59:08 -07:00
const keys = mids.map(mid => `message:${mid}`);
const messages = await db.getObjects(keys, fields);
2021-02-04 02:07:29 -07:00
return await Promise.all(messages.map(
async (message, idx) => modifyMessage(message, fields, parseInt(mids[idx], 10))
));
2018-10-23 13:59:20 -04:00
};
Messaging.getMessageField = async (mid, field) => {
const fields = await Messaging.getMessageFields(mid, [field]);
return fields ? fields[field] : null;
2017-01-03 20:02:24 +03:00
};
Messaging.getMessageFields = async (mid, fields) => {
const messages = await Messaging.getMessagesFields([mid], fields);
return messages ? messages[0] : null;
2017-01-03 20:02:24 +03:00
};
Messaging.setMessageField = async (mid, field, content) => {
2021-02-03 23:59:08 -07:00
await db.setObjectField(`message:${mid}`, field, content);
2017-01-03 20:02:24 +03:00
};
Messaging.setMessageFields = async (mid, data) => {
2021-02-03 23:59:08 -07:00
await db.setObject(`message:${mid}`, data);
2017-01-03 20:02:24 +03:00
};
Messaging.getMessagesData = async (mids, uid, roomId, isNew) => {
let messages = await Messaging.getMessagesFields(mids, []);
messages = await user.blocks.filter(uid, 'fromuid', messages);
messages = messages
2021-02-04 00:01:39 -07:00
.map((msg, idx) => {
if (msg) {
msg.messageId = parseInt(mids[idx], 10);
msg.ip = undefined;
2017-01-03 20:02:24 +03:00
}
return msg;
})
.filter(Boolean);
const users = await user.getUsersFields(
messages.map(msg => msg && msg.fromuid),
['uid', 'username', 'userslug', 'picture', 'status', 'banned']
);
2021-02-04 00:01:39 -07:00
messages.forEach((message, index) => {
message.fromUser = users[index];
message.fromUser.banned = !!message.fromUser.banned;
message.fromUser.deleted = message.fromuid !== message.fromUser.uid && message.fromUser.uid === 0;
2021-02-04 00:06:15 -07:00
const self = message.fromuid === parseInt(uid, 10);
message.self = self ? 1 : 0;
message.newSet = false;
message.roomId = String(message.roomId || roomId);
message.deleted = !!message.deleted;
message.system = !!message.system;
});
messages = await Promise.all(messages.map(async (message) => {
if (message.system) {
message.content = validator.escape(String(message.content));
2020-04-23 21:50:08 -04:00
message.cleanedContent = utils.stripHTMLTags(utils.decodeHTMLEntities(message.content));
return message;
}
const result = await Messaging.parse(message.content, message.fromuid, uid, roomId, isNew);
message.content = result;
message.cleanedContent = utils.stripHTMLTags(utils.decodeHTMLEntities(result));
return message;
}));
if (messages.length > 1) {
// Add a spacer in between messages with time gaps between them
2021-02-04 00:01:39 -07:00
messages = messages.map((message, index) => {
// Compare timestamps with the previous message, and check if a spacer needs to be added
if (index > 0 && message.timestamp > messages[index - 1].timestamp + Messaging.newMessageCutoff) {
// If it's been 5 minutes, this is a new set of messages
message.newSet = true;
} else if (index > 0 && message.fromuid !== messages[index - 1].fromuid) {
// If the previous message was from the other person, this is also a new set
message.newSet = true;
Bootstrap5 (#10894) * chore: up deps * chore: up composer * fix(deps): bump 2factor to v7 * chore: up harmony * chore: up harmony * fix: missing await * feat: allow middlewares to pass in template values via res.locals * feat: buildAccountData middleware automatically added ot all account routes * fix: properly allow values in res.locals.templateValues to be added to the template data * refactor: user/blocks * refactor(accounts): categories and consent * feat: automatically 404 if exposeUid or exposeGroupName come up empty * refactor: remove calls to getUserDataByUserSlug for most account routes, since it is populated via middleware now * fix: allow exposeUid and exposeGroupName to work with slugs with mixed capitalization * fix: move reputation removal check to accountHelpers method * test: skip i18n tests if ref branch when present is not develop * fix(deps): bump theme versions * fix(deps): bump ntfy and 2factor * chore: up harmony * fix: add missing return * fix: #11191, only focus on search input on md environments and up * feat: allow file uploads on mobile chat closes https://github.com/NodeBB/NodeBB/issues/11217 * chore: up themes * chore: add lang string * fix(deps): bump ntfy to 1.0.15 * refactor: use new if/each syntax * chore: up composer * fix: regression from user helper refactor * chore: up harmony * chore: up composer * chore: up harmony * chore: up harmony * chore: up harmony * chore: fix composer version * feat: add increment helper * chore: up harmony * fix: #11228 no timestamps in future :hourglass: * chore: up harmony * check config.theme as well fire action:posts.loaded after processing dom * chore: up harmony * chore: up harmony * chore: up harmony * chore: up themes * chore: up harmony * remove extra class * refactor: move these to core from harmony * chore: up widgets * chore: up widgets * height auto * fix: closes #11238 * dont focus inputs, annoying on mobile * fix: dont focus twice, only focus on chat input on desktop dont wrap widget footer in row * chore: up harmony * chore: up harmony * update chat window * chore: up themes * fix cache buster for skins * chat fixes * chore: up harmony * chore: up composer * refactor: change hook logs to debug * fix: scroll to post right after adding to dom * fix: hash scrolling and highlighting correct post * test: re-enable read API schema tests * fix: add back schema changes for 179faa2270f2ad955dcc4a7b04755acce59e6ffd and c3920ccb10d8ead2dcd9914bb1784bed3f6adfd4 * fix: schema changes from 488f0978a4aa1ca1e4d2a1f2e8c7ef7a681f2f27 * fix: schema changes for f4cf482a874701ce80c0f306c49d8788cec66f87 * fix: schema update for be6bbabd0e2551fbe9571dcf3ee40ad721764543 * fix: schema changes for 69c96078ea78ee2c45885a90a6f6a59f9042a33c * fix: schema changes for d1364c313021e48a879a818b24947e1457c062f7 * fix: schema changes for 84ff1152f7552dd866e25a90972d970b9861107e * fix: schema changes for b860c2605c209e0650ef98f4c80d842ea23a51ce * fix: schema changes for 23cb67a1126481848fac39aafd1e253441e76d7f * fix: schema changes for b916e42f400dac8aa51670b15e439f87f0eb8939 * fix: schema change for a9bbb586fcb3a1c61b5fb69052236e78cdf7d743 * fix: schema changes for 4b738c8cd36c936a1dbe2bb900c694bf6c5520ec * fix: schema changes for 58b5781cea9acb129e6604a82ab5a5bfc0d8394d * fix: schema changes for 794bf01b21709c4be06584d576d706b3d6342057 * fix: schema changes for 80ea12c1c1963f5b39fb64841e4f3c8da3c87af2, e368feef51e0766f119c9710fb4db8f64724725c, and 52ead114bec961c62fa2eb0786540e229f6e4873 * fix: composer-default object in config? * fix: schema changes for 9acdc6808c070555352951c651921df181b10993 and 093093420027999df3c67bf0ea6024f6dbf81d2d * fix: schema changes for c0a52924f1f7ef8caeaacda67363ac269b56042c * fix: schema change for aba420a3f3b774e949c2539c73f3dc0e1ae79a38, move loggedInUser to optional props * fix: schema changes for 8c67031609da30d788561459f8bb76e9a69253de * fix: schema changes for 27e53b42f3ce48fa61d3754375715cd41ffe808d * fix: schema changes for 28359665187b0a3b9ec6226dca1234ebdbd725a5 * fix: breaking test for email confirmation API call * fix: schema changes for refactored search page * fix: schema changes for user object * fix: schema changes for 9f531f957e08eabb4bae844ddd67bde14d9b59f0 * fix: schema changes for c4042c70decd628e5b880bd109515b47e4e16164 and 23175110a29640e6fa052db1079bfedb34a61055 * fix: schema changes for 9b3616b10392e247974eb0c1e6225a1582bf6c69 * fix: schema changes for 5afd5de07d42fd33f039a6f85ded3b4992200e5a * fix: schema change for 1d7baf12171cffbd3af8914bef4e6297d1160d49 * fix: schema changes for 57bfb37c55a839662144e684875003ab52315ecc and be6bbabd0e2551fbe9571dcf3ee40ad721764543 * fix: schema changes for 6e86b4afa20d662af8b9f1c07518df2d8c258105 and 3efad2e13b7319eb9a1f4fda7af047be43ebc11f and 68f66223e73a72f378f193c83a9b5546bede2cda * fix: allowing optional qs prop in pagination keys (not sure why this didn't break before) * fix: re-login on email change * fix: schema changes for c926358d734a2fa410de87f4e4a91744215fc14a * fix: schema changes for 388a8270c9882892bad5c8141f65da8d59eac0fd * fix: schema change for 2658bcc821c22e137a6eeb9bb74098856a642eaf * fix: no need to call account middlewares for chats routes * fix: schema changes for 71743affc3e58dc85d4ffa15ce043d4d9ddd3d67 * fix: final schema changes * test: support for anyOf and oneOf * fix: check thumb * dont scroll to top on back press * remove group log * fix: add top margin to merged and deleted alerts * chore: up widgets * fix: improve fix-lists mixin * chore: up harmony/composer * feat: allow hiding quicksearch results during search * dont record searches made by composer * chore: up 54 * chore: up spam be gone * feat: add prev/next page and page count into mobile paginator * chore: up harmony * chore: up harmony * use old style for IS * fix: hide entire toolbar row if no posts or not singlePost * fix: updated messaging for post-queue template, #11206 * fix: btn-sm on post queue back button * fix: bump harmony, closes #11206 * fix: remove unused alert module import * fix: bump harmony * fix: bump harmony * chore: up harmony * refactor: IS scrolltop * fix: update users:search-user-for-chat source string * feat: support for mark-read toggle on chats dropdown and recent chats list * feat: api v3 calls to mark chat read/unread * feat: send event:chats.mark socket event on mark read or unread * refactor: allow frontend to mark chats as unread, use new API v3 routes instead of socket calls, better frontend event handling * docs: openapi schema updates for chat marking * fix: allow unread state toggling in chats dropdown too * fix: issue where repeated openings of the chats dropdown would continually add events for mark-read/unread * fix: debug log * refactor: move userSearch filter to a module * feat(routes): allow remounting /categories (#11230) * feat: send flags count to frontend on flags list page * refactor: filter form client-side js to extract out some logic * fix: applyFilters to not take any arguments, update selectedCids in updateButton instead of onHidden * fix: use userFilter module for assignee, reporterId, targetUid * fix(openapi): schema changes for updated flags page * fix: dont allow adding duplicates to userFilter * use same var * remove log * fix: closes #11282 * feat: lang key for x-topics * chore: up harmony * chore: up emoji * chore: up harmony * fix: update userFilter to allow new option `selectedBlock` * fix: wrong block name passed to userFilter * fix: https://github.com/NodeBB/NodeBB/issues/11283 * fix: chats, allow multiple dropdowns like in harmony * chore: up harmony * refactor: flag note adding/editing, closes #11285 * fix: remove old prepareEdit logic * chore: add caveat about hacky code block in userFilter module * fix: placeholders for userFilter module * refactor: navigator so it works with multiple thumbs/navigators * chore: up harmony * fix: closes #11287, destroy quick reply autocomplete on navigation * fix: filter disabled categories on user categories page count * chore: up harmony * docs: update openapi spec to include info about passing in timestamps for topic creation, removing timestamp as valid request param for topic replying * fix: send back null values on ACP search dashboard for startDate and endDate if not expicitly passed in, fix tests * fix: tweak table order in ACP dash searches * fix: only invoke navigator click drag on left mouse button * feat: add back unread indicator to navigator * clear bookmark on mark unread * fix: navigator crash on ajaxify * better thumb top calculation * fix: reset user bookmark when topic is marked unread * Revert "fix: reset user bookmark when topic is marked unread" This reverts commit 9bcd85c2c6848c3d325d32027261809da6e11c9e. * fix: update unread indicator on scroll, add unread count * chore: bump harmony * fix: crash on navigator unread update when backing out of a topic * fix: closes #11183 * fix: update topics:recent zset when rescheduling a topic * fix: dupe quote button, increase delay, hide immediately on empty selection * fix: navigator not showing up on first load * refactor: remove glance assorted fixes to navigator dont reduce remaning count if user scrolls down and up quickly only call topic.navigatorCallback when index changes * more sanity checks for bookmark dont allow setting bookmark higher than topic postcount * closes #11218, :train: * Revert "fix: update topics:recent zset when rescheduling a topic" This reverts commit 737973cca9e94b6cb3867492a09e1e0b1af391d5. * fix: #11306, show proper error if queued post doesn't exist was showing no-privileges if someone else accepted the post * https://github.com/NodeBB/NodeBB/issues/11307 dont use li * chore: up harmony * chore: bump version string * fix: copy paste fail * feat: closes #7382, tag filtering add client side support for filtering by tags on /category, /recent and /unread * chore: up harmony * chore: up harmony * Revert "fix: add back req.query fallback for backwards compatibility" [breaking] This reverts commit cf6cc2c454dc35c330393c62ee8ce67b42d8eefb. This commit is no longer required as passing in a CSRF token via query parameter is no longer supported as of NodeBB v3.x This is a breaking change. * fix: pass csrf token in form data, re: NodeBB/NodeBB#11309 * chore: up deps * fix: tests, use x-csrf-token query param removed * test: fix csrf_token * lint: remove unused * feat: add itemprop="image" to avatar helper * fix: get chat upload button in chat modal * breaking: remove deprecated socket.io methods * test: update messaging tests to not use sockets * fix: parent post links * fix: prevent post tooltip if mouse leaves before data/tpl is loaded * chore: up harmony * chore: up harmony * chore: up harmony * chore: up harmony * fix: nested replies indices * fix(deps): bump 2factor * feat: add loggedIn user to all api routes * chore: up themes * refactor: audit admin v3 write api routes as per #11321 * refactor: audit category v3 write api routes as per #11321 [breaking] docs: fix open api spec for #11321 * refactor: audit chat v3 write api routes as per #11321 * refactor: audit files v3 write api routes as per #11321 * refactor: audit flags v3 write api routes as per #11321 * refactor: audit posts v3 write api routes as per #11321 * refactor: audit topics v3 write api routes as per #11321 * refactor: audit users v3 write api routes as per #11321 * fix: lang string * remove min height * fix: empty topic/labels taking up space * fix: tag filtering when changing filter to watched topics or changing popular time limit to month * chore: up harmony * fix: closes #11354, show no post error if queued post already accepted/rejected * test: #11354 * test: #11354 * fix(deps): bump 2factor * fix: #11357 clear cache on thumb remove * fix: thumb remove on windows, closes #11357 * test: openapi for thumbs * test: fix openapi --------- Co-authored-by: Julian Lam <julian@nodebb.org> Co-authored-by: Opliko <opliko.reg@protonmail.com>
2023-03-17 11:58:31 -04:00
} else if (index > 0 && messages[index - 1].system) {
message.newSet = true;
} else if (index === 0) {
message.newSet = true;
}
return message;
});
} else if (messages.length === 1) {
// For single messages, we don't know the context, so look up the previous message and compare
2021-02-04 00:06:15 -07:00
const key = `uid:${uid}:chat:room:${roomId}:mids`;
const index = await db.sortedSetRank(key, messages[0].messageId);
if (index > 0) {
const mid = await db.getSortedSetRange(key, index - 1, index - 1);
const fields = await Messaging.getMessageFields(mid, ['fromuid', 'timestamp']);
if ((messages[0].timestamp > fields.timestamp + Messaging.newMessageCutoff) ||
Bootstrap5 (#10894) * chore: up deps * chore: up composer * fix(deps): bump 2factor to v7 * chore: up harmony * chore: up harmony * fix: missing await * feat: allow middlewares to pass in template values via res.locals * feat: buildAccountData middleware automatically added ot all account routes * fix: properly allow values in res.locals.templateValues to be added to the template data * refactor: user/blocks * refactor(accounts): categories and consent * feat: automatically 404 if exposeUid or exposeGroupName come up empty * refactor: remove calls to getUserDataByUserSlug for most account routes, since it is populated via middleware now * fix: allow exposeUid and exposeGroupName to work with slugs with mixed capitalization * fix: move reputation removal check to accountHelpers method * test: skip i18n tests if ref branch when present is not develop * fix(deps): bump theme versions * fix(deps): bump ntfy and 2factor * chore: up harmony * fix: add missing return * fix: #11191, only focus on search input on md environments and up * feat: allow file uploads on mobile chat closes https://github.com/NodeBB/NodeBB/issues/11217 * chore: up themes * chore: add lang string * fix(deps): bump ntfy to 1.0.15 * refactor: use new if/each syntax * chore: up composer * fix: regression from user helper refactor * chore: up harmony * chore: up composer * chore: up harmony * chore: up harmony * chore: up harmony * chore: fix composer version * feat: add increment helper * chore: up harmony * fix: #11228 no timestamps in future :hourglass: * chore: up harmony * check config.theme as well fire action:posts.loaded after processing dom * chore: up harmony * chore: up harmony * chore: up harmony * chore: up themes * chore: up harmony * remove extra class * refactor: move these to core from harmony * chore: up widgets * chore: up widgets * height auto * fix: closes #11238 * dont focus inputs, annoying on mobile * fix: dont focus twice, only focus on chat input on desktop dont wrap widget footer in row * chore: up harmony * chore: up harmony * update chat window * chore: up themes * fix cache buster for skins * chat fixes * chore: up harmony * chore: up composer * refactor: change hook logs to debug * fix: scroll to post right after adding to dom * fix: hash scrolling and highlighting correct post * test: re-enable read API schema tests * fix: add back schema changes for 179faa2270f2ad955dcc4a7b04755acce59e6ffd and c3920ccb10d8ead2dcd9914bb1784bed3f6adfd4 * fix: schema changes from 488f0978a4aa1ca1e4d2a1f2e8c7ef7a681f2f27 * fix: schema changes for f4cf482a874701ce80c0f306c49d8788cec66f87 * fix: schema update for be6bbabd0e2551fbe9571dcf3ee40ad721764543 * fix: schema changes for 69c96078ea78ee2c45885a90a6f6a59f9042a33c * fix: schema changes for d1364c313021e48a879a818b24947e1457c062f7 * fix: schema changes for 84ff1152f7552dd866e25a90972d970b9861107e * fix: schema changes for b860c2605c209e0650ef98f4c80d842ea23a51ce * fix: schema changes for 23cb67a1126481848fac39aafd1e253441e76d7f * fix: schema changes for b916e42f400dac8aa51670b15e439f87f0eb8939 * fix: schema change for a9bbb586fcb3a1c61b5fb69052236e78cdf7d743 * fix: schema changes for 4b738c8cd36c936a1dbe2bb900c694bf6c5520ec * fix: schema changes for 58b5781cea9acb129e6604a82ab5a5bfc0d8394d * fix: schema changes for 794bf01b21709c4be06584d576d706b3d6342057 * fix: schema changes for 80ea12c1c1963f5b39fb64841e4f3c8da3c87af2, e368feef51e0766f119c9710fb4db8f64724725c, and 52ead114bec961c62fa2eb0786540e229f6e4873 * fix: composer-default object in config? * fix: schema changes for 9acdc6808c070555352951c651921df181b10993 and 093093420027999df3c67bf0ea6024f6dbf81d2d * fix: schema changes for c0a52924f1f7ef8caeaacda67363ac269b56042c * fix: schema change for aba420a3f3b774e949c2539c73f3dc0e1ae79a38, move loggedInUser to optional props * fix: schema changes for 8c67031609da30d788561459f8bb76e9a69253de * fix: schema changes for 27e53b42f3ce48fa61d3754375715cd41ffe808d * fix: schema changes for 28359665187b0a3b9ec6226dca1234ebdbd725a5 * fix: breaking test for email confirmation API call * fix: schema changes for refactored search page * fix: schema changes for user object * fix: schema changes for 9f531f957e08eabb4bae844ddd67bde14d9b59f0 * fix: schema changes for c4042c70decd628e5b880bd109515b47e4e16164 and 23175110a29640e6fa052db1079bfedb34a61055 * fix: schema changes for 9b3616b10392e247974eb0c1e6225a1582bf6c69 * fix: schema changes for 5afd5de07d42fd33f039a6f85ded3b4992200e5a * fix: schema change for 1d7baf12171cffbd3af8914bef4e6297d1160d49 * fix: schema changes for 57bfb37c55a839662144e684875003ab52315ecc and be6bbabd0e2551fbe9571dcf3ee40ad721764543 * fix: schema changes for 6e86b4afa20d662af8b9f1c07518df2d8c258105 and 3efad2e13b7319eb9a1f4fda7af047be43ebc11f and 68f66223e73a72f378f193c83a9b5546bede2cda * fix: allowing optional qs prop in pagination keys (not sure why this didn't break before) * fix: re-login on email change * fix: schema changes for c926358d734a2fa410de87f4e4a91744215fc14a * fix: schema changes for 388a8270c9882892bad5c8141f65da8d59eac0fd * fix: schema change for 2658bcc821c22e137a6eeb9bb74098856a642eaf * fix: no need to call account middlewares for chats routes * fix: schema changes for 71743affc3e58dc85d4ffa15ce043d4d9ddd3d67 * fix: final schema changes * test: support for anyOf and oneOf * fix: check thumb * dont scroll to top on back press * remove group log * fix: add top margin to merged and deleted alerts * chore: up widgets * fix: improve fix-lists mixin * chore: up harmony/composer * feat: allow hiding quicksearch results during search * dont record searches made by composer * chore: up 54 * chore: up spam be gone * feat: add prev/next page and page count into mobile paginator * chore: up harmony * chore: up harmony * use old style for IS * fix: hide entire toolbar row if no posts or not singlePost * fix: updated messaging for post-queue template, #11206 * fix: btn-sm on post queue back button * fix: bump harmony, closes #11206 * fix: remove unused alert module import * fix: bump harmony * fix: bump harmony * chore: up harmony * refactor: IS scrolltop * fix: update users:search-user-for-chat source string * feat: support for mark-read toggle on chats dropdown and recent chats list * feat: api v3 calls to mark chat read/unread * feat: send event:chats.mark socket event on mark read or unread * refactor: allow frontend to mark chats as unread, use new API v3 routes instead of socket calls, better frontend event handling * docs: openapi schema updates for chat marking * fix: allow unread state toggling in chats dropdown too * fix: issue where repeated openings of the chats dropdown would continually add events for mark-read/unread * fix: debug log * refactor: move userSearch filter to a module * feat(routes): allow remounting /categories (#11230) * feat: send flags count to frontend on flags list page * refactor: filter form client-side js to extract out some logic * fix: applyFilters to not take any arguments, update selectedCids in updateButton instead of onHidden * fix: use userFilter module for assignee, reporterId, targetUid * fix(openapi): schema changes for updated flags page * fix: dont allow adding duplicates to userFilter * use same var * remove log * fix: closes #11282 * feat: lang key for x-topics * chore: up harmony * chore: up emoji * chore: up harmony * fix: update userFilter to allow new option `selectedBlock` * fix: wrong block name passed to userFilter * fix: https://github.com/NodeBB/NodeBB/issues/11283 * fix: chats, allow multiple dropdowns like in harmony * chore: up harmony * refactor: flag note adding/editing, closes #11285 * fix: remove old prepareEdit logic * chore: add caveat about hacky code block in userFilter module * fix: placeholders for userFilter module * refactor: navigator so it works with multiple thumbs/navigators * chore: up harmony * fix: closes #11287, destroy quick reply autocomplete on navigation * fix: filter disabled categories on user categories page count * chore: up harmony * docs: update openapi spec to include info about passing in timestamps for topic creation, removing timestamp as valid request param for topic replying * fix: send back null values on ACP search dashboard for startDate and endDate if not expicitly passed in, fix tests * fix: tweak table order in ACP dash searches * fix: only invoke navigator click drag on left mouse button * feat: add back unread indicator to navigator * clear bookmark on mark unread * fix: navigator crash on ajaxify * better thumb top calculation * fix: reset user bookmark when topic is marked unread * Revert "fix: reset user bookmark when topic is marked unread" This reverts commit 9bcd85c2c6848c3d325d32027261809da6e11c9e. * fix: update unread indicator on scroll, add unread count * chore: bump harmony * fix: crash on navigator unread update when backing out of a topic * fix: closes #11183 * fix: update topics:recent zset when rescheduling a topic * fix: dupe quote button, increase delay, hide immediately on empty selection * fix: navigator not showing up on first load * refactor: remove glance assorted fixes to navigator dont reduce remaning count if user scrolls down and up quickly only call topic.navigatorCallback when index changes * more sanity checks for bookmark dont allow setting bookmark higher than topic postcount * closes #11218, :train: * Revert "fix: update topics:recent zset when rescheduling a topic" This reverts commit 737973cca9e94b6cb3867492a09e1e0b1af391d5. * fix: #11306, show proper error if queued post doesn't exist was showing no-privileges if someone else accepted the post * https://github.com/NodeBB/NodeBB/issues/11307 dont use li * chore: up harmony * chore: bump version string * fix: copy paste fail * feat: closes #7382, tag filtering add client side support for filtering by tags on /category, /recent and /unread * chore: up harmony * chore: up harmony * Revert "fix: add back req.query fallback for backwards compatibility" [breaking] This reverts commit cf6cc2c454dc35c330393c62ee8ce67b42d8eefb. This commit is no longer required as passing in a CSRF token via query parameter is no longer supported as of NodeBB v3.x This is a breaking change. * fix: pass csrf token in form data, re: NodeBB/NodeBB#11309 * chore: up deps * fix: tests, use x-csrf-token query param removed * test: fix csrf_token * lint: remove unused * feat: add itemprop="image" to avatar helper * fix: get chat upload button in chat modal * breaking: remove deprecated socket.io methods * test: update messaging tests to not use sockets * fix: parent post links * fix: prevent post tooltip if mouse leaves before data/tpl is loaded * chore: up harmony * chore: up harmony * chore: up harmony * chore: up harmony * fix: nested replies indices * fix(deps): bump 2factor * feat: add loggedIn user to all api routes * chore: up themes * refactor: audit admin v3 write api routes as per #11321 * refactor: audit category v3 write api routes as per #11321 [breaking] docs: fix open api spec for #11321 * refactor: audit chat v3 write api routes as per #11321 * refactor: audit files v3 write api routes as per #11321 * refactor: audit flags v3 write api routes as per #11321 * refactor: audit posts v3 write api routes as per #11321 * refactor: audit topics v3 write api routes as per #11321 * refactor: audit users v3 write api routes as per #11321 * fix: lang string * remove min height * fix: empty topic/labels taking up space * fix: tag filtering when changing filter to watched topics or changing popular time limit to month * chore: up harmony * fix: closes #11354, show no post error if queued post already accepted/rejected * test: #11354 * test: #11354 * fix(deps): bump 2factor * fix: #11357 clear cache on thumb remove * fix: thumb remove on windows, closes #11357 * test: openapi for thumbs * test: fix openapi --------- Co-authored-by: Julian Lam <julian@nodebb.org> Co-authored-by: Opliko <opliko.reg@protonmail.com>
2023-03-17 11:58:31 -04:00
(messages[0].fromuid !== fields.fromuid) ||
messages[0].system) {
// If it's been 5 minutes, this is a new set of messages
messages[0].newSet = true;
}
} else {
messages[0].newSet = true;
}
}
const data = await plugins.hooks.fire('filter:messaging.getMessages', {
messages: messages,
uid: uid,
roomId: roomId,
isNew: isNew,
mids: mids,
});
return data && data.messages;
2017-01-03 20:02:24 +03:00
};
};
2018-10-23 13:59:20 -04:00
async function modifyMessage(message, fields, mid) {
2018-10-23 13:59:20 -04:00
if (message) {
2018-10-25 19:58:01 -04:00
db.parseIntFields(message, intFields, fields);
2018-10-23 13:59:20 -04:00
if (message.hasOwnProperty('timestamp')) {
message.timestampISO = utils.toISOString(message.timestamp);
}
if (message.hasOwnProperty('edited')) {
2018-12-08 19:23:22 -05:00
message.editedISO = utils.toISOString(message.edited);
2018-10-23 13:59:20 -04:00
}
}
const payload = await plugins.hooks.fire('filter:messaging.getFields', {
mid: mid,
message: message,
fields: fields,
});
return payload.message;
2018-10-23 14:11:59 -04:00
}