give more access to groups db for normal queries.

Author: fiatjaf

core.go

@@ -448,9 +448,17 @@ func virtualInviteValidationEvent(inviter nostr.PubKey) nostr.Event {
 
 // splits the query between the main relay and the groups relay
 func queryStored(ctx context.Context, filter nostr.Filter) iter.Seq[nostr.Event] {
-	if len(filter.Kinds) == 0 {
+	if filter.IDs != nil {
+		// query both normal and groups
+		return eventstore.SortedMerge(
+			queryNormal(ctx, filter),
+			groups.State.Query(ctx, filter),
+		)
+	}
+
+	if filter.Kinds == nil {
 		// only normal kinds or no kinds specified
-		return queryMain(ctx, filter)
+		return queryNormal(ctx, filter)
 	}
 
 	if len(filter.Tags["h"]) > 0 {
@@ -459,27 +467,50 @@ func queryStored(ctx context.Context, filter nostr.Filter) iter.Seq[nostr.Event]
 
 	groupsFilter := filter
 	groupsFilter.Kinds = nil
-	mainFilter := filter
-	mainFilter.Kinds = nil
+	normalFilter := filter
+	normalFilter.Kinds = nil
 	for _, kind := range filter.Kinds {
 		if slices.Contains(nip29.MetadataEventKinds, kind) {
 			groupsFilter.Kinds = append(groupsFilter.Kinds, kind)
 		} else {
-			mainFilter.Kinds = append(mainFilter.Kinds, kind)
+			normalFilter.Kinds = append(normalFilter.Kinds, kind)
 		}
 	}
 
-	if len(groupsFilter.Kinds) > 0 && len(mainFilter.Kinds) > 0 {
+	if groupsFilter.Kinds != nil && normalFilter.Kinds != nil {
 		// mixed kinds - need to split the filter and query both
 		return eventstore.SortedMerge(
-			queryMain(ctx, mainFilter),
+			queryNormal(ctx, normalFilter),
 			groups.State.Query(ctx, groupsFilter),
 		)
-	} else if len(groupsFilter.Kinds) > 0 && len(mainFilter.Kinds) == 0 {
+	} else if groupsFilter.Kinds != nil && normalFilter.Kinds == nil {
 		// only groups kinds requested
 		return groups.State.Query(ctx, filter)
 	} else {
 		// only normal kinds requested
-		return queryMain(ctx, filter)
+		return queryNormal(ctx, filter)
+	}
+}
+
+func queryNormal(ctx context.Context, filter nostr.Filter) iter.Seq[nostr.Event] {
+	// if the query includes ids or common references we'll pass it to the groups db too
+	checkGroupsDB := false
+	if filter.IDs != nil {
+		checkGroupsDB = true
+	} else {
+		for _, tagName := range []string{"e", "E", "a", "A"} {
+			if _, ok := filter.Tags[tagName]; ok {
+				checkGroupsDB = true
+			}
+		}
 	}
+	if checkGroupsDB {
+		return eventstore.SortedMerge(
+			groups.State.Query(ctx, filter),
+			queryMain(ctx, filter),
+		)
+	}
+
+	// otherwise only query the main db
+	return queryMain(ctx, filter)
 }

groups/queries.go

@@ -12,6 +12,7 @@ import (
 func (s *GroupsState) Query(ctx context.Context, filter nostr.Filter) iter.Seq[nostr.Event] {
 	return func(yield func(nostr.Event) bool) {
 		authed := khatru.GetAllAuthed(ctx)
+
 		groupIds, hasGroupIds := filter.Tags["d"]
 		if !hasGroupIds {
 			groupIds, hasGroupIds = filter.Tags["h"]
@@ -64,24 +65,10 @@ func (s *GroupsState) Query(ctx context.Context, filter nostr.Filter) iter.Seq[n
 							return
 						}
 					default:
-						// to return all events from all groups would be insanity
-						// so we do a careful inspection of the filter here
-						//
-						// to begin with, we only accept queries that want one specific event, by either id or addr
-						var results iter.Seq[nostr.Event]
-						if refE, ok := filter.Tags["e"]; ok && len(refE) > 0 {
-							results = s.DB.QueryEvents(filter, 50)
-						} else if refA, ok := filter.Tags["a"]; ok && len(refA) > 0 {
-							results = s.DB.QueryEvents(filter, 50)
-						} else if len(filter.IDs) > 0 {
-							results = s.DB.QueryEvents(filter, len(filter.IDs))
-						} else {
-							results = func(yield func(nostr.Event) bool) {} // nothing
-						}
-
-						// now here in refE/refA/ids we have to check for each result if it is allowed
-						for evt := range results {
-							if group := s.GetGroupFromEvent(evt); !group.Hidden {
+						// query few events here, as we expect to be dealing with
+						// either id queries or ref queries ("#e", "#a" etc)
+						for evt := range s.DB.QueryEvents(filter, 50) {
+							if group := s.GetGroupFromEvent(evt); !group.Hidden && !group.Private {
 								if !yield(evt) {
 									return
 								}
@@ -144,7 +131,7 @@ func (s *GroupsState) Query(ctx context.Context, filter nostr.Filter) iter.Seq[n
 						// normal (non-metadata) events
 						default:
 							// if we are here that means that filter already includes at least an "h" tag
-							// and access control is already validated
+							// and access control is already validated by RequestAuthWhenNecessary()
 							for evt := range s.DB.QueryEvents(filter, 1500) {
 								if !yield(evt) {
 									return