From 58e38947ed8448c914455e159bc612e88739d7ee Mon Sep 17 00:00:00 2001 From: tobiichi3227 <86729076+tobiichi3227@users.noreply.github.com> Date: Thu, 13 Feb 2025 21:37:37 +0800 Subject: [PATCH 1/8] Impr(special): Add Valentine's Day --- fortune_generator/json/static_special.json | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/fortune_generator/json/static_special.json b/fortune_generator/json/static_special.json index 05b4658..7fec768 100644 --- a/fortune_generator/json/static_special.json +++ b/fortune_generator/json/static_special.json @@ -180,6 +180,26 @@ "r_2_desc": "" } }, + { + "event": "情人節", + "triggerDate": { + "month": "2", + "date": "14" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "表達愛意", + "l_1_desc": "與愛人共享溫馨時光", + "l_2_event": "送禮物", + "l_2_desc": "透過心意滿滿的禮物傳遞深情" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, { "event": "世界社會正義日", "triggerDate": { -- 2.49.1 From 704032580ba16519666b03bbad34a8757e6c2ec7 Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Thu, 13 Feb 2025 23:14:54 +0800 Subject: [PATCH 2/8] Chore: Remove redundant file --- fortune_generator/js/fortune.js | 2 +- fortune_generator/json/special.json | 768 ---------------------------- 2 files changed, 1 insertion(+), 769 deletions(-) delete mode 100644 fortune_generator/json/special.json diff --git a/fortune_generator/js/fortune.js b/fortune_generator/js/fortune.js index 25df2ff..425a295 100644 --- a/fortune_generator/js/fortune.js +++ b/fortune_generator/js/fortune.js @@ -213,7 +213,7 @@ let special_events_index = 0; // init page async function init_page() { - // fetch fortune.json and special.json + // fetch data from `fortune.json` await fetch_data(); // hide the elements of show fortune page diff --git a/fortune_generator/json/special.json b/fortune_generator/json/special.json deleted file mode 100644 index 3f7a451..0000000 --- a/fortune_generator/json/special.json +++ /dev/null @@ -1,768 +0,0 @@ -{ - "special_events": [ - { - "event": "感恩節", - "triggerDate": { - "month": "11", - "week": "4", - "weekday": "4" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "家人團聚", - "l_1_desc": "分享寶貴時光", - "l_2_event": "吃火雞大餐", - "l_2_desc": "Happy Thanksgiving!" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "棉花糖日", - "triggerDate": { - "month": "12", - "date": "07" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "吃棉花糖", - "l_1_desc": "慶祝棉花糖日", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "貓奴日", - "triggerDate": { - "month": "12", - "date": "15" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "嚕貓", - "l_1_desc": "撫平傷心的心情", - "l_2_event": "喝咖啡", - "l_2_desc": "到貓咪咖啡店去喝咖啡" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "冬至", - "triggerDate": { - "month": "12", - "date": "22" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "吃湯圓", - "l_1_desc": "團團圓圓", - "l_2_event": "保暖", - "l_2_desc": "冬至到了" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "平安夜", - "triggerDate": { - "month": "12", - "date": "24" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "除舊佈新", - "l_1_desc": "平安祥和", - "l_2_event": "交換禮物", - "l_2_desc": "獲得真心的祝福" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "聖誕節", - "triggerDate": { - "month": "12", - "date": "25" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "家庭聚會", - "l_1_desc": "一起團圓吃火雞大餐", - "l_2_event": "注意保暖", - "l_2_desc": "冬至到了" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "元旦", - "triggerDate": { - "month": "1", - "date": "1" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "早起", - "l_1_desc": "心情愉悅迎接新年", - "l_2_event": "大掃除", - "l_2_desc": "新年新氣象" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "國際資料隱私日", - "triggerDate": { - "month": "1", - "date": "28" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "整理資料", - "l_1_desc": "注意在線資料安全", - "l_2_event": "注意隱私", - "l_2_desc": "謹慎上網" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "植樹節", - "triggerDate": { - "month": "3", - "date": "12" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "植樹造林", - "l_1_desc": "保護生態、美化環境", - "l_2_event": "節能減碳", - "l_2_desc": "延長資源壽命" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "白色情人節", - "triggerDate": { - "month": "3", - "date": "14" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "送禮物", - "l_1_desc": "表達愛意和感激之情", - "l_2_event": "觀星", - "l_2_desc": "仰望星空，共描明月" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "世界森林日", - "triggerDate": { - "month": "3", - "date": "21" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "環境教育", - "l_1_desc": "提升對自然的敬重", - "l_2_event": "節約用水", - "l_2_desc": "保護生態系統穩定" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "愚人節", - "triggerDate": { - "month": "4", - "date": "1" - }, - "status_index": "3", - "goodFortunes": { - "l_1_event": "喜笑顏開", - "l_1_desc": "與親朋好友分享快樂", - "l_2_event": "開派對", - "l_2_desc": "組織有趣的活動和遊戲" - }, - "badFortunes": { - "r_1_event": "冒犯他人", - "r_1_desc": "避免製造觸怒人的笑話", - "r_2_event": "惡作劇", - "r_2_desc": "注意避免不必要的麻煩" - } - }, - { - "event": "兒童節", - "triggerDate": { - "month": "4", - "date": "4" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "喜笑顏開", - "l_1_desc": "與親朋好友分享快樂", - "l_2_event": "開派對", - "l_2_desc": "組織有趣的活動和遊戲" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "世界健康日", - "triggerDate": { - "month": "4", - "date": "7" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "健康飲食", - "l_1_desc": "多攝取水果、蔬菜和全穀食品", - "l_2_event": "運動鍛煉", - "l_2_desc": "保持身體健康和活力" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "世界地球日", - "triggerDate": { - "month": "4", - "date": "22" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "環保行動", - "l_1_desc": "參與植樹造林或垃圾回收等環保行動", - "l_2_event": "節能減排", - "l_2_desc": "選擇環保型交通工具" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "世界閱讀日", - "triggerDate": { - "month": "4", - "date": "23" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "推廣閱讀", - "l_1_desc": "激發對知識的渴望", - "l_2_event": "書籍分享", - "l_2_desc": "與他人分享你的書單" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "世界智慧財產權日", - "triggerDate": { - "month": "4", - "date": "26" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "保護創意", - "l_1_desc": "尊重他人的創意和智慧財產權，共同維護創作人的權益", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "星際大戰日", - "triggerDate": { - "month": "5", - "date": "04" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "電影馬拉松", - "l_1_desc": "播放所有星際大戰電影", - "l_2_event": "感受原力", - "l_2_desc": "May the force be with you, always." - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "世界微笑日", - "triggerDate": { - "month": "5", - "date": "08" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "微笑", - "l_1_desc": "用微笑向世界問好", - "l_2_event": "放慢腳步", - "l_2_desc": "觀察四周的美好事物" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "母親節", - "triggerDate": { - "month": "5", - "week": "2", - "weekday": "7" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "家庭聚餐", - "l_1_desc": "表達對媽媽的感恩之心", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "世界環境日", - "triggerDate": { - "month": "6", - "date": "05" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "少用塑膠", - "l_1_desc": "選擇可重複使用的替代品", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "世界獻血者日", - "triggerDate": { - "month": "6", - "date": "14" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "捐血", - "l_1_desc": "捐出血液和血漿，分享生命要時常", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "夏至", - "triggerDate": { - "year": "2024", - "month": "6", - "date": "20" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "觀賞日出和日落", - "l_1_desc": "享受一年最長的白天", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "巧克力日", - "triggerDate": { - "month": "7", - "date": "07" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "送巧克力", - "l_1_desc": "共享巧克力盛宴", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "宅宅日", - "triggerDate": { - "month": "7", - "date": "13" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "觀影", - "l_1_desc": "看心愛的電影或影集", - "l_2_event": "閱讀", - "l_2_desc": "享受片刻的寧靜" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "國際冷笑話日", - "triggerDate": { - "month": "7", - "date": "24" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "講冷笑話", - "l_1_desc": "一起嘻嘻哈哈", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "國際友誼日", - "triggerDate": { - "month": "7", - "date": "30" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "與朋友聯絡", - "l_1_desc": "回憶美好時光", - "l_2_event": "一起出遊", - "l_2_desc": "增進彼此的感情" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "國際左撇子日", - "triggerDate": { - "month": "8", - "date": "13" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "挑戰新事物", - "l_1_desc": "嘗試用左手完成任務", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "世界攝影日", - "triggerDate": { - "month": "8", - "date": "19" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "拍攝照片", - "l_1_desc": "捕捉生活中的美好瞬間", - "l_2_event": "分享作品", - "l_2_desc": "展示您的攝影技巧" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "國際狗狗日", - "triggerDate": { - "month": "8", - "date": "26" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "陪伴狗狗", - "l_1_desc": "帶狗狗散步或遊玩", - "l_2_event": "分享作品", - "l_2_desc": "展示您的攝影技巧" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "國際慈善日", - "triggerDate": { - "month": "9", - "date": "5" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "捐贈物資", - "l_1_desc": "捐贈物資或金錢，幫助有需要的人", - "l_2_event": "參與志願活動", - "l_2_desc": "參加社區慈善活動，提升社會貢獻" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "中秋節", - "triggerDate": { - "year": "2024", - "month": "9", - "date": "17" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "賞月", - "l_1_desc": "與家人一同賞月，增進感情", - "l_2_event": "吃月餅", - "l_2_desc": "與家人朋友分享月餅的美味" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "國際和平日", - "triggerDate": { - "month": "9", - "date": "21" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "分享愛心", - "l_1_desc": "與他人分享關懷與愛心，促進和平", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "教師節", - "triggerDate": { - "month": "9", - "date": "28" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "感謝老師", - "l_1_desc": "向老師表達感謝，增進師生情誼", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "世界糧食日", - "triggerDate": { - "month": "10", - "date": "16" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "節約糧食", - "l_1_desc": "支持可持續的食物系統", - "l_2_event": "捐贈食品", - "l_2_desc": "捐贈食物給有需要的人，傳遞愛心" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "聯合國日", - "triggerDate": { - "month": "10", - "date": "24" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "支持和平", - "l_1_desc": "參與促進世界和平的活動", - "l_2_event": "了解國際事務", - "l_2_desc": "增強全球視野" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "萬聖節", - "triggerDate": { - "month": "10", - "date": "31" - }, - "status_index": "4", - "goodFortunes": { - "l_1_event": "扮演角色", - "l_1_desc": "穿上喜愛的角色服裝，享受萬聖節的氛圍", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "忽略安全", - "r_2_desc": "活動時忽視安全措施可能帶來風險" - } - }, - { - "event": "世界善心日", - "triggerDate": { - "month": "11", - "date": "13" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "善待他人", - "l_1_desc": "在生活中多一些善意與寬容", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - } - ] -} -- 2.49.1 From 4391176199c2bea8a8fcbd76553e2da4d675a76e Mon Sep 17 00:00:00 2001 From: tobiichi3227 <86729076+tobiichi3227@users.noreply.github.com> Date: Sun, 16 Feb 2025 14:50:49 +0800 Subject: [PATCH 3/8] Chore: Update service-worker special file cache (#53) --- fortune_generator/js/service-worker.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fortune_generator/js/service-worker.js b/fortune_generator/js/service-worker.js index 24bf3f9..7eebada 100644 --- a/fortune_generator/js/service-worker.js +++ b/fortune_generator/js/service-worker.js @@ -18,7 +18,9 @@ const NEED_UPDATE = [ "/fortune_generator/css/styles.css", "/fortune_generator/js/fortune.js", "/fortune_generator/js/matrix.js", - "/fortune_generator/json/special.json", + "/fortune_generator/json/custom_special.json", + "/fortune_generator/json/cyclical_special.json", + "/fortune_generator/json/static_special.json", "/fortune_generator/json/fortune.json", "/fortune_generator/json/manifest.json", "https://api.ipify.org/?format=json", -- 2.49.1 From 32e3156d30c2ddee9d86d1495e86dbb2e9b25480 Mon Sep 17 00:00:00 2001 From: tobiichi3227 <86729076+tobiichi3227@users.noreply.github.com> Date: Mon, 17 Feb 2025 07:44:41 +0800 Subject: [PATCH 4/8] Fix(Fortune): properly display Unicode characters (#54) --- scripts/check-events.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/check-events.py b/scripts/check-events.py index 36d931f..76d2256 100644 --- a/scripts/check-events.py +++ b/scripts/check-events.py @@ -374,7 +374,7 @@ for idx, event in enumerate(special_events["special_events"]): if errors: logging.error(args.path) for idx, error_msgs in errors.items(): - logging.error(json.dumps(special_events["special_events"][idx], indent=4)) + logging.error(json.dumps(special_events["special_events"][idx], indent=4, ensure_ascii=False)) for msg in error_msgs: logging.error(msg) exit(-1) -- 2.49.1 From 52d09db764224c0d615c8d824db2330e8f495657 Mon Sep 17 00:00:00 2001 From: tobiichi3227 <86729076+tobiichi3227@users.noreply.github.com> Date: Fri, 21 Feb 2025 01:00:49 +0800 Subject: [PATCH 5/8] Chore(Fortune): add pre-commit to check special events (#55) * Chore(Fortune): add pre-commit to check special events * Chore(Fortune): Update pre-commit hook version * Chore(Fortune): replace shell script with Python for better compatibility --- .pre-commit-config.yaml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .pre-commit-config.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..e01afb6 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,36 @@ +# See https://pre-commit.com for more information +# See https://pre-commit.com/hooks.html for more hooks +repos: +- repo: https://github.com/pre-commit/pre-commit-hooks + rev: v5.0.0 + hooks: + - id: trailing-whitespace + - id: end-of-file-fixer + - id: check-yaml + - id: check-added-large-files + +- repo: local + hooks: + - id: check-cyclical-event + name: check-cyclical-event + entry: python3 scripts/check-events.py fortune_generator/json/cyclical_special.json cyclical + language: python + files: fortune_generator/json/cyclical_special.json + types: [json] + pass_filenames: false + + - id: check-custom-event + name: check-custom-event + entry: python3 scripts/check-events.py fortune_generator/json/custom_special.json custom + language: python + files: fortune_generator/json/custom_special.json + types: [json] + pass_filenames: false + + - id: check-static-event + name: check-static-event + entry: python3 scripts/check-events.py fortune_generator/json/static_special.json static + language: python + files: fortune_generator/json/static_special.json + types: [json] + pass_filenames: false -- 2.49.1 From f7d450895f3eb9f468744efa377ce6ffb1a05ca6 Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Sat, 22 Feb 2025 00:38:30 +0800 Subject: [PATCH 6/8] Refactor: Update service worker paths --- fortune_generator/js/service-worker.js | 30 +++++++++++++------------- fortune_generator/manifest.json | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/fortune_generator/js/service-worker.js b/fortune_generator/js/service-worker.js index 7eebada..1702ced 100644 --- a/fortune_generator/js/service-worker.js +++ b/fortune_generator/js/service-worker.js @@ -2,27 +2,27 @@ const pre_cache_file_version = "pre-v1.1.0"; const auto_cache_file_version = "auto-v1.1.0"; const ASSETS = [ - "/images/lifeadventurer-192x192.png", - "/images/lifeadventurer-512x512.png", - "/images/lifeadventurer-180x180.png", - "/images/lifeadventurer-270x270.png", - "/images/lifeadventurer.jpg", + "/generators/images/lifeadventurer-192x192.png", + "/generators/images/lifeadventurer-512x512.png", + "/generators/images/lifeadventurer-180x180.png", + "/generators/images/lifeadventurer-270x270.png", + "/generators/images/lifeadventurer.jpg", "https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css", "https://ajax.googleapis.com/ajax/libs/jquery/3.7.1/jquery.min.js", ]; const NEED_UPDATE = [ - "/fortune_generator/", - "/fortune_generator/index.html", - "/fortune_generator/css/styles.css", - "/fortune_generator/js/fortune.js", - "/fortune_generator/js/matrix.js", - "/fortune_generator/json/custom_special.json", - "/fortune_generator/json/cyclical_special.json", - "/fortune_generator/json/static_special.json", - "/fortune_generator/json/fortune.json", - "/fortune_generator/json/manifest.json", + "/generators/fortune_generator/", + "/generators/fortune_generator/index.html", + "/generators/fortune_generator/css/styles.css", + "/generators/fortune_generator/js/fortune.js", + "/generators/fortune_generator/js/matrix.js", + "/generators/fortune_generator/json/custom_special.json", + "/generators/fortune_generator/json/cyclical_special.json", + "/generators/fortune_generator/json/static_special.json", + "/generators/fortune_generator/json/fortune.json", + "/generators/fortune_generator/json/manifest.json", "https://api.ipify.org/?format=json", ]; diff --git a/fortune_generator/manifest.json b/fortune_generator/manifest.json index 6426e93..9f82ca8 100644 --- a/fortune_generator/manifest.json +++ b/fortune_generator/manifest.json @@ -26,7 +26,7 @@ "type": "image/png" } ], - "start_url": "/fortune_generator/index.html", + "start_url": "/generators/fortune_generator/index.html", "display": "standalone", "orientation": "portrait" } -- 2.49.1 From 16b7c8dde1ee68709c7a780db918a282a5545abf Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Sat, 22 Feb 2025 01:30:08 +0800 Subject: [PATCH 7/8] Feat: Add seedMagic --- fortune_generator/js/fortune.js | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/fortune_generator/js/fortune.js b/fortune_generator/js/fortune.js index 425a295..d2f43c3 100644 --- a/fortune_generator/js/fortune.js +++ b/fortune_generator/js/fortune.js @@ -342,7 +342,21 @@ function Appear() { hashDate + (date * day) >> 1; // decide the status - status_index = ((seed1 + seed2) % statusLen + statusLen) % statusLen; + let seedMagic = 0; + if (seed1 > seed2) { + seedMagic = (seed1 ^ seed2) + parseInt(seed1.toString().split('').reverse().join('')); + } else if (seed1 < seed2) { + let collatzLen = 0; + let temp = Math.abs(seed1 - seed2); + while (temp !== 1) { + temp = temp % 2 === 0 ? temp / 2 : 3 * temp + 1; + collatzLen++; + } + seedMagic = collatzLen + seed2.toString(2).replace(/0/g, '').length; + } else { + seedMagic = seed1 + seed2; + } + status_index = ((seedMagic) % statusLen + statusLen) % statusLen; // update last record localStorage.setItem("last_date", d.toISOString()); -- 2.49.1 From 4531962dbb2a399d8c71fd3b34f7b12bf32884ed Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Sat, 22 Feb 2025 23:17:24 +0800 Subject: [PATCH 8/8] Chore: Update copyright to 2023-2025 --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index e4e3d1b..ccb5628 100644 --- a/index.html +++ b/index.html @@ -83,7 +83,7 @@