From 89d695ab5ab3410bff8beefc278b042017c9c003 Mon Sep 17 00:00:00 2001
From: Cherry <sheepareawesome777@gmail.com>
Date: Tue, 25 Jul 2023 16:36:37 -0400
Subject: [PATCH] fixed not loading if blacklist empty + other stuff ;-;

---
 lua/presence/init.lua | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/lua/presence/init.lua b/lua/presence/init.lua
index 11193ea..e04639b 100644
--- a/lua/presence/init.lua
+++ b/lua/presence/init.lua
@@ -130,6 +130,7 @@ function Presence:setup(...)
     self:set_option("workspace_text", "Working on %s")
     self:set_option("line_number_text", "Line %s out of %s")
     self:set_option("blacklist", {})
+    self:set_option("blacklist_repos", {})
     self:set_option("buttons", true)
     self:set_option("show_time", true)
     -- File assets options
@@ -687,10 +688,9 @@ function Presence:check_blacklist(buffer, parent_dirpath, project_dirpath)
         project_dirname = self.get_filename(project_dirpath, self.os.path_separator)
     end
 
-    print(git_repo)
-
     -- Blacklist table
-    local blacklist_table = self.options["blacklist"]
+    local blacklist_table = self.options["blacklist"] or {}
+    local blacklist_repos_table = self.options["blacklist_repos"] or {}
 
     -- Loop over the values to see if the provided project/path is in the blacklist
     for _, val in pairs(blacklist_table) do
@@ -707,17 +707,6 @@ function Presence:check_blacklist(buffer, parent_dirpath, project_dirpath)
         end
 
         -- Match project either by Lua pattern or by plain string
-<<<<<<< HEAD
-        local is_git_repo_blacklisted = git_repo and
-            ((git_repo:match(val) == git_repo) == git_repo or
-                (git_repo:find(val, nil, true)))
-        if is_git_repo_blacklisted then
-            return true
-        end
-
-        -- Match project either by Lua pattern or by plain string
-=======
->>>>>>> 8f89ca5 (moved git repo check into its own loop)
         local is_project_directory_blacklisted = project_dirpath and
             ((project_dirpath:match(val) == project_dirpath or
                     project_dirname:match(val) == project_dirname) or
@@ -731,7 +720,12 @@ function Presence:check_blacklist(buffer, parent_dirpath, project_dirpath)
 
     -- check against git repo blacklist
     local git_repo = Presence:get_git_repo_url(parent_dirpath)
-    local blacklist_repos_table = self.options["blacklist_repos"] or {}
+    if git_repo then
+        self.log:debug(string.format("Checking git repo blacklist for %s", git_repo))
+    else
+        self.log:debug("No git repo, skipping blacklist check")
+        return false
+    end
 
 
     for _, val in pairs(blacklist_repos_table) do
@@ -739,7 +733,7 @@ function Presence:check_blacklist(buffer, parent_dirpath, project_dirpath)
 
         local is_git_repo_blacklisted = git_repo and
             ((git_repo:match(val) == git_repo) == git_repo or
-            (git_repo:find(val, nil, true)))
+                (git_repo:find(val, nil, true)))
 
         if is_git_repo_blacklisted then
             return true
@@ -856,10 +850,11 @@ function Presence:update_for_buffer(buffer, should_debounce)
     local project_name, project_path = self:get_project_name(parent_dirpath)
 
     -- Check for blacklist
-    local is_blacklisted = #self.options.blacklist > 0 and self:check_blacklist(buffer, parent_dirpath, project_path)
+    local blacklist_not_empty = (#self.options.blacklist > 0 or #self.options.blacklist_repos > 0)
+    local is_blacklisted = blacklist_not_empty and self:check_blacklist(buffer, parent_dirpath, project_path)
     if is_blacklisted then
         self.last_activity.file = buffer
-        self.log:debug("Either project or directory name is blacklisted, skipping...")
+        self.log:debug("Either project, directory name, or repository URL is blacklisted. Skipping...")
         self:cancel()
         return
     end