summaryrefslogtreecommitdiff
path: root/testrig
diff options
context:
space:
mode:
authorLibravatar tobi <31960611+tsmethurst@users.noreply.github.com>2024-02-27 13:22:05 +0100
committerLibravatar GitHub <noreply@github.com>2024-02-27 12:22:05 +0000
commit9cadc764b389df970c767608e7a061f3bd777dfa (patch)
treee49218fff3af5800b5305720a04a4f74e7b5c2cb /testrig
parent[chore]: Bump github.com/tdewolff/minify/v2 from 2.20.17 to 2.20.18 (#2689) (diff)
downloadgotosocial-9cadc764b389df970c767608e7a061f3bd777dfa.tar.xz
[feature] Add experimental `instance-federation-spam-filter` option (#2685)
* [chore] Move `visibility` to `filter/visibility` * [feature] Add experimental instance-federation-spam-filter option
Diffstat (limited to 'testrig')
-rw-r--r--testrig/config.go1
-rw-r--r--testrig/federatingdb.go10
-rw-r--r--testrig/util.go2
3 files changed, 10 insertions, 3 deletions
diff --git a/testrig/config.go b/testrig/config.go
index a8d148cac..f8330ac14 100644
--- a/testrig/config.go
+++ b/testrig/config.go
@@ -65,6 +65,7 @@ var testDefaults = config.Configuration{
WebAssetBaseDir: "./web/assets/",
InstanceFederationMode: config.InstanceFederationModeDefault,
+ InstanceFederationSpamFilter: true,
InstanceExposePeers: true,
InstanceExposeSuspended: true,
InstanceExposeSuspendedWeb: true,
diff --git a/testrig/federatingdb.go b/testrig/federatingdb.go
index d66a82306..41c5a8ae9 100644
--- a/testrig/federatingdb.go
+++ b/testrig/federatingdb.go
@@ -19,12 +19,18 @@ package testrig
import (
"github.com/superseriousbusiness/gotosocial/internal/federation/federatingdb"
+ "github.com/superseriousbusiness/gotosocial/internal/filter/spam"
+ "github.com/superseriousbusiness/gotosocial/internal/filter/visibility"
"github.com/superseriousbusiness/gotosocial/internal/state"
"github.com/superseriousbusiness/gotosocial/internal/typeutils"
- "github.com/superseriousbusiness/gotosocial/internal/visibility"
)
// NewTestFederatingDB returns a federating DB with the underlying db
func NewTestFederatingDB(state *state.State) federatingdb.DB {
- return federatingdb.New(state, typeutils.NewConverter(state), visibility.NewFilter(state))
+ return federatingdb.New(
+ state,
+ typeutils.NewConverter(state),
+ visibility.NewFilter(state),
+ spam.NewFilter(state),
+ )
}
diff --git a/testrig/util.go b/testrig/util.go
index 9e5987065..e078074e5 100644
--- a/testrig/util.go
+++ b/testrig/util.go
@@ -27,13 +27,13 @@ import (
"os"
"time"
+ "github.com/superseriousbusiness/gotosocial/internal/filter/visibility"
"github.com/superseriousbusiness/gotosocial/internal/messages"
tlprocessor "github.com/superseriousbusiness/gotosocial/internal/processing/timeline"
wprocessor "github.com/superseriousbusiness/gotosocial/internal/processing/workers"
"github.com/superseriousbusiness/gotosocial/internal/state"
"github.com/superseriousbusiness/gotosocial/internal/timeline"
"github.com/superseriousbusiness/gotosocial/internal/typeutils"
- "github.com/superseriousbusiness/gotosocial/internal/visibility"
)
// Starts workers on the provided state using noop processing functions.