Skip to content

Don't create a new buffer on every retry during the initial sync #114

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

Open
symphorien wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Don't create a new buffer on every retry during the initial sync #114

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
29 changes: 16 additions & 13 deletions matrix.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ local WEECHAT_VERSION
local SERVER
local STDOUT = {}
local OUT = {}
local BUFFER
local BUFFER = nil
local Room
local MatrixServer
local Olm
Expand Down Expand Up @@ -513,7 +513,8 @@ function real_http_cb(extra, command, rc, stdout, stderr)
perr(('Invalid http request: %s'):format(stdout))
return w.WEECHAT_RC_OK
end
if status_code == 504 and command:find'/sync' then -- keep hammering to try to get in as the server will keep slowly generating the response
if status_code == 504 and extra == "initial" then -- keep hammering to try to get in as the server will keep slowly generating the response
perr('retrying initial sync after 504')
SERVER:initial_sync()
return w.WEECHAT_RC_OK
end
Expand Down Expand Up @@ -1172,17 +1173,19 @@ function MatrixServer:connect()
end

function MatrixServer:initial_sync()
BUFFER = w.buffer_new(SCRIPT_NAME, "", "", "closed_matrix_buffer_cb", "")
w.buffer_set(BUFFER, "short_name", SCRIPT_NAME)
w.buffer_set(BUFFER, "name", SCRIPT_NAME)
w.buffer_set(BUFFER, "localvar_set_type", "server")
w.buffer_set(BUFFER, "localvar_set_server", SCRIPT_NAME)
w.buffer_set(BUFFER, "title", ("Matrix: %s"):format(
w.config_get_plugin'homeserver_url'))
if w.config_string(w.config_get('irc.look.server_buffer')) == 'merge_with_core' then
w.buffer_merge(BUFFER, w.buffer_search_main())
end
w.buffer_set(BUFFER, "display", "auto")
if BUFFER == nil then
BUFFER = w.buffer_new(SCRIPT_NAME, "", "", "closed_matrix_buffer_cb", "")
w.buffer_set(BUFFER, "short_name", SCRIPT_NAME)
w.buffer_set(BUFFER, "name", SCRIPT_NAME)
w.buffer_set(BUFFER, "localvar_set_type", "server")
w.buffer_set(BUFFER, "localvar_set_server", SCRIPT_NAME)
w.buffer_set(BUFFER, "title", ("Matrix: %s"):format(
w.config_get_plugin'homeserver_url'))
if w.config_string(w.config_get('irc.look.server_buffer')) == 'merge_with_core' then
w.buffer_merge(BUFFER, w.buffer_search_main())
end
w.buffer_set(BUFFER, "display", "auto")
end
local data = urllib.urlencode({
access_token = self.access_token,
timeout = 1000*POLL_INTERVAL,
Expand Down