RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added MEDIA_NEW_INVALID error handler. Disabled edit media with webp.

This commit is contained in:
23rd 2019-04-02 19:24:34 +03:00
parent 92f95fa9eb
commit 84858b8940
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/SourceFiles/apiwrap.cpp
View File

@ -4644,7 +4644,8 @@ void ApiWrap::editUploadedPhoto(
applyUpdates(result);
}).fail([=](const RPCError &error) {
QString err = error.type();
if (err == qstr("MESSAGE_NOT_MODIFIED")) {
if (err == qstr("MESSAGE_NOT_MODIFIED")
|| err == qstr("MEDIA_NEW_INVALID")) {
item->returnSavedMedia();
_session->data().sendHistoryChangeNotifications();
} else {
@ -4707,7 +4708,8 @@ void ApiWrap::editUploadedDocument(
applyUpdates(result);
}).fail([=](const RPCError &error) {
QString err = error.type();
if (err == qstr("MESSAGE_NOT_MODIFIED")) {
if (err == qstr("MESSAGE_NOT_MODIFIED")
|| err == qstr("MEDIA_NEW_INVALID")) {
item->returnSavedMedia();
_session->data().sendHistoryChangeNotifications();
} else {

23
Telegram/SourceFiles/boxes/edit_caption_box.cpp
View File

@ -402,6 +402,16 @@ void EditCaptionBox::createEditMediaButton() {
return;
}
const auto isWebp = [](QString mimeType) {
if (mimeType == qstr("image/webp")) {
Ui::show(
Box<InformBox>(lang(lng_edit_media_album_error)),
LayerOption::KeepOther);
return true;
}
return false;
};
if (!result.remoteContent.isEmpty()) {
// Don't use remoteContent to edit album item.
if (_isAlbum) {
@ -412,10 +422,16 @@ void EditCaptionBox::createEditMediaButton() {
QString(),
result.remoteContent
).thumbnail;
_preparedList = Storage::PrepareMediaFromImage(
auto list = Storage::PrepareMediaFromImage(
std::move(image),
std::move(result.remoteContent),
st::sendMediaPreviewSize);
if (isWebp(list.files.front().mime)) {
return;
}
_preparedList = std::move(list);
} else if (!result.paths.isEmpty()) {
auto list = Storage::PrepareMediaList(
QStringList(result.paths.front()),
@ -442,6 +458,11 @@ void EditCaptionBox::createEditMediaButton() {
return;
}
}
const auto info = QFileInfo(result.paths.front());
if (isWebp(Core::MimeTypeForFile(info).name())) {
return;
}
_preparedList = std::move(list);
} else {
return;