it never ends.
This commit is contained in:
@@ -224,20 +224,20 @@ func (group *Group) MergeInMetadataEvent(evt *nostr.Event) error {
|
||||
group.LastMetadataUpdate = evt.CreatedAt
|
||||
group.Name = group.Address.ID
|
||||
|
||||
if tag := evt.Tags.GetFirst([]string{"name", ""}); tag != nil {
|
||||
group.Name = (*tag)[1]
|
||||
if tag := evt.Tags.Find("name"); tag != nil {
|
||||
group.Name = tag[1]
|
||||
}
|
||||
if tag := evt.Tags.GetFirst([]string{"about", ""}); tag != nil {
|
||||
group.About = (*tag)[1]
|
||||
if tag := evt.Tags.Find("about"); tag != nil {
|
||||
group.About = tag[1]
|
||||
}
|
||||
if tag := evt.Tags.GetFirst([]string{"picture", ""}); tag != nil {
|
||||
group.Picture = (*tag)[1]
|
||||
if tag := evt.Tags.Find("picture"); tag != nil {
|
||||
group.Picture = tag[1]
|
||||
}
|
||||
|
||||
if tag := evt.Tags.GetFirst([]string{"private"}); tag != nil {
|
||||
if tag := evt.Tags.Find("private"); tag != nil {
|
||||
group.Private = true
|
||||
}
|
||||
if tag := evt.Tags.GetFirst([]string{"closed"}); tag != nil {
|
||||
if tag := evt.Tags.Find("closed"); tag != nil {
|
||||
group.Closed = true
|
||||
}
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ type Role struct {
|
||||
Description string
|
||||
}
|
||||
|
||||
type KindRange []int
|
||||
type KindRange []uint16
|
||||
|
||||
var ModerationEventKinds = KindRange{
|
||||
nostr.KindSimpleGroupPutUser,
|
||||
@@ -30,7 +30,7 @@ var MetadataEventKinds = KindRange{
|
||||
nostr.KindSimpleGroupRoles,
|
||||
}
|
||||
|
||||
func (kr KindRange) Includes(kind int) bool {
|
||||
func (kr KindRange) Includes(kind uint16) bool {
|
||||
_, ok := slices.BinarySearch(kr, kind)
|
||||
return ok
|
||||
}
|
||||
|
||||
@@ -20,8 +20,8 @@ func TestGroupEventBackAndForth(t *testing.T) {
|
||||
meta1 := group1.ToMetadataEvent()
|
||||
|
||||
require.Equal(t, "xyz", meta1.Tags.GetD(), "translation of group1 to metadata event failed: %s", meta1)
|
||||
require.NotNil(t, meta1.Tags.GetFirst([]string{"name", "banana"}), "translation of group1 to metadata event failed: %s", meta1)
|
||||
require.NotNil(t, meta1.Tags.GetFirst([]string{"private"}), "translation of group1 to metadata event failed: %s", meta1)
|
||||
require.NotNil(t, meta1.Tags.FindWithValue("name", "banana"), "translation of group1 to metadata event failed: %s", meta1)
|
||||
require.NotNil(t, meta1.Tags.Find("private"), "translation of group1 to metadata event failed: %s", meta1)
|
||||
|
||||
group2, _ := NewGroup("groups.com'abc")
|
||||
group2.Members[ALICE] = []*Role{{Name: "nada"}}
|
||||
@@ -32,16 +32,16 @@ func TestGroupEventBackAndForth(t *testing.T) {
|
||||
|
||||
require.Equal(t, "abc", admins2.Tags.GetD(), "translation of group2 to admins event failed")
|
||||
require.Equal(t, 3, len(admins2.Tags), "translation of group2 to admins event failed")
|
||||
require.NotNil(t, admins2.Tags.GetFirst([]string{"p", ALICE, "nada"}), "translation of group2 to admins event failed")
|
||||
require.NotNil(t, admins2.Tags.GetFirst([]string{"p", BOB, "nada"}), "translation of group2 to admins event failed")
|
||||
require.True(t, admins2.Tags.FindWithValue("p", ALICE)[2] == "nada", "translation of group2 to admins event failed")
|
||||
require.True(t, admins2.Tags.FindWithValue("p", BOB)[2] == "nada", "translation of group2 to admins event failed")
|
||||
|
||||
members2 := group2.ToMembersEvent()
|
||||
require.Equal(t, "abc", members2.Tags.GetD(), "translation of group2 to members2 event failed")
|
||||
require.Equal(t, 5, len(members2.Tags), "translation of group2 to members2 event failed")
|
||||
require.NotNil(t, members2.Tags.GetFirst([]string{"p", ALICE}), "translation of group2 to members2 event failed")
|
||||
require.NotNil(t, members2.Tags.GetFirst([]string{"p", BOB}), "translation of group2 to members2 event failed")
|
||||
require.NotNil(t, members2.Tags.GetFirst([]string{"p", CAROL}), "translation of group2 to members2 event failed")
|
||||
require.NotNil(t, members2.Tags.GetFirst([]string{"p", DEREK}), "translation of group2 to members2 event failed")
|
||||
require.NotNil(t, members2.Tags.FindWithValue("p", ALICE), "translation of group2 to members2 event failed")
|
||||
require.NotNil(t, members2.Tags.FindWithValue("p", BOB), "translation of group2 to members2 event failed")
|
||||
require.NotNil(t, members2.Tags.FindWithValue("p", CAROL), "translation of group2 to members2 event failed")
|
||||
require.NotNil(t, members2.Tags.FindWithValue("p", DEREK), "translation of group2 to members2 event failed")
|
||||
|
||||
group1.MergeInMembersEvent(members2)
|
||||
require.Equal(t, 4, len(group1.Members), "merge of members2 into group1 failed")
|
||||
|
||||
Reference in New Issue
Block a user