Remove auto join settings

This commit is contained in:
Jon Staab
2026-03-03 14:43:03 -08:00
parent 4a77e0dab6
commit 90b07525af
4 changed files with 4 additions and 9 deletions
-2
View File
@@ -46,7 +46,6 @@ Contains policy and access related configuration.
Configures NIP 29 support. Configures NIP 29 support.
- `enabled` - whether NIP 29 is enabled. - `enabled` - whether NIP 29 is enabled.
- `auto_join` - whether relay members can join groups without approval. Defaults to `false`.
### `[management]` ### `[management]`
@@ -97,7 +96,6 @@ strip_signatures = false
[groups] [groups]
enabled = true enabled = true
auto_join = false
[management] [management]
enabled = true enabled = true
+2 -4
View File
@@ -422,8 +422,7 @@ func TestAPIHandler_PatchRelay(t *testing.T) {
"strip_signatures": false, "strip_signatures": false,
}, },
"groups": map[string]interface{}{ "groups": map[string]interface{}{
"enabled": true, "enabled": true,
"auto_join": false,
}, },
} }
body, _ := json.Marshal(initialConfig) body, _ := json.Marshal(initialConfig)
@@ -701,8 +700,7 @@ func TestAPIHandler_ConfigValidation(t *testing.T) {
"strip_signatures": false, "strip_signatures": false,
}, },
"groups": map[string]interface{}{ "groups": map[string]interface{}{
"enabled": true, "enabled": true,
"auto_join": true,
}, },
"push": map[string]interface{}{ "push": map[string]interface{}{
"enabled": true, "enabled": true,
+1 -2
View File
@@ -32,8 +32,7 @@ type Config struct {
} `toml:"policy" json:"policy"` } `toml:"policy" json:"policy"`
Groups struct { Groups struct {
Enabled bool `toml:"enabled" json:"enabled"` Enabled bool `toml:"enabled" json:"enabled"`
AutoJoin bool `toml:"auto_join" json:"auto_join"`
} `toml:"groups" json:"groups"` } `toml:"groups" json:"groups"`
Push struct { Push struct {
+1 -1
View File
@@ -380,7 +380,7 @@ func (instance *Instance) OnEvent(ctx context.Context, event nostr.Event) (rejec
func (instance *Instance) OnEventSaved(ctx context.Context, event nostr.Event) { func (instance *Instance) OnEventSaved(ctx context.Context, event nostr.Event) {
h := GetGroupIDFromEvent(event) h := GetGroupIDFromEvent(event)
if event.Kind == nostr.KindSimpleGroupJoinRequest && instance.Config.Groups.AutoJoin { if event.Kind == nostr.KindSimpleGroupJoinRequest {
instance.Groups.AddMember(h, event.PubKey) instance.Groups.AddMember(h, event.PubKey)
instance.Groups.UpdateMembersList(h) instance.Groups.UpdateMembersList(h)
} }