WoWInterface SVN EasyDND
Compare Revisions
- This comparison shows the changes necessary to convert path
/trunk
- from Rev 74 to Rev 75
- ↔ Reverse comparison
Rev 74 → Rev 75
EasyDND/EasyDND.lua
236,240 → 236,42
| return "" |
| end |
| -- Thanks a lot to Xinhuan for giving me the hint to use string.gsub instead of string.sub |
| -- it saves so much code space accross all languages! |
| local function OnSysFilter(b) |
| local _, s, t, u = EasyDND, string.sub, string.find, string.len |
| local _, gg, ff = EasyDND, string.gsub, string.find |
| if _.db.profile.hidesys then |
| local a = GetLocale() or "enUS" |
| if a == "enUS" then |
| if t(b, s(MARKED_DND, 1, u(MARKED_DND) -3)) then |
| return true |
| elseif t(b, CLEARED_DND) then |
| return true |
| elseif t(b, MARKED_AFK) then |
| return true |
| elseif t(b, s(MARKED_AFK_MESSAGE, 1, u(MARKED_AFK_MESSAGE) -2)) then |
| return true |
| elseif t(b, CLEARED_AFK) then |
| return true |
| end |
| elseif a == "enGB" then |
| if t(b, s(MARKED_DND, 1, u(MARKED_DND) -3)) then |
| return true |
| elseif t(b, CLEARED_DND) then |
| return true |
| elseif t(b, MARKED_AFK) then |
| return true |
| elseif t(b, s(MARKED_AFK_MESSAGE, 1, u(MARKED_AFK_MESSAGE) -2)) then |
| return true |
| elseif t(b, CLEARED_AFK) then |
| return true |
| end |
| elseif a == "esES" then |
| if t(b, s(MARKED_DND, 1, u(MARKED_DND) -3)) then |
| return true |
| elseif t(b, CLEARED_DND) then |
| return true |
| elseif t(b, MARKED_AFK) then |
| return true |
| elseif t(b, s(MARKED_AFK_MESSAGE, 1, u(MARKED_AFK_MESSAGE) -2)) then |
| return true |
| elseif t(b, CLEARED_AFK) then |
| return true |
| end |
| elseif a == "esMX" then |
| if t(b, s(MARKED_DND, 1, u(MARKED_DND) -3)) then |
| return true |
| elseif t(b, CLEARED_DND) then |
| return true |
| elseif t(b, MARKED_AFK) then |
| return true |
| elseif t(b, s(MARKED_AFK_MESSAGE, 1, u(MARKED_AFK_MESSAGE) -2)) then |
| return true |
| elseif t(b, CLEARED_AFK) then |
| return true |
| end |
| elseif a == "deDE" then |
| if t(b, s(MARKED_DND, 1, u(MARKED_DND) -3)) then |
| return true |
| elseif t(b, CLEARED_DND) then |
| return true |
| elseif t(b, MARKED_AFK) then |
| return true |
| elseif t(b, s(MARKED_AFK_MESSAGE, 1, u(MARKED_AFK_MESSAGE) -4)) then |
| return true |
| elseif t(b, CLEARED_AFK) then |
| return true |
| end |
| elseif a == "frFR" then |
| if t(b, s(MARKED_DND, 1, u(MARKED_DND) -3)) then |
| return true |
| elseif t(b, CLEARED_DND) then |
| return true |
| elseif t(b, MARKED_AFK) then |
| return true |
| elseif t(b, s(MARKED_AFK_MESSAGE, 1, u(MARKED_AFK_MESSAGE) -2)) then |
| return true |
| elseif t(b, CLEARED_AFK) then |
| return true |
| end |
| elseif a == "ruRU" then |
| if t(b, s(MARKED_DND, 1, u(MARKED_DND) -5)) then -- changed from 3.0.1 to 3.0.8 |
| return true |
| elseif t(b, CLEARED_DND) then |
| return true |
| elseif t(b, MARKED_AFK) then |
| return true |
| elseif t(b, s(MARKED_AFK_MESSAGE, 1, u(MARKED_AFK_MESSAGE) -5)) then -- changed from 3.0.1 to 3.0.8 |
| return true |
| elseif t(b, CLEARED_AFK) then |
| return true |
| end |
| elseif a == "koKR" then |
| if t(b, s(MARKED_DND, 3, -1)) then |
| return true |
| elseif t(b, CLEARED_DND) then |
| return true |
| elseif t(b, MARKED_AFK) then |
| return true |
| elseif t(b, s(MARKED_AFK_MESSAGE, 4, -1)) then |
| return true |
| elseif t(b, CLEARED_AFK) then |
| return true |
| end |
| elseif a == "zhCN" or a == "enCN" then |
| if t(b, s(MARKED_DND, 1, u(MARKED_DND) -5)) then |
| return true |
| elseif t(b, CLEARED_DND) then |
| return true |
| elseif t(b, MARKED_AFK) then |
| return true |
| elseif t(b, s(MARKED_AFK_MESSAGE, 1, u(MARKED_AFK_MESSAGE) -2)) then |
| return true |
| elseif t(b, CLEARED_AFK) then |
| return true |
| end |
| elseif a == "zhTW" or a == "enTW" then |
| if t(b, s(MARKED_DND, 1, u(MARKED_DND) -5)) then |
| return true |
| elseif t(b, CLEARED_DND) then |
| return true |
| elseif t(b, MARKED_AFK) then |
| return true |
| elseif t(b, s(MARKED_AFK_MESSAGE, 1, u(MARKED_AFK_MESSAGE) -2)) then |
| return true |
| elseif t(b, CLEARED_AFK) then |
| return true |
| end |
| local a, new = GetLocale() or "" |
| if a == "deDE" then new = gg(MARKED_AFK_MESSAGE, "%%1$s", ".*") |
| else new = gg(MARKED_AFK_MESSAGE, "%%s", ".*") end |
| local patterns = { |
| CLEARED_DND, |
| MARKED_AFK, |
| CLEARED_AFK, |
| gg(MARKED_DND, "%%s", ".*"), |
| new |
| } |
| for i, j in pairs(patterns) do |
| if ff(b, j) then return true end |
| end |
| end |
| return false |
| end |
| -- Thanks a lot to Xinhuan for giving me the hint to use string.gsub instead of string.sub |
| -- it saves so much code space accross all languages! |
| local function OnSysAntiFilter(b) |
| local _, s, t, u = EasyDND, string.sub, string.find, string.len |
| local _, gg, ff = EasyDND, string.gsub, string.find |
| if _.db.profile.anti_hidesys and _.x then |
| local a = GetLocale() or "enUS" |
| _.x = false |
| if a == "enUS" then |
| if t(b, s(ERR_INVITED_TO_GROUP_SS, 21, -1)) then |
| return true |
| elseif t(b, s(ERR_INVITED_TO_GUILD_SSS, 17, u(ERR_INVITED_TO_GUILD_SSS) -3)) then |
| return true |
| elseif t(b, s(DUEL_REQUESTED, 4, -1)) then |
| return true |
| elseif t(b, s(ERR_TRADE_REQUEST_S, 4, -1)) then |
| return true |
| end |
| elseif a == "enGB" then |
| if t(b, s(ERR_INVITED_TO_GROUP_SS, 21, -1)) then |
| return true |
| elseif t(b, s(ERR_INVITED_TO_GUILD_SSS, 17, u(ERR_INVITED_TO_GUILD_SSS) -3)) then |
| return true |
| elseif t(b, s(DUEL_REQUESTED, 4, -1)) then |
| return true |
| elseif t(b, s(ERR_TRADE_REQUEST_S, 4, -1)) then |
| return true |
| end |
| elseif a == "esES" then |
| if t(b, s(ERR_INVITED_TO_GROUP_SS, 21, -1)) then |
| return true |
| elseif t(b, s(ERR_INVITED_TO_GUILD_SSS, 17, u(ERR_INVITED_TO_GUILD_SSS) -3)) then |
| return true |
| elseif t(b, s(DUEL_REQUESTED, 4, -1)) then |
| return true |
| elseif t(b, s(ERR_TRADE_REQUEST_S, 4, -1)) then |
| return true |
| end |
| elseif a == "esMX" then |
| if t(b, s(ERR_INVITED_TO_GROUP_SS, 21, -1)) then |
| return true |
| elseif t(b, s(ERR_INVITED_TO_GUILD_SSS, 17, u(ERR_INVITED_TO_GUILD_SSS) -3)) then |
| return true |
| elseif t(b, s(DUEL_REQUESTED, 4, -1)) then |
| return true |
| elseif t(b, s(ERR_TRADE_REQUEST_S, 4, -1)) then |
| return true |
| end |
| elseif a == "deDE" then |
| if t(b, s(ERR_INVITED_TO_GROUP_SS, 21, -1)) then |
| return true |
| elseif t(b, s(ERR_INVITED_TO_GUILD_SSS, 17, u(ERR_INVITED_TO_GUILD_SSS) -18)) then |
| return true |
| elseif t(b, s(DUEL_REQUESTED, 4, -1)) then |
| return true |
| elseif t(b, s(ERR_TRADE_REQUEST_S, 4, -1)) then |
| return true |
| end |
| elseif a == "frFR" then |
| if t(b, s(ERR_INVITED_TO_GROUP_SS, 21, -1)) then |
| return true |
| elseif t(b, s(ERR_INVITED_TO_GUILD_SSS, 17, u(ERR_INVITED_TO_GUILD_SSS) -3)) then |
| return true |
| elseif t(b, s(DUEL_REQUESTED, 4, -1)) then |
| return true |
| elseif t(b, s(ERR_TRADE_REQUEST_S, 4, -1)) then |
| return true |
| end |
| elseif a == "ruRU" then |
| if t(b, s(ERR_INVITED_TO_GROUP_SS, 21, -1)) then |
| return true |
| elseif t(b, s(ERR_INVITED_TO_GUILD_SSS, 17, u(ERR_INVITED_TO_GUILD_SSS) -5)) then -- changed from 3.0.1 to 3.0.8 |
| return true |
| elseif t(b, s(DUEL_REQUESTED, 4, -1)) then |
| return true |
| elseif t(b, s(ERR_TRADE_REQUEST_S, 4, -1)) then |
| return true |
| end |
| elseif a == "koKR" then |
| if t(b, s(ERR_INVITED_TO_GROUP_SS, 20, -1)) then |
| return true |
| elseif t(b, s(ERR_INVITED_TO_GUILD_SSS, 17, u(ERR_INVITED_TO_GUILD_SSS) -25)) then |
| return true |
| elseif t(b, s(DUEL_REQUESTED, 3, -1)) then |
| return true |
| elseif t(b, s(ERR_TRADE_REQUEST_S, 3, -1)) then |
| return true |
| end |
| elseif a == "zhCN" or a == "enCN" then |
| if t(b, s(ERR_INVITED_TO_GROUP_SS, 20, -1)) then |
| return true |
| elseif t(b, s(ERR_INVITED_TO_GUILD_SSS, 17, u(ERR_INVITED_TO_GUILD_SSS) -5)) then |
| return true |
| elseif t(b, s(DUEL_REQUESTED, 3, -1)) then |
| return true |
| elseif t(b, s(ERR_TRADE_REQUEST_S, 3, -1)) then |
| return true |
| end |
| elseif a == "zhTW" or a == "enTW" then |
| if t(b, s(ERR_INVITED_TO_GROUP_SS, 20, -1)) then |
| return true |
| elseif t(b, s(ERR_INVITED_TO_GUILD_SSS, 17, u(ERR_INVITED_TO_GUILD_SSS) -5)) then |
| return true |
| elseif t(b, s(DUEL_REQUESTED, 3, -1)) then |
| return true |
| elseif t(b, s(ERR_TRADE_REQUEST_S, 3, -1)) then |
| return true |
| end |
| local patterns = { |
| gg(DUEL_REQUESTED, "%%s", ".*"), |
| gg(ERR_TRADE_REQUEST_S, "%%s", ".*"), |
| gg(ERR_INVITED_TO_GROUP_SS, "[|]Hplayer:%%s[|]h[[]%%s[]][|]h", "[|]Hplayer:.*[|]h[[].*[]][|]h"), |
| gg(gg(ERR_INVITED_TO_GUILD_SSS, "[|]Hplayer:%%s[|]h[[]%%s[]][|]h", "[|]Hplayer:.*[|]h[[].*[]][|]h"), "%%s", ".*") |
| } |
| for i, j in pairs(patterns) do |
| if ff(b, j) then return true end |
| end |
| end |
| return false |
693,7 → 495,7
| local function __hooked_Bank_OnEvent(self, event, ...) |
| local delay, _, args, frame = 0, EasyDND, ..., nil |
| if self then frame = self:GetName() or "none" end |
| if event == "BANKFRAME_CLOSED" or ( frame and frame == "GuildBankFrame" ) then |
| if event == "BANKFRAME_CLOSED" or ( frame and frame == "GuildBankFrame" ) or ( frame and frame == "MailFrame" ) then |
| local fake = CreateFrame("Frame", nil, UIParent) |
| fake:SetScript("OnUpdate", function(a, elapsed) |
| if _.h then |
708,7 → 510,10
| fake = nil |
| _.h = false |
| if type(event) == "string" then _.__orig_BankFrame_OnEvent(self, event, args) |
| else _.__orig_HideUIPanel(self) end |
| else |
| _.__orig_HideUIPanel(self) |
| if frame == "MailFrame" then Stub("MAIL_CLOSED") end |
| end |
| end |
| end) |
| else |
983,3 → 788,4
| InitGlobalVariables() |
| _:Print(L["deactivated"]) |
| end |
EasyDND/EasyDND.toc
20,7 → 20,7
| ## X-CompatibleLocales: enUS, enGB, esES, esMX, deDE, frFR, ruRU, koKR, zhCN, zhTW, enCN, enTW |
| ## X-Embeds: LibDataBroker-1.1 |
| ## Dependencies: Ace3 |
| ## OptionalDeps: LibDBIcon-1.0, DewdropLib |
| ## OptionalDeps: LibDBIcon-1.0, DewdropLib, tekDebug |
| ## SavedVariables: EasyDNDDB |
| ## SavedVariablesPerCharacter: EasyDNDDBPC |
31,18 → 31,10
| embeds.xml |
| locals\enUS.lua |
| locals\enGB.lua |
| locals\frFR.lua |
| locals\deDE.lua |
| locals\esES.lua |
| locals\esMX.lua |
| locals\ruRU.lua |
| locals\koKR.lua |
| locals\zhCN.lua |
| locals\zhTW.lua |
| locals\enCN.lua |
| locals\enTW.lua |
| EasyDND.lua |
| opts\options.lua |
| frames\broker.lua |
EasyDND/locals/zhCN.lua
File deleted
EasyDND/locals/enCN.lua
File deleted
EasyDND/locals/enGB.lua
File deleted
EasyDND/locals/esMX.lua
File deleted
EasyDND/locals/zhTW.lua
File deleted
EasyDND/locals/enTW.lua
File deleted
EasyDND/locals/esES.lua
File deleted
EasyDND/locals/enUS.lua
18,7 → 18,15
| _G.EasyDND_MINOR_VERSION = MINOR_VERSION |
| if not LibStub then return end |
| local L = LibStub("AceLocale-3.0"):NewLocale("EasyDND", "enUS", true) |
| local L = |
| LibStub("AceLocale-3.0"):NewLocale("EasyDND", "enUS", true) or |
| LibStub("AceLocale-3.0"):NewLocale("EasyDND", "enGB", false) or |
| LibStub("AceLocale-3.0"):NewLocale("EasyDND", "esES", false) or |
| LibStub("AceLocale-3.0"):NewLocale("EasyDND", "esMX", false) or |
| LibStub("AceLocale-3.0"):NewLocale("EasyDND", "zhCN", false) or |
| LibStub("AceLocale-3.0"):NewLocale("EasyDND", "zhTW", false) or |
| LibStub("AceLocale-3.0"):NewLocale("EasyDND", "enCN", false) or |
| LibStub("AceLocale-3.0"):NewLocale("EasyDND", "enTW", false) |
| if not L then return end |
| L["activated"] = true |
WoWInterface
AddOn Sites
© 2004 - 2022 MMOUI
vBulletin © 2024, Jelsoft Enterprises Ltd