diff --git a/README.md b/README.md index 3218186..d2d06c4 100644 --- a/README.md +++ b/README.md @@ -46,14 +46,12 @@ Contains policy and access related configuration. Configures NIP 29 support. - `enabled` - whether NIP 29 is enabled. -- `auto_join` - whether relay members can join groups without approval. Defaults to `false`. ### `[management]` Configures NIP 86 support. - `enabled` - whether NIP 86 is enabled. -- `methods` - a list of [NIP 86](https://github.com/nostr-protocol/nips/blob/master/86.md) relay management methods enabled for this relay. ### `[blossom]` @@ -98,11 +96,9 @@ strip_signatures = false [groups] enabled = true -auto_join = false [management] enabled = true -methods = ["supportedmethods", "banpubkey", "allowpubkey"] [blossom] enabled = false diff --git a/zooid/api_test.go b/zooid/api_test.go index 9cf0d98..07ab751 100644 --- a/zooid/api_test.go +++ b/zooid/api_test.go @@ -422,8 +422,7 @@ func TestAPIHandler_PatchRelay(t *testing.T) { "strip_signatures": false, }, "groups": map[string]interface{}{ - "enabled": true, - "auto_join": false, + "enabled": true, }, } body, _ := json.Marshal(initialConfig) @@ -701,15 +700,13 @@ func TestAPIHandler_ConfigValidation(t *testing.T) { "strip_signatures": false, }, "groups": map[string]interface{}{ - "enabled": true, - "auto_join": true, + "enabled": true, }, "push": map[string]interface{}{ "enabled": true, }, "management": map[string]interface{}{ "enabled": true, - "methods": []string{"invite"}, }, "blossom": map[string]interface{}{ "enabled": true, diff --git a/zooid/config.go b/zooid/config.go index 5fa1ab4..7ffb580 100644 --- a/zooid/config.go +++ b/zooid/config.go @@ -32,8 +32,7 @@ type Config struct { } `toml:"policy" json:"policy"` Groups struct { - Enabled bool `toml:"enabled" json:"enabled"` - AutoJoin bool `toml:"auto_join" json:"auto_join"` + Enabled bool `toml:"enabled" json:"enabled"` } `toml:"groups" json:"groups"` Push struct { @@ -41,8 +40,7 @@ type Config struct { } `toml:"push" json:"push"` Management struct { - Enabled bool `toml:"enabled" json:"enabled"` - Methods []string `toml:"methods" json:"methods"` + Enabled bool `toml:"enabled" json:"enabled"` } `toml:"management" json:"management"` Blossom struct { diff --git a/zooid/instance.go b/zooid/instance.go index 9ac19ee..084aaf8 100644 --- a/zooid/instance.go +++ b/zooid/instance.go @@ -383,7 +383,7 @@ func (instance *Instance) OnEvent(ctx context.Context, event nostr.Event) (rejec func (instance *Instance) OnEventSaved(ctx context.Context, event nostr.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.UpdateMembersList(h) }