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

Bootstrap5 (#10894)

Browse Source 
* 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 ⌛

* 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 179faa2270 and c3920ccb10

* fix: schema changes from 488f0978a4

* fix: schema changes for f4cf482a87

* fix: schema update for be6bbabd0e

* fix: schema changes for 69c96078ea

* fix: schema changes for d1364c3130

* fix: schema changes for 84ff1152f7

* fix: schema changes for b860c2605c

* fix: schema changes for 23cb67a112

* fix: schema changes for b916e42f40

* fix: schema change for a9bbb586fc

* fix: schema changes for 4b738c8cd3

* fix: schema changes for 58b5781cea

* fix: schema changes for 794bf01b21

* fix: schema changes for 80ea12c1c1, e368feef51, and 52ead114be

* fix: composer-default object in config?

* fix: schema changes for 9acdc6808c and 0930934200

* fix: schema changes for c0a52924f1

* fix: schema change for aba420a3f3, move loggedInUser to optional props

* fix: schema changes for 8c67031609

* fix: schema changes for 27e53b42f3

* fix: schema changes for 2835966518

* 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 9f531f957e

* fix: schema changes for c4042c70de and 23175110a2

* fix: schema changes for 9b3616b103

* fix: schema changes for 5afd5de07d

* fix: schema change for 1d7baf1217

* fix: schema changes for 57bfb37c55 and be6bbabd0e

* fix: schema changes for 6e86b4afa2 and 3efad2e13b and 68f66223e7

* 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 c926358d73

* fix: schema changes for 388a8270c9

* fix: schema change for 2658bcc821

* fix: no need to call account middlewares for chats routes

* fix: schema changes for 71743affc3

* 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 9bcd85c2c6.

* 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, 🚋

* Revert "fix: update topics:recent zset when rescheduling a topic"

This reverts commit 737973cca9.

* 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 cf6cc2c454.
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>
This commit is contained in:
Barış Soner Uşaklı
2023-03-17 11:58:31 -04:00
committed by GitHub
parent 1e7f32b1c4
commit 7ba70d1561
564 changed files with 19068 additions and 36796 deletions
Download Patch File Download Diff File Expand all files Collapse all files

266
test/messaging.js
View File

@@ -13,6 +13,7 @@ const meta = require('../src/meta');
const User = require('../src/user');
const Groups = require('../src/groups');
const Messaging = require('../src/messaging');
const api = require('../src/api');
const helpers = require('./helpers');
const socketModules = require('../src/socket.io/modules');
const utils = require('../src/utils');
@@ -147,8 +148,6 @@ describe('Messaging Library', () => {
roomId = body.response.roomId;
assert(roomId);
await util.promisify(socketModules.chats.canMessage)({ uid: mocks.users.foo.uid }, roomId);
});
it('should send a user-join system message when a chat room is created', async () => {
@@ -231,27 +230,19 @@ describe('Messaging Library', () => {
assert.equal(data.owner, mocks.users.foo.uid);
});
it('should send a user-leave system message when a user leaves the chat room', (done) => {
socketModules.chats.getMessages(
{ uid: mocks.users.foo.uid },
{ uid: mocks.users.foo.uid, roomId: roomId, start: 0 },
(err, messages) => {
assert.ifError(err);
assert.equal(messages.length, 4);
const message = messages.pop();
assert.strictEqual(message.system, true);
assert.strictEqual(message.content, 'user-leave');
done();
}
);
it('should send a user-leave system message when a user leaves the chat room', async () => {
const { body } = await callv3API('get', `/chats/${roomId}`, {}, 'foo');
const { messages } = body.response;
const message = messages.pop();
assert.strictEqual(message.system, true);
assert.strictEqual(message.content, 'user-leave');
});
it('should not send a user-leave system message when a user tries to leave a room they are not in', async () => {
await callv3API('delete', `/chats/${roomId}/users/${mocks.users.baz.uid}`, {}, 'baz');
const messages = await socketModules.chats.getMessages(
{ uid: mocks.users.foo.uid },
{ uid: mocks.users.foo.uid, roomId: roomId, start: 0 }
);
const { body } = await callv3API('get', `/chats/${roomId}`, {}, 'foo');
const { messages } = body.response;
assert.equal(messages.length, 4);
let message = messages.pop();
assert.strictEqual(message.system, true);
@@ -269,7 +260,8 @@ describe('Messaging Library', () => {
}, 'herp');
await callv3API('post', `/chats/${body.response.roomId}/users`, { uids: [mocks.users.baz.uid] }, 'herp');
await util.promisify(socketModules.chats.leave)({ uid: mocks.users.herp.uid }, body.response.roomId);
await callv3API('delete', `/chats/${body.response.roomId}/users/${mocks.users.herp.uid}`, {}, 'herp');
const data = await Messaging.getRoomData(body.response.roomId);
assert.equal(data.owner, mocks.users.foo.uid);
@@ -419,61 +411,40 @@ describe('Messaging Library', () => {
assert.strictEqual(notification.path, `${nconf.get('relative_path')}/chats/${roomId}`);
});
it('should fail to get messages from room with invalid data', (done) => {
socketModules.chats.getMessages({ uid: null }, null, (err) => {
assert.equal(err.message, '[[error:invalid-data]]');
socketModules.chats.getMessages({ uid: mocks.users.foo.uid }, null, (err) => {
assert.equal(err.message, '[[error:invalid-data]]');
socketModules.chats.getMessages({ uid: mocks.users.foo.uid }, { uid: null }, (err) => {
assert.equal(err.message, '[[error:invalid-data]]');
socketModules.chats.getMessages({ uid: mocks.users.foo.uid }, { uid: 1, roomId: null }, (err) => {
assert.equal(err.message, '[[error:invalid-data]]');
done();
});
});
});
});
it('should get messages from room', async () => {
const { body } = await callv3API('get', `/chats/${roomId}`, {}, 'foo');
const { messages } = body.response;
assert(Array.isArray(messages));
// Filter out system messages
const normalMessages = messages.filter(message => !message.system);
assert.equal(normalMessages[0].roomId, roomId);
assert.equal(normalMessages[0].fromuid, mocks.users.foo.uid);
});
it('should get messages from room', (done) => {
socketModules.chats.getMessages({ uid: mocks.users.foo.uid }, {
uid: mocks.users.foo.uid,
roomId: roomId,
start: 0,
}, (err, messages) => {
assert.ifError(err);
assert(Array.isArray(messages));
it('should fail to mark read with invalid data', async () => {
let _err;
try {
await api.chats.mark({ uid: null }, { state: 0, roomId });
} catch (err) {
_err = err;
}
assert.strictEqual(_err.message, '[[error:invalid-data]]');
// Filter out system messages
messages = messages.filter(message => !message.system);
assert.equal(messages[0].roomId, roomId);
assert.equal(messages[0].fromuid, mocks.users.foo.uid);
done();
});
try {
await api.chats.mark({ uid: mocks.users.foo.uid }, null);
} catch (err) {
_err = err;
}
assert.strictEqual(_err.message, '[[error:invalid-data]]');
});
it('should fail to mark read with invalid data', (done) => {
socketModules.chats.markRead({ uid: null }, roomId, (err) => {
assert.equal(err.message, '[[error:invalid-data]]');
socketModules.chats.markRead({ uid: mocks.users.foo.uid }, null, (err) => {
assert.equal(err.message, '[[error:invalid-data]]');
done();
});
});
it('should not error if user is not in room', async () => {
await api.chats.mark({ uid: mocks.users.herp.uid }, { state: 0, roomId: 10 });
});
it('should not error if user is not in room', (done) => {
socketModules.chats.markRead({ uid: mocks.users.herp.uid }, 10, (err) => {
assert.ifError(err);
done();
});
});
it('should mark room read', (done) => {
socketModules.chats.markRead({ uid: mocks.users.foo.uid }, roomId, (err) => {
assert.ifError(err);
done();
});
it('should mark room read', async () => {
await api.chats.mark({ uid: mocks.users.foo.uid }, { state: 0, roomId: roomId });
});
it('should mark all rooms read', (done) => {
@@ -496,18 +467,13 @@ describe('Messaging Library', () => {
assert.strictEqual(statusCode, 200);
});
it('should send a room-rename system message when a room is renamed', (done) => {
socketModules.chats.getMessages(
{ uid: mocks.users.foo.uid },
{ uid: mocks.users.foo.uid, roomId: roomId, start: 0 },
(err, messages) => {
assert.ifError(err);
const message = messages.pop();
assert.strictEqual(message.system, true);
assert.strictEqual(message.content, 'room-rename, new room name');
done();
}
);
it('should send a room-rename system message when a room is renamed', async () => {
const { body } = await callv3API('get', `/chats/${roomId}`, {}, 'foo');
const { messages } = body.response;
const message = messages.pop();
assert.strictEqual(message.system, true);
assert.strictEqual(message.content, 'room-rename, new room name');
});
it('should fail to load room with invalid-data', async () => {
@@ -644,94 +610,56 @@ describe('Messaging Library', () => {
assert.strictEqual(body.response.content, 'message edited');
});
it('should fail to delete message with invalid data', (done) => {
socketModules.chats.delete({ uid: mocks.users.foo.uid }, null, (err) => {
assert.equal(err.message, '[[error:invalid-data]]');
socketModules.chats.delete({ uid: mocks.users.foo.uid }, { roomId: null }, (err) => {
assert.equal(err.message, '[[error:invalid-data]]');
socketModules.chats.delete({ uid: mocks.users.foo.uid }, { roomId: 1, messageId: null }, (err) => {
assert.equal(err.message, '[[error:invalid-data]]');
done();
});
});
it('should fail to delete message if not owner', async () => {
const { statusCode, body } = await callv3API('delete', `/chats/${roomId}/messages/${mid}`, {}, 'herp');
assert.strictEqual(statusCode, 400);
assert.strictEqual(body.status.message, 'You are not allowed to delete this message');
});
it('should mark the message as deleted', async () => {
await callv3API('delete', `/chats/${roomId}/messages/${mid}`, {}, 'foo');
const value = await db.getObjectField(`message:${mid}`, 'deleted');
assert.strictEqual(1, parseInt(value, 10));
});
it('should show deleted message to original users', async () => {
const { body } = await callv3API('get', `/chats/${roomId}`, {}, 'foo');
const { messages } = body.response;
// Reduce messages to their mids
const mids = messages.reduce((mids, cur) => {
mids.push(cur.messageId);
return mids;
}, []);
assert(mids.includes(mid));
});
it('should not show deleted message to other users', async () => {
const { body } = await callv3API('get', `/chats/${roomId}`, {}, 'herp');
const { messages } = body.response;
messages.forEach((msg) => {
assert(!msg.deleted || msg.content === '[[modules:chat.message-deleted]]', msg.content);
assert(!msg.deleted || msg.cleanedContent, '[[modules:chat.message-deleted]]', msg.content);
});
});
it('should fail to delete message if not owner', (done) => {
socketModules.chats.delete({ uid: mocks.users.herp.uid }, { messageId: mid, roomId: roomId }, (err) => {
assert.equal(err.message, '[[error:cant-delete-chat-message]]');
done();
});
it('should error out if a message is deleted again', async () => {
const { statusCode, body } = await callv3API('delete', `/chats/${roomId}/messages/${mid}`, {}, 'foo');
assert.strictEqual(statusCode, 400);
assert.strictEqual(body.status.message, 'This chat message has already been deleted.');
});
it('should mark the message as deleted', (done) => {
socketModules.chats.delete({ uid: mocks.users.foo.uid }, { messageId: mid, roomId: roomId }, (err) => {
assert.ifError(err);
db.getObjectField(`message:${mid}`, 'deleted', (err, value) => {
assert.ifError(err);
assert.strictEqual(1, parseInt(value, 10));
done();
});
});
it('should restore the message', async () => {
await callv3API('post', `/chats/${roomId}/messages/${mid}`, {}, 'foo');
const value = await db.getObjectField(`message:${mid}`, 'deleted');
assert.strictEqual(0, parseInt(value, 10));
});
it('should show deleted message to original users', (done) => {
socketModules.chats.getMessages(
{ uid: mocks.users.foo.uid },
{ uid: mocks.users.foo.uid, roomId: roomId, start: 0 },
(err, messages) => {
assert.ifError(err);
// Reduce messages to their mids
const mids = messages.reduce((mids, cur) => {
mids.push(cur.messageId);
return mids;
}, []);
assert(mids.includes(mid));
done();
}
);
});
it('should not show deleted message to other users', (done) => {
socketModules.chats.getMessages(
{ uid: mocks.users.herp.uid },
{ uid: mocks.users.herp.uid, roomId: roomId, start: 0 },
(err, messages) => {
assert.ifError(err);
messages.forEach((msg) => {
assert(!msg.deleted || msg.content === '[[modules:chat.message-deleted]]', msg.content);
assert(!msg.deleted || msg.cleanedContent, '[[modules:chat.message-deleted]]', msg.content);
});
done();
}
);
});
it('should error out if a message is deleted again', (done) => {
socketModules.chats.delete({ uid: mocks.users.foo.uid }, { messageId: mid, roomId: roomId }, (err) => {
assert.strictEqual('[[error:chat-deleted-already]]', err.message);
done();
});
});
it('should restore the message', (done) => {
socketModules.chats.restore({ uid: mocks.users.foo.uid }, { messageId: mid, roomId: roomId }, (err) => {
assert.ifError(err);
db.getObjectField(`message:${mid}`, 'deleted', (err, value) => {
assert.ifError(err);
assert.strictEqual(0, parseInt(value, 10));
done();
});
});
});
it('should error out if a message is restored again', (done) => {
socketModules.chats.restore({ uid: mocks.users.foo.uid }, { messageId: mid, roomId: roomId }, (err) => {
assert.strictEqual('[[error:chat-restored-already]]', err.message);
done();
});
it('should error out if a message is restored again', async () => {
const { statusCode, body } = await callv3API('post', `/chats/${roomId}/messages/${mid}`, {}, 'foo');
assert.strictEqual(statusCode, 400);
assert.strictEqual(body.status.message, 'This chat message has already been restored.');
});
describe('disabled via ACP', () => {
@@ -744,23 +672,21 @@ describe('Messaging Library', () => {
});
it('should error out for regular users', async () => {
try {
await socketModules.chats.delete({ uid: mocks.users.baz.uid }, { messageId: mid2, roomId: roomId });
} catch (err) {
assert.strictEqual('[[error:chat-message-editing-disabled]]', err.message);
}
const { statusCode, body } = await callv3API('delete', `/chats/${roomId}/messages/${mid2}`, {}, 'baz');
assert.strictEqual(statusCode, 400);
assert.strictEqual(body.status.message, 'chat-message-editing-disabled');
});
it('should succeed for administrators', async () => {
await socketModules.chats.delete({ uid: mocks.users.foo.uid }, { messageId: mid2, roomId: roomId });
await socketModules.chats.restore({ uid: mocks.users.foo.uid }, { messageId: mid2, roomId: roomId });
await callv3API('delete', `/chats/${roomId}/messages/${mid2}`, {}, 'foo');
await callv3API('post', `/chats/${roomId}/messages/${mid2}`, {}, 'foo');
});
it('should succeed for global moderators', async () => {
await Groups.join(['Global Moderators'], mocks.users.baz.uid);
await socketModules.chats.delete({ uid: mocks.users.foo.uid }, { messageId: mid2, roomId: roomId });
await socketModules.chats.restore({ uid: mocks.users.foo.uid }, { messageId: mid2, roomId: roomId });
await callv3API('delete', `/chats/${roomId}/messages/${mid2}`, {}, 'baz');
await callv3API('post', `/chats/${roomId}/messages/${mid2}`, {}, 'baz');
await Groups.leave(['Global Moderators'], mocks.users.baz.uid);
});