Skip to content
Snippets Groups Projects
Verified Commit 5cede811 authored by Nicolas Werner's avatar Nicolas Werner
Browse files

Fix parsing redacted image packs

parent 31f2af61
No related branches found
No related tags found
No related merge requests found
Pipeline #4288 failed
......@@ -58,7 +58,8 @@ from_json(const nlohmann::json &obj, ImagePack &content)
content.pack = ImagePack::PackDescription{};
from_json(obj.at("pack"), *content.pack);
}
content.images = obj.at("images").get<std::map<std::string, PackImage>>();
if (obj.contains("images"))
content.images = obj.at("images").get<std::map<std::string, PackImage>>();
}
void
......
......@@ -1283,7 +1283,8 @@ TEST(StateEvents, ImagePack)
EXPECT_EQ(event.origin_server_ts, 1510476064445);
EXPECT_EQ(event.unsigned_data.age, 37);
EXPECT_EQ(event.state_key, "my-pack");
EXPECT_EQ(event.content.pack.has_value(), true);
ASSERT_EQ(event.content.pack.has_value(), true);
assert(event.content.pack);
EXPECT_EQ(event.content.pack->display_name, "Awesome Pack");
EXPECT_EQ(event.content.pack->attribution, "huh");
EXPECT_EQ(event.content.pack->avatar_url, "mxc://example.org/asdjfasd");
......@@ -1298,6 +1299,22 @@ TEST(StateEvents, ImagePack)
EXPECT_EQ(event.content.images["sticker"].is_emoji(), false);
EXPECT_EQ(event.content.images["sticker"].overrides_usage(), true);
EXPECT_EQ(json(event)["content"]["images"].size(), 2);
json data2 = R"({
"origin_server_ts": 1510476064445,
"sender": "@nheko_test:matrix.org",
"event_id": "$15104760642668662QICBu:matrix.org",
"unsigned": {
"age": 37
},
"state_key": "my-pack",
"content": {
},
"type": "im.ponies.room_emotes",
"room_id": "!lfoDRlNFWlvOnvkBwQ:matrix.org"
})"_json;
EXPECT_NO_THROW(data2.get<ns::StateEvent<ns::msc2545::ImagePack>>());
}
TEST(StateEvents, Widget)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment