From dacf47e2d848513235bda0af91c15e1b18e7cc97 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <me@hydev.org>
Date: Fri, 2 Dec 2022 19:21:27 -0500
Subject: [PATCH] [O] New format

---
 people/homoyamakaze/info.json5         | 26 +++++++++++---------------
 people/homoyamakaze/info.zh_hant.json5 | 15 ---------------
 people/homoyamakaze/page.md            | 13 +++++++++++--
 people/lintong/info.json5              | 13 +++++--------
 people/lintong/info.zh_hant.json5      | 14 --------------
 people/lintong/page.md                 |  7 +++++++
 6 files changed, 34 insertions(+), 54 deletions(-)
 delete mode 100644 people/homoyamakaze/info.zh_hant.json5
 delete mode 100644 people/lintong/info.zh_hant.json5

diff --git a/people/homoyamakaze/info.json5 b/people/homoyamakaze/info.json5
index 8aed6fcd..8032a60c 100644
--- a/people/homoyamakaze/info.json5
+++ b/people/homoyamakaze/info.json5
@@ -1,15 +1,11 @@
-{ 
-  id: 'homoyamakaze', 
-  name: '浅羽猫头', 
-  profileUrl: '${path}/photos/profile.jpg', 
-  info: [ 
-  ['昵称', '浅羽猫头'], 
-  ['曾用名', '穗也猫猫头'], 
-  ['地区', '甘肃兰州'], 
-  ['出生', '1999.11.3'], 
-  ['逝世', '2022.11.9'], 
-  ], 
-  websites: [ 
-  ['twitter', 'https://twitter.com/homoyamakaze'], 
-  ], 
-  } 
+{
+    id: 'homoyamakaze',
+    profileUrl: '${path}/photos/profile.jpg',
+    info: {
+        born: "1999-11-03",
+        died: "2022-11-09"
+    },
+    websites: [
+        ['twitter', 'https://twitter.com/homoyamakaze'],
+    ],
+}
diff --git a/people/homoyamakaze/info.zh_hant.json5 b/people/homoyamakaze/info.zh_hant.json5
deleted file mode 100644
index 2e9e8c78..00000000
--- a/people/homoyamakaze/info.zh_hant.json5
+++ /dev/null
@@ -1,15 +0,0 @@
-{ 
-  id: 'homoyamakaze', 
-  name: '淺羽貓頭', 
-  profileUrl: '${path}/photos/profile.jpg', 
-  info: [ 
-  ['昵稱', '淺羽貓頭'], 
-  ['曾用名', '穗也貓貓頭'], 
-  ['地區', '甘肅蘭州'], 
-  ['出生', '1999.11.3'], 
-  ['逝世', '2022.11.9'], 
-  ], 
-  websites: [ 
-  ['twitter', 'https://twitter.com/homoyamakaze'], 
-  ], 
-  } 
diff --git a/people/homoyamakaze/page.md b/people/homoyamakaze/page.md
index d5124b4d..ca2ed758 100644
--- a/people/homoyamakaze/page.md
+++ b/people/homoyamakaze/page.md
@@ -1,12 +1,21 @@
+---
+name: 浅羽猫头
+info:
+    alias: 浅羽猫头、穗也猫猫头
+    location: 甘肃兰州
+---
+
 ## 简介
 
 [浅羽猫头](https://twitter.com/homoyamakaze) ，上传了wiki上唯一一个辽宁地区开证方法，线下协助多名跨性别开具证明和处方，帮助很多人买到了低价日雌，数量至少在100盒以上。
 
-<PhotoScroll photos={[ '${path}/photos/1.jpg', ]} />  <PhotoScroll photos={[ '${path}/photos/2.png', ]} />
+<PhotoScroll photos={[ '${path}/photos/1.jpg', ]} />  
+<PhotoScroll photos={[ '${path}/photos/2.png', ]} />
 
 2022 年 11 月 9 日晚，因网络暴力导致双相发作于家中逝世，信息准确性由她女朋友[穗也柚子](https://twitter.com/YuzuTvT)确认，有公安现场笔录录音。
 
-<PhotoScroll photos={[ '${path}/photos/3.jpg', ]} />  <PhotoScroll photos={[ '${path}/photos/4.jpg', ]} />
+<PhotoScroll photos={[ '${path}/photos/3.jpg', ]} />  
+<PhotoScroll photos={[ '${path}/photos/4.jpg', ]} />
 
 该消息于 2022 年 11 月 25 日由 [穗也柚子](https://twitter.com/YuzuTvT) 和 [Lee](https://twitter.com/rbqwansui) 发布。
 
diff --git a/people/lintong/info.json5 b/people/lintong/info.json5
index 4dd265cf..9ad1b8f3 100644
--- a/people/lintong/info.json5
+++ b/people/lintong/info.json5
@@ -1,14 +1,11 @@
 {
     id: 'lintong',
-    name: '林童',
     profileUrl: '${path}/photos/profile.jpg',
-    info: [
-        ['昵称', '林童'],
-        ['地区', '湖北武汉'],
-        ['出生', '2000.06.01'],
-        ['逝世', '2022.06.06'],
-    ],
+    info: {
+        born: "2000.06.01",
+        died: "2022.06.06"
+    },
     websites: [
         ['QQ', 'https://304915994.qzone.qq.com/'],
     ],
-}
\ No newline at end of file
+}
diff --git a/people/lintong/info.zh_hant.json5 b/people/lintong/info.zh_hant.json5
deleted file mode 100644
index d899b057..00000000
--- a/people/lintong/info.zh_hant.json5
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    id: 'lintong',
-    name: '林童',
-    profileUrl: '${path}/photos/profile.jpg',
-    info: [
-        ['暱稱', '林童'],
-        ['地區', '湖北武漢'],
-        ['出生', '2000-06-01'],
-        ['逝世', '2022-06-06'],
-    ],
-    websites: [
-        ['QQ', 'https://304915994.qzone.qq.com/'],
-    ],
-}
\ No newline at end of file
diff --git a/people/lintong/page.md b/people/lintong/page.md
index 3cf3c43a..9e102691 100644
--- a/people/lintong/page.md
+++ b/people/lintong/page.md
@@ -1,3 +1,10 @@
+---
+name: 林童
+info:
+    alias: 林童
+    location: 湖北武汉
+---
+
 ## 简介
 
 林童，是一个占有欲比较强烈的女孩子，有个不经常联系的妈妈，喜欢吃西红柿炒鸡蛋什么的，喝黑色魔爪，粘人，性格方面，比较突出的就是喜欢逼着你干不喜欢的事情，有点公主病？可能是因为我吧。比较喜欢麻烦爱人。不喜欢麻烦熟人。(生前爱人留)