From 3886cc9c13933d5c2add90be95b1452dd3fcb8a0 Mon Sep 17 00:00:00 2001 From: levlam Date: Mon, 2 May 2022 13:54:22 +0300 Subject: [PATCH] Minor SessionType improvements. --- td/generate/scheme/td_api.tl | 34 +++++++++++++++++----------------- td/telegram/Account.cpp | 30 +++++++++++++++--------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl index f8013b6d083d..a8367eb6c07f 100644 --- a/td/generate/scheme/td_api.tl +++ b/td/generate/scheme/td_api.tl @@ -3283,55 +3283,55 @@ accountTtl days:int32 = AccountTtl; //@class SessionType @description Represents the type of a session -//@description This session is running on an Android device +//@description The session is running on an Android device sessionTypeAndroid = SessionType; -//@description This session is running on a generic Apple device +//@description The session is running on a generic Apple device sessionTypeApple = SessionType; -//@description This session is running on the Brave browser +//@description The session is running on the Brave browser sessionTypeBrave = SessionType; -//@description This session is running on the Chrome browser +//@description The session is running on the Chrome browser sessionTypeChrome = SessionType; -//@description This session is running on the Edge browser +//@description The session is running on the Edge browser sessionTypeEdge = SessionType; -//@description This session is running on the Firefox browser +//@description The session is running on the Firefox browser sessionTypeFirefox = SessionType; -//@description This session is running on an iPad device +//@description The session is running on an iPad device sessionTypeIpad = SessionType; -//@description This session is running on an iPhone device +//@description The session is running on an iPhone device sessionTypeIphone = SessionType; -//@description This session is running on a Linux device +//@description The session is running on a Linux device sessionTypeLinux = SessionType; -//@description This session is running on a Mac device +//@description The session is running on a Mac device sessionTypeMac = SessionType; -//@description This session is running on the Opera browser +//@description The session is running on the Opera browser sessionTypeOpera = SessionType; -//@description This session is running on the Safari browser +//@description The session is running on the Safari browser sessionTypeSafari = SessionType; -//@description This session is running on an Ubuntu device +//@description The session is running on an Ubuntu device sessionTypeUbuntu = SessionType; -//@description This session is running on an unknown type of device +//@description The session is running on an unknown type of device sessionTypeUnknown = SessionType; -//@description This session is running on the Vivaldi browser +//@description The session is running on the Vivaldi browser sessionTypeVivaldi = SessionType; -//@description This session is running on a Windows device +//@description The session is running on a Windows device sessionTypeWindows = SessionType; -//@description This session is running on a Xbox console +//@description The session is running on an Xbox console sessionTypeXbox = SessionType; diff --git a/td/telegram/Account.cpp b/td/telegram/Account.cpp index 4b44347cbde2..2ccccb973324 100644 --- a/td/telegram/Account.cpp +++ b/td/telegram/Account.cpp @@ -28,12 +28,12 @@ namespace td { -static td_api::object_ptr get_session_type( +static td_api::object_ptr get_session_type_object( const tl_object_ptr &authorization) { auto contains = [](const string &str, const char *substr) { return str.find(substr) != string::npos; }; - + const string &app_name = authorization->app_name_; auto device_model = to_lower(authorization->device_model_); auto platform = to_lower(authorization->platform_); @@ -43,8 +43,8 @@ static td_api::object_ptr get_session_type( return td_api::make_object(); } - bool web = [&] { - Slice web_name("Web"); + bool is_web = [&] { + CSlice web_name("Web"); auto pos = app_name.find(web_name.c_str()); if (pos == string::npos) { return false; @@ -54,7 +54,7 @@ static td_api::object_ptr get_session_type( return !('a' <= next_character && next_character <= 'z'); }(); - if (web) { + if (is_web) { if (contains(device_model, "brave")) { return td_api::make_object(); } else if (contains(device_model, "vivaldi")) { @@ -82,15 +82,15 @@ static td_api::object_ptr get_session_type( return td_api::make_object(); } - auto ios = begins_with(platform, "ios") || contains(system_version, "ios"); - auto macos = begins_with(platform, "macos") || contains(system_version, "macos"); - if (ios && contains(device_model, "iphone")) { + auto is_ios = begins_with(platform, "ios") || contains(system_version, "ios"); + auto is_macos = begins_with(platform, "macos") || contains(system_version, "macos"); + if (is_ios && contains(device_model, "iphone")) { return td_api::make_object(); - } else if (ios && contains(device_model, "ipad")) { + } else if (is_ios && contains(device_model, "ipad")) { return td_api::make_object(); - } else if (macos && contains(device_model, "mac")) { + } else if (is_macos && contains(device_model, "mac")) { return td_api::make_object(); - } else if (ios || macos) { + } else if (is_ios || is_macos) { return td_api::make_object(); } @@ -103,10 +103,10 @@ static td_api::object_ptr convert_authorization_object( return td_api::make_object( authorization->hash_, authorization->current_, authorization->password_pending_, !authorization->encrypted_requests_disabled_, !authorization->call_requests_disabled_, - get_session_type(authorization), authorization->api_id_, authorization->app_name_, - authorization->app_version_, authorization->official_app_, authorization->device_model_, - authorization->platform_, authorization->system_version_, authorization->date_created_, - authorization->date_active_, authorization->ip_, authorization->country_, authorization->region_); + get_session_type_object(authorization), authorization->api_id_, authorization->app_name_, + authorization->app_version_, authorization->official_app_, authorization->device_model_, authorization->platform_, + authorization->system_version_, authorization->date_created_, authorization->date_active_, authorization->ip_, + authorization->country_, authorization->region_); } class SetAccountTtlQuery final : public Td::ResultHandler {