mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2025-06-05 06:33:57 +02:00
Fix autologin token account selection.
This commit is contained in:
parent
b4993453c0
commit
1647991f6a
1 changed files with 9 additions and 3 deletions
|
@ -50,8 +50,13 @@ const auto kBadPrefix = u"http://"_q;
|
||||||
[[nodiscard]] QString UrlWithAutoLoginToken(
|
[[nodiscard]] QString UrlWithAutoLoginToken(
|
||||||
const QString &url,
|
const QString &url,
|
||||||
QUrl parsed,
|
QUrl parsed,
|
||||||
const QString &domain) {
|
const QString &domain,
|
||||||
const auto &active = Core::App().activeAccount();
|
QVariant context) {
|
||||||
|
const auto my = context.value<ClickHandlerContext>();
|
||||||
|
const auto window = my.sessionWindow.get();
|
||||||
|
const auto &active = window
|
||||||
|
? window->session().account()
|
||||||
|
: Core::App().activeAccount();
|
||||||
const auto token = active.mtp().configValues().autologinToken;
|
const auto token = active.mtp().configValues().autologinToken;
|
||||||
const auto domains = active.appConfig().get<std::vector<QString>>(
|
const auto domains = active.appConfig().get<std::vector<QString>>(
|
||||||
"autologin_domains",
|
"autologin_domains",
|
||||||
|
@ -238,7 +243,8 @@ bool UiIntegration::handleUrlClick(
|
||||||
const auto domain = DomainForAutoLogin(parsed);
|
const auto domain = DomainForAutoLogin(parsed);
|
||||||
const auto skip = context.value<ClickHandlerContext>().skipBotAutoLogin;
|
const auto skip = context.value<ClickHandlerContext>().skipBotAutoLogin;
|
||||||
if (skip || !BotAutoLogin(url, domain, context)) {
|
if (skip || !BotAutoLogin(url, domain, context)) {
|
||||||
File::OpenUrl(UrlWithAutoLoginToken(url, std::move(parsed), domain));
|
File::OpenUrl(
|
||||||
|
UrlWithAutoLoginToken(url, std::move(parsed), domain, context));
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue