diff options
| author | Michael Muré <batolettre@gmail.com> | 2021-05-03 11:45:15 +0200 |
|---|---|---|
| committer | Michael Muré <batolettre@gmail.com> | 2022-08-22 13:25:26 +0200 |
| commit | 45b04351d8d02e53b3401b0ee23f7cbe750b63cd (patch) | |
| tree | 59d203ef6c0f6a497b7074cd5617c8869cac3b14 /cache/bug_cache.go | |
| parent | 43026fc53669d462a60feec7d22aec090959be72 (diff) | |
| download | git-bug-45b04351d8d02e53b3401b0ee23f7cbe750b63cd.tar.gz | |
bug: have a type for combined ids, fix https://github.com/MichaelMure/git-bug/issues/653
Diffstat (limited to 'cache/bug_cache.go')
| -rw-r--r-- | cache/bug_cache.go | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/cache/bug_cache.go b/cache/bug_cache.go index e03b27ff..6caaeb11 100644 --- a/cache/bug_cache.go +++ b/cache/bug_cache.go @@ -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 |