diff options
| author | Steve Moyer <smoyer1@selesy.com> | 2022-08-23 10:33:19 -0400 |
|---|---|---|
| committer | Steve Moyer <smoyer1@selesy.com> | 2022-08-23 10:33:19 -0400 |
| commit | 7ba98bfadc2c4c7fd3e777074976b78d6171b163 (patch) | |
| tree | 4865a84837a016e9a18b566046a2aa7a1992acc7 /cache/bug_cache.go | |
| parent | 2c2c449187557384fd1e5b9333e808451be86041 (diff) | |
| parent | 5a70e8b3a2e0fe3d1a1dcd4c24bb6bf64633cb7f (diff) | |
| download | git-bug-7ba98bfadc2c4c7fd3e777074976b78d6171b163.tar.gz | |
Merge branch 'master' into fix-850-ineffective-comment-edit
Diffstat (limited to 'cache/bug_cache.go')
| -rw-r--r-- | cache/bug_cache.go | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/cache/bug_cache.go b/cache/bug_cache.go index 7503fc37..6caaeb11 100644 --- a/cache/bug_cache.go +++ b/cache/bug_cache.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/MichaelMure/git-bug/bug" + "github.com/MichaelMure/git-bug/entities/bug" "github.com/MichaelMure/git-bug/entity" "github.com/MichaelMure/git-bug/entity/dag" "github.com/MichaelMure/git-bug/repository" @@ -209,7 +209,7 @@ func (c *BugCache) EditCreateCommentRaw(author *IdentityCache, unixTime int64, b return op, c.notifyUpdated() } -func (c *BugCache) EditComment(target entity.Id, message string) (*bug.EditCommentOperation, error) { +func (c *BugCache) EditComment(target entity.CombinedId, message string) (*bug.EditCommentOperation, error) { author, err := c.repoCache.GetUserIdentity() if err != nil { return nil, err @@ -218,9 +218,14 @@ func (c *BugCache) EditComment(target entity.Id, message string) (*bug.EditComme return c.EditCommentRaw(author, time.Now().Unix(), target, message, nil) } -func (c *BugCache) EditCommentRaw(author *IdentityCache, unixTime int64, target entity.Id, message string, metadata map[string]string) (*bug.EditCommentOperation, error) { +func (c *BugCache) EditCommentRaw(author *IdentityCache, unixTime int64, target entity.CombinedId, message string, metadata map[string]string) (*bug.EditCommentOperation, error) { + comment, err := c.Snapshot().SearchComment(target) + if err != nil { + return nil, err + } + c.mu.Lock() - op, err := bug.EditComment(c.bug, author.Identity, unixTime, target, message, nil, metadata) + op, err := bug.EditComment(c.bug, author.Identity, unixTime, comment.TargetId(), message, nil, metadata) c.mu.Unlock() if err != nil { return nil, err |