From 0c326754277fabfcf739859039802c1b557f8cf7 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 7 May 2020 15:57:12 +0200 Subject: [PATCH] Fix fetch from auto mute plugin --- peertube-plugin-auto-mute/main.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/peertube-plugin-auto-mute/main.js b/peertube-plugin-auto-mute/main.js index ca3648d..626d325 100644 --- a/peertube-plugin-auto-mute/main.js +++ b/peertube-plugin-auto-mute/main.js @@ -25,7 +25,7 @@ async function register ({ registerSetting({ name: 'check-seconds-interval', label: 'Blocklist check frequency (seconds)', - type: 'input-textarea', + type: 'input', private: true, default: 3600 // 1 Hour }) @@ -105,7 +105,7 @@ function runLater () { function get (url) { return new Promise((resolve, reject) => { - simpleGet({ url, json: true }, function (err, res, data) { + simpleGet.concat({ url, method: 'GET', json: true }, function (err, res, data) { if (err) return reject(err) return resolve({ res, data }) @@ -114,13 +114,15 @@ function get (url) { } function addEntity (peertubeHelpers, value) { - const moderation = { peertubeHelpers } + const { moderation, logger } = peertubeHelpers if (store.alreadyAdded.has(value)) return store.alreadyRemoved.delete(value) store.alreadyAdded.add(value) + logger.info('Auto mute %s from blocklist.', value) + // Account if (value.includes('@')) { return moderation.blockAccount({ byAccountId: store.serverAccountId, handleToBlock: value }) @@ -131,13 +133,15 @@ function addEntity (peertubeHelpers, value) { } function removeEntity (peertubeHelpers, value) { - const moderation = { peertubeHelpers } + const { moderation, logger } = peertubeHelpers if (store.alreadyRemoved.has(value)) return store.alreadyAdded.delete(value) store.alreadyRemoved.add(value) + logger.info('Auto removing mute %s from blocklist.', value) + // Account if (value.includes('@')) { return moderation.blockAccount({ byAccountId: store.serverAccountId, handleToUnblock: value })