Eugh.

graph2/graph.go

@@ -47,6 +47,10 @@ func (r *rootResolver) Story() StoryResolver {
 	return &types.StoryResolver
 }
 
+func (r *rootResolver) File() FileResolver {
+	return &types.FileResolver
+}
+
 func (r *rootResolver) Change() ChangeResolver {
 	return &types.ChangeResolver
 }

graph2/queries/changes.go

@@ -16,7 +16,7 @@ func (r *resolver) Changes(ctx context.Context, filter *changes.Filter) ([]model
 
 /// Subscriptions
 
-func (r *subscriptionResolver) Changes(ctx context.Context, keys []models.ChangeKey) (<-chan *models.Change, error) {
+func (r *subscriptionResolver) Changes(ctx context.Context, keys []models.ChangeKey) (<-chan models.Change, error) {
 	if len(keys) == 0 {
 		return nil, errors.New("At least one key is required for a subscription")
 	}

graph2/queries/channel.go

@@ -15,12 +15,7 @@ import (
 // Queries
 
 func (r *resolver) Channel(ctx context.Context, name string) (*models.Channel, error) {
-	channel, err := channels.FindName(name)
+	return channels.FindName(name)
-	if err != nil {
-		return nil, err
-	}
-
-	return &channel, nil
 }
 
 func (r *resolver) Channels(ctx context.Context, filter *channels.Filter) ([]models.Channel, error) {
@@ -59,7 +54,7 @@ func (r *mutationResolver) AddChannel(ctx context.Context, input input.ChannelAd
 
 	go changes.Submit("Channel", "add", token.UserID, true, changekeys.Listed(channel), channel)
 
-	return &channel, nil
+	return channel, nil
 }
 
 func (r *mutationResolver) EditChannel(ctx context.Context, input input.ChannelEditInput) (*models.Channel, error) {
@@ -73,12 +68,12 @@ func (r *mutationResolver) EditChannel(ctx context.Context, input input.ChannelE
 		return nil, errors.New("Channel not found")
 	}
 
-	channel, err = channels.Edit(channel, input.Logged, input.Hub, input.EventName, input.LocationName)
+	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 channel, nil
 }

graph2/queries/chapter.go

@@ -5,25 +5,22 @@ import (
 	"errors"
 	"time"
 
-	"git.aiterp.net/rpdata/api/graph2/input"
-	"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/chapters"
 	"git.aiterp.net/rpdata/api/models/comments"
+
+	"git.aiterp.net/rpdata/api/internal/auth"
 	"git.aiterp.net/rpdata/api/models/stories"
+
+	"git.aiterp.net/rpdata/api/graph2/input"
+	"git.aiterp.net/rpdata/api/models"
+	"git.aiterp.net/rpdata/api/models/chapters"
 )
 
 // Queries
 
 func (r *resolver) Chapter(ctx context.Context, id string) (*models.Chapter, error) {
-	chapter, err := chapters.FindID(id)
+	return chapters.FindID(id)
-	if err != nil {
-		return nil, err
-	}
-
-	return &chapter, nil
 }
 
 // Mutations
@@ -57,7 +54,7 @@ func (r *mutationResolver) AddChapter(ctx context.Context, input input.ChapterAd
 		commentMode = *input.CommentMode
 	}
 
-	chapter, err := chapters.Add(story, input.Title, author, input.Source, time.Now(), input.FictionalDate, commentMode)
+	chapter, err := chapters.Add(*story, input.Title, author, input.Source, time.Now(), input.FictionalDate, commentMode)
 	if err != nil {
 		return nil, errors.New("Failed to create chapter: " + err.Error())
 	}
@@ -88,7 +85,7 @@ func (r *mutationResolver) MoveChapter(ctx context.Context, input input.ChapterM
 	}
 
 	oldStoryID := chapter.StoryID
-	chapter, err = chapters.Move(chapter, target)
+	chapter, err = chapters.Move(chapter, *target)
 	if err != nil {
 		return nil, errors.New("Failed to move chapter: " + err.Error())
 	}

graph2/queries/character.go

@@ -16,23 +16,13 @@ import (
 
 // Queries
 
-func (r *resolver) Character(ctx context.Context, id *string, nick *string) (*models.Character, error) {
+func (r *resolver) Character(ctx context.Context, id *string, nick *string) (models.Character, error) {
 	if id != nil {
-		character, err := characters.FindID(*id)
+		return characters.FindID(*id)
-		if err != nil {
-			return nil, err
-		}
-
-		return &character, nil
 	} else if nick != nil {
-		character, err := characters.FindNick(*nick)
+		return characters.FindNick(*nick)
-		if err != nil {
-			return nil, err
-		}
-
-		return &character, nil
 	} else {
-		return nil, 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")
 	}
 }
 
@@ -42,13 +32,13 @@ func (r *resolver) Characters(ctx context.Context, filter *characters.Filter) ([
 
 // Mutations
 
-func (r *mutationResolver) AddCharacter(ctx context.Context, input input.CharacterAddInput) (*models.Character, error) {
+func (r *mutationResolver) AddCharacter(ctx context.Context, input input.CharacterAddInput) (models.Character, error) {
 	token := auth.TokenFromContext(ctx)
 	if !token.Permitted("member", "character.add") {
-		return nil, errors.New("You are not permitted to add characters")
+		return models.Character{}, errors.New("You are not permitted to add characters")
 	}
 	if len(input.Name) < 2 || len(input.Nick) < 2 {
-		return nil, errors.New("You need to provide a name and a nick (min length: 2)")
+		return models.Character{}, errors.New("You need to provide a name and a nick (min length: 2)")
 	}
 
 	shortName := ""
@@ -66,7 +56,7 @@ func (r *mutationResolver) AddCharacter(ctx context.Context, input input.Charact
 	author := token.UserID
 	if input.Author != nil && *input.Author != author {
 		if !token.Permitted("character.add") {
-			return nil, errors.New("You are only permitted to add your own characters")
+			return models.Character{}, errors.New("You are only permitted to add your own characters")
 		}
 
 		author = *input.Author
@@ -76,109 +66,109 @@ func (r *mutationResolver) AddCharacter(ctx context.Context, input input.Charact
 
 	character, err := characters.Add(input.Nick, input.Name, shortName, author, description)
 	if err != nil {
-		return nil, errors.New("Adding character failed: " + err.Error())
+		return models.Character{}, errors.New("Adding character failed: " + err.Error())
 	}
 
 	go changes.Submit("Character", "add", token.UserID, true, changekeys.Listed(character), character)
 
-	return &character, nil
+	return character, nil
 }
 
-func (r *mutationResolver) AddCharacterNick(ctx context.Context, input input.CharacterNickInput) (*models.Character, error) {
+func (r *mutationResolver) AddCharacterNick(ctx context.Context, input input.CharacterNickInput) (models.Character, error) {
 	character, err := characters.FindID(input.ID)
 	if err != nil {
-		return nil, errors.New("Character not found")
+		return models.Character{}, errors.New("Character not found")
 	}
 
 	if len(input.Nick) < 2 {
-		return nil, errors.New("You need to provide a valid nick (min length: 2)")
+		return models.Character{}, errors.New("You need to provide a valid nick (min length: 2)")
 	}
 
 	token := auth.TokenFromContext(ctx)
 	if !token.PermittedUser(character.Author, "member", "character.edit") {
-		return nil, errors.New("You are not permitted to edit this character")
+		return models.Character{}, errors.New("You are not permitted to edit this character")
 	}
 
 	logs.ScheduleFullUpdate()
 
 	character, err = characters.AddNick(character, input.Nick)
 	if err != nil {
-		return nil, errors.New("Failed to add nick: " + err.Error())
+		return models.Character{}, errors.New("Failed to add nick: " + err.Error())
 	}
 
 	go logs.ScheduleFullUpdate()
 	go changes.Submit("Character", "edit", token.UserID, true, changekeys.Listed(character), character)
 
-	return &character, nil
+	return character, nil
 }
 
-func (r *mutationResolver) RemoveCharacterNick(ctx context.Context, input input.CharacterNickInput) (*models.Character, error) {
+func (r *mutationResolver) RemoveCharacterNick(ctx context.Context, input input.CharacterNickInput) (models.Character, error) {
 	character, err := characters.FindID(input.ID)
 	if err != nil {
-		return nil, errors.New("Character not found")
+		return models.Character{}, errors.New("Character not found")
 	}
 
 	token := auth.TokenFromContext(ctx)
 	if !token.PermittedUser(character.Author, "member", "character.edit") {
-		return nil, errors.New("You are not permitted to edit this character")
+		return models.Character{}, errors.New("You are not permitted to edit this character")
 	}
 
 	character, err = characters.RemoveNick(character, input.Nick)
 	if err != nil {
-		return nil, errors.New("Failed to remove nick: " + err.Error())
+		return models.Character{}, errors.New("Failed to remove nick: " + err.Error())
 	}
 
 	go logs.ScheduleFullUpdate()
 	go changes.Submit("Character", "edit", token.UserID, true, changekeys.Listed(character), character)
 
-	return &character, nil
+	return character, nil
 }
 
-func (r *mutationResolver) EditCharacter(ctx context.Context, input input.CharacterEditInput) (*models.Character, error) {
+func (r *mutationResolver) EditCharacter(ctx context.Context, input input.CharacterEditInput) (models.Character, error) {
 	character, err := characters.FindID(input.ID)
 	if err != nil {
-		return nil, errors.New("Character not found")
+		return models.Character{}, errors.New("Character not found")
 	}
 
 	if input.Name != nil && len(*input.Name) < 2 {
-		return nil, errors.New("You need to provide a valid name (min length: 2)")
+		return models.Character{}, errors.New("You need to provide a valid name (min length: 2)")
 	}
 	if input.ShortName != nil && len(*input.ShortName) < 2 {
-		return nil, errors.New("You need to provide a valid short name (min length: 2)")
+		return models.Character{}, errors.New("You need to provide a valid short name (min length: 2)")
 	}
 
 	token := auth.TokenFromContext(ctx)
 	if !token.PermittedUser(character.Author, "member", "character.edit") {
-		return nil, errors.New("You are not permitted to edit this character")
+		return models.Character{}, errors.New("You are not permitted to edit this character")
 	}
 
 	character, err = characters.Edit(character, input.Name, input.ShortName, input.Description)
 	if err != nil {
-		return nil, errors.New("Failed to edit character: " + err.Error())
+		return models.Character{}, errors.New("Failed to edit character: " + err.Error())
 	}
 
 	go changes.Submit("Character", "edit", token.UserID, true, changekeys.Listed(character), character)
 
-	return &character, nil
+	return character, nil
 }
 
-func (r *mutationResolver) RemoveCharacter(ctx context.Context, input input.CharacterRemoveInput) (*models.Character, error) {
+func (r *mutationResolver) RemoveCharacter(ctx context.Context, input input.CharacterRemoveInput) (models.Character, error) {
 	character, err := characters.FindID(input.ID)
 	if err != nil {
-		return nil, errors.New("Character not found")
+		return models.Character{}, errors.New("Character not found")
 	}
 
 	token := auth.TokenFromContext(ctx)
 	if !token.PermittedUser(character.Author, "member", "character.remove") {
-		return nil, errors.New("You are not permitted to remove this character")
+		return models.Character{}, errors.New("You are not permitted to remove this character")
 	}
 
 	character, err = characters.Remove(character)
 	if err != nil {
-		return nil, errors.New("Failed to remove character: " + err.Error())
+		return models.Character{}, errors.New("Failed to remove character: " + err.Error())
 	}
 
 	go changes.Submit("Character", "remove", token.UserID, true, changekeys.Listed(character), character)
 
-	return &character, nil
+	return character, nil
 }

graph2/queries/comment.go

@@ -24,39 +24,34 @@ import (
 
 // Queries
 
-func (r *resolver) Comment(ctx context.Context, id string) (*models.Comment, error) {
+func (r *resolver) Comment(ctx context.Context, id string) (models.Comment, error) {
-	comment, err := comments.Find(id)
+	return comments.Find(id)
-	if err != nil {
-		return nil, err
-	}
-
-	return &comment, nil
 }
 
 // Mutations
 
-func (r *mutationResolver) AddComment(ctx context.Context, input input.CommentAddInput) (*models.Comment, error) {
+func (r *mutationResolver) AddComment(ctx context.Context, input input.CommentAddInput) (models.Comment, error) {
 	chapter, err := chapters.FindID(input.ChapterID)
 	if err != nil {
-		return nil, errors.New("Chapter not found")
+		return models.Comment{}, errors.New("Chapter not found")
 	}
 
 	token := auth.TokenFromContext(ctx)
 	if !token.Permitted("member", "story.edit") {
-		return nil, errors.New("Unauthorized")
+		return models.Comment{}, errors.New("Unauthorized")
 	}
 
 	if !chapter.CanComment() {
-		return nil, errors.New("Comments are disabled or locked")
+		return models.Comment{}, errors.New("Comments are disabled or locked")
 	}
 
 	var characterPtr *models.Character
 	if input.CharacterID != nil {
 		character, err := characters.FindID(*input.CharacterID)
 		if err != nil {
-			return nil, errors.New("Character not found")
+			return models.Comment{}, errors.New("Character not found")
 		} else if character.Author != token.UserID {
-			return nil, errors.New("That is not your character")
+			return models.Comment{}, errors.New("That is not your character")
 		}
 
 		characterPtr = &character
@@ -74,7 +69,7 @@ func (r *mutationResolver) AddComment(ctx context.Context, input input.CommentAd
 
 	comment, err := comments.Add(chapter, subject, token.UserID, input.Source, input.CharacterName, characterPtr, time.Now(), fictionalDate)
 	if err != nil {
-		return nil, errors.New("Failed to add comment: " + err.Error())
+		return models.Comment{}, errors.New("Failed to add comment: " + err.Error())
 	}
 
 	go func() {
@@ -87,27 +82,27 @@ func (r *mutationResolver) AddComment(ctx context.Context, input input.CommentAd
 		changes.Submit("Comment", "add", token.UserID, true, changekeys.Many(comment, chapter, models.Story{ID: chapter.StoryID}), comment, chapter, story)
 	}()
 
-	return &comment, nil
+	return comment, nil
 }
 
-func (r *mutationResolver) EditComment(ctx context.Context, input input.CommentEditInput) (*models.Comment, error) {
+func (r *mutationResolver) EditComment(ctx context.Context, input input.CommentEditInput) (models.Comment, error) {
 	comment, err := comments.Find(input.CommentID)
 	if err != nil {
-		return nil, errors.New("Comment not found")
+		return models.Comment{}, errors.New("Comment not found")
 	}
 
 	token := auth.TokenFromContext(ctx)
 	if !token.PermittedUser(comment.Author, "member", "story.edit") {
-		return nil, errors.New("You cannot edit this comment")
+		return models.Comment{}, errors.New("You cannot edit this comment")
 	}
 
 	chapter, err := chapters.FindID(comment.ChapterID)
 	if err != nil {
-		return nil, errors.New("Comment's chapter not found")
+		return models.Comment{}, errors.New("Comment's chapter not found")
 	}
 
 	if !chapter.CanComment() {
-		return nil, errors.New("Comments are disabled or locked")
+		return models.Comment{}, errors.New("Comments are disabled or locked")
 	}
 
 	if input.ClearFictionalDate != nil && *input.ClearFictionalDate == true {
@@ -117,15 +112,15 @@ func (r *mutationResolver) EditComment(ctx context.Context, input input.CommentE
 	if input.CharacterID != nil && *input.CharacterID != "" {
 		character, err := characters.FindID(*input.CharacterID)
 		if err != nil {
-			return nil, errors.New("Character not found")
+			return models.Comment{}, errors.New("Character not found")
 		} else if character.Author != token.UserID {
-			return nil, errors.New("That is not your character")
+			return models.Comment{}, errors.New("That is not your character")
 		}
 	}
 
 	comment, err = comments.Edit(comment, input.Source, input.CharacterName, input.CharacterID, input.Subject, input.FictionalDate)
 	if err != nil {
-		return nil, errors.New("Could not post comment: " + err.Error())
+		return models.Comment{}, errors.New("Could not post comment: " + err.Error())
 	}
 
 	go func() {
@@ -138,32 +133,32 @@ func (r *mutationResolver) EditComment(ctx context.Context, input input.CommentE
 		changes.Submit("Comment", "edit", token.UserID, true, changekeys.Many(comment, chapter, models.Story{ID: chapter.StoryID}), comment, chapter, story)
 	}()
 
-	return &comment, nil
+	return comment, nil
 }
 
-func (r *mutationResolver) RemoveComment(ctx context.Context, input input.CommentRemoveInput) (*models.Comment, error) {
+func (r *mutationResolver) RemoveComment(ctx context.Context, input input.CommentRemoveInput) (models.Comment, error) {
 	comment, err := comments.Find(input.CommentID)
 	if err != nil {
-		return nil, errors.New("Comment not found")
+		return models.Comment{}, errors.New("Comment not found")
 	}
 
 	token := auth.TokenFromContext(ctx)
 	if !token.PermittedUser(comment.Author, "member", "story.edit") {
-		return nil, errors.New("You cannot remove this comment")
+		return models.Comment{}, errors.New("You cannot remove this comment")
 	}
 
 	chapter, err := chapters.FindID(comment.ChapterID)
 	if err != nil {
-		return nil, errors.New("Comment's chapter not found")
+		return models.Comment{}, errors.New("Comment's chapter not found")
 	}
 
 	if !chapter.CanComment() {
-		return nil, errors.New("Comments are disabled or locked")
+		return models.Comment{}, errors.New("Comments are disabled or locked")
 	}
 
 	err = comments.Remove(comment)
 	if err != nil {
-		return nil, errors.New("Failed to remove comment: " + err.Error())
+		return models.Comment{}, errors.New("Failed to remove comment: " + err.Error())
 	}
 
 	go func() {
@@ -176,5 +171,5 @@ func (r *mutationResolver) RemoveComment(ctx context.Context, input input.Commen
 		changes.Submit("Comment", "remove", token.UserID, true, changekeys.Many(comment, chapter, models.Story{ID: chapter.StoryID}), comment, chapter, story)
 	}()
 
-	return &comment, nil
+	return comment, nil
 }

graph2/queries/file.go

@@ -8,13 +8,8 @@ import (
 	"git.aiterp.net/rpdata/api/models/files"
 )
 
-func (r *resolver) File(ctx context.Context, id string) (*models.File, error) {
+func (r *resolver) File(ctx context.Context, id string) (models.File, error) {
-	file, err := files.FindID(id)
+	return files.FindID(id)
-	if err != nil {
-		return nil, err
-	}
-
-	return &file, nil
 }
 
 func (r *resolver) Files(ctx context.Context, filter *files.Filter) ([]models.File, error) {

graph2/queries/log.go

@@ -20,13 +20,8 @@ import (
 
 // Queries
 
-func (r *resolver) Log(ctx context.Context, id string) (*models.Log, error) {
+func (r *resolver) Log(ctx context.Context, id string) (models.Log, error) {
-	log, err := logs.FindID(id)
+	return logs.FindID(id)
-	if err != nil {
-		return nil, err
-	}
-
-	return &log, nil
 }
 
 func (r *resolver) Logs(ctx context.Context, filter *logs.Filter) ([]models.Log, error) {
@@ -61,10 +56,10 @@ func (r *resolver) Logs(ctx context.Context, filter *logs.Filter) ([]models.Log,
 
 // Mutations
 
-func (r *mutationResolver) AddLog(ctx context.Context, input input.LogAddInput) (*models.Log, error) {
+func (r *mutationResolver) AddLog(ctx context.Context, input input.LogAddInput) (models.Log, error) {
 	token := auth.TokenFromContext(ctx)
 	if !token.Authenticated() || !token.Permitted("log.add") {
-		return nil, errors.New("You are not permitted to add logs")
+		return models.Log{}, errors.New("You are not permitted to add logs")
 	}
 
 	open := input.Open != nil && *input.Open == true
@@ -85,7 +80,7 @@ func (r *mutationResolver) AddLog(ctx context.Context, input input.LogAddInput)
 
 	log, err := logs.Add(input.Date, input.Channel, title, event, description, open)
 	if !token.Authenticated() || !token.Permitted("log.add") {
-		return nil, errors.New("Failed to create log: " + err.Error())
+		return models.Log{}, errors.New("Failed to create log: " + err.Error())
 	}
 
 	go func() {
@@ -99,7 +94,7 @@ func (r *mutationResolver) AddLog(ctx context.Context, input input.LogAddInput)
 		changes.Submit("Log", "add", token.UserID, true, changekeys.Listed(log), log)
 	}()
 
-	return &log, nil
+	return log, nil
 }
 
 func (r *mutationResolver) ImportLog(ctx context.Context, input input.LogImportInput) ([]models.Log, error) {
@@ -146,44 +141,44 @@ func (r *mutationResolver) ImportLog(ctx context.Context, input input.LogImportI
 	return newLogs, nil
 }
 
-func (r *mutationResolver) EditLog(ctx context.Context, input input.LogEditInput) (*models.Log, error) {
+func (r *mutationResolver) EditLog(ctx context.Context, input input.LogEditInput) (models.Log, error) {
 	token := auth.TokenFromContext(ctx)
 	if !token.Authenticated() || !token.Permitted("log.edit") {
-		return nil, errors.New("You are not permitted to edit logs")
+		return models.Log{}, errors.New("You are not permitted to edit logs")
 	}
 
 	log, err := logs.FindID(input.ID)
 	if err != nil {
-		return nil, errors.New("Log not found")
+		return models.Log{}, errors.New("Log not found")
 	}
 
 	log, err = logs.Edit(log, input.Title, input.Event, input.Description, input.Open)
 	if err != nil {
-		return nil, errors.New("Failed to edit log: " + err.Error())
+		return models.Log{}, errors.New("Failed to edit log: " + err.Error())
 	}
 
 	go changes.Submit("Log", "edit", token.UserID, true, changekeys.Listed(log), log)
 
-	return &log, nil
+	return log, nil
 }
 
-func (r *mutationResolver) RemoveLog(ctx context.Context, input input.LogRemoveInput) (*models.Log, error) {
+func (r *mutationResolver) RemoveLog(ctx context.Context, input input.LogRemoveInput) (models.Log, error) {
 	token := auth.TokenFromContext(ctx)
 	if !token.Authenticated() || !token.Permitted("log.remove") {
-		return nil, errors.New("You are not permitted to remove logs")
+		return models.Log{}, errors.New("You are not permitted to remove logs")
 	}
 
 	log, err := logs.FindID(input.ID)
 	if err != nil {
-		return nil, errors.New("Log not found")
+		return models.Log{}, errors.New("Log not found")
 	}
 
 	log, err = logs.Remove(log)
 	if err != nil {
-		return nil, errors.New("Failed to remove log: " + err.Error())
+		return models.Log{}, errors.New("Failed to remove log: " + err.Error())
 	}
 
 	go changes.Submit("Log", "remove", token.UserID, true, changekeys.Listed(log), log)
 
-	return &log, nil
+	return log, nil
 }

graph2/queries/post.go

@@ -16,13 +16,8 @@ import (
 
 // Queries
 
-func (r *resolver) Post(ctx context.Context, id string) (*models.Post, error) {
+func (r *resolver) Post(ctx context.Context, id string) (models.Post, error) {
-	post, err := posts.FindID(id)
+	return posts.FindID(id)
-	if err != nil {
-		return nil, err
-	}
-
-	return &post, nil
 }
 
 func (r *resolver) Posts(ctx context.Context, filter *posts.Filter) ([]models.Post, error) {
@@ -48,37 +43,37 @@ func (r *resolver) Posts(ctx context.Context, filter *posts.Filter) ([]models.Po
 
 // Mutation
 
-func (r *mutationResolver) AddPost(ctx context.Context, input input.PostAddInput) (*models.Post, error) {
+func (r *mutationResolver) AddPost(ctx context.Context, input input.PostAddInput) (models.Post, error) {
 	token := auth.TokenFromContext(ctx)
 	if !token.Authenticated() || !token.Permitted("post.add") {
-		return nil, errors.New("You are not permitted to edit logs")
+		return models.Post{}, errors.New("You are not permitted to edit logs")
 	}
 
 	log, err := logs.FindID(input.LogID)
 	if err != nil {
-		return nil, err
+		return models.Post{}, err
 	}
 
 	post, err := posts.Add(log, input.Time, input.Kind, input.Nick, input.Text)
 	if err != nil {
-		return nil, err
+		return models.Post{}, err
 	}
 
 	go logs.UpdateCharacters(log, nil)
 	go changes.Submit("Post", "add", token.UserID, true, changekeys.Many(log, post), post)
 
-	return &post, nil
+	return post, nil
 }
 
-func (r *mutationResolver) EditPost(ctx context.Context, input input.PostEditInput) (*models.Post, error) {
+func (r *mutationResolver) EditPost(ctx context.Context, input input.PostEditInput) (models.Post, error) {
 	token := auth.TokenFromContext(ctx)
 	if !token.Authenticated() || !token.Permitted("post.edit") {
-		return nil, errors.New("You are not permitted to edit logs")
+		return models.Post{}, errors.New("You are not permitted to edit logs")
 	}
 
 	post, err := posts.FindID(input.ID)
 	if err != nil {
-		return nil, errors.New("Post not found")
+		return models.Post{}, errors.New("Post not found")
 	}
 
 	if input.Nick != nil {
@@ -94,7 +89,7 @@ func (r *mutationResolver) EditPost(ctx context.Context, input input.PostEditInp
 
 	post, err = posts.Edit(post, input.Time, input.Kind, input.Nick, input.Text)
 	if err != nil {
-		return nil, errors.New("Adding post failed: " + err.Error())
+		return models.Post{}, errors.New("Adding post failed: " + err.Error())
 	}
 
 	go func() {
@@ -106,7 +101,7 @@ func (r *mutationResolver) EditPost(ctx context.Context, input input.PostEditInp
 		changes.Submit("Post", "edit", token.UserID, true, changekeys.Many(log, post), post)
 	}()
 
-	return &post, nil
+	return post, nil
 }
 
 func (r *mutationResolver) MovePost(ctx context.Context, input input.PostMoveInput) ([]models.Post, error) {
@@ -137,20 +132,20 @@ func (r *mutationResolver) MovePost(ctx context.Context, input input.PostMoveInp
 	return posts, nil
 }
 
-func (r *mutationResolver) RemovePost(ctx context.Context, input input.PostRemoveInput) (*models.Post, error) {
+func (r *mutationResolver) RemovePost(ctx context.Context, input input.PostRemoveInput) (models.Post, error) {
 	token := auth.TokenFromContext(ctx)
 	if !token.Authenticated() || !token.Permitted("post.remove") {
-		return nil, errors.New("You are not permitted to edit logs")
+		return models.Post{}, errors.New("You are not permitted to edit logs")
 	}
 
 	post, err := posts.FindID(input.ID)
 	if err != nil {
-		return nil, errors.New("Post not found (before removing, of course)")
+		return models.Post{}, errors.New("Post not found (before removing, of course)")
 	}
 
 	post, err = posts.Remove(post)
 	if err != nil {
-		return nil, errors.New("Could not remove post: " + err.Error())
+		return models.Post{}, errors.New("Could not remove post: " + err.Error())
 	}
 
 	go func() {
@@ -163,5 +158,5 @@ func (r *mutationResolver) RemovePost(ctx context.Context, input input.PostRemov
 		changes.Submit("Post", "remove", token.UserID, true, changekeys.Many(log, post), post)
 	}()
 
-	return &post, nil
+	return post, nil
 }

graph2/queries/story.go

@@ -16,12 +16,7 @@ import (
 )
 
 func (r *resolver) Story(ctx context.Context, id string) (*models.Story, error) {
-	story, err := stories.FindID(id)
+	return stories.FindID(id)
-	if err != nil {
-		return nil, err
-	}
-
-	return &story, nil
 }
 
 func (r *resolver) Stories(ctx context.Context, filter *stories.Filter) ([]models.Story, error) {
@@ -73,7 +68,7 @@ func (r *mutationResolver) AddStory(ctx context.Context, input input.StoryAddInp
 
 	go changes.Submit("Story", "add", token.UserID, story.Listed, changekeys.Listed(story), story)
 
-	return &story, nil
+	return story, nil
 }
 
 func (r *mutationResolver) AddStoryTag(ctx context.Context, input input.StoryTagAddInput) (*models.Story, error) {
@@ -94,14 +89,14 @@ func (r *mutationResolver) AddStoryTag(ctx context.Context, input input.StoryTag
 		}
 	}
 
-	story, err = stories.AddTag(story, input.Tag)
+	story, err = stories.AddTag(*story, input.Tag)
 	if err != nil {
 		return nil, errors.New("Failed to add story: " + err.Error())
 	}
 
 	go changes.Submit("Story", "tag", token.UserID, story.Listed, changekeys.Listed(story), story, input.Tag)
 
-	return &story, nil
+	return story, nil
 }
 
 func (r *mutationResolver) RemoveStoryTag(ctx context.Context, input input.StoryTagRemoveInput) (*models.Story, error) {
@@ -122,14 +117,14 @@ func (r *mutationResolver) RemoveStoryTag(ctx context.Context, input input.Story
 		}
 	}
 
-	story, err = stories.RemoveTag(story, input.Tag)
+	story, err = stories.RemoveTag(*story, input.Tag)
 	if err != nil {
 		return nil, errors.New("Failed to add story: " + err.Error())
 	}
 
 	go changes.Submit("Story", "untag", token.UserID, story.Listed, changekeys.Listed(story), story, input.Tag)
 
-	return &story, nil
+	return story, nil
 }
 
 func (r *mutationResolver) EditStory(ctx context.Context, input input.StoryEditInput) (*models.Story, error) {
@@ -148,14 +143,14 @@ func (r *mutationResolver) EditStory(ctx context.Context, input input.StoryEditI
 		input.FictionalDate = &time.Time{}
 	}
 
-	story, err = stories.Edit(story, input.Name, input.Category, input.Listed, input.Open, input.FictionalDate)
+	story, err = stories.Edit(*story, input.Name, input.Category, input.Listed, input.Open, input.FictionalDate)
 	if err != nil {
 		return nil, errors.New("Failed to add story: " + err.Error())
 	}
 
 	go changes.Submit("Story", "edit", token.UserID, story.Listed, changekeys.Listed(story), story)
 
-	return &story, nil
+	return story, nil
 }
 
 func (r *mutationResolver) RemoveStory(ctx context.Context, input input.StoryRemoveInput) (*models.Story, error) {
@@ -170,17 +165,17 @@ func (r *mutationResolver) RemoveStory(ctx context.Context, input input.StoryRem
 		return nil, errors.New("You are not permitted to remove this story")
 	}
 
-	story, err = stories.Remove(story)
+	story, err = stories.Remove(*story)
 	if err != nil {
 		return nil, err
 	}
 
-	err = chapters.RemoveStory(story)
+	err = chapters.RemoveStory(*story)
 	if err != nil {
 		return nil, errors.New("Failed to remove chapters, but story is removed: " + err.Error())
 	}
 
 	go changes.Submit("Story", "remove", token.UserID, story.Listed, changekeys.Listed(story), story)
 
-	return &story, nil
+	return story, nil
 }

graph2/queries/token.go

@@ -8,11 +8,11 @@ import (
 	"git.aiterp.net/rpdata/api/models"
 )
 
-func (r *resolver) Token(ctx context.Context) (*models.Token, error) {
+func (r *resolver) Token(ctx context.Context) (models.Token, error) {
 	token := auth.TokenFromContext(ctx)
 	if !token.Authenticated() {
-		return nil, errors.New("No (valid) token")
+		return models.Token{}, errors.New("No (valid) token")
 	}
 
-	return token, nil
+	return *token, nil
 }

graph2/types/change.go

@@ -2,6 +2,7 @@ package types
 
 import (
 	"context"
+	"log"
 
 	"git.aiterp.net/rpdata/api/graph2/input"
 	"git.aiterp.net/rpdata/api/models"
@@ -14,8 +15,10 @@ func (r *changeResolver) Objects(ctx context.Context, obj *models.Change) ([]inp
 
 	results := make([]input.ChangeObject, 0, len(objects))
 	for _, object := range objects {
-		if changeObject, ok := object.(input.ChangeObject); ok {
+		if cObj, ok := object.(input.ChangeObject); ok {
-			results = append(results, changeObject)
+			results = append(results, cObj)
+		} else {
+			log.Printf("Warning: %T is not a change object", object)
 		}
 	}
 

graph2/types/file.go

@@ -0,0 +1,16 @@
+package types
+
+import (
+	"context"
+
+	"git.aiterp.net/rpdata/api/models"
+)
+
+type fileResolver struct{}
+
+func (r *fileResolver) Size(ctx context.Context, file *models.File) (int, error) {
+	return int(file.Size), nil
+}
+
+// FileResolver is a resolver
+var FileResolver fileResolver

graph2/types/log.go

@@ -11,10 +11,10 @@ import (
 
 type logResolver struct{}
 
-func (r *logResolver) Channel(ctx context.Context, log *models.Log) (*models.Channel, error) {
+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 models.Channel{}, errors.New("no loader")
 	}
 
 	return loader.Channel("name", log.ChannelName)

graph2/types/token.go

@@ -9,13 +9,8 @@ import (
 
 type tokenResolver struct{}
 
-func (r *tokenResolver) User(ctx context.Context, token *models.Token) (*models.User, error) {
+func (r *tokenResolver) User(ctx context.Context, token *models.Token) (models.User, error) {
-	user, err := users.Find(token.UserID)
+	return users.Find(token.UserID)
-	if err != nil {
-		return nil, err
-	}
-
-	return &user, nil
 }
 
 // TokenResolver is a resolver

internal/loader/channel.go

@@ -11,13 +11,13 @@ import (
 )
 
 // Channel gets a character by key
-func (loader *Loader) Channel(key, value string) (*models.Channel, error) {
+func (loader *Loader) Channel(key, value string) (models.Channel, error) {
 	if !strings.HasPrefix(key, "Channel.") {
 		key = "Channel." + key
 	}
 
 	if loader.loaders[key] == nil {
-		return nil, errors.New("unsupported key")
+		return models.Channel{}, errors.New("unsupported key")
 	}
 
 	loader.loadPrimed(key)
@@ -25,15 +25,15 @@ func (loader *Loader) Channel(key, value string) (*models.Channel, error) {
 	thunk := loader.loaders[key].Load(loader.ctx, dataloader.StringKey(value))
 	res, err := thunk()
 	if err != nil {
-		return nil, err
+		return models.Channel{}, err
 	}
 
 	channel, ok := res.(models.Channel)
 	if !ok {
-		return nil, errors.New("incorrect type")
+		return channel, errors.New("incorrect type")
 	}
 
-	return &channel, nil
+	return channel, nil
 }
 
 // PrimeChannels primes channels for loading along with the first one.

models/changes/subscribe.go

@@ -12,13 +12,13 @@ var subList []*subscription
 
 type subscription struct {
 	Keys     map[string]bool
-	Channel  chan<- *models.Change
+	Channel  chan<- models.Change
 	WildCard bool
 }
 
 // Subscribe subscribes to all changes.
-func Subscribe(ctx context.Context, keys []models.ChangeKey, wildcard bool) <-chan *models.Change {
+func Subscribe(ctx context.Context, keys []models.ChangeKey, wildcard bool) <-chan models.Change {
-	channel := make(chan *models.Change, 64)
+	channel := make(chan models.Change, 64)
 	sub := &subscription{
 		Keys:     make(map[string]bool, len(keys)),
 		Channel:  channel,
@@ -58,18 +58,16 @@ func pushToSubscribers(change models.Change) {
 	subMutex.Lock()
 SubLoop:
 	for _, sub := range subList {
-		changeCopy := change
-
 		if sub.WildCard && change.Listed {
 			select {
-			case sub.Channel <- &changeCopy:
+			case sub.Channel <- change:
 			default:
 			}
 		} else {
 			for _, key := range keys {
 				if sub.Keys[key] {
 					select {
-					case sub.Channel <- &changeCopy:
+					case sub.Channel <- change:
 					default:
 					}
 

models/channel.go

@@ -9,8 +9,7 @@ type Channel struct {
 	LocationName string `bson:"locationName,omitempty"`
 }
 
-// IsChangeObject is an interface implementation to identify it as a valid
+// IsChangeObject is a dummy interface implementation
-// ChangeObject in GQL.
 func (*Channel) IsChangeObject() {
-	panic("this method is a dummy, and so is its caller")
+	// Dummy interface implementation
-}
+}

models/channels/add.go

@@ -11,9 +11,9 @@ import (
 var ErrInvalidName = errors.New("Invalid channel name")
 
 // Add creates a new channel.
-func Add(name string, logged, hub bool, event, location string) (models.Channel, error) {
+func Add(name string, logged, hub bool, event, location string) (*models.Channel, error) {
 	if len(name) < 3 && !strings.HasPrefix(name, "#") {
-		return models.Channel{}, ErrInvalidName
+		return nil, ErrInvalidName
 	}
 
 	channel := models.Channel{
@@ -26,8 +26,8 @@ func Add(name string, logged, hub bool, event, location string) (models.Channel,
 
 	err := collection.Insert(channel)
 	if err != nil {
-		return models.Channel{}, err
+		return nil, err
 	}
 
-	return channel, nil
+	return &channel, nil
 }

models/channels/edit.go

@@ -6,7 +6,7 @@ import (
 )
 
 // Edit edits a channels
-func Edit(channel models.Channel, logged, hub *bool, eventName, locationName *string) (models.Channel, error) {
+func Edit(channel models.Channel, logged, hub *bool, eventName, locationName *string) (*models.Channel, error) {
 	mutation := bson.M{}
 
 	if logged != nil && *logged != channel.Logged {
@@ -27,13 +27,13 @@ func Edit(channel models.Channel, logged, hub *bool, eventName, locationName *st
 	}
 
 	if len(mutation) == 0 {
-		return channel, nil
+		return &channel, nil
 	}
 
 	err := collection.UpdateId(channel.Name, bson.M{"$set": mutation})
 	if err != nil {
-		return models.Channel{}, err
+		return nil, err
 	}
 
-	return channel, nil
+	return &channel, nil
 }

models/channels/ensure.go

@@ -10,22 +10,22 @@ import (
 
 // Ensure adds a channel if it doesn't exist. If logged is set and the found channel isn't logged,
 // that is changed.
-func Ensure(name string, logged bool) (models.Channel, error) {
+func Ensure(name string, logged bool) (*models.Channel, error) {
 	if len(name) < 3 && !strings.HasPrefix(name, "#") {
-		return models.Channel{}, ErrInvalidName
+		return nil, ErrInvalidName
 	}
 
 	channel, err := FindName(name)
 	if err == mgo.ErrNotFound {
 		return Add(name, logged, false, "", "")
 	} else if err != nil {
-		return models.Channel{}, err
+		return nil, err
 	}
 
 	if logged && !channel.Logged {
-		channel, err = Edit(channel, &logged, nil, nil, nil)
+		channel, err = Edit(*channel, &logged, nil, nil, nil)
 		if err != nil {
-			return models.Channel{}, err
+			return nil, err
 		}
 	}
 

models/channels/find.go

@@ -3,9 +3,12 @@ package channels
 import "git.aiterp.net/rpdata/api/models"
 
 // FindName finds a channel by its id (its name).
-func FindName(name string) (models.Channel, error) {
+func FindName(name string) (*models.Channel, error) {
 	channel := models.Channel{}
 	err := collection.FindId(name).One(&channel)
+	if err != nil {
+		return nil, err
+	}
 
-	return channel, err
+	return &channel, nil
 }

models/chapter.go

@@ -21,8 +21,7 @@ func (chapter *Chapter) CanComment() bool {
 	return !chapter.CommentsLocked && chapter.CommentMode.IsEnabled()
 }
 
-// IsChangeObject is an interface implementation to identify it as a valid
+// IsChangeObject is a dummy interface implementation
-// ChangeObject in GQL.
 func (*Chapter) IsChangeObject() {
-	panic("this method is a dummy, and so is its caller")
+	// Dummy interface implementation
-}
+}

models/chapters/add.go

@@ -8,7 +8,7 @@ import (
 )
 
 // Add adds a new chapter.
-func Add(story models.Story, title, author, source string, createdDate time.Time, finctionalDate *time.Time, commentMode models.ChapterCommentMode) (models.Chapter, error) {
+func Add(story models.Story, title, author, source string, createdDate time.Time, finctionalDate *time.Time, commentMode models.ChapterCommentMode) (*models.Chapter, error) {
 	chapter := models.Chapter{
 		ID:             makeChapterID(),
 		StoryID:        story.ID,
@@ -27,7 +27,7 @@ func Add(story models.Story, title, author, source string, createdDate time.Time
 
 	err := collection.Insert(chapter)
 	if err != nil {
-		return models.Chapter{}, err
+		return nil, err
 	}
 
 	if createdDate.After(story.UpdatedDate) {
@@ -36,5 +36,5 @@ func Add(story models.Story, title, author, source string, createdDate time.Time
 		}
 	}
 
-	return chapter, nil
+	return &chapter, nil
 }

models/chapters/db.go

@@ -13,11 +13,14 @@ import (
 var collection *mgo.Collection
 var storyCollection *mgo.Collection
 
-func find(query interface{}) (models.Chapter, error) {
+func find(query interface{}) (*models.Chapter, error) {
 	chapter := models.Chapter{}
 	err := collection.Find(query).One(&chapter)
+	if err != nil {
+		return nil, err
+	}
 
-	return chapter, err
+	return &chapter, err
 }
 
 func list(query interface{}) ([]models.Chapter, error) {

models/chapters/edit.go

@@ -9,7 +9,7 @@ import (
 
 // Edit edits a chapter, and updates EditedDate. While many Edit functions cheat if there's nothing to
 // change, this functill will due to EditedDate.
-func Edit(chapter models.Chapter, title, source *string, fictionalDate *time.Time, commentMode *models.ChapterCommentMode, commentsLocked *bool) (models.Chapter, error) {
+func Edit(chapter models.Chapter, title, source *string, fictionalDate *time.Time, commentMode *models.ChapterCommentMode, commentsLocked *bool) (*models.Chapter, error) {
 	now := time.Now()
 	changes := bson.M{"editedDate": now}
 
@@ -39,8 +39,8 @@ func Edit(chapter models.Chapter, title, source *string, fictionalDate *time.Tim
 
 	err := collection.UpdateId(chapter.ID, bson.M{"$set": changes})
 	if err != nil {
-		return chapter, err
+		return nil, err
 	}
 
-	return edited, nil
+	return &edited, nil
 }

models/chapters/find.go

@@ -6,6 +6,6 @@ import (
 )
 
 // FindID finds a chapter by ID
-func FindID(id string) (models.Chapter, error) {
+func FindID(id string) (*models.Chapter, error) {
 	return find(bson.M{"_id": id})
 }

models/chapters/move.go

@@ -8,12 +8,12 @@ import (
 )
 
 // Move updates the chapter, moving it to the given story.
-func Move(chapter models.Chapter, story models.Story) (models.Chapter, error) {
+func Move(chapter models.Chapter, story models.Story) (*models.Chapter, error) {
 	now := time.Now()
 
 	err := collection.UpdateId(chapter.ID, bson.M{"$set": bson.M{"editedDate": now, "storyId": story.ID}})
 	if err != nil {
-		return models.Chapter{}, err
+		return nil, err
 	}
 
 	chapter.EditedDate = now
@@ -24,5 +24,5 @@ func Move(chapter models.Chapter, story models.Story) (models.Chapter, error) {
 		}
 	}
 
-	return chapter, nil
+	return &chapter, nil
 }

models/chapters/remove.go

@@ -6,9 +6,9 @@ import (
 )
 
 // Remove removes a chapter.
-func Remove(chapter models.Chapter) (models.Chapter, error) {
+func Remove(chapter models.Chapter) (*models.Chapter, error) {
 	if err := collection.RemoveId(chapter.ID); err != nil {
-		return models.Chapter{}, err
+		return nil, err
 	}
 
 	return chapter, nil

models/character.go

@@ -30,8 +30,7 @@ func (character *Character) HasNick(nick string) bool {
 	return false
 }
 
-// IsChangeObject is an interface implementation to identify it as a valid
+// IsChangeObject is a dummy interface implementation
-// ChangeObject in GQL.
 func (*Character) IsChangeObject() {
-	panic("this method is a dummy, and so is its caller")
+	// Dummy interface implementation
-}
+}

models/comment.go

@@ -16,8 +16,7 @@ type Comment struct {
 	Source        string    `bson:"source"`
 }
 
-// IsChangeObject is an interface implementation to identify it as a valid
+// IsChangeObject is a dummy interface implementation
-// ChangeObject in GQL.
 func (*Comment) IsChangeObject() {
-	panic("this method is a dummy, and so is its caller")
+	// Dummy interface implementation
-}
+}

models/file.go

@@ -15,8 +15,7 @@ type File struct {
 	URL      string    `bson:"url,omitempty" json:"url,omitempty"`
 }
 
-// IsChangeObject is an interface implementation to identify it as a valid
+// IsChangeObject is a dummy interface implementation
-// ChangeObject in GQL.
 func (*File) IsChangeObject() {
-	panic("this method is a dummy, and so is its caller")
+	// Dummy interface implementation
-}
+}

models/log.go

@@ -15,8 +15,7 @@ type Log struct {
 	CharacterIDs []string  `bson:"characterIds"`
 }
 
-// IsChangeObject is an interface implementation to identify it as a valid
+// IsChangeObject is a dummy interface implementation
-// ChangeObject in GQL.
 func (*Log) IsChangeObject() {
-	panic("this method is a dummy, and so is its caller")
+	// Dummy interface implementation
-}
+}

models/post.go

@@ -13,8 +13,7 @@ type Post struct {
 	Position int       `bson:"position"`
 }
 
-// IsChangeObject is an interface implementation to identify it as a valid
+// IsChangeObject is a dummy interface implementation
-// ChangeObject in GQL.
 func (*Post) IsChangeObject() {
-	panic("this method is a dummy, and so is its caller")
+	// Dummy interface implementation
-}
+}

models/stories/add-tag.go

@@ -11,19 +11,19 @@ import (
 var ErrTagAlreadyExists = errors.New("Tag already exists on story")
 
 // AddTag adds a tag to the story. It returns ErrTagAlreadyExists if the tag is already there
-func AddTag(story models.Story, tag models.Tag) (models.Story, error) {
+func AddTag(story models.Story, tag models.Tag) (*models.Story, error) {
 	for i := range story.Tags {
 		if story.Tags[i].Equal(tag) {
-			return models.Story{}, ErrTagAlreadyExists
+			return nil, ErrTagAlreadyExists
 		}
 	}
 
 	err := collection.UpdateId(story.ID, bson.M{"$push": bson.M{"tags": tag}})
 	if err != nil {
-		return models.Story{}, err
+		return nil, err
 	}
 
 	story.Tags = append(story.Tags, tag)
 
-	return story, nil
+	return &story, nil
 }

models/stories/add.go

@@ -7,7 +7,7 @@ import (
 )
 
 // Add creates a new story.
-func Add(name, author string, category models.StoryCategory, listed, open bool, tags []models.Tag, createdDate, fictionalDate time.Time) (models.Story, error) {
+func Add(name, author string, category models.StoryCategory, listed, open bool, tags []models.Tag, createdDate, fictionalDate time.Time) (*models.Story, error) {
 	story := models.Story{
 		ID:            makeStoryID(),
 		Name:          name,
@@ -23,8 +23,8 @@ func Add(name, author string, category models.StoryCategory, listed, open bool,
 
 	err := collection.Insert(story)
 	if err != nil {
-		return models.Story{}, err
+		return nil, err
 	}
 
-	return story, nil
+	return &story, nil
 }

models/stories/db.go

@@ -12,11 +12,14 @@ import (
 
 var collection *mgo.Collection
 
-func find(query interface{}) (models.Story, error) {
+func find(query interface{}) (*models.Story, error) {
 	story := models.Story{}
 	err := collection.Find(query).One(&story)
+	if err != nil {
+		return nil, err
+	}
 
-	return story, err
+	return &story, err
 }
 
 func list(query interface{}, limit int) ([]models.Story, error) {

models/stories/edit.go

@@ -8,7 +8,7 @@ import (
 )
 
 // Edit edits the story and returns the edited story if it succeeds.
-func Edit(story models.Story, name *string, category *models.StoryCategory, listed, open *bool, fictionalDate *time.Time) (models.Story, error) {
+func Edit(story models.Story, name *string, category *models.StoryCategory, listed, open *bool, fictionalDate *time.Time) (*models.Story, error) {
 	changes := bson.M{}
 
 	if name != nil && *name != story.Name {
@@ -33,13 +33,13 @@ func Edit(story models.Story, name *string, category *models.StoryCategory, list
 	}
 
 	if len(changes) == 0 {
-		return story, nil
+		return &story, nil
 	}
 
 	err := collection.UpdateId(story.ID, bson.M{"$set": changes})
 	if err != nil {
-		return models.Story{}, err
+		return nil, err
 	}
 
-	return story, nil
+	return &story, nil
 }

models/stories/find.go

@@ -6,6 +6,6 @@ import (
 )
 
 // FindID finds a story by ID
-func FindID(id string) (models.Story, error) {
+func FindID(id string) (*models.Story, error) {
 	return find(bson.M{"_id": id})
 }

models/stories/remove-tag.go

@@ -11,7 +11,7 @@ import (
 var ErrTagNotExists = errors.New("Tag does not exist on story")
 
 // RemoveTag removes a tag to the story. It returns ErrTagNotExists if the tag does not exist.
-func RemoveTag(story models.Story, tag models.Tag) (models.Story, error) {
+func RemoveTag(story models.Story, tag models.Tag) (*models.Story, error) {
 	index := -1
 	for i := range story.Tags {
 		if story.Tags[i].Equal(tag) {
@@ -20,15 +20,15 @@ func RemoveTag(story models.Story, tag models.Tag) (models.Story, error) {
 		}
 	}
 	if index == -1 {
-		return models.Story{}, ErrTagNotExists
+		return nil, ErrTagNotExists
 	}
 
 	err := collection.UpdateId(story.ID, bson.M{"$pull": bson.M{"tags": tag}})
 	if err != nil {
-		return models.Story{}, err
+		return nil, err
 	}
 
 	story.Tags = append(story.Tags[:index], story.Tags[index+1:]...)
 
-	return story, nil
+	return &story, nil
 }

models/stories/remove.go

@@ -5,6 +5,6 @@ import (
 )
 
 // Remove the story from the database
-func Remove(story models.Story) (models.Story, error) {
+func Remove(story models.Story) (*models.Story, error) {
-	return story, collection.RemoveId(story.ID)
+	return &story, collection.RemoveId(story.ID)
 }

models/story.go

@@ -17,8 +17,7 @@ type Story struct {
 	UpdatedDate   time.Time     `bson:"updatedDate"`
 }
 
-// IsChangeObject is an interface implementation to identify it as a valid
+// IsChangeObject is a dummy interface implementation
-// ChangeObject in GQL.
 func (*Story) IsChangeObject() {
-	panic("this method is a dummy, and so is its caller")
+	// Dummy interface implementation
-}
+}

models/tag.go

@@ -11,8 +11,7 @@ func (tag *Tag) Equal(other Tag) bool {
 	return tag.Kind == other.Kind && tag.Name == other.Name
 }
 
-// IsChangeObject is an interface implementation to identify it as a valid
+// IsChangeObject is a dummy interface implementation
-// ChangeObject in GQL.
 func (*Tag) IsChangeObject() {
-	panic("this method is a dummy, and so is its caller")
+	// Dummy interface implementation
-}
+}