Skip to content

Commit 2c2b4fb

Browse files
committed
Use internal APIs instead of raw data access
1 parent f9c53e8 commit 2c2b4fb

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

Search/SearchEverywhere.lua

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ local function CacheCharacter(character, callback)
1616
end
1717
end
1818

19-
local characterData = CopyTable(SYNDICATOR_DATA.Characters[character])
19+
local characterData = CopyTable(Syndicator.API.GetCharacter(character))
2020

2121
local bagsList = {}
2222
for _, bag in ipairs(characterData.bags) do
@@ -65,7 +65,7 @@ end
6565
local function CacheGuild(guild, callback)
6666
local guildList = {}
6767
local linkToTabIndex = {}
68-
for tabIndex, tab in ipairs(CopyTable(SYNDICATOR_DATA.Guilds[guild].bank)) do
68+
for tabIndex, tab in ipairs(CopyTable(Syndicator.API.GetGuild(guild).bank)) do
6969
for _, item in ipairs(tab.slots) do
7070
if item.itemLink then
7171
linkToTabIndex[item.itemLink] = tabIndex
@@ -152,11 +152,11 @@ function Syndicator.Search.RequestSearchEverywhereResults(searchTerm, callback)
152152
Warband = {},
153153
}
154154

155-
for c in pairs(SYNDICATOR_DATA.Characters) do
155+
for _, c in ipairs(Syndicator.API.GetAllCharacters()) do
156156
pending.Characters[c] = true
157157
end
158158

159-
for g in pairs(SYNDICATOR_DATA.Guilds) do
159+
for _, g in ipairs(Syndicator.API.GetAllGuilds()) do
160160
pending.Guilds[g] = true
161161
end
162162

@@ -261,7 +261,7 @@ function Syndicator.Search.CombineSearchEverywhereResults(results, callback)
261261
local source = CopyTable(r.source)
262262
source.itemCount = r.itemCount
263263
if source.character then
264-
local characterData = SYNDICATOR_DATA.Characters[source.character]
264+
local characterData = Syndicator.API.GetCharacter(source.character)
265265
if not characterData.details.hidden and (source.container ~= "equipped" or Syndicator.Config.Get(Syndicator.Config.Options.SHOW_EQUIPPED_ITEMS_IN_TOOLTIPS)) then
266266
if seenCharacters[key][source.character .. "_" .. source.container] then
267267
local entry = items[key].sources[seenCharacters[key][source.character .. "_" .. source.container]]
@@ -275,7 +275,7 @@ function Syndicator.Search.CombineSearchEverywhereResults(results, callback)
275275
items[key].itemCount = items[key].itemCount + r.itemCount
276276
end
277277
elseif source.guild then
278-
local guildData = SYNDICATOR_DATA.Guilds[source.guild]
278+
local guildData = Syndicator.API.GetGuild(source.guild)
279279
if not guildData.details.hidden then
280280
if seenGuilds[key][source.guild] then
281281
local entry = items[key].sources[seenGuilds[key][source.guild]]
@@ -361,7 +361,7 @@ local function PrintSource(indent, source, searchTerm)
361361
if addonTable.ShowItemLocationCallback then
362362
character = GetLink(source, searchTerm, source.character)
363363
end
364-
local characterData = SYNDICATOR_DATA.Characters[source.character]
364+
local characterData = Syndicator.API.GetCharacter(source.character)
365365
local className = characterData.details.className
366366
if className then
367367
character = "|c" .. (CUSTOM_CLASS_COLORS or RAID_CLASS_COLORS)[className].colorStr .. character .. "|r"

Tracking/CurrencyTooltipData.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ function Syndicator.Tracking.GetCurrencyTooltipData(currencyID, sameConnectedRea
1212
local currentFaction = UnitFactionGroup("player")
1313

1414
local summary = {}
15-
for character, info in pairs(SYNDICATOR_DATA.Characters) do
15+
for _, character in pairs(Syndicator.API.GetAllCharacters()) do
16+
local info = Syndicator.API.GetCharacter(character)
1617
if not info.details.hidden and (not sameConnectedRealm or matchingRealms[info.details.realmNormalized]) and (not sameFaction or info.details.faction == currentFaction) then
1718
if info.currencies and info.currencies[currencyID] and info.currencies[currencyID] > 0 then
1819
table.insert(summary, {

Tracking/ItemSummaries.lua

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -323,11 +323,11 @@ function SyndicatorItemSummariesMixin:GetTooltipInfo(key, sameConnectedRealm, sa
323323
if charactersByRealm then
324324
for char, summary in pairs(charactersByRealm) do
325325
local byKey = summary[key]
326-
local characterDetails = SYNDICATOR_DATA.Characters[char .. "-" .. r].details
326+
local characterDetails = Syndicator.API.GetCharacter(char .. "-" .. r).details
327327
if byKey ~= nil and characterDetails.show.inventory and (not sameFaction or characterDetails.faction == currentFaction) then
328328
table.insert(result.characters, {
329-
character = char,
330-
realmNormalized = r,
329+
character = characterDetails.character,
330+
realmNormalized = characterDetails.realmNormalized,
331331
className = characterDetails.className,
332332
race = characterDetails.race,
333333
sex = characterDetails.sex,
@@ -348,7 +348,7 @@ function SyndicatorItemSummariesMixin:GetTooltipInfo(key, sameConnectedRealm, sa
348348
local guildDetails = SYNDICATOR_DATA.Guilds[guild .. "-" .. r].details
349349
if byKey ~= nil and guildDetails.show.inventory and (not sameFaction or guildDetails.faction == currentFaction) then
350350
table.insert(result.guilds, {
351-
guild = guild,
351+
guild = guildDetails.guild,
352352
realmNormalized = r,
353353
bank = byKey.bank or 0
354354
})
@@ -359,7 +359,7 @@ function SyndicatorItemSummariesMixin:GetTooltipInfo(key, sameConnectedRealm, sa
359359

360360
local currentGuild = Syndicator.API.GetCurrentGuild()
361361
if currentGuild then
362-
local currentGuildDetails = SYNDICATOR_DATA.Guilds[currentGuild].details
362+
local currentGuildDetails = Syndicator.API.GetGuild(currentGuild).details
363363
if not FindInTableIf(result.guilds, function(a) return a.guild == currentGuildDetails.guild and a.realmNormalized == currentGuildDetails.realm end) and self.SV.Guilds.ByRealm[currentGuildDetails.realm] then
364364
local summary = self.SV.Guilds.ByRealm[currentGuildDetails.realm][currentGuildDetails.guild]
365365
if summary then

0 commit comments

Comments
 (0)