fix conflicts

2024-04-07 15:42:28 +00:00
parent ece86f756d bb7b4a8ea4
commit d6c736f1a5
30 changed files with 185 additions and 31 deletions
@@ -283,6 +283,7 @@ namespace MisskeyAPI {
          : '',
        plain_content: n.text ? n.text : null,
        created_at: n.createdAt,
+        edited_at: n.updatedAt || null,
        emojis: mapEmojis(n.emojis).concat(mapReactionEmojis(n.reactionEmojis)),
        replies_count: n.repliesCount,
        reblogs_count: n.renoteCount,