tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace emoji with icon_mane in chat filters.

Browse Source 
GitOrigin-RevId: 61b30d075e330a92935ea2c8cfc0bf78fb32958b
This commit is contained in:
levlam 2020-06-01 16:55:31 +03:00
parent 5401fd636a
commit 6e42d79769
10 changed files with 143 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
td/generate/scheme/td_api.tl
View File

@ -673,7 +673,7 @@ chatTypeSecret secret_chat_id:int32 user_id:int32 = ChatType;
//@description Represents a filter of user chats
//@title The title of the filter; 1-12 characters without line feeds
//@emoji The emoji for short filter representation
//@icon_name The icon name for short filter representation. Must be one of "All", "Unread", "Unmuted", "Bots", "Channels", "Groups", "Private", "Custom", "Setup", "Cat", "Crown", "Favorite", "Flower", "Game", "Home", "Love", "Mask", "Party", "Sport", "Study", "Trade", "Travel", "Work". Pass an empty string for autodetection
//@pinned_chat_ids The chat identifiers of pinned chats in the filtered chat list
//@included_chat_ids The chat identifiers of always included chats in the filtered chat list
//@excluded_chat_ids The chat identifiers of always excluded chats in the filtered chat list
@ -685,13 +685,13 @@ chatTypeSecret secret_chat_id:int32 user_id:int32 = ChatType;
//@include_bots True, if bots need to be included
//@include_groups True, if basic groups and supergroups need to be included
//@include_channels True, if channels need to be included
chatFilter title:string emoji:string pinned_chat_ids:vector<int53> included_chat_ids:vector<int53> excluded_chat_ids:vector<int53> exclude_muted:Bool exclude_read:Bool exclude_archived:Bool include_contacts:Bool include_non_contacts:Bool include_bots:Bool include_groups:Bool include_channels:Bool = ChatFilter;
chatFilter title:string icon_name:string pinned_chat_ids:vector<int53> included_chat_ids:vector<int53> excluded_chat_ids:vector<int53> exclude_muted:Bool exclude_read:Bool exclude_archived:Bool include_contacts:Bool include_non_contacts:Bool include_bots:Bool include_groups:Bool include_channels:Bool = ChatFilter;
//@description Contains basic information about a chat filter
//@id Unique chat filter identifier
//@title The title of the filter; 1-12 characters without line feeds
//@emoji The emoji for short filter representation
chatFilterInfo id:int32 title:string emoji:string = ChatFilterInfo;
//@icon_name The icon name for short filter representation. One of "All", "Unread", "Unmuted", "Bots", "Channels", "Groups", "Private", "Custom", "Setup", "Cat", "Crown", "Favorite", "Flower", "Game", "Home", "Love", "Mask", "Party", "Sport", "Study", "Trade", "Travel", "Work"
chatFilterInfo id:int32 title:string icon_name:string = ChatFilterInfo;
//@description Describes a recommended chat filter @filter The chat filter @param_description Chat filter description
recommendedChatFilter filter:chatFilter description:string = RecommendedChatFilter;

BIN
td/generate/scheme/td_api.tlo
View File

Binary file not shown.

1
td/telegram/ContactsManager.cpp
View File

@ -12016,6 +12016,7 @@ bool ContactsManager::is_chat_full_outdated(const ChatFull *chat_full, const Cha
}
}
LOG(INFO) << "Full " << chat_id << " is up-to-date with version " << chat_full->version;
return false;
}

116
td/telegram/MessagesManager.cpp
View File

@ -137,6 +137,7 @@ class UpdateDialogFilterQuery : public Td::ResultHandler {
}
void on_error(uint64 id, Status status) override {
LOG(ERROR) << "Receive error for UpdateDialogFilterQuery: " << status;
promise_.set_error(std::move(status));
}
};
@ -4908,8 +4909,59 @@ struct MessagesManager::DialogFilter {
}
}
static string get_emoji_by_icon_name(const string &icon_name) {
init_icon_names();
auto it = icon_name_to_emoji_.find(icon_name);
if (it != icon_name_to_emoji_.end()) {
return it->second;
}
return string();
}
string get_icon_name() const {
init_icon_names();
auto it = emoji_to_icon_name_.find(emoji);
if (it != emoji_to_icon_name_.end()) {
return it->second;
}
if (!pinned_dialog_ids.empty() || !included_dialog_ids.empty() || !excluded_dialog_ids.empty()) {
return "Custom";
}
if (include_contacts || include_non_contacts) {
if (!include_bots && !include_groups && !include_channels) {
return "Private";
}
} else {
if (!include_bots && !include_channels) {
if (!include_groups) {
// just in case
return "Custom";
}
return "Groups";
}
if (!include_bots && !include_groups) {
return "Channels";
}
if (!include_groups && !include_channels) {
return "Bots";
}
}
if (exclude_read && !exclude_muted) {
return "Unread";
}
if (exclude_muted && !exclude_read) {
return "Unmuted";
}
return "Custom";
}
telegram_api::object_ptr<telegram_api::dialogFilter> get_input_dialog_filter() const {
int32 flags = telegram_api::dialogFilter::EMOTICON_MASK;
int32 flags = 0;
if (!emoji.empty()) {
flags |= telegram_api::dialogFilter::EMOTICON_MASK;
}
if (exclude_muted) {
flags |= telegram_api::dialogFilter::EXCLUDE_MUTED_MASK;
}
@ -4974,8 +5026,38 @@ struct MessagesManager::DialogFilter {
friend bool operator!=(const unique_ptr<DialogFilter> &lhs, const unique_ptr<DialogFilter> &rhs) {
return !(lhs == rhs);
}
private:
static std::unordered_map<string, string> emoji_to_icon_name_;
static std::unordered_map<string, string> icon_name_to_emoji_;
static void init_icon_names() {
static bool is_inited = [&] {
vector<string> emojis{"\xF0\x9F\x92\xAC", "\xE2\x9C\x85", "\xF0\x9F\x94\x94",
"\xF0\x9F\xA4\x96", "\xF0\x9F\x93\xA2", "\xF0\x9F\x91\xA5",
"\xF0\x9F\x91\xA4", "\xF0\x9F\x93\x81", "\xF0\x9F\x93\x8B",
"\xF0\x9F\x90\xB1", "\xF0\x9F\x91\x91", "\xE2\xAD\x90\xEF\xB8\x8F",
"\xF0\x9F\x8C\xB9", "\xF0\x9F\x8E\xAE", "\xF0\x9F\x8F\xA0",
"\xE2\x9D\xA4\xEF\xB8\x8F", "\xF0\x9F\x8E\xAD", "\xF0\x9F\x8D\xB8",
"\xE2\x9A\xBD\xEF\xB8\x8F", "\xF0\x9F\x8E\x93", "\xF0\x9F\x93\x88",
"\xE2\x9C\x88\xEF\xB8\x8F", "\xF0\x9F\x92\xBC"};
vector<string> icon_names{"All", "Unread", "Unmuted", "Bots", "Channels", "Groups", "Private", "Custom",
"Setup", "Cat", "Crown", "Favorite", "Flower", "Game", "Home", "Love",
"Mask", "Party", "Sport", "Study", "Trade", "Travel", "Work"};
CHECK(emojis.size() == icon_names.size());
for (size_t i = 0; i < emojis.size(); i++) {
emoji_to_icon_name_[remove_emoji_modifiers(emojis[i])] = icon_names[i];
icon_name_to_emoji_[icon_names[i]] = remove_emoji_modifiers(emojis[i]);
}
return true;
}();
CHECK(is_inited);
}
};
std::unordered_map<string, string> MessagesManager::DialogFilter::emoji_to_icon_name_;
std::unordered_map<string, string> MessagesManager::DialogFilter::icon_name_to_emoji_;
template <class StorerT>
void MessagesManager::DialogFilter::store(StorerT &storer) const {
using td::store;
@ -14730,7 +14812,7 @@ vector<DialogId> MessagesManager::get_common_dialogs(UserId user_id, DialogId of
vector<DialogId> &common_dialog_ids = it->second.dialog_ids;
bool use_cache = (!it->second.is_outdated && it->second.received_date >= Time::now() - 3600) || force ||
offset_chat_id != 0 || common_dialog_ids.size() >= static_cast<size_t>(MAX_GET_DIALOGS);
// use cache if it's up to date, or we required to use it or we can't update it
// use cache if it is up-to-date, or we required to use it or we can't update it
if (use_cache) {
auto offset_it = common_dialog_ids.begin();
if (offset_dialog_id != DialogId()) {
@ -15593,7 +15675,10 @@ Result<unique_ptr<MessagesManager::DialogFilter>> MessagesManager::create_dialog
if (dialog_filter->title.empty()) {
return Status::Error(400, "Title must be non-empty");
}
dialog_filter->emoji = std::move(filter->emoji_);
dialog_filter->emoji = DialogFilter::get_emoji_by_icon_name(filter->icon_name_);
if (dialog_filter->emoji.empty() && !filter->icon_name_.empty()) {
return Status::Error(400, "Wrong icon name specified");
}
dialog_filter->exclude_muted = filter->exclude_muted_;
dialog_filter->exclude_read = filter->exclude_read_;
dialog_filter->exclude_archived = filter->exclude_archived_;
@ -15645,12 +15730,25 @@ void MessagesManager::edit_dialog_filter(DialogFilterId dialog_filter_id, td_api
return promise.set_error(Status::Error(400, "Chat filter not found"));
}
auto old_icon_name = old_dialog_filter->get_icon_name();
auto new_icon_name = filter->icon_name_;
auto r_dialog_filter = create_dialog_filter(dialog_filter_id, std::move(filter));
if (r_dialog_filter.is_error()) {
return promise.set_error(r_dialog_filter.move_as_error());
}
auto new_dialog_filter = r_dialog_filter.move_as_ok();
CHECK(new_dialog_filter != nullptr);
if (new_icon_name.empty()) {
// keep old emoji
new_dialog_filter->emoji = old_dialog_filter->emoji;
} else if (new_icon_name == old_icon_name) {
// keep old emoji, but only if with it icon_name is exactly as specified
auto new_emoji = std::move(new_dialog_filter->emoji);
new_dialog_filter->emoji = old_dialog_filter->emoji;
if (new_dialog_filter->get_icon_name() != new_icon_name) {
new_dialog_filter->emoji = std::move(new_emoji);
}
}
if (*new_dialog_filter == *old_dialog_filter) {
return promise.set_value(Unit());
@ -17531,10 +17629,10 @@ td_api::object_ptr<td_api::chatFilter> MessagesManager::get_chat_filter_object(c
return chat_ids;
};
return td_api::make_object<td_api::chatFilter>(
filter->title, filter->emoji, get_chat_ids(filter->pinned_dialog_ids), get_chat_ids(filter->included_dialog_ids),
get_chat_ids(filter->excluded_dialog_ids), filter->exclude_muted, filter->exclude_read, filter->exclude_archived,
filter->include_contacts, filter->include_non_contacts, filter->include_bots, filter->include_groups,
filter->include_channels);
filter->title, filter->get_icon_name(), get_chat_ids(filter->pinned_dialog_ids),
get_chat_ids(filter->included_dialog_ids), get_chat_ids(filter->excluded_dialog_ids), filter->exclude_muted,
filter->exclude_read, filter->exclude_archived, filter->include_contacts, filter->include_non_contacts,
filter->include_bots, filter->include_groups, filter->include_channels);
}
td_api::object_ptr<td_api::updateScopeNotificationSettings>
@ -33263,8 +33361,8 @@ td_api::object_ptr<td_api::updateChatFilters> MessagesManager::get_update_chat_f
CHECK(!td_->auth_manager_->is_bot());
auto update = td_api::make_object<td_api::updateChatFilters>();
for (const auto &filter : dialog_filters_) {
update->chat_filters_.push_back(
td_api::make_object<td_api::chatFilterInfo>(filter->dialog_filter_id.get(), filter->title, filter->emoji));
update->chat_filters_.push_back(td_api::make_object<td_api::chatFilterInfo>(
filter->dialog_filter_id.get(), filter->title, filter->get_icon_name()));
}
return update;
}

23
td/telegram/StickersManager.cpp
View File

@ -6196,29 +6196,6 @@ td_api::object_ptr<td_api::httpUrl> StickersManager::get_emoji_suggestions_url_r
return result;
}
string StickersManager::remove_emoji_modifiers(string emoji) {
static const Slice modifiers[] = {u8"\uFE0E" /* variation selector-15 */,
u8"\uFE0F" /* variation selector-16 */,
u8"\u200D\u2640" /* zero width joiner + female sign */,
u8"\u200D\u2642" /* zero width joiner + male sign */,
u8"\U0001F3FB" /* emoji modifier fitzpatrick type-1-2 */,
u8"\U0001F3FC" /* emoji modifier fitzpatrick type-3 */,
u8"\U0001F3FD" /* emoji modifier fitzpatrick type-4 */,
u8"\U0001F3FE" /* emoji modifier fitzpatrick type-5 */,
u8"\U0001F3FF" /* emoji modifier fitzpatrick type-6 */};
bool found = true;
while (found) {
found = false;
for (auto &modifier : modifiers) {
if (ends_with(emoji, modifier) && emoji.size() > modifier.size()) {
emoji.resize(emoji.size() - modifier.size());
found = true;
}
}
}
return emoji;
}
void StickersManager::after_get_difference() {
if (td_->auth_manager_->is_bot()) {
return;

2
td/telegram/StickersManager.h
View File

@ -614,8 +614,6 @@ class StickersManager : public Actor {
void on_get_emoji_suggestions_url(int64 random_id, Promise<Unit> &&promise,
Result<telegram_api::object_ptr<telegram_api::emojiURL>> &&r_emoji_url);
static string remove_emoji_modifiers(string emoji);
Td *td_;
ActorShared<> parent_;
std::unordered_map<FileId, unique_ptr<Sticker>, FileIdHash> stickers_; // file_id -> Sticker

4
td/telegram/Td.cpp
View File

@ -5906,7 +5906,7 @@ void Td::on_request(uint64 id, td_api::createChatFilter &request) {
return send_error_raw(id, 400, "Chat filter must be non-empty");
}
CLEAN_INPUT_STRING(request.filter_->title_);
CLEAN_INPUT_STRING(request.filter_->emoji_);
CLEAN_INPUT_STRING(request.filter_->icon_name_);
CREATE_OK_REQUEST_PROMISE();
messages_manager_->create_dialog_filter(std::move(request.filter_), std::move(promise));
}
@ -5917,7 +5917,7 @@ void Td::on_request(uint64 id, td_api::editChatFilter &request) {
return send_error_raw(id, 400, "Chat filter must be non-empty");
}
CLEAN_INPUT_STRING(request.filter_->title_);
CLEAN_INPUT_STRING(request.filter_->emoji_);
CLEAN_INPUT_STRING(request.filter_->icon_name_);
CREATE_OK_REQUEST_PROMISE();
messages_manager_->edit_dialog_filter(DialogFilterId(request.chat_filter_id_), std::move(request.filter_),
std::move(promise));

4
td/telegram/cli.cpp
View File

@ -1089,10 +1089,12 @@ class CliClient final : public Actor {
td_api::object_ptr<td_api::chatFilter> as_chat_filter(string filter) const {
string title;
string icon_name;
string pinned_chat_ids;
string included_chat_ids;
string excluded_chat_ids;
std::tie(title, filter) = split(filter);
std::tie(icon_name, filter) = split(filter);
std::tie(pinned_chat_ids, filter) = split(filter);
std::tie(included_chat_ids, filter) = split(filter);
std::tie(excluded_chat_ids, filter) = split(filter);
@ -1102,7 +1104,7 @@ class CliClient final : public Actor {
};
return td_api::make_object<td_api::chatFilter>(
title, string(), as_chat_ids(pinned_chat_ids), as_chat_ids(included_chat_ids), as_chat_ids(excluded_chat_ids),
title, icon_name, as_chat_ids(pinned_chat_ids), as_chat_ids(included_chat_ids), as_chat_ids(excluded_chat_ids),
rand_bool(), rand_bool(), rand_bool(), rand_bool(), rand_bool(), rand_bool(), rand_bool(), rand_bool());
}

23
td/telegram/misc.cpp
View File

@ -351,4 +351,27 @@ Result<string> check_url(Slice url) {
return http_url.get_url();
}
string remove_emoji_modifiers(string emoji) {
static const Slice modifiers[] = {u8"\uFE0E" /* variation selector-15 */,
u8"\uFE0F" /* variation selector-16 */,
u8"\u200D\u2640" /* zero width joiner + female sign */,
u8"\u200D\u2642" /* zero width joiner + male sign */,
u8"\U0001F3FB" /* emoji modifier fitzpatrick type-1-2 */,
u8"\U0001F3FC" /* emoji modifier fitzpatrick type-3 */,
u8"\U0001F3FD" /* emoji modifier fitzpatrick type-4 */,
u8"\U0001F3FE" /* emoji modifier fitzpatrick type-5 */,
u8"\U0001F3FF" /* emoji modifier fitzpatrick type-6 */};
bool found = true;
while (found) {
found = false;
for (auto &modifier : modifiers) {
if (ends_with(emoji, modifier) && emoji.size() > modifier.size()) {
emoji.resize(emoji.size() - modifier.size());
found = true;
}
}
}
return emoji;
}
} // namespace td

3
td/telegram/misc.h
View File

@ -39,4 +39,7 @@ string get_emoji_fingerprint(uint64 num);
// checks whether url is a valid tg, ton or HTTP(S) URL and returns its in a canonical form
Result<string> check_url(Slice url);
// removes all emoji modifiers
string remove_emoji_modifiers(string emoji);
} // namespace td