image packs: license->attribution

include/mtx/events/mscs/image_packs.hpp

@@ -63,8 +63,8 @@ struct ImagePack
                 std::string display_name;
                 //! An optional avatar/preview of the pack.
                 std::string avatar_url;
-                //! The license of this pack, if any.
-                std::string license;
+                //! Attribution for this pack, i.e. where it is from originally.
+                std::string attribution;
 
                 //! What the images are used for. Indexed by PackUsage
                 std::bitset<2> usage;

lib/structs/events/mscs/image_packs.cpp

@@ -28,7 +28,7 @@ from_json(const nlohmann::json &obj, ImagePack::PackDescription &content)
 {
         content.avatar_url   = obj.value("avatar_url", "");
         content.display_name = obj.value("display_name", "");
-        content.license      = obj.value("license", "");
+        content.attribution  = obj.value("attribution", "");
 
         if (obj.contains("usage")) {
                 for (const auto &e : obj.at("usage")) {
@@ -72,8 +72,8 @@ to_json(nlohmann::json &obj, const ImagePack::PackDescription &content)
                 obj["avatar_url"] = content.avatar_url;
         if (!content.display_name.empty())
                 obj["display_name"] = content.display_name;
-        if (!content.license.empty())
-                obj["license"] = content.license;
+        if (!content.attribution.empty())
+                obj["attribution"] = content.attribution;
 
         if (content.usage.test(PackUsage::Sticker))
                 obj["usage"].push_back("sticker");

tests/events.cpp

@@ -1092,7 +1092,7 @@ TEST(StateEvents, ImagePack)
     "display_name": "Awesome Pack",
     "avatar_url": "mxc://example.org/asdjfasd",
     "usage": ["emoticon"],
-    "license": "huh"
+    "attribution": "huh"
   }
 },
           "type": "im.ponies.room_emotes",
@@ -1110,7 +1110,7 @@ TEST(StateEvents, ImagePack)
         EXPECT_EQ(event.state_key, "my-pack");
         EXPECT_EQ(event.content.pack.has_value(), true);
         EXPECT_EQ(event.content.pack->display_name, "Awesome Pack");
-        EXPECT_EQ(event.content.pack->license, "huh");
+        EXPECT_EQ(event.content.pack->attribution, "huh");
         EXPECT_EQ(event.content.pack->avatar_url, "mxc://example.org/asdjfasd");
         EXPECT_EQ(event.content.pack->is_emoji(), true);
         EXPECT_EQ(event.content.pack->is_sticker(), false);
@@ -1664,7 +1664,7 @@ TEST(RoomAccountData, ImagePack)
     "display_name": "Awesome Pack",
     "avatar_url": "mxc://example.org/asdjfasd",
     "usage": ["emoticon"],
-    "license": "huh"
+    "attribution": "huh"
   }
 },
           "type": "im.ponies.user_emotes"
@@ -1675,7 +1675,7 @@ TEST(RoomAccountData, ImagePack)
         EXPECT_EQ(event.type, ns::EventType::ImagePackInAccountData);
         EXPECT_EQ(event.content.pack.has_value(), true);
         EXPECT_EQ(event.content.pack->display_name, "Awesome Pack");
-        EXPECT_EQ(event.content.pack->license, "huh");
+        EXPECT_EQ(event.content.pack->attribution, "huh");
         EXPECT_EQ(event.content.pack->avatar_url, "mxc://example.org/asdjfasd");
         EXPECT_EQ(event.content.pack->is_emoji(), true);
         EXPECT_EQ(event.content.pack->is_sticker(), false);