From cc88c102ff56cd2ae62f00b62ca4ca239b046a58 Mon Sep 17 00:00:00 2001
From: Tim Robertson <funkjedi@gmail.com>
Date: Wed, 11 Sep 2024 19:34:21 -0400
Subject: [PATCH] Remove LibAuras dep

---
 .pkgmeta                                   |   1 -
 .vscode/settings.json                      |  18 ++
 SheepMonitor.toc                           |   4 +-
 changelog.txt                              |   3 +
 embeds.xml                                 |   1 -
 libs/LibAuras/CHANGES.txt                  |  11 --
 libs/LibAuras/LibAuras.lua                 | 195 ---------------------
 libs/LibAuras/LibAuras.toc                 |   9 -
 libs/LibAuras/Libs/LibStub/LibStub.lua     |  51 ------
 libs/LibAuras/Libs/LibStub/LibStub.toc     |   9 -
 libs/LibAuras/Libs/LibStub/tests/test.lua  |  41 -----
 libs/LibAuras/Libs/LibStub/tests/test2.lua |  27 ---
 libs/LibAuras/Libs/LibStub/tests/test3.lua |  14 --
 libs/LibAuras/Libs/LibStub/tests/test4.lua |  41 -----
 libs/LibAuras/Libs/libs.xml                |   3 -
 main.lua                                   |  43 +++--
 16 files changed, 44 insertions(+), 427 deletions(-)
 delete mode 100644 libs/LibAuras/CHANGES.txt
 delete mode 100644 libs/LibAuras/LibAuras.lua
 delete mode 100644 libs/LibAuras/LibAuras.toc
 delete mode 100644 libs/LibAuras/Libs/LibStub/LibStub.lua
 delete mode 100644 libs/LibAuras/Libs/LibStub/LibStub.toc
 delete mode 100644 libs/LibAuras/Libs/LibStub/tests/test.lua
 delete mode 100644 libs/LibAuras/Libs/LibStub/tests/test2.lua
 delete mode 100644 libs/LibAuras/Libs/LibStub/tests/test3.lua
 delete mode 100644 libs/LibAuras/Libs/LibStub/tests/test4.lua
 delete mode 100644 libs/LibAuras/Libs/libs.xml

diff --git a/.pkgmeta b/.pkgmeta
index 2a2d35f..1a05c48 100644
--- a/.pkgmeta
+++ b/.pkgmeta
@@ -10,7 +10,6 @@ externals:
     libs/AceGUI-3.0: https://repos.wowace.com/wow/ace3/trunk/AceGUI-3.0
     libs/AceLocale-3.0: https://repos.wowace.com/wow/ace3/trunk/AceLocale-3.0
     libs/AceTimer-3.0: https://repos.wowace.com/wow/ace3/trunk/AceTimer-3.0
-    libs/LibAuras: https://repos.wowace.com/wow/libauras
     libs/LibWidgetFactory-1.0/libs/AceGUI-3.0: https://repos.wowace.com/wow/ace3/trunk/AceGUI-3.0
 
 enable-nolib-creation: no
diff --git a/.vscode/settings.json b/.vscode/settings.json
index f5601cf..8c6797b 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -15,9 +15,27 @@
         "RaidBossEmoteFrame",
         "RaidNotice_AddMessage",
         "STANDARD_TEXT_FONT",
+        "Settings",
+        "PARTY",
+        "PLAYER"
     ],
     "Lua.workspace.ignoreDir": [
         ".vscode",
         "libs",
+    ],
+    "Lua.runtime.version": "Lua 5.1",
+    "Lua.runtime.builtin": {
+        "basic": "disable",
+        "debug": "disable",
+        "io": "disable",
+        "math": "disable",
+        "os": "disable",
+        "package": "disable",
+        "string": "disable",
+        "table": "disable",
+        "utf8": "disable"
+    },
+    "Lua.workspace.library": [
+        "~/.vscode-server/extensions/ketho.wow-api-0.17.4/Annotations"
     ]
 }
diff --git a/SheepMonitor.toc b/SheepMonitor.toc
index 2a0e13f..268cad6 100755
--- a/SheepMonitor.toc
+++ b/SheepMonitor.toc
@@ -2,9 +2,9 @@
 ## Title: Sheep Monitor
 ## Notes: Provides various methods of notification to help you keep track of your flock.
 ## Author: funkjedi
-## Version: 1.28
+## Version: 1.29
 ## SavedVariables: SheepMonitorDatabase
-## OptionalDeps: Ace3, LibAuras, LibAuraInfo-1.0
+## OptionalDeps: Ace3, LibAuraInfo-1.0
 ## X-Curse-Project-ID: 28218
 ## X-WoWI-ID: 19050
 ## X-Wago-ID: vEGP1RN1
diff --git a/changelog.txt b/changelog.txt
index e37c7f0..517ebcd 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,6 @@
+1.29
+- remove LibAuras dep
+
 1.28
 - fix check for classic
 
diff --git a/embeds.xml b/embeds.xml
index 6bd0b95..d023285 100755
--- a/embeds.xml
+++ b/embeds.xml
@@ -7,7 +7,6 @@
     <Include file="libs\AceTimer-3.0\AceTimer-3.0.xml"/>
     <Include file="libs\AceDB-3.0\AceDB-3.0.xml"/>
     <Include file="libs\AceGUI-3.0\AceGUI-3.0.xml"/>
-    <Script file="libs\LibAuras\LibAuras.lua"/>
     <Include file="libs\LibAuraInfo-1.0\LibAuraInfo-1.0\lib.xml"/>
     <Include file="libs\LibWidgetFactory-1.0\LibWidgetFactory-1.0.xml"/>
 </Ui>
diff --git a/libs/LibAuras/CHANGES.txt b/libs/LibAuras/CHANGES.txt
deleted file mode 100644
index 6a1d784..0000000
--- a/libs/LibAuras/CHANGES.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-lightweight tag edfcee0c16818f60bf85ff910c62ae58fc9c26d2 1.0-BETAr1
-Author:	John Camp <jjcamp@gmail.com>
-Date:	Sun Jul 15 11:29:05 2018 -0500
-
-commit edfcee0c16818f60bf85ff910c62ae58fc9c26d2
-Author: John Camp <jjcamp@gmail.com>
-Date:   Sun Jul 15 11:29:05 2018 -0500
-
-    Fixes a bug where :UnitAura only returned a name if it found a matching
-    buff
-
diff --git a/libs/LibAuras/LibAuras.lua b/libs/LibAuras/LibAuras.lua
deleted file mode 100644
index 21dd3da..0000000
--- a/libs/LibAuras/LibAuras.lua
+++ /dev/null
@@ -1,195 +0,0 @@
-local lib = LibStub:NewLibrary("LibAuras", 1)
-
-if not lib then return end
-
-if not lib.frame then
-    lib.frame = CreateFrame("Frame")
-end
-
-lib.AURAS = lib.AURAS or {}
-
-local FILTERS, getGuidAndCheckAuras, getBuff, getDebuff, getAura, nameToSpellId, getAurasForUnit, addBuff, addDebuff, addAura
-
-
-lib.frame:RegisterEvent("UNIT_AURA")
-lib.frame:SetScript("OnEvent", function(self, event)
-    if event == "UNIT_AURA" then lib.AURAS = {} end
-end)
-
-function lib:UnitBuff(unitId, spellIdOrName, filter)
-    local guid = getGuidAndCheckAuras(unitId)
-    if not guid then return end
-
-    return getBuff(guid, spellIdOrName, filter or "")
-end
-
-function lib:UnitDebuff(unitId, spellIdOrName, filter)
-    local guid = getGuidAndCheckAuras(unitId)
-    if not guid then return end
-
-    return getDebuff(guid, spellIdOrName, filter or "")
-end
-
-function lib:UnitAura(unitId, spellIdOrName, filter)
-    local guid = getGuidAndCheckAuras(unitId)
-    if not guid then return end
-
-    local result = {getBuff(guid, spellIdOrName, filter or "")}
-    if #result < 2 then
-        return getDebuff(guid, spellIdOrName, filter or "")
-    end
-    return unpack(result)
-end
-
-local FILTERS = {
-    HELPFUL = false,
-    HARMFUL = false,
-    PLAYER = false,
-    RAID = false,
-    CANCELABLE = false,
-    NOTCANCELABLE = false
-}
-
-getGuidAndCheckAuras = function(unitId)
-    local guid = UnitGUID(unitId)
-    if not guid then return nil end
-    if not lib.AURAS[guid] then
-        getAurasForUnit(unitId, guid)
-    end
-    return guid
-end
-
-getBuff = function(guid, spellIdOrName, filter)
-    return getAura(guid, spellIdOrName, "HELPFUL " .. filter)
-end
-
-getDebuff = function(guid, spellIdOrName, filter)
-    return getAura(guid, spellIdOrName, "HARMFUL " .. filter)
-end
-
-getAura = function(guid, spellIdOrName, filter)
-    local filters = {}
-    for k in pairs(FILTERS) do filters[k] = FILTERS[k] end
-    for s in filter:gmatch("%a+") do
-        if filters[s:upper()] ~= nil then
-            filters[s:upper()] = true
-        end
-    end
-
-    local auraType = "BUFF"
-    if not filters["HELPFUL"] and not filters["HARMFUL"] then
-        error("filter must contain either \"HELPFUL\" or \"HARMFUL\"")
-    elseif filters["HELPFUL"] and filters["HARMFUL"] then
-        return
-    elseif filters["HARMFUL"] then
-        auraType = "DEBUFF"
-    end
-
-    local spellId = nameToSpellId(spellIdOrName, guid, auraType)
-    local aura = lib.AURAS[guid][auraType][spellId]
-    if not aura then return
-    elseif filters["PLAYER"] and aura.unitCaster ~= "player" then return
-    end
-    return aura.name, aura.icon, aura.count, aura.debuffType, aura.duration, aura.expirationTime, aura.unitCaster, aura.canStealOrPurge, aura.nameplateShowPersonal, spellId, aura.canApplyAura, aura.isBossDebuff, aura.isCastByPlayer, aura.nameplateShowAll, aura.timeMod, aura.value1, aura.value2, aura.value3
-end
-
-nameToSpellId = function(spellIdOrName, guid, auraType)
-    if type(spellIdOrName) == "number" then
-        return spellIdOrName
-    elseif type(spellIdOrName) == "string" then
-        local spellId = lib.AURAS[guid][auraType].NAMES[spellIdOrName]
-        if not spellId then return nil end
-        return spellId
-    end
-    return nil
-end
-
-getAurasForUnit = function(unitId, guid)
-    lib.AURAS[guid] = {}
-    lib.AURAS[guid]["BUFF"] = {}
-    lib.AURAS[guid]["BUFF"].NAMES = {}
-    lib.AURAS[guid]["DEBUFF"] = {}
-    lib.AURAS[guid]["DEBUFF"].NAMES = {}
-    for i = 1, 40 do
-        if not addBuff(unitId, guid, i) then break end
-    end
-    for i = 1, 40 do
-        if not addDebuff(unitId, guid, i) then break end
-    end
-end
-
-addBuff = function(unitId, guid, index)
-    return addAura(unitId, guid, index, "BUFF")
-end
-
-addDebuff = function(unitId, guid, index)
-    return addAura(unitId, guid, index, "DEBUFF")
-end
-
-addAura = function(unitId, guid, index, type)
-    local filter = nil
-    if type == "BUFF" then filter = "HELPFUL" end
-    if type == "DEBUFF" then filter = "HARMFUL" end
-    if not filter then return end
-    local name, icon, count, debuffType, duration, expirationTime, unitCaster, canStealOrPurge, nameplateShowPersonal, spellId, canApplyAura, isBossDebuff, isCastByPlayer, nameplateShowAll, timeMod, value1, value2, value3 = UnitAura(unitId, index, filter)
-    if not name then
-        return false
-    end
-    lib.AURAS[guid][type][spellId] = {}
-    lib.AURAS[guid][type][spellId].name = name
-    lib.AURAS[guid][type][spellId].icon = icon
-    lib.AURAS[guid][type][spellId].count = count
-    lib.AURAS[guid][type][spellId].debuffType = debuffType
-    lib.AURAS[guid][type][spellId].duration = duration
-    lib.AURAS[guid][type][spellId].expirationTime = expirationTime
-    lib.AURAS[guid][type][spellId].unitCaster = unitCaster
-    lib.AURAS[guid][type][spellId].canStealOrPurge = canStealOrPurge
-    lib.AURAS[guid][type][spellId].nameplateShowPersonal = nameplateShowPersonal
-    lib.AURAS[guid][type][spellId].canApplyAura = canApplyAura
-    lib.AURAS[guid][type][spellId].isBossDebuff = isBossDebuff
-    lib.AURAS[guid][type][spellId].isCastByPlayer = isCastByPlayer
-    lib.AURAS[guid][type][spellId].nameplateShowAll = nameplateShowAll
-    lib.AURAS[guid][type][spellId].timeMod = timeMod
-    lib.AURAS[guid][type][spellId].value1 = value1
-    lib.AURAS[guid][type][spellId].value2 = value2
-    lib.AURAS[guid][type][spellId].value3 = value3
-    if not lib.AURAS[guid][type].NAMES[name] then
-        lib.AURAS[guid][type].NAMES[name] = spellId
-    end
-    return true
-end
-
--- DEBUG stuff
---[[
-function libAurasTest()
-    print("Starting Tests")
-    LA = LibStub:GetLibrary("LibAuras")
-    print(":UnitAura(\"player\", 186406) (Sign of the Critter)")
-    print(LA:UnitAura("player", 186406))
-    print(":UnitBuff(\"pet\", \"Dire Frenzy\"")
-    print(LA:UnitBuff("pet", "Dire Frenzy"))
-    print(":UnitDeuff(\"target\", \"Growl\"")
-    print(LA:UnitDebuff("target", "Growl"))
-    LA:printAurasTable()
-end
-
-function lib:printAurasTable()
-    print(".AURAS")
-    for k in pairs(self.AURAS) do
-        print(k)
-        lib:printTable(self.AURAS[k], "  ")
-    end
-end
-
-function lib:printTable(table, prefix)
-    if not table then return end
-    for k in pairs(table) do
-        if type(table[k]) ~= "table" then
-            print(prefix .. k .. " = " .. tostring(table[k]))
-        else
-            print(prefix .. tostring(k))
-            lib:printTable(table[k], prefix .. "  ")
-        end
-    end
-end
-]]
diff --git a/libs/LibAuras/LibAuras.toc b/libs/LibAuras/LibAuras.toc
deleted file mode 100644
index 308b11d..0000000
--- a/libs/LibAuras/LibAuras.toc
+++ /dev/null
@@ -1,9 +0,0 @@
-## Interface: 80000
-## Title: LibAuras
-## Notes: Buff/Debuff Library
-## Author: Kibster
-#@no-lib-strip@
-Libs\libs.xml
-#@end-no-lib-strip@
-
-LibAuras.lua
diff --git a/libs/LibAuras/Libs/LibStub/LibStub.lua b/libs/LibAuras/Libs/LibStub/LibStub.lua
deleted file mode 100644
index 7e7b76d..0000000
--- a/libs/LibAuras/Libs/LibStub/LibStub.lua
+++ /dev/null
@@ -1,51 +0,0 @@
--- $Id: LibStub.lua 103 2014-10-16 03:02:50Z mikk $
--- LibStub is a simple versioning stub meant for use in Libraries.  http://www.wowace.com/addons/libstub/ for more info
--- LibStub is hereby placed in the Public Domain
--- Credits: Kaelten, Cladhaire, ckknight, Mikk, Ammo, Nevcairiel, joshborke
-local LIBSTUB_MAJOR, LIBSTUB_MINOR = "LibStub", 2  -- NEVER MAKE THIS AN SVN REVISION! IT NEEDS TO BE USABLE IN ALL REPOS!
-local LibStub = _G[LIBSTUB_MAJOR]
-
--- Check to see is this version of the stub is obsolete
-if not LibStub or LibStub.minor < LIBSTUB_MINOR then
-	LibStub = LibStub or {libs = {}, minors = {} }
-	_G[LIBSTUB_MAJOR] = LibStub
-	LibStub.minor = LIBSTUB_MINOR
-	
-	-- LibStub:NewLibrary(major, minor)
-	-- major (string) - the major version of the library
-	-- minor (string or number ) - the minor version of the library
-	-- 
-	-- returns nil if a newer or same version of the lib is already present
-	-- returns empty library object or old library object if upgrade is needed
-	function LibStub:NewLibrary(major, minor)
-		assert(type(major) == "string", "Bad argument #2 to `NewLibrary' (string expected)")
-		minor = assert(tonumber(strmatch(minor, "%d+")), "Minor version must either be a number or contain a number.")
-		
-		local oldminor = self.minors[major]
-		if oldminor and oldminor >= minor then return nil end
-		self.minors[major], self.libs[major] = minor, self.libs[major] or {}
-		return self.libs[major], oldminor
-	end
-	
-	-- LibStub:GetLibrary(major, [silent])
-	-- major (string) - the major version of the library
-	-- silent (boolean) - if true, library is optional, silently return nil if its not found
-	--
-	-- throws an error if the library can not be found (except silent is set)
-	-- returns the library object if found
-	function LibStub:GetLibrary(major, silent)
-		if not self.libs[major] and not silent then
-			error(("Cannot find a library instance of %q."):format(tostring(major)), 2)
-		end
-		return self.libs[major], self.minors[major]
-	end
-	
-	-- LibStub:IterateLibraries()
-	-- 
-	-- Returns an iterator for the currently registered libraries
-	function LibStub:IterateLibraries() 
-		return pairs(self.libs) 
-	end
-	
-	setmetatable(LibStub, { __call = LibStub.GetLibrary })
-end
diff --git a/libs/LibAuras/Libs/LibStub/LibStub.toc b/libs/LibAuras/Libs/LibStub/LibStub.toc
deleted file mode 100644
index 31aef48..0000000
--- a/libs/LibAuras/Libs/LibStub/LibStub.toc
+++ /dev/null
@@ -1,9 +0,0 @@
-## Interface: 70200
-## Title: Lib: LibStub
-## Notes: Universal Library Stub
-## Credits: Kaelten, Cladhaire, ckknight, Mikk, Ammo, Nevcairiel
-## X-Website: http://www.wowace.com/addons/libstub/
-## X-Category: Library
-## X-License: Public Domain
-
-LibStub.lua
diff --git a/libs/LibAuras/Libs/LibStub/tests/test.lua b/libs/LibAuras/Libs/LibStub/tests/test.lua
deleted file mode 100644
index fb3bcbd..0000000
--- a/libs/LibAuras/Libs/LibStub/tests/test.lua
+++ /dev/null
@@ -1,41 +0,0 @@
-debugstack = debug.traceback
-strmatch = string.match
-
-loadfile("../LibStub.lua")()
-
-local lib, oldMinor = LibStub:NewLibrary("Pants", 1) -- make a new thingy
-assert(lib) -- should return the library table
-assert(not oldMinor) -- should not return the old minor, since it didn't exist
-
--- the following is to create data and then be able to check if the same data exists after the fact
-function lib:MyMethod()
-end
-local MyMethod = lib.MyMethod
-lib.MyTable = {}
-local MyTable = lib.MyTable
-
-local newLib, newOldMinor = LibStub:NewLibrary("Pants", 1) -- try to register a library with the same version, should silently fail
-assert(not newLib) -- should not return since out of date
-
-local newLib, newOldMinor = LibStub:NewLibrary("Pants", 0) -- try to register a library with a previous, should silently fail
-assert(not newLib) -- should not return since out of date
-
-local newLib, newOldMinor = LibStub:NewLibrary("Pants", 2) -- register a new version
-assert(newLib) -- library table
-assert(rawequal(newLib, lib)) -- should be the same reference as the previous
-assert(newOldMinor == 1) -- should return the minor version of the previous version
-
-assert(rawequal(lib.MyMethod, MyMethod)) -- verify that values were saved
-assert(rawequal(lib.MyTable, MyTable)) -- verify that values were saved
-
-local newLib, newOldMinor = LibStub:NewLibrary("Pants", "Blah 3 Blah") -- register a new version with a string minor version (instead of a number)
-assert(newLib) -- library table
-assert(newOldMinor == 2) -- previous version was 2
-
-local newLib, newOldMinor = LibStub:NewLibrary("Pants", "Blah 4 and please ignore 15 Blah") -- register a new version with a string minor version (instead of a number)
-assert(newLib)
-assert(newOldMinor == 3) -- previous version was 3 (even though it gave a string)
-
-local newLib, newOldMinor = LibStub:NewLibrary("Pants", 5) -- register a new library, using a normal number instead of a string
-assert(newLib)
-assert(newOldMinor == 4) -- previous version was 4 (even though it gave a string)
diff --git a/libs/LibAuras/Libs/LibStub/tests/test2.lua b/libs/LibAuras/Libs/LibStub/tests/test2.lua
deleted file mode 100644
index af431dd..0000000
--- a/libs/LibAuras/Libs/LibStub/tests/test2.lua
+++ /dev/null
@@ -1,27 +0,0 @@
-debugstack = debug.traceback
-strmatch = string.match
-
-loadfile("../LibStub.lua")()
-
-for major, library in LibStub:IterateLibraries() do
-	-- check that MyLib doesn't exist yet, by iterating through all the libraries
-	assert(major ~= "MyLib")
-end
-
-assert(not LibStub:GetLibrary("MyLib", true)) -- check that MyLib doesn't exist yet by direct checking
-assert(not pcall(LibStub.GetLibrary, LibStub, "MyLib")) -- don't silently fail, thus it should raise an error.
-local lib = LibStub:NewLibrary("MyLib", 1) -- create the lib
-assert(lib) -- check it exists
-assert(rawequal(LibStub:GetLibrary("MyLib"), lib)) -- verify that :GetLibrary("MyLib") properly equals the lib reference
-
-assert(LibStub:NewLibrary("MyLib", 2))	-- create a new version
-
-local count=0
-for major, library in LibStub:IterateLibraries() do
-	-- check that MyLib exists somewhere in the libraries, by iterating through all the libraries
-	if major == "MyLib" then -- we found it!
-		count = count +1
-		assert(rawequal(library, lib)) -- verify that the references are equal
-	end
-end
-assert(count == 1) -- verify that we actually found it, and only once
diff --git a/libs/LibAuras/Libs/LibStub/tests/test3.lua b/libs/LibAuras/Libs/LibStub/tests/test3.lua
deleted file mode 100644
index 3c06002..0000000
--- a/libs/LibAuras/Libs/LibStub/tests/test3.lua
+++ /dev/null
@@ -1,14 +0,0 @@
-debugstack = debug.traceback
-strmatch = string.match
-
-loadfile("../LibStub.lua")()
-
-local proxy = newproxy() -- non-string
-
-assert(not pcall(LibStub.NewLibrary, LibStub, proxy, 1)) -- should error, proxy is not a string, it's userdata
-local success, ret = pcall(LibStub.GetLibrary, proxy, true)
-assert(not success or not ret) -- either error because proxy is not a string or because it's not actually registered.
-
-assert(not pcall(LibStub.NewLibrary, LibStub, "Something", "No number in here")) -- should error, minor has no string in it.
-
-assert(not LibStub:GetLibrary("Something", true)) -- shouldn't've created it from the above statement
diff --git a/libs/LibAuras/Libs/LibStub/tests/test4.lua b/libs/LibAuras/Libs/LibStub/tests/test4.lua
deleted file mode 100644
index 294623b..0000000
--- a/libs/LibAuras/Libs/LibStub/tests/test4.lua
+++ /dev/null
@@ -1,41 +0,0 @@
-debugstack = debug.traceback
-strmatch = string.match
-
-loadfile("../LibStub.lua")()
-
-
--- Pretend like loaded libstub is old and doesn't have :IterateLibraries
-assert(LibStub.minor)
-LibStub.minor = LibStub.minor - 0.0001
-LibStub.IterateLibraries = nil
-
-loadfile("../LibStub.lua")()
-
-assert(type(LibStub.IterateLibraries)=="function")
-
-
--- Now pretend that we're the same version -- :IterateLibraries should NOT be re-created
-LibStub.IterateLibraries = 123
-
-loadfile("../LibStub.lua")()
-
-assert(LibStub.IterateLibraries == 123)
-
-
--- Now pretend that a newer version is loaded -- :IterateLibraries should NOT be re-created
-LibStub.minor = LibStub.minor + 0.0001
-
-loadfile("../LibStub.lua")()
-
-assert(LibStub.IterateLibraries == 123)
-
-
--- Again with a huge number
-LibStub.minor = LibStub.minor + 1234567890
-
-loadfile("../LibStub.lua")()
-
-assert(LibStub.IterateLibraries == 123)
-
-
-print("OK")
diff --git a/libs/LibAuras/Libs/libs.xml b/libs/LibAuras/Libs/libs.xml
deleted file mode 100644
index cdc7151..0000000
--- a/libs/LibAuras/Libs/libs.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/..\FrameXML\UI.xsd">
-	<Script file="LibStub\LibStub.lua"/>
-</Ui>
diff --git a/main.lua b/main.lua
index b7ba43e..5262b93 100755
--- a/main.lua
+++ b/main.lua
@@ -1,32 +1,30 @@
 local addonName, SheepMonitor = ...
 
-SheepMonitor = LibStub('AceAddon-3.0'):NewAddon(SheepMonitor, addonName, 'AceEvent-3.0', 'AceTimer-3.0')
+SheepMonitor                  = LibStub('AceAddon-3.0'):NewAddon(SheepMonitor, addonName, 'AceEvent-3.0', 'AceTimer-3.0')
 
-_G['SheepMonitor'] = SheepMonitor
+_G['SheepMonitor']            = SheepMonitor
 
-local L = LibStub('AceLocale-3.0'):GetLocale('SheepMonitor')
+local L                       = LibStub('AceLocale-3.0'):GetLocale('SheepMonitor')
 
-local LibAuraInfo = LibStub('LibAuraInfo-1.0')
+local LibAuraInfo             = LibStub('LibAuraInfo-1.0')
 
 -- LuaFormatter off
-LibAuraInfo.auraInfo[118]    = '60;1' -- updating polymorph value for BFA
-LibAuraInfo.auraInfo[28271]  = '60;1' -- updating polymorph value for BFA
-LibAuraInfo.auraInfo[28272]  = '60;1' -- updating polymorph value for BFA
-LibAuraInfo.auraInfo[61305]  = '60;1' -- updating polymorph value for BFA
-LibAuraInfo.auraInfo[61721]  = '60;1' -- updating polymorph value for BFA
-LibAuraInfo.auraInfo[61780]  = '60;1' -- updating polymorph value for BFA
-LibAuraInfo.auraInfo[126819] = '60;1' -- updating polymorph value for BFA
-LibAuraInfo.auraInfo[161353] = '60;1' -- updating polymorph value for BFA
-LibAuraInfo.auraInfo[161354] = '60;1' -- updating polymorph value for BFA
-LibAuraInfo.auraInfo[161355] = '60;1' -- updating polymorph value for BFA
-LibAuraInfo.auraInfo[161372] = '60;1' -- updating polymorph value for BFA
-LibAuraInfo.auraInfo[383121] = '60;1' -- adding mass polymorph
-LibAuraInfo.auraInfo[3355]   = '60;1' -- fixing incorrect value
-LibAuraInfo.auraInfo[115078] = '40;1' -- adding ability_monk_paralysis
+LibAuraInfo.auraInfo[118]     = '60;1' -- updating polymorph value for BFA
+LibAuraInfo.auraInfo[28271]   = '60;1' -- updating polymorph value for BFA
+LibAuraInfo.auraInfo[28272]   = '60;1' -- updating polymorph value for BFA
+LibAuraInfo.auraInfo[61305]   = '60;1' -- updating polymorph value for BFA
+LibAuraInfo.auraInfo[61721]   = '60;1' -- updating polymorph value for BFA
+LibAuraInfo.auraInfo[61780]   = '60;1' -- updating polymorph value for BFA
+LibAuraInfo.auraInfo[126819]  = '60;1' -- updating polymorph value for BFA
+LibAuraInfo.auraInfo[161353]  = '60;1' -- updating polymorph value for BFA
+LibAuraInfo.auraInfo[161354]  = '60;1' -- updating polymorph value for BFA
+LibAuraInfo.auraInfo[161355]  = '60;1' -- updating polymorph value for BFA
+LibAuraInfo.auraInfo[161372]  = '60;1' -- updating polymorph value for BFA
+LibAuraInfo.auraInfo[383121]  = '60;1' -- adding mass polymorph
+LibAuraInfo.auraInfo[3355]    = '60;1' -- fixing incorrect value
+LibAuraInfo.auraInfo[115078]  = '40;1' -- adding ability_monk_paralysis
 -- LuaFormatter on
 
-local LibAuras = LibStub:GetLibrary('LibAuras')
-
 function SheepMonitor:OnInitialize()
     self.db = LibStub('AceDB-3.0'):New('SheepMonitorDatabase', {
         char = {
@@ -70,7 +68,7 @@ end
 
 function SheepMonitor:COMBAT_LOG_EVENT_UNFILTERED(event, ...)
     local timestamp, eventType, hideCaster, sourceGUID, sourceName, sourceFlags, sourceFlags2, destGUID, destName, destFlags, destFlags2,
-        spellId, spellName, spellSchool = CombatLogGetCurrentEventInfo()
+    spellId, spellName, spellSchool = CombatLogGetCurrentEventInfo()
 
     -- the classic always returns a spell id of zero so we
     -- resolve the spell id using the spell name instead
@@ -99,7 +97,8 @@ function SheepMonitor:COMBAT_LOG_EVENT_UNFILTERED(event, ...)
             }
 
             if not self:IsClassic() and destGUID == UnitGUID('target') then
-                aura.duration = select(5, LibAuras:UnitAura('target', spellId, 'PLAYER|HARMFUL')) or 0
+                local auraInfo = AuraUtil.FindAuraByName(spellName, 'target', 'PLAYER|HARMFUL')
+                aura.duration = auraInfo and auraInfo.duration or aura.duration
             end
 
             self:AuraApplied(aura)