mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-02 23:55:12 +00:00
Code Issues Releases Wiki Activity

Added support of primary username to FieldAutocomplete.

Browse Source
This commit is contained in:
23rd
2022-10-13 01:34:46 +03:00
committed by John Preston
parent 79f592a84f
commit 00df4625e2
5 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
View File

@@ -51,6 +51,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <QtWidgets/QApplication>
[[nodiscard]] QString PrimaryUsername(not_null<UserData*> user) {
const auto &usernames = user->usernames();
return usernames.empty() ? user->username() : usernames.front();
}
class FieldAutocomplete::Inner final : public Ui::RpWidget {
public:
struct ScrollTo {
@@ -396,9 +401,9 @@ void FieldAutocomplete::updateFiltered(bool resetScroll) {
}
auto filterNotPassedByUsername = [this](UserData *user) -> bool {
if (user->username().startsWith(_filter, Qt::CaseInsensitive)) {
if (PrimaryUsername(user).startsWith(_filter, Qt::CaseInsensitive)) {
const auto exactUsername =
(user->username().size() == _filter.size());
(PrimaryUsername(user).size() == _filter.size());
return exactUsername;
}
return true;
@@ -407,7 +412,7 @@ void FieldAutocomplete::updateFiltered(bool resetScroll) {
for (const auto &nameWord : user->nameWords()) {
if (nameWord.startsWith(_filter, Qt::CaseInsensitive)) {
const auto exactUsername =
(user->username().compare(_filter, Qt::CaseInsensitive) == 0);
(PrimaryUsername(user).compare(_filter, Qt::CaseInsensitive) == 0);
return exactUsername;
}
}
@@ -556,7 +561,7 @@ void FieldAutocomplete::updateFiltered(bool resetScroll) {
for (const auto &command : *i->second) {
if (!listAllSuggestions) {
auto toFilter = (hasUsername || botStatus == 0 || botStatus == 2)
? command.command + '@' + user->username()
? command.command + '@' + PrimaryUsername(user)
: command.command;
if (!toFilter.startsWith(_filter, Qt::CaseInsensitive)/* || toFilter.size() == _filter.size()*/) {
continue;
@@ -575,7 +580,7 @@ void FieldAutocomplete::updateFiltered(bool resetScroll) {
const auto toFilter = (hasUsername
|| botStatus == 0
|| botStatus == 2)
? command.command + '@' + user->username()
? command.command + '@' + PrimaryUsername(user)
: command.command;
if (!toFilter.startsWith(_filter, Qt::CaseInsensitive)/* || toFilter.size() == _filter.size()*/) continue;
}
@@ -941,16 +946,16 @@ void FieldAutocomplete::Inner::paintEvent(QPaintEvent *e) {
auto &row = _mrows->at(i);
const auto user = row.user;
auto first = (!filterIsEmpty
&& user->username().startsWith(
&& PrimaryUsername(user).startsWith(
filter,
Qt::CaseInsensitive))
? ('@' + user->username().mid(0, filterSize))
? ('@' + PrimaryUsername(user).mid(0, filterSize))
: QString();
auto second = first.isEmpty()
? (user->username().isEmpty()
? QString()
: ('@' + user->username()))
: user->username().mid(filterSize);
? (PrimaryUsername(user).isEmpty()
? QString()
: ('@' + PrimaryUsername(user)))
: PrimaryUsername(user).mid(filterSize);
auto firstwidth = st::mentionFont->width(first);
auto secondwidth = st::mentionFont->width(second);
auto unamewidth = firstwidth + secondwidth;
@@ -1015,7 +1020,7 @@ void FieldAutocomplete::Inner::paintEvent(QPaintEvent *e) {
auto toHighlight = row.command;
int32 botStatus = _parent->chat() ? _parent->chat()->botStatus : ((_parent->channel() && _parent->channel()->isMegagroup()) ? _parent->channel()->mgInfo->botStatus : -1);
if (hasUsername || botStatus == 0 || botStatus == 2) {
toHighlight += '@' + user->username();
toHighlight += '@' + PrimaryUsername(user);
}
user->loadUserpic();
user->paintUserpicLeft(p, row.userpic, st::mentionPadding.left(), i * st::mentionHeight + st::mentionPadding.top(), width(), st::mentionPhotoSize);
@@ -1149,7 +1154,8 @@ bool FieldAutocomplete::Inner::chooseAtIndex(
}
} else if (!_mrows->empty()) {
if (index < _mrows->size()) {
_mentionChosen.fire({ _mrows->at(index).user, method });
const auto user = _mrows->at(index).user;
_mentionChosen.fire({ user, PrimaryUsername(user), method });
return true;
}
} else if (!_hrows->empty()) {
@@ -1172,7 +1178,7 @@ bool FieldAutocomplete::Inner::chooseAtIndex(
|| _parent->filter().indexOf('@') > 0);
const auto commandString = QString("/%1%2").arg(
command,
insertUsername ? ('@' + user->username()) : QString());
insertUsername ? ('@' + PrimaryUsername(user)) : QString());
_botCommandChosen.fire({ commandString, method });
return true;