Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-01 21:30:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: #12320, .text() gets \n\t characters

Browse Source 
add name check in order active plugins
use single db call to set order
This commit is contained in:
Barış Soner Uşaklı
2024-01-31 08:42:18 -05:00
parent 6e6c3974e4
commit 67c8bd9916
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/src/admin/extend/plugins.js
View File

@@ -195,7 +195,7 @@ define('admin/extend/plugins', [
let html = '';
activePlugins.forEach(function (plugin) {
html += `
<li class="d-flex justify-content-between gap-1 pointer border-bottom pb-2">
<li class="d-flex justify-content-between gap-1 pointer border-bottom pb-2" data-plugin="${plugin}">
${plugin}
<div class="d-flex gap-1">
<div class="btn-ghost-sm move-up">
@@ -233,7 +233,7 @@ define('admin/extend/plugins', [
const plugins = $('#order-active-plugins-modal .plugin-list').children();
const data = [];
plugins.each(function (index, el) {
data.push({ name: $(el).text(), order: index });
data.push({ name: $(el).attr('data-plugin'), order: index });
});
socket.emit('admin.plugins.orderActivePlugins', data, function (err) {

10
src/socket.io/admin/plugins.js
View File

@@ -5,6 +5,7 @@ const nconf = require('nconf');
const plugins = require('../../plugins');
const events = require('../../events');
const db = require('../../database');
const { pluginNamePattern } = require('../../constants');
const Plugins = module.exports;
@@ -41,7 +42,14 @@ Plugins.orderActivePlugins = async function (socket, data) {
throw new Error('[[error:plugins-set-in-configuration]]');
}
data = data.filter(plugin => plugin && plugin.name);
await Promise.all(data.map(plugin => db.sortedSetAdd('plugins:active', plugin.order || 0, plugin.name)));
data.forEach((plugin) => {
if (!pluginNamePattern.test(plugin.name)) {
throw new Error('[[error:invalid-plugin-id]]');
}
});
await db.sortedSetAdd('plugins:active', data.map(p => p.order || 0), data.map(p => p.name));
};
Plugins.upgrade = async function (socket, data) {