ActivityPub-federated video streaming platform using P2P directly in your web browser
pass ip address to requires-approval.result hook
kontrollantenb0fc3643be22
diff --git a/packages/tests/fixtures/peertube-plugin-test/main.js b/packages/tests/fixtures/peertube-plugin-test/main.jsindex 203e9f7e70..6d2252a6b6 100644--- a/packages/tests/fixtures/peertube-plugin-test/main.js+++ b/packages/tests/fixtures/peertube-plugin-test/main.js@@ -344,9 +344,9 @@ async function register ({ registerHook, registerSetting, settingsManager, storaregisterHook({target: 'filter:api.user.signup.requires-approval.result',- handler: ({ requiresApproval, registrationReason }, { body, headers }) => {+ handler: ({ requiresApproval, registrationReason }, { body, headers, ip }) => {return {- requiresApproval: body.username === 'waiting_john',+ requiresApproval: ip !== undefined && body.username === 'waiting_john',registrationReason: 'Marked as spam'}}diff --git a/server/core/middlewares/validators/users/user-registrations.ts b/server/core/middlewares/validators/users/user-registrations.tsindex 9ac8e5e6af..f9e9a79add 100644--- a/server/core/middlewares/validators/users/user-registrations.ts+++ b/server/core/middlewares/validators/users/user-registrations.ts@@ -63,7 +63,8 @@ const determineSignupMode = ['filter:api.user.signup.requires-approval.result',{body: pick(req.body, [ 'username', 'email', 'registrationReason' ]),- headers: req.headers+ headers: req.headers,+ ip: req.ip})