Merge branch 'master' into master

pwntester · Feb 4, 2025 · 9b17d01 · 9b17d01
2 parents ccc2834 + 0969fa2
commit 9b17d01
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/lua/octo/pickers/fzf-lua/entry_maker.lua b/lua/octo/pickers/fzf-lua/entry_maker.lua
@@ -10,9 +10,9 @@ function M.gen_from_issue(issue_table)
   local kind = issue_table.__typename == "Issue" and "issue" or "pull_request"
   local filename
   if kind == "issue" then
-    filename = utils.get_issue_uri(issue_table.repository.nameWithOwner, issue_table.number)
+    filename = utils.get_issue_uri(issue_table.number, issue_table.repository.nameWithOwner)
   else
-    filename = utils.get_pull_request_uri(issue_table.repository.nameWithOwner, issue_table.number)
+    filename = utils.get_pull_request_uri(issue_table.number, issue_table.repository.nameWithOwner)
   end
   return {
     filename = filename,

diff --git a/lua/octo/pickers/fzf-lua/pickers/utils.lua b/lua/octo/pickers/fzf-lua/pickers/utils.lua
@@ -64,7 +64,7 @@ function M.open(command, entry)
   elseif command == "tab" then
     vim.cmd [[:tab sb %]]
   end
-  utils.get(entry.kind, entry.repo, entry.value)
+  utils.get(entry.kind, entry.value, entry.repo)
 end
 
 --[[

diff --git a/lua/octo/pickers/telescope/entry_maker.lua b/lua/octo/pickers/telescope/entry_maker.lua
@@ -109,11 +109,11 @@ function M.gen_from_issue(max_number, print_repo)
 
     local filename
     if kind == "issue" then
-      filename = utils.get_issue_uri(obj.repository.nameWithOwner, obj.number)
+      filename = utils.get_issue_uri(obj.number, obj.repository.nameWithOwner)
     elseif kind == "pull_request" then
-      filename = utils.get_pull_request_uri(obj.repository.nameWithOwner, obj.number)
+      filename = utils.get_pull_request_uri(obj.number, obj.repository.nameWithOwner)
     else
-      filename = utils.get_discussion_uri(obj.respository.nameWithOwner, obj.number)
+      filename = utils.get_discussion_uri(obj.number, obj.respository.nameWithOwner)
     end
 
     return {

diff --git a/lua/octo/pickers/telescope/provider.lua b/lua/octo/pickers/telescope/provider.lua
@@ -77,7 +77,7 @@ local function open(command)
       vim.cmd [[:tab sb %]]
     end
     if selection then
-      utils.get(selection.kind, selection.repo, selection.value)
+      utils.get(selection.kind, selection.value, selection.repo)
     end
   end
 end