Moved channels to new system, fixed change insert not working.

graph2/complexity.go

@@ -3,7 +3,6 @@ package graph2
 import (
 	"git.aiterp.net/rpdata/api/graph2/graphcore"
 	"git.aiterp.net/rpdata/api/models"
-	"git.aiterp.net/rpdata/api/models/channels"
 	"git.aiterp.net/rpdata/api/models/files"
 	"git.aiterp.net/rpdata/api/models/stories"
 )
@@ -25,7 +24,7 @@ func complexity() (cr graphcore.ComplexityRoot) {
 	cr.Query.Channel = func(childComplexity int, name string) int {
 		return childComplexity + findComplexity
 	}
-	cr.Query.Channels = func(childComplexity int, filter *channels.Filter) int {
+	cr.Query.Channels = func(childComplexity int, filter *models.ChannelFilter) int {
 		return childComplexity + listComplexity
 	}
 	cr.Query.Post = func(childComplexity int, id string) int {

graph2/gqlgen.yml

@@ -24,7 +24,7 @@ models:
   Channel:
     model: git.aiterp.net/rpdata/api/models.Channel
   ChannelsFilter:
-    model: git.aiterp.net/rpdata/api/models/channels.Filter
+    model: git.aiterp.net/rpdata/api/models.ChannelFilter
   UnknownNick:
     model: git.aiterp.net/rpdata/api/models.UnknownNick
   Post:

graph2/resolvers/channel.go

@@ -2,93 +2,48 @@ package resolvers
 
 import (
 	"context"
-	"errors"
-
 	"git.aiterp.net/rpdata/api/graph2/graphcore"
-	"git.aiterp.net/rpdata/api/internal/auth"
 	"git.aiterp.net/rpdata/api/models"
-	"git.aiterp.net/rpdata/api/models/changekeys"
-	"git.aiterp.net/rpdata/api/models/changes"
-	"git.aiterp.net/rpdata/api/models/channels"
 )
 
 // Queries
 
 func (r *queryResolver) Channel(ctx context.Context, name string) (*models.Channel, error) {
-	channel, err := channels.FindName(name)
-	if err != nil {
-		return nil, err
-	}
-
-	return &channel, nil
+	return r.s.Channels.Find(ctx, name)
 }
 
-func (r *queryResolver) Channels(ctx context.Context, filter *channels.Filter) ([]*models.Channel, error) {
-	channels, err := channels.List(filter)
-	if err != nil {
-		return nil, err
+func (r *queryResolver) Channels(ctx context.Context, filter *models.ChannelFilter) ([]*models.Channel, error) {
+	if filter == nil {
+		filter = &models.ChannelFilter{}
 	}
 
-	channels2 := make([]*models.Channel, len(channels))
-	for i := range channels {
-		channels2[i] = &channels[i]
-	}
-
-	return channels2, nil
+	return r.s.Channels.List(ctx, *filter)
 }
 
 // Mutations
 
 func (r *mutationResolver) AddChannel(ctx context.Context, input graphcore.ChannelAddInput) (*models.Channel, error) {
-	token := auth.TokenFromContext(ctx)
-	if !token.Authenticated() || !token.Permitted("channel.add") {
-		return nil, errors.New("You are not permitted to add channels")
-	}
+	logged := input.Logged != nil && *input.Logged
+	hub := input.Hub != nil && *input.Hub
 
-	logged := false
-	if input.Logged != nil {
-		logged = *input.Logged
-	}
-	hub := false
-	if input.Hub != nil {
-		hub = *input.Hub
-	}
-	eventName := ""
-	if input.EventName != nil {
-		eventName = *input.EventName
-	}
 	locationName := ""
 	if input.LocationName != nil {
 		locationName = *input.LocationName
 	}
 
-	channel, err := channels.Add(input.Name, logged, hub, eventName, locationName)
-	if err != nil {
-		return nil, errors.New("Failed to add channel: " + err.Error())
+	eventName := ""
+	if input.LocationName != nil {
+		eventName = *input.EventName
 	}
 
-	go changes.Submit("Channel", "add", token.UserID, true, changekeys.Listed(channel), channel)
-
-	return &channel, nil
+	return r.s.Channels.Create(ctx, input.Name, logged, hub, eventName, locationName)
 }
 
 func (r *mutationResolver) EditChannel(ctx context.Context, input graphcore.ChannelEditInput) (*models.Channel, error) {
-	token := auth.TokenFromContext(ctx)
-	if !token.Authenticated() || !token.Permitted("channel.edit") {
-		return nil, errors.New("You are not permitted to edit channels")
-	}
-
-	channel, err := channels.FindName(input.Name)
-	if err != nil {
-		return nil, errors.New("Channel not found")
-	}
-
-	channel, err = channels.Edit(channel, input.Logged, input.Hub, input.EventName, input.LocationName)
-	if err != nil {
-		return nil, errors.New("Failed to edit channel: " + err.Error())
-	}
-
-	go changes.Submit("Channel", "edit", token.UserID, true, changekeys.Listed(channel), channel)
-
-	return &channel, nil
+	return r.s.Channels.Update(ctx, input.Name, models.ChannelUpdate{
+		Logged:       input.Logged,
+		Hub:          input.Hub,
+		EventName:    input.EventName,
+		LocationName: input.LocationName,
+	})
 }

graph2/types/log.go

@@ -2,25 +2,19 @@ package types
 
 import (
 	"context"
-	"errors"
 	"git.aiterp.net/rpdata/api/services"
 
-	"git.aiterp.net/rpdata/api/internal/loader"
 	"git.aiterp.net/rpdata/api/models"
 )
 
 type logResolver struct {
 	logs       *services.LogService
 	characters *services.CharacterService
+	channels   *services.ChannelService
 }
 
 func (r *logResolver) Channel(ctx context.Context, log *models.Log) (*models.Channel, error) {
-	loader := loader.FromContext(ctx)
-	if loader == nil {
-		return nil, errors.New("no loader")
-	}
-
-	return loader.Channel("name", log.ChannelName)
+	return r.channels.Find(ctx, log.ChannelName)
 }
 
 func (r *logResolver) Characters(ctx context.Context, log *models.Log) ([]*models.Character, error) {
@@ -39,5 +33,5 @@ func (r *logResolver) Posts(ctx context.Context, log *models.Log, kinds []string
 
 // LogResolver is a resolver
 func LogResolver(s *services.Bundle) *logResolver {
-	return &logResolver{characters: s.Characters, logs: s.Logs}
+	return &logResolver{characters: s.Characters, logs: s.Logs, channels: s.Channels}
 }