Merge pull request #471 from jarviliam/feat-resolved-by

pwntester · Dec 28, 2023 · 08d02e1 · 08d02e1
2 parents 8787835 + 725bd11
commit 08d02e1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/lua/octo/gh/graphql.lua b/lua/octo/gh/graphql.lua
@@ -183,6 +183,7 @@ M.start_review_mutation = [[
               diffSide
               startDiffSide
               isResolved
+              resolvedBy { login }
               isCollapsed
               isOutdated
               comments(first:100) {
@@ -1414,6 +1415,7 @@ query {
           startLine
           originalStartLine
           isResolved
+          resolvedBy { login }
           isCollapsed
           isOutdated
           comments(first:100) {

diff --git a/lua/octo/ui/writers.lua b/lua/octo/ui/writers.lua
@@ -851,6 +851,12 @@ function M.write_review_thread_header(bufnr, opts, line)
     -- )
     --vim.list_extend(header_vt, resolved_bubble)
     vim.list_extend(header_vt, { { conf.resolved_icon, "OctoGreen" } })
+    if opts.resolvedBy then
+      vim.list_extend(
+        header_vt,
+        { { " [Resolved by: ", "OctoSymbol" }, { opts.resolvedBy.login, "OctoDetailsLabel" }, { "] ", "OctoSymbol" } }
+      )
+    end
   end
 
   M.write_block(bufnr, { "" })
@@ -1312,6 +1318,7 @@ function M.write_threads(bufnr, threads)
           end_line = end_line,
           isOutdated = thread.isOutdated,
           isResolved = thread.isResolved,
+          resolvedBy = thread.resolvedBy,
           commit = comment.originalCommit.abbreviatedOid,
         })