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

Use sharedUser/sharedChat in messageUserShared/messageChatShared.

Browse Source
This commit is contained in:
levlam 2024-03-21 22:00:36 +03:00
parent cfa47d5283
commit 35124395a4
3 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3147,11 +3147,11 @@ messagePremiumGiveawayWinners boosted_chat_id:int53 giveaway_message_id:int53 ad
//@description A contact has registered with Telegram
messageContactRegistered = MessageContent;
//@description The current user shared users, which were requested by the bot @user_ids Identifier of the shared users @button_id Identifier of the keyboard button with the request
messageUsersShared user_ids:vector<int53> button_id:int32 = MessageContent;
//@description The current user shared users, which were requested by the bot @users The shared users @button_id Identifier of the keyboard button with the request
messageUsersShared users:vector<sharedUser> button_id:int32 = MessageContent;
//@description The current user shared a chat, which was requested by the bot @chat_id Identifier of the shared chat @button_id Identifier of the keyboard button with the request
messageChatShared chat_id:int53 button_id:int32 = MessageContent;
//@description The current user shared a chat, which was requested by the bot @chat The shared chat @button_id Identifier of the keyboard button with the request
messageChatShared chat:sharedChat button_id:int32 = MessageContent;
//@description The user allowed the bot to send messages @reason The reason why the bot was allowed to write messages
messageBotWriteAccessAllowed reason:BotWriteAccessAllowReason = MessageContent;

21
td/telegram/MessageContent.cpp
View File

@ -70,6 +70,7 @@
#include "td/telegram/SecureValue.h"
#include "td/telegram/SecureValue.hpp"
#include "td/telegram/ServerMessageId.h"
#include "td/telegram/SharedDialog.h"
#include "td/telegram/StickerFormat.h"
#include "td/telegram/StickersManager.h"
#include "td/telegram/StickersManager.hpp"
@ -7173,25 +7174,15 @@ tl_object_ptr<td_api::MessageContent> get_message_content_object(const MessageCo
const auto *m = static_cast<const MessageRequestedDialog *>(content);
CHECK(!m->shared_dialog_ids.empty());
if (m->shared_dialog_ids[0].get_type() == DialogType::User) {
vector<int64> user_ids;
vector<td_api::object_ptr<td_api::sharedUser>> users;
for (auto shared_dialog_id : m->shared_dialog_ids) {
if (td->auth_manager_->is_bot()) {
user_ids.push_back(shared_dialog_id.get_user_id().get());
} else {
user_ids.push_back(
td->contacts_manager_->get_user_id_object(shared_dialog_id.get_user_id(), "MessageRequestedDialog"));
}
users.push_back(SharedDialog(shared_dialog_id).get_shared_user_object(td));
}
return make_tl_object<td_api::messageUsersShared>(std::move(user_ids), m->button_id);
return make_tl_object<td_api::messageUsersShared>(std::move(users), m->button_id);
}
CHECK(m->shared_dialog_ids.size() == 1);
int64 chat_id;
if (td->auth_manager_->is_bot()) {
chat_id = m->shared_dialog_ids[0].get();
} else {
chat_id = td->dialog_manager_->get_chat_id_object(m->shared_dialog_ids[0], "messageChatShared");
}
return make_tl_object<td_api::messageChatShared>(chat_id, m->button_id);
return make_tl_object<td_api::messageChatShared>(SharedDialog(m->shared_dialog_ids[0]).get_shared_chat_object(td),
m->button_id);
}
case MessageContentType::WebViewWriteAccessAllowed: {
const auto *m = static_cast<const MessageWebViewWriteAccessAllowed *>(content);

3
td/telegram/SharedDialog.h
View File

@ -22,6 +22,9 @@ class SharedDialog {
public:
SharedDialog() = default;
SharedDialog(DialogId dialog_id) : dialog_id_(dialog_id) {
}
SharedDialog(Td *td, telegram_api::object_ptr<telegram_api::RequestedPeer> &&requested_peer_ptr);
bool is_valid() const {