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

Guess format of sent stickers by file extension.

Browse Source
This commit is contained in:
levlam 2022-02-17 20:45:58 +03:00
parent a5ed61393c
commit deafeee33b
3 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
td/telegram/StickerFormat.cpp
View File

@ -10,7 +10,7 @@
namespace td { namespace td {
StickerFormat get_sticker_format(Slice mime_type) { StickerFormat get_sticker_format_by_mime_type(Slice mime_type) {
if (mime_type == "application/x-tgsticker") { if (mime_type == "application/x-tgsticker") {
return StickerFormat::Tgs; return StickerFormat::Tgs;
} }
@ -23,6 +23,19 @@ StickerFormat get_sticker_format(Slice mime_type) {
return StickerFormat::Unknown; return StickerFormat::Unknown;
} }
StickerFormat get_sticker_format_by_extension(Slice extension) {
if (extension == "tgs") {
return StickerFormat::Tgs;
}
if (extension == "webp") {
return StickerFormat::Webp;
}
if (extension == "webm") {
return StickerFormat::Webm;
}
return StickerFormat::Unknown;
}
td_api::object_ptr<td_api::StickerType> get_sticker_type_object( td_api::object_ptr<td_api::StickerType> get_sticker_type_object(
StickerFormat sticker_format, bool is_masks, td_api::object_ptr<td_api::maskPosition> mask_position) { StickerFormat sticker_format, bool is_masks, td_api::object_ptr<td_api::maskPosition> mask_position) {
switch (sticker_format) { switch (sticker_format) {

4
td/telegram/StickerFormat.h
View File

@ -17,7 +17,9 @@ namespace td {
// update store_sticker/store_sticker_set when this type changes // update store_sticker/store_sticker_set when this type changes
enum class StickerFormat : int32 { Unknown, Webp, Tgs, Webm }; enum class StickerFormat : int32 { Unknown, Webp, Tgs, Webm };
StickerFormat get_sticker_format(Slice mime_type); StickerFormat get_sticker_format_by_mime_type(Slice mime_type);
StickerFormat get_sticker_format_by_extension(Slice extension);
td_api::object_ptr<td_api::StickerType> get_sticker_type_object(StickerFormat sticker_format, bool is_masks, td_api::object_ptr<td_api::StickerType> get_sticker_type_object(StickerFormat sticker_format, bool is_masks,
td_api::object_ptr<td_api::maskPosition> mask_position); td_api::object_ptr<td_api::maskPosition> mask_position);

26
td/telegram/StickersManager.cpp
View File

@ -2267,7 +2267,7 @@ std::pair<int64, FileId> StickersManager::on_get_sticker_document(tl_object_ptr<
return {}; return {};
} }
auto format = get_sticker_format(document->mime_type_); auto format = get_sticker_format_by_mime_type(document->mime_type_);
if (format == StickerFormat::Unknown || (expected_format != StickerFormat::Unknown && format != expected_format)) { if (format == StickerFormat::Unknown || (expected_format != StickerFormat::Unknown && format != expected_format)) {
LOG(ERROR) << "Expected sticker of the type " << expected_format << ", but received of the type " << format; LOG(ERROR) << "Expected sticker of the type " << expected_format << ", but received of the type " << format;
return {}; return {};
@ -2619,6 +2619,21 @@ void StickersManager::add_sticker_thumbnail(Sticker *s, PhotoSize thumbnail) {
void StickersManager::create_sticker(FileId file_id, string minithumbnail, PhotoSize thumbnail, Dimensions dimensions, void StickersManager::create_sticker(FileId file_id, string minithumbnail, PhotoSize thumbnail, Dimensions dimensions,
tl_object_ptr<telegram_api::documentAttributeSticker> sticker, tl_object_ptr<telegram_api::documentAttributeSticker> sticker,
StickerFormat format, MultiPromiseActor *load_data_multipromise_ptr) { StickerFormat format, MultiPromiseActor *load_data_multipromise_ptr) {
if (format == StickerFormat::Unknown && sticker == nullptr) {
auto old_sticker = get_sticker(file_id);
if (old_sticker != nullptr) {
format = old_sticker->format;
} else {
// guess format by file extension
auto file_view = td_->file_manager_->get_file_view(file_id);
auto suggested_path = file_view.suggested_path();
const PathView path_view(suggested_path);
format = get_sticker_format_by_extension(path_view.extension());
if (format == StickerFormat::Unknown) {
format = StickerFormat::Webp;
}
}
}
if (is_sticker_format_vector(format) && dimensions.width == 0) { if (is_sticker_format_vector(format) && dimensions.width == 0) {
dimensions.width = 512; dimensions.width = 512;
dimensions.height = 512; dimensions.height = 512;
@ -2790,15 +2805,6 @@ tl_object_ptr<telegram_api::InputMedia> StickersManager::get_input_media(
flags |= telegram_api::inputMediaUploadedDocument::THUMB_MASK; flags |= telegram_api::inputMediaUploadedDocument::THUMB_MASK;
} }
auto mime_type = get_sticker_format_mime_type(s->format); auto mime_type = get_sticker_format_mime_type(s->format);
if (s->format == StickerFormat::Unknown && !s->set_id.is_valid()) {
auto suggested_path = file_view.suggested_path();
const PathView path_view(suggested_path);
if (path_view.extension() == "tgs") {
mime_type = "application/x-tgsticker";
} else if (path_view.extension() == "webm") {
mime_type = "video/webm";
}
}
return make_tl_object<telegram_api::inputMediaUploadedDocument>( return make_tl_object<telegram_api::inputMediaUploadedDocument>(
flags, false /*ignored*/, false /*ignored*/, std::move(input_file), std::move(input_thumbnail), mime_type, flags, false /*ignored*/, false /*ignored*/, std::move(input_file), std::move(input_thumbnail), mime_type,
std::move(attributes), vector<tl_object_ptr<telegram_api::InputDocument>>(), 0); std::move(attributes), vector<tl_object_ptr<telegram_api::InputDocument>>(), 0);