Skip to content

MultiBot: deduplicate shared roster workflow helpers #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Wishmaster117 merged 1 commit into from
Aug 7, 2026
+17 −37
Merged

MultiBot: deduplicate shared roster workflow helpers #51

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 17 additions & 37 deletions Core/MultiBot.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1335,7 +1335,7 @@ end
local FAVORITE_ROSTER_REFRESH_DELAYS = { 0, 0.8, 1.8, 3.2, 5.0, 7.5, 9.5 }
local FAVORITE_ROSTER_REFRESH_TTL = 10.0

local function GetFavoriteRosterRefreshNow()
local function GetBridgeWorkflowNow()
if type(GetTime) == "function" then
return GetTime()
end
Expand All @@ -1347,7 +1347,7 @@ local function GetFavoriteRosterRefreshNow()
return 0
end

local function NormalizeFavoriteRosterRefreshName(name)
local function NormalizeBridgeWorkflowName(name)
if type(name) ~= "string" then
return ""
end
Expand All @@ -1367,7 +1367,7 @@ local function GetFavoriteRosterRefreshState()
end

local function PruneFavoriteRosterRefreshTargets(state)
local now = GetFavoriteRosterRefreshNow()
local now = GetBridgeWorkflowNow()
local unresolved = 0

for key, target in pairs(state.targets) do
Expand Down Expand Up @@ -1399,8 +1399,8 @@ function MultiBot.BeginFavoriteRosterRefresh(name)
end

local state = GetFavoriteRosterRefreshState()
local key = NormalizeFavoriteRosterRefreshName(name)
local now = GetFavoriteRosterRefreshNow()
local key = NormalizeBridgeWorkflowName(name)
local now = GetBridgeWorkflowNow()

state.sequence = state.sequence + 1
local generation = state.sequence
Expand All @@ -1417,7 +1417,7 @@ function MultiBot.BeginFavoriteRosterRefresh(name)
return
end

if tonumber(target.expiresAt or 0) <= GetFavoriteRosterRefreshNow() then
if tonumber(target.expiresAt or 0) <= GetBridgeWorkflowNow() then
state.targets[key] = nil
return
end
Expand Down Expand Up @@ -1524,26 +1524,6 @@ local ADDCLASS_AUTO_GROUP_MAX_PENDING = 8
local ADDCLASS_AUTO_GROUP_MAX_ATTEMPTS = 3
local ADDCLASS_AUTO_GROUP_RETRY_DELAY = 1.5

local function GetAddClassAutoGroupNow()
if type(GetTime) == "function" then
return GetTime()
end

if type(time) == "function" then
return time()
end

return 0
end

local function NormalizeAddClassAutoGroupName(name)
if type(name) ~= "string" then
return ""
end

return string.lower(name)
end

local function GetAddClassAutoGroupState()
if type(MultiBot._addClassAutoGroup) ~= "table" then
MultiBot._addClassAutoGroup = {}
Expand Down Expand Up @@ -1577,7 +1557,7 @@ local function CompleteAddClassAutoGroupTransaction(state, transaction)
end

local function CompactAddClassAutoGroupState(state)
local now = GetAddClassAutoGroupNow()
local now = GetBridgeWorkflowNow()
local pending = {}

for _, transaction in ipairs(state.pending) do
Expand All @@ -1597,22 +1577,22 @@ local function BuildAddClassAutoGroupBaseline()
if MultiBot.bridge and type(MultiBot.bridge.roster) == "table" then
for _, entry in ipairs(MultiBot.bridge.roster) do
if type(entry) == "table" and type(entry.name) == "string" and entry.name ~= "" then
names[NormalizeAddClassAutoGroupName(entry.name)] = true
names[NormalizeBridgeWorkflowName(entry.name)] = true
end
end
end

if MultiBot.index and type(MultiBot.index.players) == "table" then
for _, name in ipairs(MultiBot.index.players) do
if type(name) == "string" and name ~= "" then
names[NormalizeAddClassAutoGroupName(name)] = true
names[NormalizeBridgeWorkflowName(name)] = true
end
end
end

local playerName = type(UnitName) == "function" and UnitName("player") or nil
if type(playerName) == "string" and playerName ~= "" then
names[NormalizeAddClassAutoGroupName(playerName)] = true
names[NormalizeBridgeWorkflowName(playerName)] = true
end

return names
Expand Down Expand Up @@ -1655,7 +1635,7 @@ local function ScheduleAddClassAutoGroupInvite(state, transaction)
return
end

local now = GetAddClassAutoGroupNow()
local now = GetBridgeWorkflowNow()
if now >= transaction.expiresAt then
CompleteAddClassAutoGroupTransaction(state, transaction)
return
Expand Down Expand Up @@ -1686,7 +1666,7 @@ local function ScheduleAddClassAutoGroupInvite(state, transaction)
if IsBridgeRosterBotActive(botName) then
CompleteAddClassAutoGroupTransaction(state, transaction)
elseif transaction.inviteAttempts < ADDCLASS_AUTO_GROUP_MAX_ATTEMPTS
and GetAddClassAutoGroupNow() < transaction.expiresAt then
and GetBridgeWorkflowNow() < transaction.expiresAt then
ScheduleAddClassAutoGroupInvite(state, transaction)
end

Expand Down Expand Up @@ -1725,7 +1705,7 @@ function MultiBot.BeginAddClassAutoGroup(classCmd)
end

state.sequence = state.sequence + 1
local now = GetAddClassAutoGroupNow()
local now = GetBridgeWorkflowNow()
local transaction = {
id = state.sequence,
classId = classId,
Expand All @@ -1741,15 +1721,15 @@ function MultiBot.BeginAddClassAutoGroup(classCmd)

if type(MultiBot.TimerAfter) == "function" then
MultiBot.TimerAfter(4.0, function()
if not transaction.completed and GetAddClassAutoGroupNow() < transaction.expiresAt
if not transaction.completed and GetBridgeWorkflowNow() < transaction.expiresAt
and MultiBot.bridge and MultiBot.bridge.connected
and MultiBot.Comm and type(MultiBot.Comm.RequestRoster) == "function" then
MultiBot.Comm.RequestRoster()
end
end)

MultiBot.TimerAfter(8.0, function()
if not transaction.completed and GetAddClassAutoGroupNow() < transaction.expiresAt
if not transaction.completed and GetBridgeWorkflowNow() < transaction.expiresAt
and MultiBot.bridge and MultiBot.bridge.connected
and MultiBot.Comm and type(MultiBot.Comm.RequestRoster) == "function" then
MultiBot.Comm.RequestRoster()
Expand All @@ -1769,7 +1749,7 @@ function MultiBot.ProcessPendingAddClassRoster(roster)
CompactAddClassAutoGroupState(state)

local scheduled = 0
local now = GetAddClassAutoGroupNow()
local now = GetBridgeWorkflowNow()

for _, transaction in ipairs(state.pending) do
if not transaction.completed then
Expand All @@ -1788,7 +1768,7 @@ function MultiBot.ProcessPendingAddClassRoster(roster)
for _, entry in ipairs(roster) do
local name = type(entry) == "table" and entry.name or nil
local classId = type(entry) == "table" and tonumber(entry.classId or 0) or 0
local key = NormalizeAddClassAutoGroupName(name)
local key = NormalizeBridgeWorkflowName(name)

if key ~= "" and classId == transaction.classId
and not transaction.baseline[key]
Expand Down
Loading