Skip to content

Commit bdee404

Browse files
author
Jon Staab
committed
Fix member removal
1 parent 0f2fe72 commit bdee404

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

zooid/groups.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package zooid
33
import (
44
"fiatjaf.com/nostr"
55
"fiatjaf.com/nostr/nip29"
6+
"fmt"
67
"slices"
78
)
89

@@ -186,9 +187,9 @@ func (g *GroupStore) GetMembers(h string) []nostr.PubKey {
186187

187188
members := make([]nostr.PubKey, 0)
188189

189-
for event := range g.Events.QueryEvents(filter, 0) {
190-
for hex := range event.Tags.FindAll("p") {
191-
if pubkey, err := nostr.PubKeyFromHex(hex[1]); err == nil {
190+
for _, event := range Reversed(slices.Collect(g.Events.QueryEvents(filter, 0))) {
191+
for tag := range event.Tags.FindAll("p") {
192+
if pubkey, err := nostr.PubKeyFromHex(tag[1]); err == nil {
192193
if event.Kind == nostr.KindSimpleGroupPutUser {
193194
members = append(members, pubkey)
194195
} else {

zooid/util.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package zooid
33
import (
44
"fiatjaf.com/nostr"
55
"math/rand"
6+
"slices"
67
"strings"
78
)
89

@@ -58,6 +59,12 @@ func Remove[T comparable](slice []T, element T) []T {
5859
return slice
5960
}
6061

62+
func Reversed[T any](slice []T) []T {
63+
slices.Reverse(slice)
64+
65+
return slice
66+
}
67+
6168
const letters = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
6269

6370
func RandomString(n int) string {

0 commit comments

Comments
 (0)