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

Add MessageWebViewWriteAccessAllowed.

Browse Source
This commit is contained in:
levlam 2023-02-22 12:24:43 +03:00
parent 2268ae87a4
commit b4a86fb299
6 changed files with 69 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2564,8 +2564,8 @@ messageChatShared chat_id:int53 button_id:int32 = MessageContent;
//@description The current user has connected a website by logging in using Telegram Login Widget on it @domain_name Domain name of the connected website
messageWebsiteConnected domain_name:string = MessageContent;
//@description The user allowed the bot to send messages
messageBotWriteAccessAllowed = MessageContent;
//@description The user allowed the bot to send messages @web_app Information about the Web App, which requested the access; may be null if none or the Web App was opened from the attachment menu
messageBotWriteAccessAllowed web_app:webApp = MessageContent;
//@description Data from a Web App has been sent to a bot @button_text Text of the keyboardButtonTypeWebApp button, which opened the Web App
messageWebAppDataSent button_text:string = MessageContent;

1
td/telegram/DialogAction.cpp
View File

@ -408,6 +408,7 @@ bool DialogAction::is_canceled_by_message_of_type(MessageContentType message_con
case MessageContentType::SuggestProfilePhoto:
case MessageContentType::WriteAccessAllowed:
case MessageContentType::RequestedDialog:
case MessageContentType::WebViewWriteAccessAllowed:
return false;
default:
UNREACHABLE();

57
td/telegram/MessageContent.cpp
View File

@ -80,6 +80,8 @@
#include "td/telegram/VideosManager.hpp"
#include "td/telegram/VoiceNotesManager.h"
#include "td/telegram/VoiceNotesManager.hpp"
#include "td/telegram/WebApp.h"
#include "td/telegram/WebApp.hpp"
#include "td/telegram/WebPageId.h"
#include "td/telegram/WebPagesManager.h"
@ -875,6 +877,19 @@ class MessageRequestedDialog final : public MessageContent {
}
};
class MessageWebViewWriteAccessAllowed final : public MessageContent {
public:
WebApp web_app;
MessageWebViewWriteAccessAllowed() = default;
explicit MessageWebViewWriteAccessAllowed(WebApp &&web_app) : web_app(std::move(web_app)) {
}
MessageContentType get_type() const final {
return MessageContentType::WebViewWriteAccessAllowed;
}
};
template <class StorerT>
static void store(const MessageContent *content, StorerT &storer) {
CHECK(content != nullptr);
@ -1244,6 +1259,11 @@ static void store(const MessageContent *content, StorerT &storer) {
store(m->button_id, storer);
break;
}
case MessageContentType::WebViewWriteAccessAllowed: {
const auto *m = static_cast<const MessageWebViewWriteAccessAllowed *>(content);
store(m->web_app, storer);
break;
}
default:
UNREACHABLE();
}
@ -1750,6 +1770,12 @@ static void parse(unique_ptr<MessageContent> &content, ParserT &parser) {
content = std::move(m);
break;
}
case MessageContentType::WebViewWriteAccessAllowed: {
auto m = make_unique<MessageWebViewWriteAccessAllowed>();
parse(m->web_app, parser);
content = std::move(m);
break;
}
default:
LOG(FATAL) << "Have unknown message content type " << static_cast<int32>(content_type);
}
@ -2374,6 +2400,7 @@ bool can_have_input_media(const Td *td, const MessageContent *content, bool is_s
case MessageContentType::SuggestProfilePhoto:
case MessageContentType::WriteAccessAllowed:
case MessageContentType::RequestedDialog:
case MessageContentType::WebViewWriteAccessAllowed:
return false;
case MessageContentType::Animation:
case MessageContentType::Audio:
@ -2500,6 +2527,7 @@ SecretInputMedia get_secret_input_media(const MessageContent *content, Td *td,
case MessageContentType::SuggestProfilePhoto:
case MessageContentType::WriteAccessAllowed:
case MessageContentType::RequestedDialog:
case MessageContentType::WebViewWriteAccessAllowed:
break;
default:
UNREACHABLE();
@ -2626,6 +2654,7 @@ static tl_object_ptr<telegram_api::InputMedia> get_input_media_impl(
case MessageContentType::SuggestProfilePhoto:
case MessageContentType::WriteAccessAllowed:
case MessageContentType::RequestedDialog:
case MessageContentType::WebViewWriteAccessAllowed:
break;
default:
UNREACHABLE();
@ -2796,6 +2825,7 @@ void delete_message_content_thumbnail(MessageContent *content, Td *td) {
case MessageContentType::SuggestProfilePhoto:
case MessageContentType::WriteAccessAllowed:
case MessageContentType::RequestedDialog:
case MessageContentType::WebViewWriteAccessAllowed:
break;
default:
UNREACHABLE();
@ -2983,6 +3013,7 @@ Status can_send_message_content(DialogId dialog_id, const MessageContent *conten
case MessageContentType::SuggestProfilePhoto:
case MessageContentType::WriteAccessAllowed:
case MessageContentType::RequestedDialog:
case MessageContentType::WebViewWriteAccessAllowed:
UNREACHABLE();
}
return Status::OK();
@ -3117,6 +3148,7 @@ static int32 get_message_content_media_index_mask(const MessageContent *content,
case MessageContentType::SuggestProfilePhoto:
case MessageContentType::WriteAccessAllowed:
case MessageContentType::RequestedDialog:
case MessageContentType::WebViewWriteAccessAllowed:
return 0;
default:
UNREACHABLE();
@ -3916,6 +3948,14 @@ void merge_message_contents(Td *td, const MessageContent *old_content, MessageCo
}
break;
}
case MessageContentType::WebViewWriteAccessAllowed: {
const auto *old_ = static_cast<const MessageWebViewWriteAccessAllowed *>(old_content);
const auto *new_ = static_cast<const MessageWebViewWriteAccessAllowed *>(new_content);
if (old_->web_app != new_->web_app) {
need_update = true;
}
break;
}
default:
UNREACHABLE();
break;
@ -4053,6 +4093,7 @@ bool merge_message_content_file_id(Td *td, MessageContent *message_content, File
case MessageContentType::SuggestProfilePhoto:
case MessageContentType::WriteAccessAllowed:
case MessageContentType::RequestedDialog:
case MessageContentType::WebViewWriteAccessAllowed:
LOG(ERROR) << "Receive new file " << new_file_id << " in a sent message of the type " << content_type;
break;
default:
@ -5043,6 +5084,7 @@ unique_ptr<MessageContent> dup_message_content(Td *td, DialogId dialog_id, const
case MessageContentType::SuggestProfilePhoto:
case MessageContentType::WriteAccessAllowed:
case MessageContentType::RequestedDialog:
case MessageContentType::WebViewWriteAccessAllowed:
return nullptr;
default:
UNREACHABLE();
@ -5241,6 +5283,10 @@ unique_ptr<MessageContent> get_action_message_content(Td *td, tl_object_ptr<tele
if (!action->domain_.empty()) {
return td::make_unique<MessageWebsiteConnected>(std::move(action->domain_));
}
if (action->app_ != nullptr && action->app_->get_id() == telegram_api::botApp::ID) {
return td::make_unique<MessageWebViewWriteAccessAllowed>(
WebApp(td, telegram_api::move_object_as<telegram_api::botApp>(action->app_), owner_dialog_id));
}
return td::make_unique<MessageUnsupported>();
}
case telegram_api::messageActionSecureValuesSent::ID: {
@ -5678,7 +5724,7 @@ tl_object_ptr<td_api::MessageContent> get_message_content_object(const MessageCo
return make_tl_object<td_api::messageSuggestProfilePhoto>(std::move(photo));
}
case MessageContentType::WriteAccessAllowed:
return make_tl_object<td_api::messageBotWriteAccessAllowed>();
return make_tl_object<td_api::messageBotWriteAccessAllowed>(nullptr);
case MessageContentType::RequestedDialog: {
const auto *m = static_cast<const MessageRequestedDialog *>(content);
if (m->dialog_id.get_type() == DialogType::User) {
@ -5688,6 +5734,10 @@ tl_object_ptr<td_api::MessageContent> get_message_content_object(const MessageCo
}
return make_tl_object<td_api::messageChatShared>(m->dialog_id.get(), m->button_id);
}
case MessageContentType::WebViewWriteAccessAllowed: {
const auto *m = static_cast<const MessageWebViewWriteAccessAllowed *>(content);
return td_api::make_object<td_api::messageBotWriteAccessAllowed>(m->web_app.get_web_app_object(td));
}
default:
UNREACHABLE();
return nullptr;
@ -5990,6 +6040,8 @@ vector<FileId> get_message_content_file_ids(const MessageContent *content, const
}
case MessageContentType::SuggestProfilePhoto:
return photo_get_file_ids(static_cast<const MessageSuggestProfilePhoto *>(content)->photo);
case MessageContentType::WebViewWriteAccessAllowed:
return static_cast<const MessageWebViewWriteAccessAllowed *>(content)->web_app.get_file_ids(td);
default:
return {};
}
@ -6086,6 +6138,7 @@ string get_message_content_search_text(const Td *td, const MessageContent *conte
case MessageContentType::SuggestProfilePhoto:
case MessageContentType::WriteAccessAllowed:
case MessageContentType::RequestedDialog:
case MessageContentType::WebViewWriteAccessAllowed:
return string();
default:
UNREACHABLE();
@ -6382,6 +6435,8 @@ void add_message_content_dependencies(Dependencies &dependencies, const MessageC
}
break;
}
case MessageContentType::WebViewWriteAccessAllowed:
break;
default:
UNREACHABLE();
break;

8
td/telegram/MessageContentType.cpp
View File

@ -119,7 +119,9 @@ StringBuilder &operator<<(StringBuilder &string_builder, MessageContentType cont
case MessageContentType::WriteAccessAllowed:
return string_builder << "WriteAccessAllowed";
case MessageContentType::RequestedDialog:
return string_builder << "ChatChosen";
return string_builder << "ChatShared";
case MessageContentType::WebViewWriteAccessAllowed:
return string_builder << "WebAppWriteAccessAllowed";
default:
UNREACHABLE();
return string_builder;
@ -183,6 +185,7 @@ bool is_allowed_media_group_content(MessageContentType content_type) {
case MessageContentType::SuggestProfilePhoto:
case MessageContentType::WriteAccessAllowed:
case MessageContentType::RequestedDialog:
case MessageContentType::WebViewWriteAccessAllowed:
return false;
default:
UNREACHABLE();
@ -254,6 +257,7 @@ bool is_secret_message_content(int32 ttl, MessageContentType content_type) {
case MessageContentType::SuggestProfilePhoto:
case MessageContentType::WriteAccessAllowed:
case MessageContentType::RequestedDialog:
case MessageContentType::WebViewWriteAccessAllowed:
return false;
default:
UNREACHABLE();
@ -318,6 +322,7 @@ bool is_service_message_content(MessageContentType content_type) {
case MessageContentType::SuggestProfilePhoto:
case MessageContentType::WriteAccessAllowed:
case MessageContentType::RequestedDialog:
case MessageContentType::WebViewWriteAccessAllowed:
return true;
default:
UNREACHABLE();
@ -382,6 +387,7 @@ bool can_have_message_content_caption(MessageContentType content_type) {
case MessageContentType::SuggestProfilePhoto:
case MessageContentType::WriteAccessAllowed:
case MessageContentType::RequestedDialog:
case MessageContentType::WebViewWriteAccessAllowed:
return false;
default:
UNREACHABLE();

3
td/telegram/MessageContentType.h
View File

@ -68,7 +68,8 @@ enum class MessageContentType : int32 {
TopicEdit,
SuggestProfilePhoto,
WriteAccessAllowed,
RequestedDialog
RequestedDialog,
WebViewWriteAccessAllowed
};
StringBuilder &operator<<(StringBuilder &string_builder, MessageContentType content_type);

1
td/telegram/MessagesManager.cpp
View File

@ -28010,6 +28010,7 @@ bool MessagesManager::can_edit_message(DialogId dialog_id, const Message *m, boo
case MessageContentType::SuggestProfilePhoto:
case MessageContentType::WriteAccessAllowed:
case MessageContentType::RequestedDialog:
case MessageContentType::WebViewWriteAccessAllowed:
return false;
default:
UNREACHABLE();