From bb72c428cecb559c6617a0835f5da19ece4b450a Mon Sep 17 00:00:00 2001 From: Rune Lausen Date: Sat, 2 Nov 2024 13:20:06 +0100 Subject: [PATCH 1/2] fix: Only write error message if project scope is needed and missing --- lua/octo/gh/init.lua | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lua/octo/gh/init.lua b/lua/octo/gh/init.lua index 5868d1f8..ee8adb16 100644 --- a/lua/octo/gh/init.lua +++ b/lua/octo/gh/init.lua @@ -100,10 +100,13 @@ function M.setup() for idx, split_scope in ipairs(split) do scopes[idx] = string.gsub(split_scope, "'", "") end - if M.has_scope { "read:project", "project" } and use_proj_v2 then - _G.octo_pv2_fragment = fragments.projects_v2_fragment - elseif not config.values.suppress_missing_scope.projects_v2 then - require("octo.utils").info "Cannot request projects v2, missing scope 'read:project'" + if use_proj_v2 then + if M.has_scope { "read:project", "project" } then + require("octo.utils").info "Using projects v2" + _G.octo_pv2_fragment = fragments.projects_v2_fragment + elseif not config.values.suppress_missing_scope.projects_v2 then + require("octo.utils").info "Cannot request projects v2, missing scope 'read:project'" + end end end), }):start() From 847e523607ab795c16fd2a06c43ae2d432639be5 Mon Sep 17 00:00:00 2001 From: Rune Lausen Date: Sun, 3 Nov 2024 16:22:58 +0100 Subject: [PATCH 2/2] chore: Improve notifications for Projects v2 access --- lua/octo/gh/init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/octo/gh/init.lua b/lua/octo/gh/init.lua index ee8adb16..1004e95b 100644 --- a/lua/octo/gh/init.lua +++ b/lua/octo/gh/init.lua @@ -102,10 +102,10 @@ function M.setup() end if use_proj_v2 then if M.has_scope { "read:project", "project" } then - require("octo.utils").info "Using projects v2" + require("octo.utils").info "Using Projects v2" _G.octo_pv2_fragment = fragments.projects_v2_fragment elseif not config.values.suppress_missing_scope.projects_v2 then - require("octo.utils").info "Cannot request projects v2, missing scope 'read:project'" + require("octo.utils").error "Cannot request Projects v2: Missing scope 'read:project' or 'project'" end end end),