正确实现 VoiceMessage.ToJson();

cyanray · Feb 28, 2022 · c8f668d · c8f668d
1 parent 85eb9cd
commit c8f668d
Showing 1 changed file with 18 additions and 5 deletions.
diff --git a/include/mirai/messages/VoiceMessage.hpp b/include/mirai/messages/VoiceMessage.hpp
@@ -84,15 +84,28 @@ namespace Cyan
 		}
 		virtual json ToJson() const override
 		{
-			return
+			json result = 
 			{
 				{ "type", type_ },
-				{ "voiceId", voiceId_.empty()? nullptr : voiceId_ },
-				{ "url", url_.empty()? nullptr : url_ },
-				{ "path", path_.empty()? nullptr : path_ },
-				{ "base64", base64_.empty()? nullptr : base64_ },
 				{ "length", length_ }
 			};
+
+			voiceId_.empty()
+				? result["voiceId"] = json(nullptr)
+				: result["voiceId"] = voiceId_;
+
+			url_.empty()
+				? result["url"] = json(nullptr)
+				: result["url"] = url_;
+
+			path_.empty()
+				? result["path"] = json(nullptr)
+				: result["path"] = path_;
+
+			base64_.empty()
+				? result["base64"] = json(nullptr)
+				: result["base64"] = base64_;
+			return result;
 		}
 		virtual ~VoiceMessage() {}