jiriks74/presence.nvim
1
0
Fork 0
mirror of https://github.com/jiriks74/presence.nvim synced 2024-11-23 20:37:50 +01:00
Code Issues Actions Releases Activity

Track authorization state and fix race condition

Browse Source
This commit is contained in:
Andrew Kwon 2021-05-31 18:41:34 -07:00
parent 12d177985b
commit 81c3cc0100
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lua/presence/init.lua
View File

@ -51,6 +51,7 @@
-- --
local Presence = {} local Presence = {}
Presence.is_authorized = false Presence.is_authorized = false
Presence.is_authorizing = false
Presence.is_connected = false Presence.is_connected = false
Presence.last_activity = {} Presence.last_activity = {}
Presence.peers = {} Presence.peers = {}
@ -259,7 +260,13 @@ end
function Presence:authorize(on_done) function Presence:authorize(on_done)
self.log:debug("Authorizing with Discord...") self.log:debug("Authorizing with Discord...")
-- Track authorization state to avoid race conditions
-- (Discord rejects when multiple auth requests are sent at once)
self.is_authorizing = true
self.discord:authorize(function(err, response) self.discord:authorize(function(err, response)
self.is_authorizing = false
if err and err:find(".*already did handshake.*") then if err and err:find(".*already did handshake.*") then
self.log:info("Already authorized with Discord") self.log:info("Already authorized with Discord")
self.is_authorized = true self.is_authorized = true
@ -449,16 +456,27 @@ function Presence.discord_event(on_ready)
end end
local args = {...} local args = {...}
local callback = function() on_ready(self, unpack(args)) end local callback = function()
on_ready(self, unpack(args))
end
-- Call Discord if already connected and authorized
if self.is_connected and self.is_authorized then if self.is_connected and self.is_authorized then
return callback() return callback()
end end
-- Schedule event if currently authorizing with Discord
if self.is_authorizing then
self.log:debug("Currently authorizing with Discord, scheduling callback for later...")
return vim.schedule(callback)
end
-- Authorize if connected but not yet authorized yet
if self.is_connected and not self.is_authorized then if self.is_connected and not self.is_authorized then
return self:authorize(callback) return self:authorize(callback)
end end
-- Connect and authorize plugin with Discord
self:connect(function() self:connect(function()
if self.is_authorized then if self.is_authorized then
return callback() return callback()
@ -483,7 +501,7 @@ function Presence:update_for_buffer(buffer, should_debounce)
-- Otherwise set it to the current time. -- Otherwise set it to the current time.
local relative_activity_set_at = should_debounce and self.last_activity.relative_set_at or os.time() local relative_activity_set_at = should_debounce and self.last_activity.relative_set_at or os.time()
self.log:debug(string.format("Setting activity for %s...", buffer)) self.log:debug(string.format("Setting activity for %s...", buffer and #buffer > 0 and buffer or "unnamed buffer"))
-- Parse vim buffer -- Parse vim buffer
local filename = self.get_filename(buffer, self.os.path_separator) local filename = self.get_filename(buffer, self.os.path_separator)