From 746cc8cc3471c1d430f46d86c80c94b4c8bef408 Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Wed, 3 Feb 2021 23:19:21 -0500
Subject: [PATCH] pluginfw: In-line `formatPluginsWithVersion()`

There's only one caller of the function, so move the logic to where it
is used.
---
 src/node/server.js                | 7 ++++++-
 src/static/js/pluginfw/plugins.js | 5 -----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/node/server.js b/src/node/server.js
index a0d9e2adc..affca7e1b 100755
--- a/src/node/server.js
+++ b/src/node/server.js
@@ -44,6 +44,7 @@ const db = require('./db/DB');
 const express = require('./hooks/express');
 const hooks = require('../static/js/pluginfw/hooks');
 const npm = require('npm/lib/npm.js');
+const pluginDefs = require('../static/js/pluginfw/plugin_defs');
 const plugins = require('../static/js/pluginfw/plugins');
 const settings = require('./utils/Settings');
 const util = require('util');
@@ -120,7 +121,11 @@ exports.start = async () => {
   await util.promisify(npm.load)();
   await db.init();
   await plugins.update();
-  console.info(`Installed plugins: ${plugins.formatPluginsWithVersion()}`);
+  const installedPlugins = Object.values(pluginDefs.plugins)
+      .filter((plugin) => plugin.package.name !== 'ep_etherpad-lite')
+      .map((plugin) => `${plugin.package.name}@${plugin.package.version}`)
+      .join(', ');
+  console.info(`Installed plugins: ${installedPlugins}`);
   console.debug(`Installed parts:\n${plugins.formatParts()}`);
   console.debug(`Installed hooks:\n${plugins.formatHooks()}`);
   await hooks.aCallAll('loadSettings', {settings});
diff --git a/src/static/js/pluginfw/plugins.js b/src/static/js/pluginfw/plugins.js
index 417fc1fe9..ceda3cc47 100644
--- a/src/static/js/pluginfw/plugins.js
+++ b/src/static/js/pluginfw/plugins.js
@@ -15,11 +15,6 @@ exports.prefix = 'ep_';
 
 exports.formatPlugins = () => Object.keys(defs.plugins).join(', ');
 
-exports.formatPluginsWithVersion = () => Object.values(defs.plugins)
-    .filter((plugin) => plugin.package.name !== 'ep_etherpad-lite')
-    .map((plugin) => `${plugin.package.name}@${plugin.package.version}`)
-    .join(', ');
-
 exports.formatParts = () => defs.parts.map((part) => part.full_name).join('\n');
 
 exports.formatHooks = (hookSetName) => {