Omit url for encrypted media events

lib/structs/events/messages/audio.cpp

@@ -35,11 +35,12 @@ to_json(json &obj, const Audio &content)
 {
         obj["msgtype"] = "m.audio";
         obj["body"]    = content.body;
-        obj["url"]     = content.url;
         obj["info"]    = content.info;
 
         if (content.file)
                 obj["file"] = content.file.value();
+        else
+                obj["url"] = content.url;
 
         if (!content.relates_to.in_reply_to.event_id.empty())
                 obj["m.relates_to"] = content.relates_to;

lib/structs/events/messages/file.cpp

@@ -39,11 +39,12 @@ to_json(json &obj, const File &content)
         obj["msgtype"]  = "m.file";
         obj["body"]     = content.body;
         obj["filename"] = content.filename;
-        obj["url"]      = content.url;
         obj["info"]     = content.info;
 
         if (content.file)
                 obj["file"] = content.file.value();
+        else
+                obj["url"] = content.url;
 
         if (!content.relates_to.in_reply_to.event_id.empty())
                 obj["m.relates_to"] = content.relates_to;

lib/structs/events/messages/image.cpp

@@ -34,11 +34,12 @@ to_json(json &obj, const Image &content)
 {
         obj["msgtype"] = "m.image";
         obj["body"]    = content.body;
-        obj["url"]     = content.url;
         obj["info"]    = content.info;
 
         if (content.file)
                 obj["file"] = content.file.value();
+        else
+                obj["url"] = content.url;
 
         if (!content.relates_to.in_reply_to.event_id.empty())
                 obj["m.relates_to"] = content.relates_to;
@@ -65,11 +66,12 @@ void
 to_json(json &obj, const StickerImage &content)
 {
         obj["body"] = content.body;
-        obj["url"]  = content.url;
         obj["info"] = content.info;
 
         if (content.file)
                 obj["file"] = content.file.value();
+        else
+                obj["url"] = content.url;
 
         if (!content.relates_to.in_reply_to.event_id.empty())
                 obj["m.relates_to"] = content.relates_to;

lib/structs/events/messages/video.cpp

@@ -36,11 +36,12 @@ to_json(json &obj, const Video &content)
 {
         obj["msgtype"] = "m.video";
         obj["body"]    = content.body;
-        obj["url"]     = content.url;
         obj["info"]    = content.info;
 
         if (content.file)
                 obj["file"] = content.file.value();
+        else
+                obj["url"] = content.url;
 
         if (!content.relates_to.in_reply_to.event_id.empty())
                 obj["m.relates_to"] = content.relates_to;