From ad6a8b3cab7f4e4e9f23a7178615b1441e620ef1 Mon Sep 17 00:00:00 2001
From: NoM0Re <1629787+NoM0Re@users.noreply.github.com>
Date: Thu, 9 Oct 2025 21:05:18 +0200
Subject: [PATCH] (refactor/BossMods) small refactor and code check

---
 WeakAuras/BossMods.lua | 67 +++++++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 31 deletions(-)

diff --git a/WeakAuras/BossMods.lua b/WeakAuras/BossMods.lua
index 5005703..d3c822b 100644
--- a/WeakAuras/BossMods.lua
+++ b/WeakAuras/BossMods.lua
@@ -49,6 +49,10 @@ elseif (DBM and type(DBM.ReleaseRevision) == "number" and DBM.ReleaseRevision >=
   dbmSupportStatus = dbmSupportStates.LEGACY
 end
 
+local barOptions = DBM and type(DBM.ReleaseRevision) == "number" and (
+  DBM.ReleaseRevision >= 20220412000000 and DBT.Options or DBM.Bars.options
+)
+
 -- DBM
 Private.ExecEnv.BossMods.DBM = {
   registeredEvents = {},
@@ -248,8 +252,6 @@ Private.ExecEnv.BossMods.DBM = {
         r, g, b = r or 0, g or 0, b or 0
       else
         -- Compability code for DBM versions from around Aberrus
-        -- Can be removed once we can assume newer versions
-        local barOptions = DBT.Options
         if barOptions then
           if dbmType == 1 then
             r, g, b = barOptions.StartColorAR, barOptions.StartColorAG, barOptions.StartColorAB
@@ -402,8 +404,6 @@ Private.ExecEnv.BossMods.DBM = {
       self:RegisterCallback("DBM_TimerStart")
       self:RegisterCallback("DBM_TimerStop")
       self:RegisterCallback("DBM_TimerUpdate")
-      self:RegisterCallback("wipe")
-      self:RegisterCallback("kill")
     end
   end,
 
@@ -413,8 +413,11 @@ Private.ExecEnv.BossMods.DBM = {
 
   RegisterStage = function(self)
     self:RegisterCallback("DBM_SetStage")
-    self:RegisterCallback("DBM_Pull")
-    self:RegisterCallback("DBM_Kill")
+    if dbmSupportStatus == dbmSupportStates.LATEST or
+      dbmSupportStatus == dbmSupportStates.COMPATIBLE then
+      self:RegisterCallback("DBM_Pull")
+      self:RegisterCallback("DBM_Kill")
+    end
   end,
 
   scheduled_scans = {},
@@ -533,7 +536,7 @@ Private.event_prototypes["DBM Timer"] = {
   type = "addons",
   events = {},
   internal_events = {
-    "DBM_TimerStart", "DBM_TimerStop", "DBM_TimerUpdate", "DBM_TimerStopAll,", "DBM_TimerForce",
+    "DBM_TimerStart", "DBM_TimerStop", "DBM_TimerUpdate", "DBM_TimerForce",
     "DBM_TimerResume", "DBM_TimerPause", "DBM_TimerUpdateIcon"
   },
   force_events = "DBM_TimerForce",
@@ -1820,7 +1823,6 @@ Private.event_prototypes["Boss Mod Timer"] = {
       trigger.use_isBarEnabled == nil and "nil" or trigger.use_isBarEnabled and "true" or "false",
       trigger.remaining_operator or "<"
     )
-
   end,
   statesParameter = "full",
   args = {
@@ -1889,6 +1891,7 @@ Private.event_prototypes["Boss Mod Timer"] = {
 }
 Private.category_event_prototype.addons["Boss Mod Timer"] = L["Boss Mod Timer"]
 
+
 -- Deactivate DBM for users with outdated versions, and always disable BigWigs triggers.
 -- DBM triggers are only disabled if the DBM version is older than 7.0.5+.
 -- Supported DBM version is "DBM Warmane" with commits from 2025-Feb-09+ and from 2025-Mar-12+.
@@ -1900,31 +1903,33 @@ Private.category_event_prototype.addons["Boss Mod Timer"] = L["Boss Mod Timer"]
 -- Download: https://github.com/Zidras/DBM-Warmane/archive/refs/heads/main.zip
 
 -- Disable DBM for users with an outdated DBM version
-if dbmSupportStatus == dbmSupportStates.UNSUPPORTED then
-  local dbm_trigger = {
-    "DBM Stage",
-    "DBM Announce",
-    "DBM Timer",
-    "Boss Mod Stage",
-    "Boss Mod Stage (Event)",
-    "Boss Mod Announce",
-    "Boss Mod Timer"
+do
+  if dbmSupportStatus == dbmSupportStates.UNSUPPORTED then
+    local dbm_trigger = {
+      "DBM Stage",
+      "DBM Announce",
+      "DBM Timer",
+      "Boss Mod Stage",
+      "Boss Mod Stage (Event)",
+      "Boss Mod Announce",
+      "Boss Mod Timer"
+    }
+
+    -- Remove all relevant DBM event prototypes
+    for _, event in ipairs(dbm_trigger) do
+      Private.event_prototypes[event] = nil
+    end
+  end
+
+  -- Always disable BigWigs triggers
+  local bigwigs_trigger = {
+    "BigWigs Stage",
+    "BigWigs Message",
+    "BigWigs Timer"
   }
 
-  -- Remove all relevant DBM event prototypes
-  for _, event in ipairs(dbm_trigger) do
+  -- Remove all relevant BigWigs event prototypes
+  for _, event in ipairs(bigwigs_trigger) do
     Private.event_prototypes[event] = nil
   end
 end
-
--- Always disable BigWigs triggers
-local bigwigs_trigger = {
-  "BigWigs Stage",
-  "BigWigs Message",
-  "BigWigs Timer"
-}
-
--- Remove all relevant BigWigs event prototypes
-for _, event in ipairs(bigwigs_trigger) do
-  Private.event_prototypes[event] = nil
-end