Fix unquoted and uncaptioned being swapped (#232)
This commit is contained in:
parent
fb48992da8
commit
7c535a9888
1 changed files with 4 additions and 4 deletions
|
|
@ -3949,9 +3949,9 @@ void ApiWrap::forwardMessagesUnquoted(
|
||||||
const auto inputMedia = media->photo()
|
const auto inputMedia = media->photo()
|
||||||
? MTP_inputMediaPhoto(MTP_flags(0), media->photo()->mtpInput(), MTPint())
|
? MTP_inputMediaPhoto(MTP_flags(0), media->photo()->mtpInput(), MTPint())
|
||||||
: MTP_inputMediaDocument(MTP_flags(0), media->document()->mtpInput(), MTPint(), MTPstring());
|
: MTP_inputMediaDocument(MTP_flags(0), media->document()->mtpInput(), MTPint(), MTPstring());
|
||||||
auto caption = (draft.options == Data::ForwardOptions::NoNamesAndCaptions)
|
auto caption = (draft.options != Data::ForwardOptions::NoNamesAndCaptions)
|
||||||
? TextWithEntities()
|
? item->originalText()
|
||||||
: item->originalText();
|
: TextWithEntities();
|
||||||
auto sentEntities = Api::EntitiesToMTP(
|
auto sentEntities = Api::EntitiesToMTP(
|
||||||
_session,
|
_session,
|
||||||
caption.entities,
|
caption.entities,
|
||||||
|
|
@ -4089,7 +4089,7 @@ void ApiWrap::forwardMessagesUnquoted(
|
||||||
const auto media = item->media();
|
const auto media = item->media();
|
||||||
|
|
||||||
auto message = ApiWrap::MessageToSend(history);
|
auto message = ApiWrap::MessageToSend(history);
|
||||||
const auto caption = (draft.options == Data::ForwardOptions::NoNamesAndCaptions
|
const auto caption = (draft.options != Data::ForwardOptions::NoNamesAndCaptions
|
||||||
&& !media->geoPoint()
|
&& !media->geoPoint()
|
||||||
&& !media->sharedContact())
|
&& !media->sharedContact())
|
||||||
? item->originalText()
|
? item->originalText()
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue