diff --git a/data/locale/en-US.ini b/data/locale/en-US.ini index a8e25aad..4c048b73 100644 --- a/data/locale/en-US.ini +++ b/data/locale/en-US.ini @@ -1877,6 +1877,7 @@ AdvSceneSwitcher.twitchToken.value="Token:" AdvSceneSwitcher.twitchToken.invalid="Invalid twitch token" AdvSceneSwitcher.twitchToken.request="Connect Account" AdvSceneSwitcher.twitchToken.request.waiting="Waiting for token approval ..." +AdvSceneSwitcher.twitchToken.request.waiting.remaining="(%1 s)" AdvSceneSwitcher.twitchToken.request.fail="Failed to get token!" AdvSceneSwitcher.twitchToken.request.fail.browser="Authentication failed! (%1)\nYou can close this window now." AdvSceneSwitcher.twitchToken.request.fail.stateMismatch="State mismatch" diff --git a/plugins/twitch/token.cpp b/plugins/twitch/token.cpp index f0a82e7b..cf25d607 100644 --- a/plugins/twitch/token.cpp +++ b/plugins/twitch/token.cpp @@ -5,6 +5,7 @@ #include +#include #include #include #include @@ -20,6 +21,7 @@ namespace advss { static const int tokenGrabberPort = 42171; +static const int tokenTimeoutSeconds = 120; static std::deque> twitchTokens; @@ -684,6 +686,8 @@ TwitchTokenSettingsDialog::TwitchTokenSettingsDialog( QWidget::connect(&_validationTimer, &QTimer::timeout, this, &TwitchTokenSettingsDialog::CheckIfTokenValid); + QWidget::connect(&_countdownTimer, &QTimer::timeout, this, + &TwitchTokenSettingsDialog::UpdateWaitingStatus); _validationTimer.start(10000); CheckIfTokenValid(); } @@ -825,12 +829,29 @@ void TwitchTokenSettingsDialog::RequestToken() _validationTimer.stop(); _tokenGrabber.SetTokenScope(scope); _tokenGrabber.start(); - _tokenStatus->setText(obs_module_text( - "AdvSceneSwitcher.twitchToken.request.waiting")); + _tokenDeadline = std::chrono::steady_clock::now() + + std::chrono::seconds(tokenTimeoutSeconds); + UpdateWaitingStatus(); + _countdownTimer.start(1000); +} + +void TwitchTokenSettingsDialog::UpdateWaitingStatus() +{ + const auto remaining = std::chrono::ceil( + _tokenDeadline - std::chrono::steady_clock::now()); + const QString remainingText = + QString(obs_module_text( + "AdvSceneSwitcher.twitchToken.request.waiting.remaining")) + .arg(std::max(remaining.count(), 0)); + _tokenStatus->setText( + QString(obs_module_text( + "AdvSceneSwitcher.twitchToken.request.waiting")) + + " " + remainingText); } void TwitchTokenSettingsDialog::GotToken(const std::optional &value) { + _countdownTimer.stop(); _currentTokenValue->setText(value.value_or("")); if (!value) { _tokenStatus->setText(obs_module_text( @@ -898,8 +919,6 @@ bool TwitchTokenSettingsDialog::AskForSettings(QWidget *parent, return true; } -int TokenGrabberThread::_timeout = 15; - TokenGrabberThread::~TokenGrabberThread() { _stopWaiting = true; @@ -1010,7 +1029,7 @@ void TokenGrabberThread::run() vblog(LOG_INFO, "Token server stopped!"); }); auto time = std::chrono::high_resolution_clock::now() + - std::chrono::seconds(_timeout); + std::chrono::seconds(tokenTimeoutSeconds); while (!_stopWaiting) { if (_cv.wait_until(lock, time) == std::cv_status::timeout) { break; diff --git a/plugins/twitch/token.hpp b/plugins/twitch/token.hpp index 17aada14..e03eec04 100644 --- a/plugins/twitch/token.hpp +++ b/plugins/twitch/token.hpp @@ -96,7 +96,6 @@ private: QString _scope; std::optional _tokenString; - static int _timeout; std::mutex _mutex; std::atomic_bool _stopWaiting = {false}; std::condition_variable _cv; @@ -118,6 +117,7 @@ private slots: void RequestToken(); void GotToken(const std::optional &); void CheckIfTokenValid(); + void UpdateWaitingStatus(); private: std::set GetEnabledOptions(); @@ -136,6 +136,8 @@ private: QCheckBox *_validateTimestamps; QCheckBox *_warnIfInvalid; QTimer _validationTimer; + QTimer _countdownTimer; + std::chrono::steady_clock::time_point _tokenDeadline; }; class TwitchConnectionSelection : public ItemSelection {