2
0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 22:46:10 +00:00

Removed username from public data members of UserData.

This commit is contained in:
23rd
2022-10-05 14:32:16 +03:00
committed by John Preston
parent 9b7329b378
commit 5751d29c47
26 changed files with 112 additions and 61 deletions

View File

@@ -517,12 +517,24 @@ not_null<UserData*> Session::processUser(const MTPUser &data) {
} else {
// apply first_name and last_name from minimal user only if we don't have
// local values for first name and last name already, otherwise skip
bool noLocalName = result->firstName.isEmpty() && result->lastName.isEmpty();
QString fname = (!minimal || noLocalName) ? TextUtilities::SingleLine(qs(data.vfirst_name().value_or_empty())) : result->firstName;
QString lname = (!minimal || noLocalName) ? TextUtilities::SingleLine(qs(data.vlast_name().value_or_empty())) : result->lastName;
const auto noLocalName = result->firstName.isEmpty()
&& result->lastName.isEmpty();
const auto fname = (!minimal || noLocalName)
? TextUtilities::SingleLine(
qs(data.vfirst_name().value_or_empty()))
: result->firstName;
const auto lname = (!minimal || noLocalName)
? TextUtilities::SingleLine(
qs(data.vlast_name().value_or_empty()))
: result->lastName;
QString phone = minimal ? result->phone() : qs(data.vphone().value_or_empty());
QString uname = minimal ? result->username : TextUtilities::SingleLine(qs(data.vusername().value_or_empty()));
const auto phone = minimal
? result->phone()
: qs(data.vphone().value_or_empty());
const auto uname = minimal
? result->username()
: TextUtilities::SingleLine(
qs(data.vusername().value_or_empty()));
const auto phoneChanged = (result->phone() != phone);
if (phoneChanged) {