models: Painstakingly converted half the model package to a models & repostiry stucture. All binaries are probably dead at this point.

graph2/gqlgen.yml

@@ -10,22 +10,24 @@ model:
 
 models:
   Tag:
-    model: git.aiterp.net/rpdata/api/model/story.Tag
+    model: git.aiterp.net/rpdata/api/models.Tag
   TagKind:
-    model: git.aiterp.net/rpdata/api/model/story.TagKind
+    model: git.aiterp.net/rpdata/api/models.TagKind
   Character:
-    model: git.aiterp.net/rpdata/api/model/character.Character
+    model: git.aiterp.net/rpdata/api/models.Character
   CharactersFilter:
-    model: git.aiterp.net/rpdata/api/model/character.Filter
+    model: git.aiterp.net/rpdata/api/models/characters.Filter
   Channel:
-    model: git.aiterp.net/rpdata/api/model/channel.Channel
+    model: git.aiterp.net/rpdata/api/models.Channel
   ChannelsFilter:
-    model: git.aiterp.net/rpdata/api/model/channel.Filter
+    model: git.aiterp.net/rpdata/api/models/channels.Filter
   Post:
-    model: git.aiterp.net/rpdata/api/model/log.Post
+    model: git.aiterp.net/rpdata/api/models.Post
+  PostsFilter:
+    model: git.aiterp.net/rpdata/api/models/posts.Filter
   Log:
-    model: git.aiterp.net/rpdata/api/model/log.Log
+    model: git.aiterp.net/rpdata/api/models.Log
   LogsFilter:
-    model: git.aiterp.net/rpdata/api/model/log.Filter
+    model: git.aiterp.net/rpdata/api/models/logs.Filter
   Date:
-    model: git.aiterp.net/rpdata/api/model/scalars.Date
+    model: git.aiterp.net/rpdata/api/models/scalars.Date

graph2/graph.go

@@ -2,12 +2,14 @@ package graph2
 
 import (
 	"git.aiterp.net/rpdata/api/graph2/queries"
+	"git.aiterp.net/rpdata/api/graph2/types"
 	graphql "github.com/99designs/gqlgen/graphql"
 )
 
 //go:generate ./combine.sh
 //go:generate gorunpkg github.com/99designs/gqlgen -v
 
+// New creates a new GraphQL schema.
 func New() graphql.ExecutableSchema {
 	return NewExecutableSchema(Config{
 		Resolvers: &rootResolver{},
@@ -19,3 +21,7 @@ type rootResolver struct{}
 func (r *rootResolver) Query() QueryResolver {
 	return &queries.Resolver
 }
+
+func (r *rootResolver) Log() LogResolver {
+	return &types.LogResolver
+}

graph2/queries/channel.go

@@ -3,13 +3,14 @@ package queries
 import (
 	"context"
 
-	"git.aiterp.net/rpdata/api/model/channel"
+	"git.aiterp.net/rpdata/api/models"
+	"git.aiterp.net/rpdata/api/models/channels"
 )
 
-func (r *resolver) Channel(ctx context.Context, name string) (channel.Channel, error) {
-	return channel.FindName(name)
+func (r *resolver) Channel(ctx context.Context, name string) (models.Channel, error) {
+	return channels.FindName(name)
 }
 
-func (r *resolver) Channels(ctx context.Context, filter *channel.Filter) ([]channel.Channel, error) {
-	return channel.List(filter)
+func (r *resolver) Channels(ctx context.Context, filter *channels.Filter) ([]models.Channel, error) {
+	return channels.List(filter)
 }

graph2/queries/character.go

@@ -4,19 +4,20 @@ import (
 	"context"
 	"errors"
 
-	"git.aiterp.net/rpdata/api/model/character"
+	"git.aiterp.net/rpdata/api/models"
+	"git.aiterp.net/rpdata/api/models/characters"
 )
 
-func (r *resolver) Character(ctx context.Context, id *string, nick *string) (character.Character, error) {
+func (r *resolver) Character(ctx context.Context, id *string, nick *string) (models.Character, error) {
 	if id != nil {
-		return character.FindID(*id)
+		return characters.FindID(*id)
 	} else if nick != nil {
-		return character.FindNick(*nick)
+		return characters.FindNick(*nick)
 	} else {
-		return character.Character{}, errors.New("You must specify either an ID or a nick")
+		return models.Character{}, errors.New("You must specify either an ID or a nick")
 	}
 }
 
-func (r *resolver) Characters(ctx context.Context, filter *character.Filter) ([]character.Character, error) {
-	return character.List(filter)
+func (r *resolver) Characters(ctx context.Context, filter *characters.Filter) ([]models.Character, error) {
+	return characters.List(filter)
 }

graph2/queries/log.go

@@ -3,30 +3,42 @@ package queries
 import (
 	"context"
 	"errors"
+	"strings"
 
 	"git.aiterp.net/rpdata/api/internal/loader"
-	"git.aiterp.net/rpdata/api/model/log"
+	"git.aiterp.net/rpdata/api/models"
+	"git.aiterp.net/rpdata/api/models/logs"
+	"github.com/99designs/gqlgen/graphql"
 )
 
-func (r *resolver) Log(ctx context.Context, id string) (log.Log, error) {
-	return log.FindID(id)
+func (r *resolver) Log(ctx context.Context, id string) (models.Log, error) {
+	return logs.FindID(id)
 }
 
-func (r *resolver) Logs(ctx context.Context, filter *log.Filter) ([]log.Log, error) {
-	logs, err := log.List(filter)
+func (r *resolver) Logs(ctx context.Context, filter *logs.Filter) ([]models.Log, error) {
+	logs, err := logs.List(filter)
 	if err != nil {
 		return nil, err
 	}
 
-	if len(logs) >= 100 {
+	reqCtx := graphql.GetRequestContext(ctx)
+	maybeCharacters := strings.Contains(reqCtx.RawQuery, "characters")
+	maybeChannels := strings.Contains(reqCtx.RawQuery, "channels")
+
+	if len(logs) >= 100 && (maybeCharacters || maybeChannels) {
 		loader := loader.FromContext(ctx)
 		if loader == nil {
 			return nil, errors.New("no loader")
 		}
 
 		for _, log := range logs {
-			loader.PrimeCharacters("id", log.CharacterIDs...)
-			loader.PrimeChannels("name", log.ChannelName)
+			if maybeChannels {
+				loader.PrimeChannels("name", log.ChannelName)
+			}
+
+			if maybeCharacters {
+				loader.PrimeCharacters("id", log.CharacterIDs...)
+			}
 		}
 	}
 

graph2/queries/post.go

@@ -2,14 +2,33 @@ package queries
 
 import (
 	"context"
+	"errors"
 
-	"git.aiterp.net/rpdata/api/model/log"
+	"git.aiterp.net/rpdata/api/models"
+	"git.aiterp.net/rpdata/api/models/posts"
 )
 
-func (r *resolver) Post(ctx context.Context, id string) (log.Post, error) {
-	return log.FindPostID(id)
+func (r *resolver) Post(ctx context.Context, id string) (models.Post, error) {
+	return posts.FindID(id)
 }
 
-func (r *resolver) Posts(ctx context.Context, ids []string) ([]log.Post, error) {
-	return log.ListPostIDs(ids...)
+func (r *resolver) Posts(ctx context.Context, filter *posts.Filter) ([]models.Post, error) {
+	// Some sanity checks to avoid querying an insame amount of posts.
+	if filter == nil {
+		filter = &posts.Filter{Limit: 256}
+	} else {
+		if (filter.Limit <= 0 || filter.Limit > 256) && filter.LogID == nil {
+			return nil, errors.New("a limit of 0 (no limit) or >256 without a logId is not allowed")
+		}
+
+		if len(filter.Kind) > 32 {
+			return nil, errors.New("You cannot specify more than 32 kinds")
+		}
+
+		if len(filter.ID) > 32 {
+			return nil, errors.New("You cannot specify more than 32 IDs")
+		}
+	}
+
+	return posts.List(filter)
 }

graph2/queries/tags.go

@@ -3,9 +3,10 @@ package queries
 import (
 	"context"
 
-	"git.aiterp.net/rpdata/api/model/story"
+	"git.aiterp.net/rpdata/api/models"
+	"git.aiterp.net/rpdata/api/models/tags"
 )
 
-func (r *resolver) Tags(ctx context.Context) ([]story.Tag, error) {
-	return story.ListTags()
+func (r *resolver) Tags(ctx context.Context) ([]models.Tag, error) {
+	return tags.List()
 }

graph2/schema/root.gql

@@ -20,9 +20,8 @@ type Query {
   # Find post by ID.
   post(id: String!): Post!
 
-  # Find posts by IDs. It's meant to allow other parts of the UI to link to a cluster of posts, e.g. for a room description for the
-  # Mapp should it ever become a thing. This does not have a filter, since it's meant to be queried in the logs' response's selection set.
-  posts(ids: [String!]!): [Post!]!
+  # Find posts
+  posts(filter: PostsFilter): [Post!]!
 
 
   # Find log by ID

graph2/schema/types/Log.gql

@@ -21,7 +21,7 @@ type Log {
 
   # The log's event, which is the same as the tags in the previous logbot site.
   # Empty string means that it's no event.
-  event: String!
+  eventName: String!
 
   # The description of a session, which is empty if unset.
   description: String!

graph2/schema/types/Post.gql

@@ -65,4 +65,12 @@ input MovePostInput {
 
   # Target index
   toPosition: Int!
+}
+
+# Filter for posts query
+input PostsFilter {
+  id: [String!]
+  kind: [String!]
+  logId: String
+  limit: Int
 }

graph2/types/log.go

@@ -0,0 +1,40 @@
+package types
+
+import (
+	"context"
+	"errors"
+
+	"git.aiterp.net/rpdata/api/internal/loader"
+	"git.aiterp.net/rpdata/api/models"
+	"git.aiterp.net/rpdata/api/models/posts"
+)
+
+type logResolver struct{}
+
+func (r *logResolver) Channel(ctx context.Context, log *models.Log) (models.Channel, error) {
+	loader := loader.FromContext(ctx)
+	if loader == nil {
+		return models.Channel{}, errors.New("no loader")
+	}
+
+	return loader.Channel("name", log.ChannelName)
+}
+
+func (r *logResolver) Characters(ctx context.Context, log *models.Log) ([]models.Character, error) {
+	loader := loader.FromContext(ctx)
+	if loader == nil {
+		return nil, errors.New("no loader")
+	}
+
+	return loader.Characters("id", log.CharacterIDs...)
+}
+
+func (r *logResolver) Posts(ctx context.Context, log *models.Log, kinds []string) ([]models.Post, error) {
+	return posts.List(&posts.Filter{
+		LogID: &log.ShortID,
+		Kind:  kinds,
+	})
+}
+
+// LogResolver is a resolver
+var LogResolver logResolver