From 451803b230084d5553962c2b3e3b2a921e9545e8 Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Wed, 8 Jan 2025 11:29:40 +0100
Subject: [feature] Fetch + create domain permissions from subscriptions
 nightly (#3635)

* peepeepoopoo

* test domain perm subs

* swagger

* envparsing

* dries your wets

* start on docs

* finish up docs

* copy paste errors

* rename actions package

* rename force -> skipCache

* move obfuscate parse nearer to where err is checked

* make higherPrios a simple slice

* don't use receiver for permsFrom funcs

* add more context to error logs

* defer finished log

* use switch for permType instead of if/else

* thanks linter, love you <3

* validate csv headers before full read

* use bufio scanner
---
 internal/processing/admin/admin.go | 47 +++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 28 deletions(-)

(limited to 'internal/processing/admin/admin.go')

diff --git a/internal/processing/admin/admin.go b/internal/processing/admin/admin.go
index 170298ca5..08e6bf0d5 100644
--- a/internal/processing/admin/admin.go
+++ b/internal/processing/admin/admin.go
@@ -21,10 +21,10 @@ import (
 	"github.com/superseriousbusiness/gotosocial/internal/cleaner"
 	"github.com/superseriousbusiness/gotosocial/internal/email"
 	"github.com/superseriousbusiness/gotosocial/internal/federation"
-	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
 	"github.com/superseriousbusiness/gotosocial/internal/media"
 	"github.com/superseriousbusiness/gotosocial/internal/processing/common"
 	"github.com/superseriousbusiness/gotosocial/internal/state"
+	"github.com/superseriousbusiness/gotosocial/internal/subscriptions"
 	"github.com/superseriousbusiness/gotosocial/internal/transport"
 	"github.com/superseriousbusiness/gotosocial/internal/typeutils"
 )
@@ -33,21 +33,14 @@ type Processor struct {
 	// common processor logic
 	c *common.Processor
 
-	state     *state.State
-	cleaner   *cleaner.Cleaner
-	converter *typeutils.Converter
-	federator *federation.Federator
-	media     *media.Manager
-	transport transport.Controller
-	email     email.Sender
-
-	// admin Actions currently
-	// undergoing processing
-	actions *Actions
-}
-
-func (p *Processor) Actions() *Actions {
-	return p.actions
+	state         *state.State
+	cleaner       *cleaner.Cleaner
+	subscriptions *subscriptions.Subscriptions
+	converter     *typeutils.Converter
+	federator     *federation.Federator
+	media         *media.Manager
+	transport     transport.Controller
+	email         email.Sender
 }
 
 // New returns a new admin processor.
@@ -55,6 +48,7 @@ func New(
 	common *common.Processor,
 	state *state.State,
 	cleaner *cleaner.Cleaner,
+	subscriptions *subscriptions.Subscriptions,
 	federator *federation.Federator,
 	converter *typeutils.Converter,
 	mediaManager *media.Manager,
@@ -62,17 +56,14 @@ func New(
 	emailSender email.Sender,
 ) Processor {
 	return Processor{
-		c:         common,
-		state:     state,
-		cleaner:   cleaner,
-		converter: converter,
-		federator: federator,
-		media:     mediaManager,
-		transport: transportController,
-		email:     emailSender,
-		actions: &Actions{
-			r:     make(map[string]*gtsmodel.AdminAction),
-			state: state,
-		},
+		c:             common,
+		state:         state,
+		cleaner:       cleaner,
+		subscriptions: subscriptions,
+		converter:     converter,
+		federator:     federator,
+		media:         mediaManager,
+		transport:     transportController,
+		email:         emailSender,
 	}
 }
-- 
cgit v1.2.3