Fix forwarding music with files
This commit is contained in:
parent
0e0b99e40c
commit
8d753995d4
1 changed files with 17 additions and 14 deletions
|
|
@ -3757,6 +3757,7 @@ void ApiWrap::forwardMessagesUnquoted(
|
||||||
|
|
||||||
enum LastGroupType {
|
enum LastGroupType {
|
||||||
None,
|
None,
|
||||||
|
Music,
|
||||||
Documents,
|
Documents,
|
||||||
Medias,
|
Medias,
|
||||||
};
|
};
|
||||||
|
|
@ -3807,13 +3808,14 @@ void ApiWrap::forwardMessagesUnquoted(
|
||||||
|| currentGroupId != newGroupId;
|
|| currentGroupId != newGroupId;
|
||||||
} else if (cForwardGrouped()) {
|
} else if (cForwardGrouped()) {
|
||||||
if (item->media() && item->media()->canBeGrouped()) {
|
if (item->media() && item->media()->canBeGrouped()) {
|
||||||
if (item->media()->photo()
|
return lastGroup != ((item->media()->photo()
|
||||||
|| (item->media()->document()
|
|| (item->media()->document()
|
||||||
&& item->media()->document()->isVideoFile())) {
|
&& item->media()->document()->isVideoFile()))
|
||||||
return lastGroup != LastGroupType::Medias;
|
? LastGroupType::Medias
|
||||||
} else {
|
: (item->media()->document()
|
||||||
return lastGroup != LastGroupType::Documents;
|
&& item->media()->document()->isSharedMediaMusic())
|
||||||
}
|
? LastGroupType::Music
|
||||||
|
: LastGroupType::Documents);
|
||||||
} else {
|
} else {
|
||||||
return lastGroup != LastGroupType::None;
|
return lastGroup != LastGroupType::None;
|
||||||
}
|
}
|
||||||
|
|
@ -4147,13 +4149,14 @@ void ApiWrap::forwardMessagesUnquoted(
|
||||||
ids.push_back(MTP_int(item->id));
|
ids.push_back(MTP_int(item->id));
|
||||||
randomIds.push_back(MTP_long(randomId));
|
randomIds.push_back(MTP_long(randomId));
|
||||||
if (item->media() && item->media()->canBeGrouped()) {
|
if (item->media() && item->media()->canBeGrouped()) {
|
||||||
if (item->media()->photo()
|
lastGroup = ((item->media()->photo()
|
||||||
|| (item->media()->document()
|
|| (item->media()->document()
|
||||||
&& item->media()->document()->isVideoFile())) {
|
&& item->media()->document()->isVideoFile()))
|
||||||
lastGroup = LastGroupType::Medias;
|
? LastGroupType::Medias
|
||||||
} else {
|
: (item->media()->document()
|
||||||
lastGroup = LastGroupType::Documents;
|
&& item->media()->document()->isSharedMediaMusic())
|
||||||
}
|
? LastGroupType::Music
|
||||||
|
: LastGroupType::Documents);
|
||||||
} else {
|
} else {
|
||||||
lastGroup = LastGroupType::None;
|
lastGroup = LastGroupType::None;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue