Merge branch 'one-among-us:main' into MTF_0615

Author: LS-KR

Diff for: .github/workflows/cloudflare-clean.yml

@@ -0,0 +1,32 @@
+name: Cloudflare Cleanup
+
+on:
+  schedule:
+    - cron: '0 0 * * 0' # Runs every week on Sunday at 00:00 UTC
+  workflow_dispatch: # Allows manual triggering of the workflow
+
+jobs:
+  clean:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: 'yarn'
+      - run: yarn install
+
+      - name: Clean Cloudflare Deployments (one-among-us)
+        run: yarn cloudflare_clean
+        env:
+          CF_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          CF_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          CF_PAGES_PROJECT_NAME: one-among-us
+
+      - name: Clean Cloudflare Deployments (our-data)
+        run: yarn cloudflare_clean
+        env:
+          CF_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          CF_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          CF_PAGES_PROJECT_NAME: our-data

Diff for: .github/workflows/preview.yml

@@ -0,0 +1,96 @@
+name: PR Preview
+
+on:
+  pull_request_target:
+    types: [opened, synchronize, reopened]
+    branches: [main, develop]
+  workflow_dispatch:
+    inputs:
+      pr_number:
+        description: 'Pull Request number to deploy preview for'
+        required: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+      deployments: write
+      pull-requests: write
+
+    steps:
+      # First, check out the workflow file (from the base) so secrets are available.
+      - name: Checkout base branch
+        uses: actions/checkout@v4
+
+      # Determine PR info based on the event type.
+      - name: Set PR info
+        id: pr-info
+        run: |
+          if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
+            echo "PR_NUMBER=${{ github.event.inputs.pr_number }}" >> $GITHUB_ENV
+          else
+            echo "PR_NUMBER=${{ github.event.pull_request.number }}" >> $GITHUB_ENV
+          fi
+
+      # Now check out the PR’s head branch (whether from a PR event or supplied manually)
+      - name: Checkout PR branch
+        uses: actions/checkout@v4
+        with:
+          ref: "refs/pull/${{ env.PR_NUMBER }}/merge"
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: 'yarn'
+
+      - name: Build
+        run: |
+          yarn install --production --frozen-lockfile
+          yarn build-preview
+          rm -rf dist/web.tgz
+
+      - name: Deploy to Cloudflare Pages
+        uses: cloudflare/wrangler-action@v3
+        with:
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          gitHubToken: ${{ secrets.GITHUB_TOKEN }}
+          command: pages deploy dist --project-name=data-preview --branch=pr-${{ env.PR_NUMBER }}
+
+      - name: Pull request comment
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const prNumber = "${{ env.PR_NUMBER }}";
+            const now = new Date().toISOString().substring(0, 19).replace('T', ' ');
+            const reviewBody = `🐱 感谢贡献！\n\n部署了预览，在这里哦: https://pr-${prNumber}.data-preview.pages.dev\n\n🕒 最后更新: ${now} (UTC)`;
+            
+            // List existing reviews on the PR.
+            const { data: reviews } = await github.rest.pulls.listReviews({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: prNumber,
+            });
+            const existingReview = reviews.find(review => review.body && review.body.includes('部署了预览'));
+            if (existingReview) {
+              // Update the existing review.
+              await github.rest.pulls.updateReview({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                pull_number: prNumber,
+                review_id: existingReview.id,
+                body: reviewBody,
+              });
+            } else {
+              // Create a new review comment.
+              await github.rest.pulls.createReview({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                pull_number: prNumber,
+                body: reviewBody,
+                event: "COMMENT",
+              });
+            }

Diff for: CONTRIBUTING.md

@@ -82,6 +82,7 @@ For Windows, Yarn could be find at [Classic YarnPkg](https://classic.yarnpkg.com
 * `actualHide`: `string[]`, if you don't want a entry show on the home and won't be redirected by random buttons, add it into this item.  
   If you set a entry in this list, you have no need to set it into `notShowOnHome` again.
 * `trigger`: `string[]`, if you think this article is likely to irritate readers and should be restricted, please set this option.
+* `skipAge`: `string[]`, if you want to skip age calculation, or not display age, put id in this option.
 
 ### Example
 
@@ -109,7 +110,7 @@ For Windows, Yarn could be find at [Classic YarnPkg](https://classic.yarnpkg.com
 ## 4. MDX external features
 
 1. Both `{/*something*/}` and `<!--something-->` can be rendered as comment, will not displayed on the website;
-2. KaTeX formula could be used in the page. eg. $C_p=\dfrac{p-p_\infty}{\frac12\rho U_\infty^2}$
+2. KaTeX formula could be used in the page. eg. `$C_p=\dfrac{p-p_\infty}{\frac12\rho U_\infty^2}$` as $C_p=\dfrac{p-p_\infty}{\frac12\rho U_\infty^2}$
 3. Footnote could be used.
 4. GitHub `[!Note]` mark could be used.
 
@@ -131,11 +132,22 @@ For Windows, Yarn could be find at [Classic YarnPkg](https://classic.yarnpkg.com
     * `slot` html slot
   * example:
     ```mdx
-    <BlueBlock>
+    <BlurBlock>
     this is an example blurred paragraph.
-    </BlueBlock>
+    </BlurBlock>
     ```
 * `CapDownQuote`
   * usage: `<CapDownQuote messages={string[][]} />`
     * messages: `string[][]`, the message of quote block.
   * example: `<blockquote><CapDownQuote messages={[["你走了呀……姊姊……”", "“这个天线的馈线那些怎么看来着？”"], ["“不上学了嘛……”", "“不是说好了下一次……”"], ["“山猫猫！抱住~”", "“她听力不太好哦……”"], ["“为什么……”", "“把我们丢在这……”"], ["“这是为了她……”", "“下一次一起打mai……”"], ["“教我开车嘛~”", "“帮我照顾好山猫猫~“"], ["“姊姊好厉害，好羡慕……”", "“又被家里人说了，公司的工作也很多……”"]]} /></blockquote>`
+* `TextRing`
+  * usage: `<TextRing text="" />`
+    * text: `string`, the text you want display
+* `DottedNumber`
+  * usage: `<DottedNumber n="" />` OR `<DottedNumber n={number}`
+    * n: `string|number`, the number you want to display.
+
+## 6. Punctuations
+
+* In zh_hans/zh_hant pages, we prefer to use these punctuations: `，。？！:;——()[]{}「」『』《》`
+* In en_ca pages, we prefer to use these punctuations: `,.?!:;-()[]{}“”‘’<>`

Diff for: data/eggs.json

@@ -6,7 +6,7 @@
     "toast": {
       "title": "找到了喵~",
       "text": "诶? 找什么喵? ",
-      "img": "https://data.one-among.us/img/cat-face-emoji-2048x1828.png",
+      "img": "https://data.one-among.us/img/cat-face-emoji-2048x1828.webp",
       "width": 64,
       "height": 57
     }
@@ -18,8 +18,8 @@
     "toast": {
       "title": "参宿四 ~Betelgeuse~",
       "text": "R.I.P.  - Be resilient -",
-      "img": "https://data.one-among.us/img/betelgeuse.png",
-      "background": "url(https://data.one-among.us/img/stardust.jpg)",
+      "img": "https://data.one-among.us/img/betelgeuse.webp",
+      "background": "url(https://data.one-among.us/img/stardust.webp)",
       "width": 64,
       "height": 64,
       "color": "#f0f8ff"
@@ -32,8 +32,8 @@
     "toast": {
       "title": "嘉陵雾稠",
       "text": "雾终将散去, 而我们终将看到彩虹",
-      "img": "https://data.one-among.us/img/bridge.png",
-      "background": "url(https://data.one-among.us/img/fog.jpg)",
+      "img": "https://data.one-among.us/img/bridge.webp",
+      "background": "url(https://data.one-among.us/img/fog.webp)",
       "width": 64,
       "height": 47
     }
@@ -45,7 +45,7 @@
     "toast": {
       "title": "海色",
       "text": "拔锚起航, 跨越闪耀泪光的海岸",
-      "img": "https://data.one-among.us/img/ship.png",
+      "img": "https://data.one-among.us/img/ship.webp",
       "background": "#0b2058ff",
       "width": 64,
       "height": 64,
@@ -60,7 +60,7 @@
     "toast": {
       "title": "往昔苦难",
       "text": "因为妳而存在, 因为妳而不在, 要在啊......",
-      "img": "https://data.one-among.us/img/lifeline.png",
+      "img": "https://data.one-among.us/img/lifeline.webp",
       "background": "#EEEEEE88",
       "width": 64,
       "height": 64
@@ -74,7 +74,7 @@
     "toast": {
       "title": "永乐桥上的风景",
       "text": "连绵不断的河流，像生命本身一样无法回头……",
-      "img": "https://data.one-among.us/img/Tientsin-Eye.png",
+      "img": "https://data.one-among.us/img/Tientsin-Eye.webp",
       "width": 64,
       "height": 64
     }
@@ -87,8 +87,8 @@
     "toast": {
       "title": "葬花",
       "text": "花谢花飞花满天, 红消香断有谁怜? ",
-      "img": "https://data.one-among.us/img/tumb.png",
-      "background": "url(https://data.one-among.us/img/flower.png)",
+      "img": "https://data.one-among.us/img/tumb.webp",
+      "background": "url(https://data.one-among.us/img/flowers.webp)",
       "width": 64,
       "height": 64
     }
@@ -117,7 +117,7 @@
     "toast": {
       "title": "希望有个 All Perfect 的结局",
       "text": " ~ All that I'm left with is your reminiscences ~ ",
-      "img": "https://data.one-among.us/img/musical-score.png",
+      "img": "https://data.one-among.us/img/musical-score.webp",
       "width": 64,
       "height": 64
     }
@@ -129,7 +129,7 @@
     "toast": {
       "title": "跨过空间与距离",
       "text": "­—· · ···­— · ·­—· / ·­—·· ­—­—­— ···­— · ­—·· / ­—·­—­— ­—­—­— ··­— / ··· ­—­—­— / ­—­— ··­— ­—·­—· ····",
-      "img": "https://data.one-among.us/img/radar.png",
+      "img": "https://data.one-among.us/img/radar.webp",
       "background": "black",
       "width": 64,
       "height": 64,

Diff for: data/hdata.json

@@ -6,5 +6,9 @@
     "trigger": ["Aniloviraw"],
     "switch": [
         ["Anilovr", "Aniloviraw"]
-    ]
+    ],
+    "skipAges": ["cheonwoomaeng"],
+    "probilities": {
+        "XingZ60": 1
+    }
 }

Diff for: netlify.toml

@@ -13,7 +13,8 @@
     "build-preview": "yarn build && scripts/preview.sh",
     "serve": "http-server --cors='*' dist",
     "preview": "yarn build-preview && yarn serve",
-    "translate": "node --loader ts-node/esm/transpile-only scripts/translate.ts"
+    "translate": "node --loader ts-node/esm/transpile-only scripts/translate.ts",
+    "cloudflare_clean": "node scripts/cloudflare_clean.js"
   },
   "dependencies": {
     "@andreekeberg/imagedata": "^1.0.2",
@@ -39,6 +40,8 @@
   "devDependencies": {
     "@octokit/core": "^4.1.0",
     "@types/js-yaml": "^4.0.5",
-    "http-server": "^14.1.1"
+    "http-server": "^14.1.1",
+    "exponential-backoff": "^3.1.0",
+    "node-fetch": "^2.6.7"
   }
 }

Diff for: package.json

@@ -0,0 +1 @@
+{"id":21092,"content":"晚安 ——桑桑","submitter":"桑桑","date":"Dec 13, 2024"}

Diff for: people/Acheron/comments/2024-12-13-C21092.json

@@ -0,0 +1 @@
+{"id":21216,"content":"晚安","submitter":"Hali","date":"Feb 4, 2025"}

Diff for: people/Acheron/comments/2025-02-04-C21216.json

@@ -0,0 +1 @@
+{"id":21222,"content":"晚安","submitter":"暮雨","date":"Feb 6, 2025"}

Diff for: people/Acheron/comments/2025-02-06-C21222.json

@@ -0,0 +1 @@
+{"id":21277,"content":"晚安啦","submitter":"邂逅","date":"Feb 27, 2025"}

Diff for: people/Acheron/comments/2025-02-27-C21277.json

@@ -1,5 +1,5 @@
 id: Acheron
-profileUrl: ${path}/photos/profile.png
+profileUrl: ${path}/photos/profile.jpg
 info:
   died: '2022-09-22'
 websites:

Diff for: people/Acheron/info.yml

@@ -0,0 +1,8 @@
+id: AmbeR_the_anpa
+profileUrl: ${path}/photos/profile.jpg
+info:
+  born: '2004-09-01'
+  died: '2024-09-17'
+websites:
+  twitter: https://x.com/Lich7355608
+  bilibili: https://space.bilibili.com/673480727

Diff for: people/Acheron/photos/profile.jpg

@@ -0,0 +1,18 @@
+---
+name: Anpa
+info:
+    alias: AmbeR_the_Anpa, amber
+    location: Tokyo, Japan
+---
+
+## Description
+
+AmbeR\_the\_anpa, born on September 1, 2004, from Yichun, Jiangxi Province. Anpa likes to drink at the bar and can also mix some wine himself. He has made a wish to become the strongest bartender. Anpa likes sports and has tried table tennis, skiing and other sports. She is also a badminton player in the city team. She plays badminton very well and it is like a shell when she fights. In my spare time, Anpa has also visited many cities across the country.
+
+Anpa was not a transgirl at first, and after two months of dating with a transgirl, Anpa decided to become a transgirl. Anpa began receiving hormone therapy in 2019. In 2022, she went to Huilongguan Hospital in Beijing to continue treatment. However, when Anpa was in high school, her high school teacher bullied her, which made Anpa suffer from depression and still felt uncomfortable in her daily life. The two of them chose to work in the country after graduating from high school. Then he went to Weifang to work and adopted a little orange cat. After a while, the domestic environment changed a little. I felt that the domestic environment was not good and Anpa discussed with his lover. I decided to discuss with my family and ask them to support them in studying in Japan.
+
+On October 3, 2023, Anpa went to Tokyo, Japan to study while working. During this period, she came to Waseda Street Psychia Clinic to seek a second medical advice, and local doctors supported Anpa’s desire to receive SRS based on the diagnostic and treatment guidelines of Japan’s GID, who was also satisfied with the medical environment in Japan.
+
+Anpa was gentle and considerate throughout his life, rescued stray animals, and participated in voluntary blood donation. He has always been patient and generous with help and support for the vulnerable groups.
+
+On July 14, 2024, Anpa attempted suicide and was rescued in the hospital ICU. At 6:12, Japan time on September 17, 2024, Anpa passed away in front of his lover due to life pressure and cyber violence. He was confirmed to die at 11:23 on the same day. After Anpa passed away, her family rushed to Japan and cremated Anpa with Anpa's lover at the funeral home in Nymph Sakuratai, Tokyo. Since the elderly in Anpa's family are still alive, they took a cold approach to what Anpa encountered during his lifetime, and everything ended.

Diff for: people/Acheron/photos/profile.png

@@ -0,0 +1,20 @@
+---
+name: 安帕
+info:
+    alias: AmbeR_the_安帕, 琥珀
+    location: 日本东京
+---
+
+## 生平
+
+AmbeR\_the\_安帕，2004年9月1日出生，江西宜春人。安帕喜欢去酒吧喝酒，自己也会调一些酒，曾许愿要成为最强的调酒师。安帕喜欢运动，乒乓球、滑雪等运动都尝试过。她还是市队的羽毛球运动员，打羽毛球很厉害，打起来就和炮弹一样。空闲之余，安帕也去过全国不少城市旅游。
+
+安帕刚开始并不是一名跨性别女性，在与一名跨性别女性谈了两个月恋爱后，安帕决定成为一名跨性别女性。安帕从2019年开始接受激素治疗。2022年前往北京回龙观医院继续治疗，然而，安帕上高中时，高中班主任霸凌她，这让安帕患上了抑郁症，在日常生活中仍然感到不适。后面两人高中毕业后选择了在国内工作。然后去潍坊打工还收养了一只小橘猫。就这样过了一段时间，国内的环境发生了一些变化，感觉国内环境不好的安帕与爱人商量后。决定和家人商量，让他们支持她俩一起前往日本留学。
+
+2023年10月3日安帕如愿和爱人前往日本东京留学，一边工作一边上学。在此期间，她来到早稻田街精神科诊所寻求医疗第二意见，当地的医生根据日本 GID 的诊断和治疗指南，支持安帕接受 SRS 的愿望，安帕对日本的医疗环境也感到满意。
+
+安帕的一生温柔体贴，救助过流浪动物，也参加过无偿献血，一直对弱势群体充满耐心且不吝帮助与支持。
+
+2024年7月14日安帕自杀未遂，在医院 ICU 被救回。2024年日本时间9月17日6:12，安帕因生活压力和遭遇网络暴力当着爱人的面弃世，同日11:23确认死亡。在安帕离世后，她的家人赶赴日本，与安帕的爱人在东京练马樱台的殡仪馆里火化了安帕。由于安帕家里的老人仍然健在，因此他们对安帕生前遭遇的事采取了冷处理的态度，一切就这么结束了。
+
+条目贡献：UP 主纪念馆（《UP主纪念馆名录》611 号）

Diff for: people/AkiraComplex/photos/profile.jpg

@@ -0,0 +1,22 @@
+---
+name: 安帕
+info:
+    alias: AmbeR_the_安帕, 琥珀
+    location: 日本東京
+---
+
+## 生平
+
+AmbeR\_the\_安帕，2004年9月1日出生，江西宜春人。安帕喜歡去酒吧喝酒，自己也會調一些酒，曾許願要成爲最強的調酒師。安帕喜歡運動，乒乓球、滑雪等運動都嘗試過。她還是市隊的羽毛球運動員，打羽毛球很厲害，打起來就和炮彈一樣。空閒之餘，安帕也去過全國不少城市旅遊。
+
+安帕剛開始並不是一名跨性別女性，在與一名跨性別女性談了兩個月戀愛後，安帕決定成爲一名跨性別女性。安帕從2019年開始接受激素治療。2022年前往北京回龍觀醫院繼續治療，然而，安帕上高中時，高中班主任霸凌她，這讓安帕患上了抑鬱症，在日常生活中仍然感到不適。後面兩人高中畢業後選擇了在國內工作。然後去濰坊打工還收養了一隻小橘貓。就這樣過了一段時間，國內的環境發生了一些變化，感覺國內環境不好的安帕與愛人商量後。決定和家人商量，讓他們支持她倆一起前往日本留學。
+
+
+2023年10月3日安帕如願和愛人前往日本東京留學，一邊工作一邊上學。在此期間，她來到早稻田街精神科診所尋求醫療第二意見，當地的醫生根據日本 GID 的診斷和治療指南，支持安帕接受 SRS 的願望，安帕對日本的醫療環境也感到滿意。
+
+安帕的一生溫柔體貼，救助過流浪動物，也參加過無償獻血，一直對弱勢羣體充滿耐心且不吝幫助與支持。
+
+2024年7月14日安帕自殺未遂，在醫院 ICU 被救回。2024年日本時間9月17日6:12，安帕因生活壓力和遭遇網絡暴力當着愛人的面棄世，同日11:23確認死亡。在安帕離世後，她的家人趕赴日本，與安帕的愛人在東京練馬櫻臺的殯儀館裏火化了安帕。由於安帕家裏的老人仍然健在，因此他們對安帕生前遭遇的事採取了冷處理的態度，一切就這麼結束了。
+
+條目貢獻：UP 主紀念館（《UP主紀念館名錄》611 號）
+