void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-09-01 17:43:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: multi forward

Browse source
This commit is contained in:
bleizix 2025-07-07 01:32:52 +05:00
parent 41e46e4924
commit a3b9059a39
3 changed files with 54 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Telegram/SourceFiles/apiwrap.cpp
View file

@ -3788,7 +3788,7 @@ void ApiWrap::sendMessage(MessageToSend &&message) {
? Data::CanSendTexts(topic) ? Data::CanSendTexts(topic)
: Data::CanSendTexts(peer); : Data::CanSendTexts(peer);
if (!canSendTexts || AyuForward::isForwarding(peer->id) || Api::SendDice(message)) { if (!canSendTexts && !AyuForward::isForwarding(peer->id) || Api::SendDice(message)) {
return; return;
} }
local().saveRecentSentHashtags(textWithTags.text); local().saveRecentSentHashtags(textWithTags.text);

43
Telegram/SourceFiles/boxes/share_box.cpp
View file

@ -64,6 +64,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
// AyuGram includes // AyuGram includes
#include "ayu/ayu_settings.h" #include "ayu/ayu_settings.h"
#include "ayu/utils/telegram_helpers.h" #include "ayu/utils/telegram_helpers.h"
#include "ayu/features/forward/ayu_forward.h"
class ShareBox::Inner final : public Ui::RpWidget { class ShareBox::Inner final : public Ui::RpWidget {
@ -1671,6 +1672,48 @@ ShareBox::SubmitCallback ShareBox::DefaultForwardCallback(
result, result,
msgIds); msgIds);
const auto requestType = Data::Histories::RequestType::Send; const auto requestType = Data::Histories::RequestType::Send;
// AyuGram-changed
const auto dismiss = [=]
{
if (show->valid()) {
show->hideLayer();
}
};
if (AyuForward::isFullAyuForwardNeeded(items.front())) {
crl::async([=]{
for (const auto thread : result) {
AyuForward::forwardMessages(
&history->owner().session(),
Api::SendAction(thread, options),
false,
Data::ResolvedForwardDraft(items, forwardOptions));
}
});
dismiss();
return;
}
if (AyuForward::isAyuForwardNeeded(items)) {
crl::async([=]
{
for (const auto thread : result) {
AyuForward::intelligentForward(
&history->owner().session(),
Api::SendAction(thread, options),
Data::ResolvedForwardDraft(items, forwardOptions));
}
});
dismiss();
return;
}
// AyuGram-changed
for (const auto thread : result) { for (const auto thread : result) {
if (!comment.text.isEmpty()) { if (!comment.text.isEmpty()) {
auto message = Api::MessageToSend( auto message = Api::MessageToSend(

12
Telegram/SourceFiles/window/window_peer_menu.cpp
View file

@ -107,7 +107,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
// AyuGram includes // AyuGram includes
#include "styles/style_ayu_icons.h" #include "styles/style_ayu_icons.h"
#include "ayu/ui/context_menu/context_menu.h" #include "ayu/ui/context_menu/context_menu.h"
#include "ayu/features/forward/ayu_forward.h"
namespace Window { namespace Window {
namespace { namespace {
@ -2579,9 +2579,17 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
std::move(comment), std::move(comment),
options, options,
state->box->forwardOptionsData()); state->box->forwardOptionsData());
if (!state->submit && successCallback) {
// AyuGram-changed
// workaround for deselecting messages when using AyuForward
const auto items = history->owner().idsToItems(msgIds);
auto ayuForwarding = AyuForward::isAyuForwardNeeded(items) || AyuForward::isFullAyuForwardNeeded(items.front());
if (!state->submit || ayuForwarding && successCallback) {
successCallback(); successCallback();
} }
// AyuGram-changed
}; };
const auto sendMenuType = [=] { const auto sendMenuType = [=] {