From feab9412dffe5772048aad29893c4cb01d566387 Mon Sep 17 00:00:00 2001
From: Michael Muré <michael.mure@consensys.net>
Date: Wed, 21 Nov 2018 18:56:12 +0100
Subject: WIP identity in git

---
 cache/bug_cache.go | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

(limited to 'cache/bug_cache.go')

diff --git a/cache/bug_cache.go b/cache/bug_cache.go
index 52e9eafb..25ff000c 100644
--- a/cache/bug_cache.go
+++ b/cache/bug_cache.go
@@ -5,6 +5,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/MichaelMure/git-bug/identity"
+
 	"github.com/MichaelMure/git-bug/bug"
 	"github.com/MichaelMure/git-bug/util/git"
 )
@@ -87,7 +89,7 @@ func (c *BugCache) AddComment(message string) error {
 }
 
 func (c *BugCache) AddCommentWithFiles(message string, files []git.Hash) error {
-	author, err := bug.GetUser(c.repoCache.repo)
+	author, err := identity.GetIdentity(c.repoCache.repo)
 	if err != nil {
 		return err
 	}
@@ -95,7 +97,7 @@ func (c *BugCache) AddCommentWithFiles(message string, files []git.Hash) error {
 	return c.AddCommentRaw(author, time.Now().Unix(), message, files, nil)
 }
 
-func (c *BugCache) AddCommentRaw(author bug.Person, unixTime int64, message string, files []git.Hash, metadata map[string]string) error {
+func (c *BugCache) AddCommentRaw(author *identity.Identity, unixTime int64, message string, files []git.Hash, metadata map[string]string) error {
 	op, err := bug.AddCommentWithFiles(c.bug, author, unixTime, message, files)
 	if err != nil {
 		return err
@@ -109,7 +111,7 @@ func (c *BugCache) AddCommentRaw(author bug.Person, unixTime int64, message stri
 }
 
 func (c *BugCache) ChangeLabels(added []string, removed []string) ([]bug.LabelChangeResult, error) {
-	author, err := bug.GetUser(c.repoCache.repo)
+	author, err := identity.GetIdentity(c.repoCache.repo)
 	if err != nil {
 		return nil, err
 	}
@@ -117,7 +119,7 @@ func (c *BugCache) ChangeLabels(added []string, removed []string) ([]bug.LabelCh
 	return c.ChangeLabelsRaw(author, time.Now().Unix(), added, removed, nil)
 }
 
-func (c *BugCache) ChangeLabelsRaw(author bug.Person, unixTime int64, added []string, removed []string, metadata map[string]string) ([]bug.LabelChangeResult, error) {
+func (c *BugCache) ChangeLabelsRaw(author *identity.Identity, unixTime int64, added []string, removed []string, metadata map[string]string) ([]bug.LabelChangeResult, error) {
 	changes, op, err := bug.ChangeLabels(c.bug, author, unixTime, added, removed)
 	if err != nil {
 		return changes, err
@@ -136,7 +138,7 @@ func (c *BugCache) ChangeLabelsRaw(author bug.Person, unixTime int64, added []st
 }
 
 func (c *BugCache) Open() error {
-	author, err := bug.GetUser(c.repoCache.repo)
+	author, err := identity.GetIdentity(c.repoCache.repo)
 	if err != nil {
 		return err
 	}
@@ -144,7 +146,7 @@ func (c *BugCache) Open() error {
 	return c.OpenRaw(author, time.Now().Unix(), nil)
 }
 
-func (c *BugCache) OpenRaw(author bug.Person, unixTime int64, metadata map[string]string) error {
+func (c *BugCache) OpenRaw(author *identity.Identity, unixTime int64, metadata map[string]string) error {
 	op, err := bug.Open(c.bug, author, unixTime)
 	if err != nil {
 		return err
@@ -158,7 +160,7 @@ func (c *BugCache) OpenRaw(author bug.Person, unixTime int64, metadata map[strin
 }
 
 func (c *BugCache) Close() error {
-	author, err := bug.GetUser(c.repoCache.repo)
+	author, err := identity.GetIdentity(c.repoCache.repo)
 	if err != nil {
 		return err
 	}
@@ -166,7 +168,7 @@ func (c *BugCache) Close() error {
 	return c.CloseRaw(author, time.Now().Unix(), nil)
 }
 
-func (c *BugCache) CloseRaw(author bug.Person, unixTime int64, metadata map[string]string) error {
+func (c *BugCache) CloseRaw(author *identity.Identity, unixTime int64, metadata map[string]string) error {
 	op, err := bug.Close(c.bug, author, unixTime)
 	if err != nil {
 		return err
@@ -180,7 +182,7 @@ func (c *BugCache) CloseRaw(author bug.Person, unixTime int64, metadata map[stri
 }
 
 func (c *BugCache) SetTitle(title string) error {
-	author, err := bug.GetUser(c.repoCache.repo)
+	author, err := identity.GetIdentity(c.repoCache.repo)
 	if err != nil {
 		return err
 	}
@@ -188,7 +190,7 @@ func (c *BugCache) SetTitle(title string) error {
 	return c.SetTitleRaw(author, time.Now().Unix(), title, nil)
 }
 
-func (c *BugCache) SetTitleRaw(author bug.Person, unixTime int64, title string, metadata map[string]string) error {
+func (c *BugCache) SetTitleRaw(author *identity.Identity, unixTime int64, title string, metadata map[string]string) error {
 	op, err := bug.SetTitle(c.bug, author, unixTime, title)
 	if err != nil {
 		return err
@@ -202,7 +204,7 @@ func (c *BugCache) SetTitleRaw(author bug.Person, unixTime int64, title string,
 }
 
 func (c *BugCache) EditComment(target git.Hash, message string) error {
-	author, err := bug.GetUser(c.repoCache.repo)
+	author, err := identity.GetIdentity(c.repoCache.repo)
 	if err != nil {
 		return err
 	}
@@ -210,7 +212,7 @@ func (c *BugCache) EditComment(target git.Hash, message string) error {
 	return c.EditCommentRaw(author, time.Now().Unix(), target, message, nil)
 }
 
-func (c *BugCache) EditCommentRaw(author bug.Person, unixTime int64, target git.Hash, message string, metadata map[string]string) error {
+func (c *BugCache) EditCommentRaw(author *identity.Identity, unixTime int64, target git.Hash, message string, metadata map[string]string) error {
 	op, err := bug.EditComment(c.bug, author, unixTime, target, message)
 	if err != nil {
 		return err
-- 
cgit