YYYY-MM-DD",
diff --git a/public/openapi/write/categories/cid/watch.yaml b/public/openapi/write/categories/cid/watch.yaml
index 8ed5a10d1e..c46ceaaa2e 100644
--- a/public/openapi/write/categories/cid/watch.yaml
+++ b/public/openapi/write/categories/cid/watch.yaml
@@ -55,7 +55,7 @@ put:
type: array
description: A list of cids that have had their watch states modified.
items:
- type: number
+ type: string
delete:
tags:
- categories
@@ -99,4 +99,4 @@ delete:
type: array
description: A list of cids that have had their watch states modified.
items:
- type: number
\ No newline at end of file
+ type: string
\ No newline at end of file
diff --git a/public/scss/admin/general/dashboard.scss b/public/scss/admin/general/dashboard.scss
index 2cfc461a0e..50c9390072 100644
--- a/public/scss/admin/general/dashboard.scss
+++ b/public/scss/admin/general/dashboard.scss
@@ -1,20 +1,26 @@
+.template-admin-dashboard #analytics-panel .graph-container {
+ min-height: 300px;
+}
.dashboard {
.card {
max-width: 100% !important;
}
+ #analytics-panel.fullscreen .graph-container {
+ width: 100%!important;
+ height: 100%!important;
+ max-height: 100%!important;
+ padding: 40px;
+ }
+
.graph-container {
+ max-height: 400px;
position: relative;
background: var(--bg-body-bg);
&.pie-chart {
max-height: 180px;
}
-
- &.fullscreen {
- width: 100%;
- padding: 40px;
- }
}
.graph-legend {
diff --git a/public/src/admin/dashboard.js b/public/src/admin/dashboard.js
index 8be06177b0..a290a791c7 100644
--- a/public/src/admin/dashboard.js
+++ b/public/src/admin/dashboard.js
@@ -18,6 +18,8 @@ import * as alerts from '../modules/alerts';
import * as translator from '../modules/translator';
import { formattedNumber } from '../modules/helpers';
+import { setupFullscreen } from './modules/fullscreen';
+
Chart.register(
LineController,
DoughnutController,
@@ -75,7 +77,7 @@ export function init() {
socket.emit('admin.rooms.getAll', updateRoomUsage);
initiateDashboard();
});
- setupFullscreen();
+ setupFullscreen($('#expand-analytics'), $('#analytics-panel'));
}
function updateRoomUsage(err, data) {
@@ -579,36 +581,3 @@ function initiateDashboard(realtime) {
}, realtime ? DEFAULTS.realtimeInterval : DEFAULTS.graphInterval);
}
-function setupFullscreen() {
- const container = document.getElementById('analytics-panel');
- const $container = $(container);
- const btn = $container.find('#expand-analytics');
- let fsMethod;
- let exitMethod;
-
- if (container.requestFullscreen) {
- fsMethod = 'requestFullscreen';
- exitMethod = 'exitFullscreen';
- } else if (container.mozRequestFullScreen) {
- fsMethod = 'mozRequestFullScreen';
- exitMethod = 'mozCancelFullScreen';
- } else if (container.webkitRequestFullscreen) {
- fsMethod = 'webkitRequestFullscreen';
- exitMethod = 'webkitCancelFullScreen';
- } else if (container.msRequestFullscreen) {
- fsMethod = 'msRequestFullscreen';
- exitMethod = 'msCancelFullScreen';
- }
-
- if (fsMethod) {
- btn.on('click', function () {
- if ($container.hasClass('fullscreen')) {
- document[exitMethod]();
- $container.removeClass('fullscreen');
- } else {
- container[fsMethod]();
- $container.addClass('fullscreen');
- }
- });
- }
-}
diff --git a/public/src/admin/dashboard/logins.js b/public/src/admin/dashboard/logins.js
index eea048293c..c82b54f17b 100644
--- a/public/src/admin/dashboard/logins.js
+++ b/public/src/admin/dashboard/logins.js
@@ -1,6 +1,6 @@
'use strict';
-define('admin/dashboard/logins', ['admin/modules/dashboard-line-graph'], (graph) => {
+define('admin/dashboard/logins', ['admin/modules/dashboard-line-graph', 'admin/modules/fullscreen'], (graph, { setupFullscreen }) => {
const ACP = {};
ACP.init = () => {
@@ -8,6 +8,7 @@ define('admin/dashboard/logins', ['admin/modules/dashboard-line-graph'], (graph)
set: 'logins',
dataset: ajaxify.data.dataset,
});
+ setupFullscreen($('#expand-analytics'), $('#analytics-panel'));
};
return ACP;
diff --git a/public/src/admin/dashboard/topics.js b/public/src/admin/dashboard/topics.js
index 91e0754779..32e2bede3e 100644
--- a/public/src/admin/dashboard/topics.js
+++ b/public/src/admin/dashboard/topics.js
@@ -1,6 +1,8 @@
'use strict';
-define('admin/dashboard/topics', ['admin/modules/dashboard-line-graph', 'hooks'], (graph, hooks) => {
+define('admin/dashboard/topics', [
+ 'admin/modules/dashboard-line-graph', 'hooks', 'admin/modules/fullscreen',
+], (graph, hooks, { setupFullscreen }) => {
const ACP = {};
ACP.init = () => {
@@ -10,6 +12,7 @@ define('admin/dashboard/topics', ['admin/modules/dashboard-line-graph', 'hooks']
}).then(() => {
hooks.onPage('action:admin.dashboard.updateGraph', ACP.updateTable);
});
+ setupFullscreen($('#expand-analytics'), $('#analytics-panel'));
};
ACP.updateTable = () => {
diff --git a/public/src/admin/dashboard/users.js b/public/src/admin/dashboard/users.js
index c9798e9572..7ef00ea477 100644
--- a/public/src/admin/dashboard/users.js
+++ b/public/src/admin/dashboard/users.js
@@ -1,6 +1,8 @@
'use strict';
-define('admin/dashboard/users', ['admin/modules/dashboard-line-graph', 'hooks'], (graph, hooks) => {
+define('admin/dashboard/users', [
+ 'admin/modules/dashboard-line-graph', 'hooks', 'admin/modules/fullscreen',
+], (graph, hooks, { setupFullscreen }) => {
const ACP = {};
ACP.init = () => {
@@ -10,6 +12,7 @@ define('admin/dashboard/users', ['admin/modules/dashboard-line-graph', 'hooks'],
}).then(() => {
hooks.onPage('action:admin.dashboard.updateGraph', ACP.updateTable);
});
+ setupFullscreen($('#expand-analytics'), $('#analytics-panel'));
};
ACP.updateTable = () => {
diff --git a/public/src/admin/manage/categories.js b/public/src/admin/manage/categories.js
index a8a6a2fb28..babdb83367 100644
--- a/public/src/admin/manage/categories.js
+++ b/public/src/admin/manage/categories.js
@@ -11,7 +11,7 @@ define('admin/manage/categories', [
], function (translator, Benchpress, categorySelector, api, Sortable, bootbox, alerts) {
Sortable = Sortable.default;
const Categories = {};
- let newCategoryId = -1;
+ let newCategoryId = '-1';
let sortables;
Categories.init = function () {
@@ -261,15 +261,15 @@ define('admin/manage/categories', [
};
function itemDidAdd(e) {
- newCategoryId = e.to.dataset.cid;
+ newCategoryId = String(e.to.dataset.cid);
}
function itemDragDidEnd(e) {
- const isCategoryUpdate = parseInt(newCategoryId, 10) !== -1;
+ const isCategoryUpdate = String(newCategoryId) !== '-1';
// Update needed?
if ((e.newIndex != null && parseInt(e.oldIndex, 10) !== parseInt(e.newIndex, 10)) || isCategoryUpdate) {
- const cid = e.item.dataset.cid;
+ const cid = String(e.item.dataset.cid);
const modified = {};
// on page 1 baseIndex is 0, on page n baseIndex is (n - 1) * ajaxify.data.categoriesPerPage
// this makes sure order is correct when drag & drop is used on pages > 1
@@ -282,8 +282,8 @@ define('admin/manage/categories', [
modified[cid].parentCid = newCategoryId;
// Show/hide expand buttons after drag completion
- const oldParentCid = parseInt(e.from.getAttribute('data-cid'), 10);
- const newParentCid = parseInt(e.to.getAttribute('data-cid'), 10);
+ const oldParentCid = String(e.from.getAttribute('data-cid') || '');
+ const newParentCid = String(e.to.getAttribute('data-cid') || '');
if (oldParentCid !== newParentCid) {
const toggle = document.querySelector(`.categories li[data-cid="${newParentCid}"] .toggle`);
if (toggle) {
diff --git a/public/src/admin/manage/category.js b/public/src/admin/manage/category.js
index 7a6e85486e..d75318a4fd 100644
--- a/public/src/admin/manage/category.js
+++ b/public/src/admin/manage/category.js
@@ -160,7 +160,7 @@ define('admin/manage/category', [
label: '[[modules:bootbox.confirm]]',
className: 'btn-primary',
callback: function () {
- if (!selectedCid || parseInt(selectedCid, 10) === parseInt(ajaxify.data.category.cid, 10)) {
+ if (!selectedCid || String(selectedCid) === String(ajaxify.data.category.cid)) {
return;
}
diff --git a/public/src/admin/manage/group.js b/public/src/admin/manage/group.js
index c856f0b487..fc68fc8f63 100644
--- a/public/src/admin/manage/group.js
+++ b/public/src/admin/manage/group.js
@@ -68,10 +68,14 @@ define('admin/manage/group', [
const cidSelector = categorySelector.init($('.member-post-cids-selector [component="category-selector"]'), {
onSelect: function (selectedCategory) {
- let cids = ($('#memberPostCids').val() || '').split(',').map(cid => parseInt(cid, 10));
- cids.push(selectedCategory.cid);
- cids = cids.filter((cid, index, array) => array.indexOf(cid) === index);
- $('#memberPostCids').val(cids.join(','));
+ const cids = new Set(($('#memberPostCids').val() || '').split(',').filter(Boolean));
+ if (cids.has(String(selectedCategory.cid))) {
+ cids.delete(String(selectedCategory.cid));
+ } else {
+ cids.add(String(selectedCategory.cid));
+ }
+
+ $('#memberPostCids').val(Array.from(cids).join(','));
cidSelector.selectCategory(0);
return false;
},
diff --git a/public/src/admin/modules/dashboard-line-graph.js b/public/src/admin/modules/dashboard-line-graph.js
index 3087518c9d..cbc2bcf5bf 100644
--- a/public/src/admin/modules/dashboard-line-graph.js
+++ b/public/src/admin/modules/dashboard-line-graph.js
@@ -72,13 +72,14 @@ export function init({ set, dataset }) {
data: data,
options: {
responsive: true,
+ maintainAspectRatio: false,
scales: {
'left-y-axis': {
type: 'linear',
position: 'left',
beginAtZero: true,
title: {
- display: true,
+ display: false,
text: key,
},
},
diff --git a/public/src/admin/modules/fullscreen.js b/public/src/admin/modules/fullscreen.js
new file mode 100644
index 0000000000..eac4ffd0c5
--- /dev/null
+++ b/public/src/admin/modules/fullscreen.js
@@ -0,0 +1,30 @@
+export function setupFullscreen($btn, $container) {
+ let fsMethod;
+ let exitMethod;
+ const container = $container.get(0);
+ if (container.requestFullscreen) {
+ fsMethod = 'requestFullscreen';
+ exitMethod = 'exitFullscreen';
+ } else if (container.mozRequestFullScreen) {
+ fsMethod = 'mozRequestFullScreen';
+ exitMethod = 'mozCancelFullScreen';
+ } else if (container.webkitRequestFullscreen) {
+ fsMethod = 'webkitRequestFullscreen';
+ exitMethod = 'webkitCancelFullScreen';
+ } else if (container.msRequestFullscreen) {
+ fsMethod = 'msRequestFullscreen';
+ exitMethod = 'msCancelFullScreen';
+ }
+
+ if (fsMethod) {
+ $btn.on('click', function () {
+ if ($container.hasClass('fullscreen')) {
+ document[exitMethod]().catch(err => console.error(err));
+ $container.removeClass('fullscreen');
+ } else {
+ container[fsMethod]().catch(err => console.error(err));
+ $container.addClass('fullscreen');
+ }
+ });
+ }
+}
\ No newline at end of file
diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.js
index 9ed57cd6ed..39395258cb 100644
--- a/public/src/client/groups/details.js
+++ b/public/src/client/groups/details.js
@@ -233,11 +233,16 @@ define('forum/groups/details', [
const cidSelector = categorySelector.init($('.member-post-cids-selector [component="category-selector"]'), {
onSelect: function (selectedCategory) {
- let cids = ($('#memberPostCids').val() || '').split(',').map(cid => parseInt(cid, 10));
- cids.push(selectedCategory.cid);
- cids = cids.filter((cid, index, array) => array.indexOf(cid) === index);
- $('#memberPostCids').val(cids.join(','));
+ const cids = new Set(($('#memberPostCids').val() || '').split(',').filter(Boolean));
+ if (cids.has(String(selectedCategory.cid))) {
+ cids.delete(String(selectedCategory.cid));
+ } else {
+ cids.add(String(selectedCategory.cid));
+ }
+
+ $('#memberPostCids').val(Array.from(cids).join(','));
cidSelector.selectCategory(0);
+ return false;
},
});
};
diff --git a/public/src/client/unread.js b/public/src/client/unread.js
index 6851ba1ec4..d0b6428dc8 100644
--- a/public/src/client/unread.js
+++ b/public/src/client/unread.js
@@ -65,9 +65,7 @@ define('forum/unread', [
// Generate list of default categories based on topic list
let defaultCategories = ajaxify.data.topics.reduce((map, topic) => {
const { category } = topic;
- let { cid } = category;
- cid = utils.isNumber(cid) ? parseInt(cid, 10) : cid;
- map.set(cid, category);
+ map.set(String(category.cid), category);
return map;
}, new Map());
defaultCategories = Array.from(defaultCategories.values());
diff --git a/public/src/modules/api.js b/public/src/modules/api.js
index 55abd1ad36..7c1038fbde 100644
--- a/public/src/modules/api.js
+++ b/public/src/modules/api.js
@@ -79,7 +79,11 @@ async function xhr(options) {
if (!res.ok) {
if (response) {
- throw new Error(isJSON ? response.status.message : response);
+ const jsonError = isJSON && (response.status?.message || response.error || '');
+ throw new Error(isJSON && jsonError ?
+ jsonError :
+ response
+ );
}
throw new Error(res.statusText);
}
diff --git a/public/src/modules/topicList.js b/public/src/modules/topicList.js
index 4af7eee9c5..1d026c1719 100644
--- a/public/src/modules/topicList.js
+++ b/public/src/modules/topicList.js
@@ -95,11 +95,11 @@ define('topicList', [
const categories = d.selectedCids &&
d.selectedCids.length &&
- d.selectedCids.indexOf(parseInt(data.cid, 10)) === -1;
+ !d.selectedCids.includes(parseInt(data.cid, 10));
const filterWatched = d.selectedFilter &&
d.selectedFilter.filter === 'watched';
const category = d.template.category &&
- parseInt(d.cid, 10) !== parseInt(data.cid, 10);
+ String(d.cid) !== String(data.cid);
const preventAlert = !!(categories || filterWatched || category || scheduledTopics.includes(data.tid));
hooks.fire('filter:topicList.onNewTopic', { topic: data, preventAlert }).then((result) => {
@@ -126,14 +126,14 @@ define('topicList', [
const isMain = parseInt(post.topic.mainPid, 10) === parseInt(post.pid, 10);
const categories = d.selectedCids &&
d.selectedCids.length &&
- d.selectedCids.indexOf(parseInt(post.topic.cid, 10)) === -1;
+ !d.selectedCids.includes(parseInt(post.topic.cid, 10));
const filterNew = d.selectedFilter &&
d.selectedFilter.filter === 'new';
const filterWatched = d.selectedFilter &&
d.selectedFilter.filter === 'watched' &&
!post.topic.isFollowing;
const category = d.template.category &&
- parseInt(d.cid, 10) !== parseInt(post.topic.cid, 10);
+ String(d.cid) !== String(post.topic.cid);
const preventAlert = !!(isMain || categories || filterNew || filterWatched || category);
hooks.fire('filter:topicList.onNewPost', { post, preventAlert }).then((result) => {
diff --git a/src/activitypub/helpers.js b/src/activitypub/helpers.js
index 558a4ee8d7..044fc2c82d 100644
--- a/src/activitypub/helpers.js
+++ b/src/activitypub/helpers.js
@@ -559,6 +559,7 @@ Helpers.renderEmoji = (text, tags, strip = false) => {
tags = Array.isArray(tags) ? tags : [tags];
let result = text;
+ const parsed = new Set();
tags.forEach((tag) => {
const isEmoji = tag.type === 'Emoji';
const hasUrl = tag.icon && tag.icon.url;
@@ -566,6 +567,9 @@ Helpers.renderEmoji = (text, tags, strip = false) => {
if (isEmoji && (strip || (hasUrl && isImage))) {
let { name } = tag;
+ if (parsed.has(name)) {
+ return;
+ }
if (!name.startsWith(':')) {
name = `:${name}`;
@@ -583,6 +587,7 @@ Helpers.renderEmoji = (text, tags, strip = false) => {
result = result.substring(0, index) + imgTag + result.substring(index + name.length);
index = result.indexOf(name, index + imgTag.length);
}
+ parsed.add(name);
}
});
diff --git a/src/api/categories.js b/src/api/categories.js
index 4806868f93..d0dd8d47df 100644
--- a/src/api/categories.js
+++ b/src/api/categories.js
@@ -8,7 +8,6 @@ const user = require('../user');
const groups = require('../groups');
const privileges = require('../privileges');
const activitypub = require('../activitypub');
-const utils = require('../utils');
const categoriesAPI = module.exports;
@@ -158,7 +157,7 @@ categoriesAPI.getTopics = async (caller, data) => {
categoriesAPI.setWatchState = async (caller, { cid, state, uid }) => {
let targetUid = caller.uid;
let cids = Array.isArray(cid) ? cid : [cid];
- cids = cids.map(cid => (utils.isNumber(cid) ? parseInt(cid, 10) : cid));
+ cids = cids.map(cid => String(cid));
if (uid) {
targetUid = uid;
@@ -170,9 +169,9 @@ categoriesAPI.setWatchState = async (caller, { cid, state, uid }) => {
// filter to subcategories of cid
let cat;
do {
- cat = categoryData.find(c => !cids.includes(c.cid) && cids.includes(c.parentCid));
+ cat = categoryData.find(c => !cids.includes(String(c.cid)) && cids.includes(String(c.parentCid)));
if (cat) {
- cids.push(cat.cid);
+ cids.push(String(cat.cid));
}
} while (cat);
diff --git a/src/api/search.js b/src/api/search.js
index 83db189de3..a5bc32f83a 100644
--- a/src/api/search.js
+++ b/src/api/search.js
@@ -22,7 +22,7 @@ searchApi.categories = async (caller, data) => {
data.states = (data.states || ['watching', 'tracking', 'notwatching', 'ignoring']).map(
state => categories.watchStates[state]
);
- data.parentCid = parseInt(data.parentCid || 0, 10);
+ data.parentCid = String(data.parentCid || 0);
let cids;
if (data.search) {
@@ -42,15 +42,15 @@ searchApi.categories = async (caller, data) => {
});
if (Array.isArray(data.selectedCids)) {
- data.selectedCids = data.selectedCids.map(cid => parseInt(cid, 10));
+ data.selectedCids = data.selectedCids.map(cid => String(cid));
}
let categoriesData = categories.buildForSelectCategories(visibleCategories, ['disabledClass'], data.parentCid);
categoriesData = categoriesData.slice(0, 1000);
categoriesData.forEach((category) => {
- category.selected = data.selectedCids ? data.selectedCids.includes(category.cid) : false;
- if (matchedCids.includes(category.cid)) {
+ category.selected = data.selectedCids ? data.selectedCids.includes(String(category.cid)) : false;
+ if (matchedCids.includes(String(category.cid))) {
category.match = true;
}
});
@@ -72,7 +72,7 @@ async function findMatchedCids(uid, data) {
localOnly: data.localOnly,
});
- let matchedCids = result.categories.map(c => c.cid);
+ let matchedCids = result.categories.map(c => String(c.cid));
// no need to filter if all 3 states are used
const filterByWatchState = !Object.values(categories.watchStates)
.every(state => data.states.includes(state));
@@ -82,8 +82,12 @@ async function findMatchedCids(uid, data) {
matchedCids = matchedCids.filter((cid, index) => data.states.includes(states[index]));
}
- const rootCids = _.uniq(_.flatten(await Promise.all(matchedCids.map(categories.getParentCids))));
- const allChildCids = _.uniq(_.flatten(await Promise.all(matchedCids.map(categories.getChildrenCids))));
+ const rootCids = _.uniq(_.flatten(
+ await Promise.all(matchedCids.map(categories.getParentCids))
+ ));
+ const allChildCids = _.uniq(_.flatten(
+ await Promise.all(matchedCids.map(categories.getChildrenCids))
+ ));
return {
cids: _.uniq(rootCids.concat(allChildCids).concat(matchedCids)),
@@ -145,7 +149,7 @@ searchApi.roomUsers = async (caller, { query, roomId }) => {
roomUsers.forEach((user, index) => {
if (user) {
user.isOwner = isOwners[index];
- user.canKick = isRoomOwner && (parseInt(user.uid, 10) !== parseInt(caller.uid, 10));
+ user.canKick = isRoomOwner && String(user.uid) !== String(caller.uid);
}
});
diff --git a/src/categories/create.js b/src/categories/create.js
index 92f63f27e6..fa49468834 100644
--- a/src/categories/create.js
+++ b/src/categories/create.js
@@ -101,7 +101,7 @@ module.exports = function (Categories) {
await privileges.categories.give(result.guestPrivileges, category.cid, ['guests', 'spiders']);
cache.del('categories:cid');
- await clearParentCategoryCache(parentCid);
+ await Categories.clearParentCategoryCache(parentCid);
if (data.cloneFromCid && parseInt(data.cloneFromCid, 10)) {
category = await Categories.copySettingsFrom(data.cloneFromCid, category.cid, !data.parentCid);
@@ -115,8 +115,8 @@ module.exports = function (Categories) {
return category;
};
- async function clearParentCategoryCache(parentCid) {
- while (parseInt(parentCid, 10) >= 0) {
+ Categories.clearParentCategoryCache = async function (parentCid) {
+ while (parentCid || parseInt(parentCid, 10) === 0) {
cache.del([
`cid:${parentCid}:children`,
`cid:${parentCid}:children:all`,
@@ -129,7 +129,7 @@ module.exports = function (Categories) {
// eslint-disable-next-line no-await-in-loop
parentCid = await Categories.getCategoryField(parentCid, 'parentCid');
}
- }
+ };
async function duplicateCategoriesChildren(parentCid, cid, uid) {
let children = await Categories.getChildren([cid], uid);
@@ -188,17 +188,13 @@ module.exports = function (Categories) {
throw new Error('[[error:invalid-cid]]');
}
- const oldParent = parseInt(destination.parentCid, 10) || 0;
- const newParent = parseInt(source.parentCid, 10) || 0;
- if (copyParent && newParent !== parseInt(toCid, 10)) {
+ const oldParent = String(destination.parentCid || 0);
+ const newParent = String(source.parentCid || 0);
+ if (copyParent && newParent !== String(toCid)) {
await db.sortedSetRemove(`cid:${oldParent}:children`, toCid);
await db.sortedSetAdd(`cid:${newParent}:children`, source.order, toCid);
- cache.del([
- `cid:${oldParent}:children`,
- `cid:${oldParent}:children:all`,
- `cid:${newParent}:children`,
- `cid:${newParent}:children:all`,
- ]);
+ await Categories.clearParentCategoryCache(oldParent);
+ await Categories.clearParentCategoryCache(newParent);
}
destination.description = source.description;
diff --git a/src/categories/delete.js b/src/categories/delete.js
index 3074cf3f55..5f96e32676 100644
--- a/src/categories/delete.js
+++ b/src/categories/delete.js
@@ -79,12 +79,13 @@ module.exports = function (Categories) {
cache.del([
'categories:cid',
'cid:0:children',
- `cid:${parentCid}:children`,
- `cid:${parentCid}:children:all`,
- `cid:${cid}:children`,
- `cid:${cid}:children:all`,
+ 'cid:0:children:all',
`cid:${cid}:tag:whitelist`,
]);
+ await Promise.all([
+ Categories.clearParentCategoryCache(parentCid),
+ Categories.clearParentCategoryCache(cid),
+ ]);
}
async function deleteTags(cid) {
diff --git a/src/categories/index.js b/src/categories/index.js
index 948ff86226..df66600794 100644
--- a/src/categories/index.js
+++ b/src/categories/index.js
@@ -104,7 +104,6 @@ Categories.getAllCidsFromSet = async function (key) {
}
cids = await db.getSortedSetRange(key, 0, -1);
- cids = cids.map(cid => utils.isNumber(cid) ? parseInt(cid, 10) : cid);
cache.set(key, cids);
return cids.slice();
};
@@ -261,7 +260,7 @@ Categories.getChildren = async function (cids, uid) {
async function getChildrenTree(category, uid) {
let childrenCids = await Categories.getChildrenCids(category.cid);
childrenCids = await privileges.categories.filterCids('find', childrenCids, uid);
- childrenCids = childrenCids.filter(cid => parseInt(category.cid, 10) !== parseInt(cid, 10));
+ childrenCids = childrenCids.filter(cid => String(category.cid) !== String(cid));
if (!childrenCids.length) {
category.children = [];
return;
@@ -280,7 +279,7 @@ Categories.getParentCids = async function (currentCid) {
// eslint-disable-next-line
cid = await Categories.getCategoryField(cid, 'parentCid');
if (cid) {
- parents.unshift(cid);
+ parents.unshift(String(cid));
}
}
return parents;
@@ -291,12 +290,12 @@ Categories.getChildrenCids = async function (rootCid) {
async function recursive(keys) {
let childrenCids = await db.getSortedSetRange(keys, 0, -1);
- childrenCids = childrenCids.filter(cid => !allCids.includes(utils.isNumber(cid) ? parseInt(cid, 10) : cid));
+ childrenCids = childrenCids.filter(cid => !allCids.includes(cid));
if (!childrenCids.length) {
return;
}
+ allCids.push(...childrenCids);
keys = childrenCids.map(cid => `cid:${cid}:children`);
- childrenCids.forEach(cid => allCids.push(utils.isNumber(cid) ? parseInt(cid, 10) : cid));
await recursive(keys);
}
const key = `cid:${rootCid}:children`;
@@ -331,7 +330,7 @@ Categories.flattenCategories = function (allCategories, categoryData) {
* @param parentCid {number} start from 0 to build full tree
*/
Categories.getTree = function (categories, parentCid) {
- parentCid = parentCid || 0;
+ parentCid = String(parentCid || 0);
const cids = categories.map(category => category && category.cid);
const cidToCategory = {};
const parents = {};
@@ -352,15 +351,15 @@ Categories.getTree = function (categories, parentCid) {
return;
}
if (!category.hasOwnProperty('parentCid') || category.parentCid === null) {
- category.parentCid = 0;
+ category.parentCid = '0';
}
- if (category.parentCid === parentCid) {
+ if (String(category.parentCid) === parentCid) {
tree.push(category);
category.parent = parents[parentCid];
} else {
- const parent = cidToCategory[category.parentCid];
+ const parent = cidToCategory[String(category.parentCid)];
if (parent && parent.cid !== category.cid) {
- category.parent = parents[category.parentCid];
+ category.parent = parents[String(category.parentCid)];
parent.children = parent.children || [];
parent.children.push(category);
}
@@ -414,10 +413,10 @@ Categories.buildForSelectCategories = function (categories, fields, parentCid) {
category.children.forEach(child => recursive(child, categoriesData, ` ${level}`, depth + 1));
}
}
- parentCid = parentCid || 0;
+ parentCid = String(parentCid || 0);
const categoriesData = [];
- const rootCategories = categories.filter(category => category && category.parentCid === parentCid);
+ const rootCategories = categories.filter(category => category && String(category.parentCid) === parentCid);
rootCategories.sort((a, b) => {
if (a.order !== b.order) {
diff --git a/src/categories/search.js b/src/categories/search.js
index b0b8bef9b9..9f8c407e76 100644
--- a/src/categories/search.js
+++ b/src/categories/search.js
@@ -94,7 +94,7 @@ module.exports = function (Categories) {
}
async function getChildrenCids(cids, uid) {
- const childrenCids = await Promise.all(cids.map(cid => Categories.getChildrenCids(cid)));
+ const childrenCids = await Promise.all(cids.map(Categories.getChildrenCids));
return await privileges.categories.filterCids('find', _.flatten(childrenCids), uid);
}
};
diff --git a/src/categories/update.js b/src/categories/update.js
index ff4d6e4d11..2c2053f9fa 100644
--- a/src/categories/update.js
+++ b/src/categories/update.js
@@ -67,8 +67,8 @@ module.exports = function (Categories) {
}
async function updateParent(cid, newParent) {
- newParent = parseInt(newParent, 10) || 0;
- if (parseInt(cid, 10) === newParent) {
+ newParent = String(newParent || 0);
+ if (String(cid) === newParent) {
throw new Error('[[error:cant-set-self-as-parent]]');
}
const childrenCids = await Categories.getChildrenCids(cid);
@@ -76,7 +76,7 @@ module.exports = function (Categories) {
throw new Error('[[error:cant-set-child-as-parent]]');
}
const categoryData = await Categories.getCategoryFields(cid, ['parentCid', 'order']);
- const oldParent = categoryData.parentCid;
+ const oldParent = String(categoryData.parentCid);
if (oldParent === newParent) {
return;
}
@@ -85,12 +85,9 @@ module.exports = function (Categories) {
db.sortedSetAdd(`cid:${newParent}:children`, categoryData.order, cid),
db.setObjectField(`${utils.isNumber(cid) ? 'category' : 'categoryRemote'}:${cid}`, 'parentCid', newParent),
]);
-
- cache.del([
- `cid:${oldParent}:children`,
- `cid:${newParent}:children`,
- `cid:${oldParent}:children:all`,
- `cid:${newParent}:children:all`,
+ await Promise.all([
+ Categories.clearParentCategoryCache(oldParent),
+ Categories.clearParentCategoryCache(newParent),
]);
}
@@ -134,11 +131,9 @@ module.exports = function (Categories) {
await db.setObjectBulk(
childrenCids.map((cid, index) => [`${utils.isNumber(cid) ? 'category' : 'categoryRemote'}:${cid}`, { order: index + 1 }])
);
-
+ await Categories.clearParentCategoryCache(parentCid);
cache.del([
'categories:cid',
- `cid:${parentCid}:children`,
- `cid:${parentCid}:children:all`,
]);
}
diff --git a/src/controllers/admin/categories.js b/src/controllers/admin/categories.js
index 5e503b1964..96fd2336c7 100644
--- a/src/controllers/admin/categories.js
+++ b/src/controllers/admin/categories.js
@@ -52,7 +52,7 @@ categoriesController.getAll = async function (req, res) {
const rootCid = parseInt(req.query.cid, 10) || 0;
const rootChildren = await categories.getAllCidsFromSet(`cid:${rootCid}:children`);
async function getRootAndChildren() {
- const childCids = _.flatten(await Promise.all(rootChildren.map(cid => categories.getChildrenCids(cid))));
+ const childCids = _.flatten(await Promise.all(rootChildren.map(categories.getChildrenCids)));
return [rootCid].concat(rootChildren.concat(childCids));
}
@@ -202,13 +202,14 @@ categoriesController.addRemote = async function (req, res) {
return res.sendStatus(404);
}
- const score = await db.sortedSetCard('cid:0:children');
- const order = score + 1; // order is 1-based lol
+ const lastItem = await db.getSortedSetRevRangeWithScores('cid:0:children', 0, 0);
+ const order = lastItem.length ? lastItem[0].score + 1 : 1;
await Promise.all([
db.sortedSetAdd('cid:0:children', order, id),
categories.setCategoryField(id, 'order', order),
]);
cache.del('cid:0:children');
+ cache.del('cid:0:children:all');
res.sendStatus(200);
};
@@ -231,7 +232,7 @@ categoriesController.removeRemote = async function (req, res) {
const parentCid = await categories.getCategoryField(req.params.cid, 'parentCid');
await db.sortedSetRemove(`cid:${parentCid || 0}:children`, req.params.cid);
- cache.del(`cid:${parentCid || 0}:children`);
-
+ await categories.clearParentCategoryCache(parentCid || 0);
+ await categories.setCategoryField(req.params.cid, 'parentCid', 0);
res.sendStatus(200);
};
diff --git a/src/controllers/admin/dashboard.js b/src/controllers/admin/dashboard.js
index f573c5e677..0cfd5350c1 100644
--- a/src/controllers/admin/dashboard.js
+++ b/src/controllers/admin/dashboard.js
@@ -140,7 +140,8 @@ async function getStats() {
getStatsForSet('topics:tid', 'topicCount'),
meta.config.activitypubEnabled ? getStatsForSet('postsRemote:pid', '') : null,
meta.config.activitypubEnabled ? getStatsForSet('topicsRemote:tid', '') : null,
- ])).filter(Boolean);
+ getStatsForSet('messages:mid', 'messageCount'),
+ ]));
results[0].name = '[[admin/dashboard:graphs.page-views]]';
results[1].name = '[[admin/dashboard:unique-visitors]]';
@@ -162,6 +163,8 @@ async function getStats() {
if (results[7]) {
results[7].name = '[[admin/dashboard:remote-topics]]';
}
+ results[8].name = '[[admin/dashboard:messages]]';
+ results = results.filter(Boolean);
({ results } = await plugins.hooks.fire('filter:admin.getStats', {
results,
@@ -224,7 +227,7 @@ function calculateDeltas(results) {
function increasePercent(last, now) {
const percent = last ? (now - last) / last * 100 : 0;
- return percent.toFixed(0);
+ return (percent > 0 ? `+` : '') + percent.toFixed(0);
}
results.yesterday -= results.today;
results.dayIncrease = increasePercent(results.yesterday, results.today);
diff --git a/src/controllers/search.js b/src/controllers/search.js
index 440deb0fc5..3a2c5af54e 100644
--- a/src/controllers/search.js
+++ b/src/controllers/search.js
@@ -201,7 +201,7 @@ async function buildSelectedCategoryLabel(selectedCids) {
label = `[[search:categories-x, ${selectedCids.length}]]`;
} else if (selectedCids.length === 1 && selectedCids[0] === 'watched') {
label = `[[search:categories-watched-categories]]`;
- } else if (selectedCids.length === 1 && parseInt(selectedCids[0], 10)) {
+ } else if (selectedCids.length === 1 && selectedCids[0]) {
const categoryData = await categories.getCategoryData(selectedCids[0]);
if (categoryData && categoryData.name) {
label = `[[search:categories-x, ${categoryData.name}]]`;
diff --git a/src/messaging/rooms.js b/src/messaging/rooms.js
index 83de1c07c7..4356775a47 100644
--- a/src/messaging/rooms.js
+++ b/src/messaging/rooms.js
@@ -110,7 +110,7 @@ module.exports = function (Messaging) {
[`chat:room:${roomId}:uids:online`, now, uid],
...(
isPublic ?
- [`chat:room:${roomId}:owners`, now, uid] :
+ [[`chat:room:${roomId}:owners`, now, uid]] :
[uid].concat(data.uids).map(uid => ([`chat:room:${roomId}:owners`, now, uid]))
),
]),
diff --git a/src/posts/category.js b/src/posts/category.js
index b87342a89f..7ce02bf490 100644
--- a/src/posts/category.js
+++ b/src/posts/category.js
@@ -40,7 +40,7 @@ module.exports = function (Posts) {
};
async function filterPidsBySingleCid(pids, cid) {
- const isMembers = await db.isSortedSetMembers(`cid:${parseInt(cid, 10)}:pids`, pids);
+ const isMembers = await db.isSortedSetMembers(`cid:${cid}:pids`, pids);
return pids.filter((pid, index) => pid && isMembers[index]);
}
};
diff --git a/src/search.js b/src/search.js
index e1a7fb4287..9993a8121d 100644
--- a/src/search.js
+++ b/src/search.js
@@ -412,8 +412,12 @@ async function getChildrenCids(data) {
if (!data.searchChildren) {
return [];
}
- const childrenCids = await Promise.all(data.categories.map(cid => categories.getChildrenCids(cid)));
- return await privileges.categories.filterCids('find', _.uniq(_.flatten(childrenCids)), data.uid);
+ const childrenCids = await Promise.all(data.categories.map(categories.getChildrenCids));
+ return await privileges.categories.filterCids(
+ 'find',
+ _.uniq(_.flatten(childrenCids)),
+ data.uid
+ );
}
async function getSearchUids(data) {
diff --git a/src/socket.io/admin/categories.js b/src/socket.io/admin/categories.js
index 53c541598d..1406edb596 100644
--- a/src/socket.io/admin/categories.js
+++ b/src/socket.io/admin/categories.js
@@ -36,7 +36,7 @@ Categories.copyPrivilegesFrom = async function (socket, data) {
Categories.copyPrivilegesToAllCategories = async function (socket, data) {
let cids = await categories.getAllCidsFromSet('categories:cid');
- cids = cids.filter(cid => parseInt(cid, 10) !== parseInt(data.cid, 10));
+ cids = cids.filter(cid => String(cid) !== String(data.cid));
for (const toCid of cids) {
// eslint-disable-next-line no-await-in-loop
await categories.copyPrivilegesFrom(data.cid, toCid, data.group, data.filter);
diff --git a/src/socket.io/categories.js b/src/socket.io/categories.js
index ae2378d73a..68e9f1942b 100644
--- a/src/socket.io/categories.js
+++ b/src/socket.io/categories.js
@@ -111,7 +111,9 @@ SocketCategories.ignore = async function (socket, data) {
async function ignoreOrWatch(fn, socket, data) {
let targetUid = socket.uid;
- const cids = Array.isArray(data.cid) ? data.cid.map(cid => parseInt(cid, 10)) : [parseInt(data.cid, 10)];
+ const cids = Array.isArray(data.cid) ?
+ data.cid.map(cid => String(cid)) :
+ [String(data.cid)];
if (data.hasOwnProperty('uid')) {
targetUid = data.uid;
}
@@ -122,9 +124,9 @@ async function ignoreOrWatch(fn, socket, data) {
// filter to subcategories of cid
let cat;
do {
- cat = categoryData.find(c => !cids.includes(c.cid) && cids.includes(c.parentCid));
+ cat = categoryData.find(c => !cids.includes(String(c.cid)) && cids.includes(String(c.parentCid)));
if (cat) {
- cids.push(cat.cid);
+ cids.push(String(cat.cid));
}
} while (cat);
diff --git a/src/topics/teaser.js b/src/topics/teaser.js
index 03ea62b5c0..1ee9f0d437 100644
--- a/src/topics/teaser.js
+++ b/src/topics/teaser.js
@@ -17,9 +17,11 @@ module.exports = function (Topics) {
}
let uid = options;
let { teaserPost } = meta.config;
+ let teaserParseType = 'plaintext';
if (typeof options === 'object') {
uid = options.uid;
teaserPost = options.teaserPost || meta.config.teaserPost;
+ teaserParseType = options.teaserParseType || 'plaintext';
}
const counts = [];
@@ -68,7 +70,7 @@ module.exports = function (Topics) {
post.timestampISO = utils.toISOString(post.timestamp);
tidToPost[post.tid] = post;
});
- await Promise.all(postData.map(p => posts.parsePost(p, 'plaintext')));
+ await Promise.all(postData.map(p => posts.parsePost(p, teaserParseType)));
const teasers = topics.map((topic, index) => {
if (!topic) {
diff --git a/src/views/admin/dashboard/logins.tpl b/src/views/admin/dashboard/logins.tpl
index 552ded83e1..814b10156d 100644
--- a/src/views/admin/dashboard/logins.tpl
+++ b/src/views/admin/dashboard/logins.tpl
@@ -23,7 +23,7 @@
{./user.username}
{function.userAgentIcons} {../browser} {../version} on {../platform}
- | {../title} | [[topic:posted-by, {../user.username}]] | -+ | {../uid} | {../username} | {../email} | -+ | {{{ end }}} diff --git a/src/views/admin/partials/dashboard/graph.tpl b/src/views/admin/partials/dashboard/graph.tpl index e6eb91ff29..c01b923109 100644 --- a/src/views/admin/partials/dashboard/graph.tpl +++ b/src/views/admin/partials/dashboard/graph.tpl @@ -3,21 +3,21 @@ |
| - - {{{ if ./href }}} - {./name} - {{{ else }}} - {./name} - {{{ end }}} - + | + {{{ if ./href }}} + {./name} + {{{ else }}} + {./name} + {{{ end }}} | {formattedNumber(./yesterday)} | {formattedNumber(./today)} | diff --git a/test/messaging.js b/test/messaging.js index 4e2e709007..bbe310e27d 100644 --- a/test/messaging.js +++ b/test/messaging.js @@ -599,6 +599,20 @@ describe('Messaging Library', () => { const { roomId } = await api.users.getPrivateRoomId({ uid: mocks.users.foo.uid }, { uid: mocks.users.herp.uid }); assert(roomId); }); + + it('should create a public chat room', async () => { + const data = await api.chats.create({ + uid: mocks.users.foo.uid, + session: {}, + }, { + name: 'public room', + type: 'public', + uids: [], + groups: ['registered-users'], + }); + assert(data.roomId); + assert.strictEqual(data.public, true); + }); }); describe('toMid', () => { diff --git a/test/search.js b/test/search.js index f0e285cb9d..e0b1421786 100644 --- a/test/search.js +++ b/test/search.js @@ -130,9 +130,10 @@ describe('Search', () => { it('should search for categories', async () => { const socketCategories = require('../src/socket.io/categories'); - let data = await socketCategories.categorySearch({ uid: phoebeUid }, { query: 'baz', parentCid: 0 }); + let data = await socketCategories.categorySearch({ uid: phoebeUid }, { search: 'baz', parentCid: 0 }); + assert.strictEqual(data.length, 1); assert.strictEqual(data[0].name, 'baz category'); - data = await socketCategories.categorySearch({ uid: phoebeUid }, { query: '', parentCid: 0 }); + data = await socketCategories.categorySearch({ uid: phoebeUid }, { search: '', parentCid: 0 }); assert.strictEqual(data.length, 5); });