Compare commits
34 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 70227278c0 | |||
| 896bb9aaf7 | |||
| 386555ecf3 | |||
| 734b573a3b | |||
| d974115606 | |||
| c1edf6c13b | |||
| 95ed876a47 | |||
| 9c09675205 | |||
| 9b6e790d4b | |||
| 7c4b5f7397 | |||
| 3db3a75f64 | |||
| 2951a248f5 | |||
| eb027d7daf | |||
| 4dfdb6fc4a | |||
| b92116f3a9 | |||
| 6b732b3110 | |||
| a986068372 | |||
| 3a446440d3 | |||
| 33435f4c46 | |||
| e7f0c3aed8 | |||
| 6e9ea20d33 | |||
| 83441a8eaf | |||
| 1c979939bb | |||
| 391694ca45 | |||
| ca552be9e9 | |||
| e099522b7e | |||
| 16b1b9d2ab | |||
| f0246d7ce9 | |||
| 165500e71d | |||
| 4f2be0e0ed | |||
| 7f2ef21557 | |||
| b33b998ae4 | |||
| e17da1686d | |||
| ab06f4ceec |
@@ -1,3 +1,56 @@
|
||||
# 2026.5.5
|
||||
- Chg: 毎日7:00の天気予報の日付表記
|
||||
- Fix: 20件前のユーズを最後に応答したコマンドのユーズとして記録していた問題
|
||||
- Fix: 毎日18:00の天気予報の仮投稿の表記が本日になっていた問題
|
||||
|
||||
# 2026.5.4
|
||||
- Chg: メモリをキャッシュしないように
|
||||
|
||||
# 2026.5.3
|
||||
- Chg: 震度分布画像のメッセージを変更
|
||||
- Fix: distに震度分布画像のアセットと地域マップがコピーされるように
|
||||
- Fix: 返信とメンションの返答が記録されない問題
|
||||
- Fix: 震度分布画像が投稿されない問題
|
||||
- Fix: 条件に合わなくても震度分布画像を生成する問題
|
||||
- Fix: 震度分布画像に隙間が空く問題
|
||||
- Del: 正確にスケジュールが動作する機能
|
||||
|
||||
# 2026.5.2
|
||||
- Fix: `/weather`が利用できない問題
|
||||
|
||||
# 2026.5.1
|
||||
- Feat: 地震の震度分布画像生成
|
||||
- Feat: 震度分布画に全タイルが埋まる機能
|
||||
- Feat: 震度分布画像の震源がタイル単位で中央になる機能
|
||||
- Feat: 震度分布画像で欠けているタイルが描画される機能
|
||||
- Feat: 震度分布画像のアセットの位置が中央基準になる機能
|
||||
- Chg: 全てのスケジュールが正確に動作するように
|
||||
- Chg: 毎日18:00に明日の天気予報を投稿するように
|
||||
- Chg: 震度分布画像のズームレベルを8から9へ
|
||||
- Chg: 震度分布画像の生成条件を震源と位置が存在するへ変更
|
||||
- Chg: 震度分布画像のアセットを並列に取得
|
||||
- Chg: 震度分布画像の震源のアセットに縁取りを追加
|
||||
- Chg: 震度分布画像の震度ではないアセットを拡大
|
||||
- Chg: ユーズの分割の案内文を太字に
|
||||
- Fix: 地震情報の画像生成での並び替えで、震度の位置が震源の位置として扱われる問題
|
||||
- Fix: 毎日7:00に天気予報の返信をできない問題
|
||||
- Del: 最大震度が不明な場合に投稿するかどうかのconfigを削除
|
||||
|
||||
# 2026.5.0
|
||||
- Feat(dev): 地震情報の画像生成機能は未完成のため、ユーズには適用されません
|
||||
- Chg: 地震情報でのタイトルを変更
|
||||
- Fix: 毎日7:00に天気予報が投稿されない問題
|
||||
|
||||
# 2026.4.3
|
||||
- Chg: forループ内でlastReadを記録するように
|
||||
- Chg: lastReadを時刻ベースに
|
||||
|
||||
# 2026.4.2
|
||||
- Fix: id除外が機能しない問題
|
||||
|
||||
# 2026.4.1
|
||||
- Chg: notificationsもfor内でlastReadを更新しないように
|
||||
|
||||
# 2026.4.0
|
||||
- Breaking: noticeUwuzuを0から作り直しました
|
||||
- Breaking: 25.12.0-alpha.1までの方針を全て廃止しました
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
# noticeUwuzu
|
||||
[uwuzu](https://www.uwuzu.com)向けのお知らせBotです。
|
||||
uwuzu v1.6.3以上で利用可能です。
|
||||
uwuzu v1.6.7以上で利用可能です。
|
||||
|
||||
## 機能
|
||||
- 時報
|
||||
毎時0分に「h:00になりました。」と投稿します。
|
||||
- 天気予報
|
||||
[天気予報 API(livedoor 天気互換)](https://weather.tsukumijima.net/)を利用して、毎日7:00に天気予報を投稿します。
|
||||
[天気予報 API(livedoor 天気互換)](https://weather.tsukumijima.net/)を利用して、毎日7:00及び18:00に天気予報を投稿します。
|
||||
18:00は明日の天気予報を投稿します。
|
||||
- 地震情報
|
||||
[P2P地震情報](https://www.p2pquake.net/)のWebSocket APIを利用して、以下の情報を受信した際に投稿します。
|
||||
- 地震発生
|
||||
@@ -22,6 +23,8 @@ uwuzu v1.6.3以上で利用可能です。
|
||||
- 地震情報のWebSocketの接続先をテスト用サンドボックスに変更
|
||||
P2P地震情報の接続先を本番環境から[テスト用サンドボックスのエンドポイント](https://www.p2pquake.net/develop/json_api_v2/)に変更します。
|
||||
そのため、最新の情報は配信されません。
|
||||
- 地震情報のid除外を無効化
|
||||
地震情報のid除外を記録も確認も行わなくなります。
|
||||
- i18nextのdebugを有効化
|
||||
[i18nextでのdebug](https://www.i18next.com/overview/configuration-options#logging)が有効化されます。
|
||||
|
||||
|
||||
@@ -12,8 +12,6 @@ earthquake:
|
||||
# 例: 30を指定すると、最大震度が震度3以上の地震発生情報のみを投稿します。
|
||||
# 10(震度1), 20(震度2), 30(震度3), 40(震度4), 45(震度5弱), 50(震度5強), 55(震度6弱), 60(震度6強), 70(震度7)が有効です。
|
||||
requireMaxScale: 30
|
||||
# 最大震度が不明な地震発生情報を投稿するかどうか boolean
|
||||
canUnknownMaxScale: true
|
||||
# 過去のデバッグ用データを使用して地震情報を配信するかどうか boolean
|
||||
# デバッグ用途のみで使用してください。
|
||||
useHistoryData: false
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
timeNotice: "{{ time }}になりました。"
|
||||
weatherProvisional: |
|
||||
本日の天気
|
||||
{{ day }}の天気
|
||||
※タイムラインが埋まるため返信に記載しています。
|
||||
weatherReply: |
|
||||
【{{ city }}】
|
||||
@@ -9,7 +9,7 @@ weatherReply: |
|
||||
最低気温: {{ minTemp }}
|
||||
降水確率: {{ chanceOfRain }}
|
||||
earthquakeNotice: |
|
||||
### ==地震発生==
|
||||
### {{ type }}
|
||||
⏰時刻: {{ occuredTime }}頃
|
||||
🫨最大震度: {{ maxScale }}
|
||||
📍震源地: {{ epicenter }}
|
||||
@@ -19,6 +19,9 @@ earthquakeNotice: |
|
||||
{{ foreignTsunami }}{{ points }}
|
||||
{{ comment }}
|
||||
🔬情報源: P2P地震速報 - {{ source }}
|
||||
earthquakeImageGenerated: |
|
||||
地震の震度分布画像を生成しました。
|
||||
地震情報ユーズ: {{ url }}
|
||||
tsunamiAreaMsg: |
|
||||
【{{ name }}】{{ immediate }}
|
||||
🏷️種別: {{ grade }}
|
||||
@@ -26,14 +29,14 @@ tsunamiAreaMsg: |
|
||||
🌊第1波の状態: {{ condition }}
|
||||
🗼予想される津波の高さ: {{ maxHeight }}
|
||||
tsunamiForecastNotice: |
|
||||
### ==津波予報**発表**==
|
||||
### 津波予報**発表**
|
||||
⏰発表時刻: {{ announceTime }}
|
||||
|
||||
{{ areasMsg }}
|
||||
|
||||
🔬情報源: P2P地震速報 - {{ source }}
|
||||
tsunamiCancelNotice: |
|
||||
### ==津波予報**解除**==
|
||||
### 津波予報**解除**
|
||||
⏰発表時刻: {{ announceTime }}
|
||||
🔬情報源: P2P地震速報 - {{ source }}
|
||||
eewAreaMsg: |
|
||||
@@ -42,7 +45,7 @@ eewAreaMsg: |
|
||||
⏰到達予想時刻: {{ arrivalTime }}
|
||||
{{ kind }}
|
||||
eewNotice: |
|
||||
### ==***緊急地震速報(警報)***==
|
||||
### ***緊急地震速報(警報)***
|
||||
{{ isTest }}{{isAssume}}
|
||||
⏰発表時刻: {{ announceTime }}
|
||||
⏰地震発生時刻: {{ occuredTime }}
|
||||
@@ -53,7 +56,7 @@ eewNotice: |
|
||||
|
||||
🔬情報源: P2P地震速報
|
||||
eewCancelNotice: |
|
||||
### ==緊急地震速報(警報)**解除**==
|
||||
### 緊急地震速報(警報)**解除**
|
||||
{{ isTest }}
|
||||
⏰発表時刻: {{ announceTime }}
|
||||
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{
|
||||
"name": "notice-uwuzu",
|
||||
"version": "2026.4.1",
|
||||
"version": "2026.5.5",
|
||||
"type": "module",
|
||||
"main": "dist/index.js",
|
||||
"scripts": {
|
||||
"start": "node .",
|
||||
"build": "tsc && tsc-alias"
|
||||
"build": "tsc && tsc-alias && cpy \"{**/*.json,**/*.png}\" ../dist --cwd=src && cpy \"260420.json\" dist"
|
||||
},
|
||||
"author": {
|
||||
"name": "Last2014",
|
||||
@@ -17,12 +17,14 @@
|
||||
"@types/node": "^25.5.2",
|
||||
"@types/ws": "^8.18.1",
|
||||
"better-uwuzu-sdk": "git+https://gitea.last2014.com/last2014/better-uwuzu-sdk.git#1.1.7",
|
||||
"cpy-cli": "^7.0.0",
|
||||
"date-fns": "^4.1.0",
|
||||
"fs": "0.0.1-security",
|
||||
"i18next": "^26.0.3",
|
||||
"miq": "git+https://gitea.last2014.com/last2014/miq.git#1.0.1",
|
||||
"node-cron": "^4.2.1",
|
||||
"os": "^0.1.2",
|
||||
"sharp": "^0.34.5",
|
||||
"tsc-alias": "^1.8.16",
|
||||
"typescript": "^5.9.3",
|
||||
"util": "^0.12.5",
|
||||
|
||||
@@ -17,6 +17,9 @@ importers:
|
||||
better-uwuzu-sdk:
|
||||
specifier: git+https://gitea.last2014.com/last2014/better-uwuzu-sdk.git#1.1.7
|
||||
version: git+https://gitea.last2014.com/last2014/better-uwuzu-sdk.git#8017146b1a2d6264d051b54afccdd46571b5fd00
|
||||
cpy-cli:
|
||||
specifier: ^7.0.0
|
||||
version: 7.0.0
|
||||
date-fns:
|
||||
specifier: ^4.1.0
|
||||
version: 4.1.0
|
||||
@@ -33,6 +36,9 @@ importers:
|
||||
specifier: ^4.2.1
|
||||
version: 4.2.1
|
||||
os: {specifier: ^0.1.2, version: 0.1.2}
|
||||
sharp:
|
||||
specifier: ^0.34.5
|
||||
version: 0.34.5
|
||||
tsc-alias:
|
||||
specifier: ^1.8.16
|
||||
version: 1.8.16
|
||||
@@ -226,6 +232,10 @@ packages:
|
||||
resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
|
||||
engines: {node: '>= 8'}
|
||||
|
||||
'@sindresorhus/merge-streams@4.0.0':
|
||||
resolution: {integrity: sha512-tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ==}
|
||||
engines: {node: '>=18'}
|
||||
|
||||
'@types/node@25.5.2':
|
||||
resolution: {integrity: sha512-tO4ZIRKNC+MDWV4qKVZe3Ql/woTnmHDr5JD8UI5hn2pwBrHEwOEMZK7WlNb5RKB6EoJ02gwmQS9OrjuFnZYdpg==}
|
||||
|
||||
@@ -295,6 +305,19 @@ packages:
|
||||
resolution: {integrity: sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==}
|
||||
engines: {node: ^12.20.0 || >=14}
|
||||
|
||||
copy-file@11.1.0:
|
||||
resolution: {integrity: sha512-X8XDzyvYaA6msMyAM575CUoygY5b44QzLcGRKsK3MFmXcOvQa518dNPLsKYwkYsn72g3EiW+LE0ytd/FlqWmyw==}
|
||||
engines: {node: '>=18'}
|
||||
|
||||
cpy-cli@7.0.0:
|
||||
resolution: {integrity: sha512-uGCdhIxGfZcPXidCuT8w1jBknVXFx0un7NLjzqBZcdnkIWtLUnWMPk5TC37ceoVjwASLSNsRtTXXNTuFIyE2ng==}
|
||||
engines: {node: '>=20'}
|
||||
hasBin: true
|
||||
|
||||
cpy@13.2.2:
|
||||
resolution: {integrity: sha512-FEc7gmNSj4mDQCWNt3mByVn3qZX3EjMvggiqgCQPF1yJAFfyX6Ai/emN89w18TRp+QcFmdTLgX3hfNnIVgYHcw==}
|
||||
engines: {node: '>=20'}
|
||||
|
||||
date-fns@4.1.0:
|
||||
resolution: {integrity: sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==}
|
||||
|
||||
@@ -396,10 +419,17 @@ packages:
|
||||
resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
|
||||
engines: {node: '>=10'}
|
||||
|
||||
globby@16.2.0:
|
||||
resolution: {integrity: sha512-QrJia2qDf5BB/V6HYlDTs0I0lBahyjLzpGQg3KT7FnCdTonAyPy2RtY802m2k4ALx6Dp752f82WsOczEVr3l6Q==}
|
||||
engines: {node: '>=20'}
|
||||
|
||||
gopd@1.2.0:
|
||||
resolution: {integrity: sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==}
|
||||
engines: {node: '>= 0.4'}
|
||||
|
||||
graceful-fs@4.2.11:
|
||||
resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
|
||||
|
||||
has-property-descriptors@1.0.2:
|
||||
resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==}
|
||||
|
||||
@@ -430,6 +460,10 @@ packages:
|
||||
resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==}
|
||||
engines: {node: '>= 4'}
|
||||
|
||||
ignore@7.0.5:
|
||||
resolution: {integrity: sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==}
|
||||
engines: {node: '>= 4'}
|
||||
|
||||
inherits@2.0.4:
|
||||
resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
|
||||
|
||||
@@ -464,6 +498,10 @@ packages:
|
||||
resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
|
||||
engines: {node: '>=0.12.0'}
|
||||
|
||||
is-path-inside@4.0.0:
|
||||
resolution: {integrity: sha512-lJJV/5dYS+RcL8uQdBDW9c9uWFLLBNRyFhnAKXw5tVqLlKZ4RMGZKv+YQ/IA3OhD+RpbJa1LLFM1FQPGyIXvOA==}
|
||||
engines: {node: '>=12'}
|
||||
|
||||
is-regex@1.2.1:
|
||||
resolution: {integrity: sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==}
|
||||
engines: {node: '>= 0.4'}
|
||||
@@ -472,10 +510,18 @@ packages:
|
||||
resolution: {integrity: sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==}
|
||||
engines: {node: '>= 0.4'}
|
||||
|
||||
junk@4.0.1:
|
||||
resolution: {integrity: sha512-Qush0uP+G8ZScpGMZvHUiRfI0YBWuB3gVBYlI0v0vvOJt5FLicco+IkP0a50LqTTQhmts/m6tP5SWE+USyIvcQ==}
|
||||
engines: {node: '>=12.20'}
|
||||
|
||||
math-intrinsics@1.1.0:
|
||||
resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
|
||||
engines: {node: '>= 0.4'}
|
||||
|
||||
meow@14.1.0:
|
||||
resolution: {integrity: sha512-EDYo6VlmtnumlcBCbh1gLJ//9jvM/ndXHfVXIFrZVr6fGcwTUyCTFNTLCKuY3ffbK8L/+3Mzqnd58RojiZqHVw==}
|
||||
engines: {node: '>=20'}
|
||||
|
||||
merge2@1.4.1:
|
||||
resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
|
||||
engines: {node: '>= 8'}
|
||||
@@ -526,6 +572,22 @@ packages:
|
||||
os@0.1.2:
|
||||
resolution: {integrity: sha512-ZoXJkvAnljwvc56MbvhtKVWmSkzV712k42Is2mA0+0KTSRakq5XXuXpjZjgAt9ctzl51ojhQWakQQpmOvXWfjQ==}
|
||||
|
||||
p-event@6.0.1:
|
||||
resolution: {integrity: sha512-Q6Bekk5wpzW5qIyUP4gdMEujObYstZl6DMMOSenwBvV0BlE5LkDwkjs5yHbZmdCEq2o4RJx4tE1vwxFVf2FG1w==}
|
||||
engines: {node: '>=16.17'}
|
||||
|
||||
p-filter@4.1.0:
|
||||
resolution: {integrity: sha512-37/tPdZ3oJwHaS3gNJdenCDB3Tz26i9sjhnguBtvN0vYlRIiDNnvTWkuh+0hETV9rLPdJ3rlL3yVOYPIAnM8rw==}
|
||||
engines: {node: '>=18'}
|
||||
|
||||
p-map@7.0.4:
|
||||
resolution: {integrity: sha512-tkAQEw8ysMzmkhgw8k+1U/iPhWNhykKnSk4Rd5zLoPJCuJaGRPo6YposrZgaxHKzDHdDWWZvE/Sk7hsL2X/CpQ==}
|
||||
engines: {node: '>=18'}
|
||||
|
||||
p-timeout@6.1.4:
|
||||
resolution: {integrity: sha512-MyIV3ZA/PmyBN/ud8vV9XzwTrNtR4jFrObymZYnZqMmW0zA8Z17vnT0rBgFE/TlohB+YCHqXMgZzb3Csp49vqg==}
|
||||
engines: {node: '>=14.16'}
|
||||
|
||||
path-type@4.0.0:
|
||||
resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
|
||||
engines: {node: '>=8'}
|
||||
@@ -610,6 +672,10 @@ packages:
|
||||
resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
|
||||
engines: {node: '>=8'}
|
||||
|
||||
slash@5.1.0:
|
||||
resolution: {integrity: sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==}
|
||||
engines: {node: '>=14.16'}
|
||||
|
||||
string_decoder@1.3.0:
|
||||
resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
|
||||
|
||||
@@ -647,6 +713,10 @@ packages:
|
||||
undici-types@7.18.2:
|
||||
resolution: {integrity: sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==}
|
||||
|
||||
unicorn-magic@0.4.0:
|
||||
resolution: {integrity: sha512-wH590V9VNgYH9g3lH9wWjTrUoKsjLF6sGLjhR4sH1LWpLmCOH0Zf7PukhDA8BiS7KHe4oPNkcTHqYkj7SOGUOw==}
|
||||
engines: {node: '>=20'}
|
||||
|
||||
util-deprecate@1.0.2:
|
||||
resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
|
||||
|
||||
@@ -797,6 +867,8 @@ snapshots:
|
||||
'@nodelib/fs.scandir': 2.1.5
|
||||
fastq: 1.20.1
|
||||
|
||||
'@sindresorhus/merge-streams@4.0.0': {}
|
||||
|
||||
'@types/node@25.5.2':
|
||||
dependencies:
|
||||
undici-types: 7.18.2
|
||||
@@ -879,6 +951,26 @@ snapshots:
|
||||
|
||||
commander@9.5.0: {}
|
||||
|
||||
copy-file@11.1.0:
|
||||
dependencies:
|
||||
graceful-fs: 4.2.11
|
||||
p-event: 6.0.1
|
||||
|
||||
cpy-cli@7.0.0:
|
||||
dependencies:
|
||||
cpy: 13.2.2
|
||||
globby: 16.2.0
|
||||
meow: 14.1.0
|
||||
|
||||
cpy@13.2.2:
|
||||
dependencies:
|
||||
copy-file: 11.1.0
|
||||
globby: 16.2.0
|
||||
junk: 4.0.1
|
||||
micromatch: 4.0.8
|
||||
p-filter: 4.1.0
|
||||
p-map: 7.0.4
|
||||
|
||||
date-fns@4.1.0: {}
|
||||
|
||||
decompress-response@6.0.0:
|
||||
@@ -987,8 +1079,19 @@ snapshots:
|
||||
merge2: 1.4.1
|
||||
slash: 3.0.0
|
||||
|
||||
globby@16.2.0:
|
||||
dependencies:
|
||||
'@sindresorhus/merge-streams': 4.0.0
|
||||
fast-glob: 3.3.3
|
||||
ignore: 7.0.5
|
||||
is-path-inside: 4.0.0
|
||||
slash: 5.1.0
|
||||
unicorn-magic: 0.4.0
|
||||
|
||||
gopd@1.2.0: {}
|
||||
|
||||
graceful-fs@4.2.11: {}
|
||||
|
||||
has-property-descriptors@1.0.2:
|
||||
dependencies:
|
||||
es-define-property: 1.0.1
|
||||
@@ -1013,6 +1116,8 @@ snapshots:
|
||||
|
||||
ignore@5.3.2: {}
|
||||
|
||||
ignore@7.0.5: {}
|
||||
|
||||
inherits@2.0.4: {}
|
||||
|
||||
ini@1.3.8: {}
|
||||
@@ -1044,6 +1149,8 @@ snapshots:
|
||||
|
||||
is-number@7.0.0: {}
|
||||
|
||||
is-path-inside@4.0.0: {}
|
||||
|
||||
is-regex@1.2.1:
|
||||
dependencies:
|
||||
call-bound: 1.0.4
|
||||
@@ -1055,8 +1162,12 @@ snapshots:
|
||||
dependencies:
|
||||
which-typed-array: 1.1.20
|
||||
|
||||
junk@4.0.1: {}
|
||||
|
||||
math-intrinsics@1.1.0: {}
|
||||
|
||||
meow@14.1.0: {}
|
||||
|
||||
merge2@1.4.1: {}
|
||||
|
||||
micromatch@4.0.8:
|
||||
@@ -1099,6 +1210,18 @@ snapshots:
|
||||
|
||||
os@0.1.2: {}
|
||||
|
||||
p-event@6.0.1:
|
||||
dependencies:
|
||||
p-timeout: 6.1.4
|
||||
|
||||
p-filter@4.1.0:
|
||||
dependencies:
|
||||
p-map: 7.0.4
|
||||
|
||||
p-map@7.0.4: {}
|
||||
|
||||
p-timeout@6.1.4: {}
|
||||
|
||||
path-type@4.0.0: {}
|
||||
|
||||
picomatch@2.3.2: {}
|
||||
@@ -1218,6 +1341,8 @@ snapshots:
|
||||
|
||||
slash@3.0.0: {}
|
||||
|
||||
slash@5.1.0: {}
|
||||
|
||||
string_decoder@1.3.0:
|
||||
dependencies:
|
||||
safe-buffer: 5.2.1
|
||||
@@ -1264,6 +1389,8 @@ snapshots:
|
||||
|
||||
undici-types@7.18.2: {}
|
||||
|
||||
unicorn-magic@0.4.0: {}
|
||||
|
||||
util-deprecate@1.0.2: {}
|
||||
|
||||
util@0.12.5:
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
onlyBuiltDependencies:
|
||||
- "better-uwuzu-sdk"
|
||||
- canvas
|
||||
- esbuild
|
||||
- "miq"
|
||||
- sharp
|
||||
|
||||
@@ -11,11 +11,16 @@ import initI18n from "@/lib/i18n";
|
||||
import config from "@/lib/config";
|
||||
|
||||
await initI18n();
|
||||
|
||||
console.log("コマンドの処理を行います");
|
||||
|
||||
try {
|
||||
let ueuses: ueuseModule[] = [];
|
||||
|
||||
const mem = Memory.memory;
|
||||
let newLastReadReply = mem.lastReadReply;
|
||||
let newLastReadMention = mem.lastReadMention;
|
||||
|
||||
{
|
||||
const response = await client.request("me/notification/", {
|
||||
page: 1,
|
||||
@@ -23,30 +28,26 @@ try {
|
||||
});
|
||||
|
||||
if (response.success) {
|
||||
const notifications = response.data.filter(notification => notification.category === "reply" && typeof notification.valueid === "string");
|
||||
const notifications = response.data.filter(n => n.category === "reply" && typeof n.valueid === "string");
|
||||
|
||||
const mem = Memory.memory;
|
||||
const lastReadReply = mem.lastReadReply;
|
||||
mem.lastReadReply = notifications[0]?.valueid ?? lastReadReply;
|
||||
Memory.memory = mem;
|
||||
|
||||
for (const notification of notifications) {
|
||||
if (notification.category !== "reply" || typeof notification.valueid !== "string")
|
||||
continue;
|
||||
|
||||
if (lastReadReply === notification.valueid)
|
||||
break;
|
||||
|
||||
const ueuseResponse = await client.request("ueuse/get", {
|
||||
uniqid: notification.valueid,
|
||||
});
|
||||
for (const [index, notification] of notifications.entries()) {
|
||||
const ueuseResponse = await client.request("ueuse/get", { uniqid: notification.valueid });
|
||||
|
||||
if (!ueuseResponse.success || !ueuseResponse.data[0]) {
|
||||
console.warn("返信通知からユーズを参照できないため、スキップします");
|
||||
continue;
|
||||
}
|
||||
|
||||
ueuses.push(ueuseResponse.data[0]);
|
||||
const ueuseData = ueuseResponse.data[0];
|
||||
const time = new Date(ueuseData.datetime).getTime();
|
||||
|
||||
if (mem.lastReadReply >= time)
|
||||
break;
|
||||
|
||||
if (index === notifications.length - 1)
|
||||
newLastReadReply = time;
|
||||
|
||||
ueuses.push(ueuseData);
|
||||
}
|
||||
} else {
|
||||
console.warn("返信通知の取得に失敗しましたが、続行します");
|
||||
@@ -62,15 +63,14 @@ try {
|
||||
if (response.success) {
|
||||
const mentions = response.data;
|
||||
|
||||
const mem = Memory.memory;
|
||||
const lastReadMention = mem.lastReadMention;
|
||||
mem.lastReadMention = mentions[0]?.uniqid ?? lastReadMention;
|
||||
Memory.memory = mem;
|
||||
for (const [index, mention] of mentions.entries()) {
|
||||
const time = new Date(mention.datetime).getTime();
|
||||
|
||||
for (const mention of mentions) {
|
||||
if (lastReadMention === mention.uniqid) {
|
||||
if (mem.lastReadMention >= time)
|
||||
break;
|
||||
}
|
||||
|
||||
if (index === mentions.length - 1)
|
||||
newLastReadMention = time;
|
||||
|
||||
ueuses.push(mention);
|
||||
}
|
||||
@@ -79,7 +79,17 @@ try {
|
||||
}
|
||||
}
|
||||
|
||||
ueuses = [...new Set(ueuses)];
|
||||
mem.lastReadReply = newLastReadReply;
|
||||
mem.lastReadMention = newLastReadMention;
|
||||
Memory.memory = mem;
|
||||
|
||||
const seenIds = new Set();
|
||||
ueuses = ueuses.filter(ueuse => {
|
||||
if (seenIds.has(ueuse.uniqid))
|
||||
return false;
|
||||
seenIds.add(ueuse.uniqid);
|
||||
return true;
|
||||
});
|
||||
|
||||
for (let i = 0; i < ueuses.length; i += config.command.maxParallels) {
|
||||
const chunk = ueuses.slice(i, i + config.command.maxParallels);
|
||||
|
||||
@@ -2,5 +2,5 @@ import ueuseModule from "better-uwuzu-sdk/types/1.6.8/types/modules/ueuse";
|
||||
import { weatherReply } from "@/feature/weatherNotice";
|
||||
|
||||
export default async function weatherCommand(ueuse: ueuseModule) {
|
||||
await weatherReply(ueuse.uniqid);
|
||||
await weatherReply(ueuse.uniqid, false);
|
||||
}
|
||||
|
After Width: | Height: | Size: 3.4 KiB |
|
After Width: | Height: | Size: 559 B |
|
After Width: | Height: | Size: 17 KiB |
|
After Width: | Height: | Size: 714 B |
|
After Width: | Height: | Size: 1.1 KiB |
|
After Width: | Height: | Size: 1.3 KiB |
|
After Width: | Height: | Size: 1.0 KiB |
|
After Width: | Height: | Size: 1.2 KiB |
|
After Width: | Height: | Size: 1.5 KiB |
|
After Width: | Height: | Size: 1.3 KiB |
|
After Width: | Height: | Size: 1.3 KiB |
|
After Width: | Height: | Size: 1.5 KiB |
|
After Width: | Height: | Size: 1015 B |
@@ -0,0 +1,533 @@
|
||||
import { readFileSync, writeFileSync } from "node:fs";
|
||||
import sharp from "sharp";
|
||||
|
||||
/**
|
||||
* 経度からX方向の座標情報を計算します
|
||||
*
|
||||
* 指定された経度とズームレベルに基づき、以下の4つの値を返します:
|
||||
* - 世界座標系でのX(0〜1の範囲、グリニッジ子午線が0)
|
||||
* - ズームレベルを考慮したピクセル単位のグローバルX座標
|
||||
* - タイルグリッドにおけるX方向のタイル番号(tileNumberX)
|
||||
* - タイル内(256×256ピクセル)でのX方向ピクセル位置(tileInnerX)
|
||||
* @param lat - 経度
|
||||
* @param z - ズームレベル(0以上の整数)
|
||||
* @returns {{
|
||||
* worldCoordX: number, // 世界座標(0~1, グリニッジ子午線が原点(0))
|
||||
* globalPixelX: number, // ズームレベルを考慮したピクセル単位のY座標
|
||||
* tileNumberX: number, // 該当するタイル番号(0オリジン)
|
||||
* tileInnerX: number, // タイル内のピクセルY座標(0〜255)
|
||||
* }}
|
||||
* @copyright murasuke on Qiita - https://qiita.com/murasuke/items/ad81b7b726a3463fa3fe#%E7%B5%8C%E5%BA%A6
|
||||
*/
|
||||
function calcLngToTileX(lng: number, z: number) {
|
||||
// 経度(-180〜180)を世界座標系のX(0〜1)に変換
|
||||
const worldCoordX = (lng + 180) / 360;
|
||||
|
||||
// ズームレベル0(256×256px)の座標の位置を計算
|
||||
let globalPixelX = worldCoordX * 256;
|
||||
|
||||
// ズームレベル(2^z)を考慮した座標を計算
|
||||
globalPixelX = globalPixelX * Math.pow(2, z);
|
||||
|
||||
// 1つの画像タイルが256pxなので、256で割って左端からのタイルの枚数(位置)を求める
|
||||
const tileNumberX = Math.floor(globalPixelX / 256);
|
||||
|
||||
// 該当タイル内のピクセル位置を算出する(タイル幅合計を引いた余り)
|
||||
const tileInnerX = Math.floor(globalPixelX - tileNumberX * 256);
|
||||
|
||||
// 計算した値を返す
|
||||
return {
|
||||
worldCoordX, // 世界座標(0~1, グリニッジ子午線が原点(0))
|
||||
globalPixelX, // ズームレベルを考慮したピクセル単位のY座標
|
||||
tileNumberX, // 該当するタイル番号(0オリジン)
|
||||
tileInnerX, // タイル内のピクセルY座標(0〜255)
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 緯度からWebメルカトル投影によるY方向の座標情報を計算します。
|
||||
*
|
||||
* 指定された緯度とズームレベルに基づき、以下の4つの値を返します:
|
||||
* - 世界座標系でのY(0〜1の範囲、北極が0)
|
||||
* - ズームレベルを考慮したピクセル単位のグローバルY座標
|
||||
* - タイルグリッドにおけるY方向のタイル番号(tileNumberY)
|
||||
* - タイル内(256×256ピクセル)でのY方向ピクセル位置(tileInnerY)
|
||||
*
|
||||
* メルカトル図法で緯度から位置を算出する式 (https://qiita.com/Seo-4d696b75/items/aa6adfbfba404fcd65aa)
|
||||
* R ln(tan(π/4 + ϕ/2))
|
||||
* R: 半径
|
||||
* ϕ: 緯度(ラジアン)
|
||||
* @param lat - 緯度(-85〜+85度の範囲が推奨)
|
||||
* @param z - ズームレベル(0以上の整数)
|
||||
* @returns {{
|
||||
* worldCoordY: number, // 世界座標系Y(0〜1)
|
||||
* globalPixelY: number, // ズームレベルを考慮したピクセル単位のY座標
|
||||
* tileNumberY: number, // Y方向のタイル番号(0オリジン)
|
||||
* tileInnerY: number // タイル内のピクセルY座標(0〜255)
|
||||
* }}
|
||||
* @copyright murasuke on Qiita - https://qiita.com/murasuke/items/ad81b7b726a3463fa3fe#%E7%B7%AF%E5%BA%A6
|
||||
*/
|
||||
function calcLatToTileY(lat: number, z: number) {
|
||||
// 緯度からメルカトル図法の座標に変換して、世界座標系のY(0~1)を計算
|
||||
let worldCoordY = latToWorldY(lat);
|
||||
|
||||
// ズームレベル0(256×256px)の座標の位置を計算
|
||||
let globalPixelY = worldCoordY * 256;
|
||||
|
||||
// ズームレベル(2^z)を考慮した座標を計算
|
||||
globalPixelY = globalPixelY * Math.pow(2, z);
|
||||
|
||||
// 1つの画像タイルが256pxなので、256で割って上端からのタイルの枚数(位置)を求める
|
||||
const tileNumberY = Math.floor(globalPixelY / 256);
|
||||
|
||||
// 該当タイル内のピクセル位置を算出する(タイル幅合計を引いた余り)
|
||||
const tileInnerY = Math.floor(globalPixelY - tileNumberY * 256);
|
||||
|
||||
// 計算した値を返す
|
||||
return {
|
||||
worldCoordY, // 世界座標(0~1, 北極側が原点(0))
|
||||
globalPixelY, // ズームレベルを考慮したピクセル単位のY座標
|
||||
tileNumberY, // 該当するタイル番号(0オリジン)
|
||||
tileInnerY, // タイル内のピクセルY座標(0〜255)
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* メルカトル図法で投影した位置を元に世界座標系でのY(0〜1、北極が0)を計算する
|
||||
*
|
||||
* メルカトル図法の式(半径1の球体を想定)
|
||||
* ϕ = (π / 180) * 緯度
|
||||
* y = ln(tan(π/4 + ϕ/2))
|
||||
* ϕ:緯度(ラジアン)
|
||||
* y:投影した位置
|
||||
*
|
||||
* * 赤道を中心(0)にして、約-85〜+85度の範囲で-π~πの値になる
|
||||
* * 高緯度では値が急増し無限大になる
|
||||
* * y = ln((tan(ϕ) + 1) / cos(ϕ)) という式もある(同じ値になる)
|
||||
*
|
||||
* 地図で位置を計算するため、北極側が原点(0)で南極側が1となるように正規化した値を返す
|
||||
*
|
||||
* @param lat 緯度(-85~85)
|
||||
* @returns {number} 世界座標系でのY(0〜1、北極が0)
|
||||
* @copyright murasuke on Qiita - https://qiita.com/murasuke/items/ad81b7b726a3463fa3fe#%E7%B7%AF%E5%BA%A6
|
||||
*/
|
||||
function latToWorldY(lat: number) {
|
||||
// 経度をラジアンに変換
|
||||
const latRad = (Math.PI / 180) * lat;
|
||||
// 緯度からメルカトル図法の座標に変換する
|
||||
const mercatorY = Math.log(Math.tan(Math.PI / 4 + latRad / 2));
|
||||
|
||||
// -1~1 の範囲になるように調整(-85度~85度の範囲)
|
||||
let worldCoordY = mercatorY / Math.PI;
|
||||
|
||||
// 原点(0)を赤道から、北極へ変換(0~1)
|
||||
worldCoordY = 1 - (worldCoordY + 1) / 2;
|
||||
|
||||
return worldCoordY;
|
||||
}
|
||||
|
||||
function getEdge<T extends any[]>(arr: T, property: keyof T[number]) {
|
||||
if (arr.length === 0) {
|
||||
return {
|
||||
most: undefined,
|
||||
least: undefined,
|
||||
}
|
||||
}
|
||||
|
||||
const counts = new Map<any, number>();
|
||||
for (const item of arr) {
|
||||
const val = item[property];
|
||||
counts.set(val, (counts.get(val) || 0) + 1);
|
||||
}
|
||||
|
||||
const uniqueValues = Array.from(counts.keys());
|
||||
|
||||
const minVal = uniqueValues.reduce((a, b) => (a < b ? a : b));
|
||||
const maxVal = uniqueValues.reduce((a, b) => (a > b ? a : b));
|
||||
|
||||
return {
|
||||
most: maxVal,
|
||||
least: minVal,
|
||||
}
|
||||
}
|
||||
|
||||
export default async function generateImage(message: any) {
|
||||
if (
|
||||
message.earthquake.hypocenter === undefined ||
|
||||
message.earthquake.hypocenter?.name === "" ||
|
||||
!(Array.isArray(message.points)) ||
|
||||
message.points.length === 0
|
||||
)
|
||||
return "input_lack";
|
||||
|
||||
const ZOOM_LEVEL = 9;
|
||||
|
||||
// タイル・地点取得
|
||||
const tiles: {
|
||||
tileX: number;
|
||||
tileY: number;
|
||||
}[] = [];
|
||||
|
||||
const positions: ({
|
||||
tileIndex: number;
|
||||
innerX: number;
|
||||
innerY: number;
|
||||
} & ({
|
||||
type: "epicenter";
|
||||
} | {
|
||||
type: "point";
|
||||
scale: number;
|
||||
}))[] = [];
|
||||
|
||||
if (
|
||||
message.earthquake.hypocenter?.latitude !== undefined &&
|
||||
message.earthquake.hypocenter?.latitude !== -200 &&
|
||||
message.earthquake.hypocenter?.longitude !== undefined &&
|
||||
message.earthquake.hypocenter?.longitude !== -200
|
||||
) {
|
||||
// 震源地
|
||||
const lng = message.earthquake.hypocenter.longitude;
|
||||
const lat = message.earthquake.hypocenter.latitude;
|
||||
const xData = calcLngToTileX(lng, ZOOM_LEVEL);
|
||||
const yData = calcLatToTileY(lat, ZOOM_LEVEL);
|
||||
|
||||
tiles.push({
|
||||
tileX: xData.tileNumberX,
|
||||
tileY: yData.tileNumberY,
|
||||
});
|
||||
|
||||
positions.push({
|
||||
tileIndex: 0,
|
||||
innerX: xData.tileInnerX,
|
||||
innerY: yData.tileInnerY,
|
||||
type: "epicenter",
|
||||
});
|
||||
}
|
||||
|
||||
if (
|
||||
Array.isArray(message.points) &&
|
||||
message.points.length > 0
|
||||
) {
|
||||
// 観測点・区域
|
||||
const areas = JSON.parse(readFileSync(`${import.meta.dirname}/areas.json`, "utf-8"));
|
||||
const points = JSON.parse(readFileSync(`${import.meta.dirname}/points.json`, "utf-8"));
|
||||
message.points.forEach((point: any) => {
|
||||
let areaData: {
|
||||
longitude: number;
|
||||
latitude: number;
|
||||
}
|
||||
|
||||
if (point.isArea) {
|
||||
areaData = areas[point.addr];
|
||||
} else {
|
||||
areaData = points[point.addr];
|
||||
}
|
||||
|
||||
const lng = areaData.longitude;
|
||||
const lat = areaData.latitude;
|
||||
const xData = calcLngToTileX(lng, ZOOM_LEVEL);
|
||||
const yData = calcLatToTileY(lat, ZOOM_LEVEL);
|
||||
|
||||
const tilePosition = {
|
||||
tileX: xData.tileNumberX,
|
||||
tileY: yData.tileNumberY,
|
||||
}
|
||||
|
||||
let tileIndex: number;
|
||||
|
||||
const sameTile = tiles
|
||||
.map((value, index) => ({ value, index }))
|
||||
.filter(tile => JSON.stringify(tile.value) === JSON.stringify(tilePosition))[0];
|
||||
|
||||
if (sameTile) {
|
||||
tileIndex = sameTile.index;
|
||||
} else {
|
||||
tiles.push(tilePosition);
|
||||
tileIndex = tiles.length - 1;
|
||||
}
|
||||
|
||||
if (tiles.filter(tile => JSON.stringify(tile) === JSON.stringify(tilePosition)).length === 0) {
|
||||
tiles.push(tilePosition);
|
||||
}
|
||||
|
||||
positions.push({
|
||||
tileIndex,
|
||||
innerX: xData.tileInnerX,
|
||||
innerY: yData.tileInnerY,
|
||||
type: "point",
|
||||
scale: point.scale,
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
// 画像生成
|
||||
const WIDTH = 1920;
|
||||
const HEIGHT = 1080;
|
||||
|
||||
let result = sharp({
|
||||
create: {
|
||||
width: WIDTH,
|
||||
height: HEIGHT,
|
||||
channels: 4,
|
||||
background: "#ffffff",
|
||||
}
|
||||
});
|
||||
|
||||
let compounds: (sharp.OverlayOptions & ({
|
||||
type: "tile" | "epicenter" | "other";
|
||||
} | {
|
||||
type: "scale";
|
||||
scale: number;
|
||||
}))[] = [];
|
||||
|
||||
// タイルの幅、最大最小
|
||||
let tileXCount = getEdge(tiles, "tileX");
|
||||
let tileYCount = getEdge(tiles, "tileY");
|
||||
let xSize = tileXCount.most - tileXCount.least + 1;
|
||||
let ySize = tileYCount.most - tileYCount.least + 1;
|
||||
|
||||
// タイルサイズ仮計算
|
||||
let tileSize: number;
|
||||
|
||||
xSize = tileXCount.most - tileXCount.least + 1;
|
||||
ySize = tileYCount.most - tileYCount.least + 1;
|
||||
if (xSize > ySize) {
|
||||
tileSize = Math.round(WIDTH / xSize);
|
||||
} else {
|
||||
tileSize = Math.round(HEIGHT / ySize);
|
||||
}
|
||||
|
||||
// 震源を中心とする
|
||||
const epicenterPosition = positions.filter(position => position.type === "epicenter")[0];
|
||||
if (!epicenterPosition)
|
||||
return "input_lack";
|
||||
|
||||
const epicenterTile = tiles[epicenterPosition.tileIndex];
|
||||
if (!epicenterTile)
|
||||
return "input_lack";
|
||||
|
||||
const leftPx = (epicenterTile.tileX - tileXCount.least) * tileSize + epicenterPosition.innerX;
|
||||
const rightPx = xSize * tileSize - leftPx;
|
||||
const topPx = (epicenterTile.tileY - tileYCount.least) * tileSize + epicenterPosition.innerY;
|
||||
const bottomPx = ySize * tileSize - topPx;
|
||||
|
||||
if (leftPx > rightPx) {
|
||||
const leftTiles = epicenterTile.tileX - tileXCount.least;
|
||||
tileXCount = {
|
||||
...tileXCount,
|
||||
most: epicenterTile.tileX + leftTiles,
|
||||
}
|
||||
} else {
|
||||
const rightTiles = tileXCount.most - epicenterTile.tileX;
|
||||
tileXCount = {
|
||||
...tileXCount,
|
||||
least: epicenterTile.tileX - rightTiles,
|
||||
}
|
||||
}
|
||||
|
||||
if (topPx > bottomPx) {
|
||||
const topTiles = epicenterTile.tileY - tileYCount.least;
|
||||
tileYCount = {
|
||||
...tileYCount,
|
||||
most: epicenterTile.tileY + topTiles,
|
||||
}
|
||||
} else {
|
||||
const bottomTiles = tileYCount.most - epicenterTile.tileY;
|
||||
tileYCount = {
|
||||
...tileYCount,
|
||||
least: epicenterTile.tileY - bottomTiles,
|
||||
}
|
||||
}
|
||||
|
||||
// タイルサイズ再計算
|
||||
xSize = tileXCount.most - tileXCount.least + 1;
|
||||
ySize = tileYCount.most - tileYCount.least + 1;
|
||||
if (xSize > ySize) {
|
||||
tileSize = Math.round(WIDTH / xSize);
|
||||
} else {
|
||||
tileSize = Math.round(HEIGHT / ySize);
|
||||
}
|
||||
|
||||
// 全画面
|
||||
if (WIDTH - xSize * tileSize > 5) {
|
||||
const requireTilesX = Math.ceil(WIDTH / tileSize);
|
||||
const halfTilesX = Math.ceil(requireTilesX / 2);
|
||||
|
||||
tileXCount = {
|
||||
least: tileXCount.least - halfTilesX,
|
||||
most: tileXCount.most + halfTilesX,
|
||||
}
|
||||
}
|
||||
|
||||
if (HEIGHT - ySize * tileSize > 5) {
|
||||
const requireTilesY = Math.ceil(HEIGHT / tileSize);
|
||||
const halfTilesY = Math.ceil(requireTilesY / 2);
|
||||
|
||||
tileYCount = {
|
||||
least: tileYCount.least - halfTilesY,
|
||||
most: tileYCount.most + halfTilesY,
|
||||
}
|
||||
}
|
||||
|
||||
// タイル幅再計算
|
||||
xSize = tileXCount.most - tileXCount.least + 1;
|
||||
ySize = tileYCount.most - tileYCount.least + 1;
|
||||
|
||||
// 欠けているタイルを取得
|
||||
for (let xIndex = 0; xIndex < xSize; xIndex++) {
|
||||
const itX = xIndex + tileXCount.least;
|
||||
|
||||
for (let yIndex = 0; yIndex < ySize; yIndex++) {
|
||||
const itY = yIndex + tileYCount.least;
|
||||
|
||||
const itTile = tiles.filter(tile => tile.tileX === itX && tile.tileY === itY)[0];
|
||||
if (itTile)
|
||||
continue;
|
||||
|
||||
tiles.push({
|
||||
tileX: itX,
|
||||
tileY: itY,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// アセット
|
||||
const assets: Record<string, {
|
||||
buffer: Buffer<ArrayBuffer>;
|
||||
size: number;
|
||||
}> = {}
|
||||
const assetsList = [
|
||||
"scales/10",
|
||||
"scales/20",
|
||||
"scales/30",
|
||||
"scales/40",
|
||||
"scales/45",
|
||||
"scales/46",
|
||||
"scales/50",
|
||||
"scales/55",
|
||||
"scales/60",
|
||||
"scales/70",
|
||||
"epicenter",
|
||||
];
|
||||
|
||||
await Promise.all(assetsList.map(async name => {
|
||||
const key = name.split("/").at(-1);
|
||||
if (!key)
|
||||
return;
|
||||
|
||||
const asset = readFileSync(`${import.meta.dirname}/assets/${name}.png`);
|
||||
const assetMeta = await sharp(asset).metadata();
|
||||
const assetSize = assetMeta.width;
|
||||
|
||||
assets[key] = {
|
||||
buffer: asset,
|
||||
size: assetSize,
|
||||
}
|
||||
}));
|
||||
|
||||
// 各画像処理
|
||||
await Promise.all(tiles.map(async (tile, index) => {
|
||||
const TYPE = "blank";
|
||||
const BASE_URL = "https://cyberjapandata.gsi.go.jp/xyz";
|
||||
|
||||
const request = await fetch(`${BASE_URL}/${TYPE}/${ZOOM_LEVEL}/${tile.tileX}/${tile.tileY}.png`);
|
||||
|
||||
if (!request.ok)
|
||||
return;
|
||||
|
||||
const tileImg = await sharp(await request.arrayBuffer()).resize({
|
||||
width: tileSize,
|
||||
height: tileSize,
|
||||
}).png().toBuffer();
|
||||
|
||||
const top = tileSize * (tile.tileY - tileYCount.least);
|
||||
const left = tileSize * (tile.tileX - tileXCount.least);
|
||||
|
||||
compounds.push({
|
||||
type: "tile",
|
||||
input: tileImg,
|
||||
top,
|
||||
left,
|
||||
});
|
||||
|
||||
const itTilePositions = positions.filter(position => position.tileIndex === index);
|
||||
itTilePositions.forEach(position => {
|
||||
const requireAssetName = position.type === "epicenter"
|
||||
? "epicenter"
|
||||
: String(position.scale);
|
||||
|
||||
const asset = assets[requireAssetName];
|
||||
if (!asset)
|
||||
return;
|
||||
|
||||
const tileResizedSize = tileSize / 256;
|
||||
|
||||
let about: any;
|
||||
|
||||
if (position.type === "epicenter") {
|
||||
about = {
|
||||
type: "epicenter",
|
||||
}
|
||||
} else {
|
||||
about = {
|
||||
type: "scale",
|
||||
scale: position.scale,
|
||||
}
|
||||
}
|
||||
|
||||
compounds.push({
|
||||
...about,
|
||||
input: asset.buffer,
|
||||
top: Math.round(top + position.innerY * tileResizedSize - asset.size / 2),
|
||||
left: Math.round(left + position.innerX * tileResizedSize - asset.size / 2),
|
||||
});
|
||||
});
|
||||
}));
|
||||
|
||||
// compounds並び替え
|
||||
const TYPE_PRIORITY: Record<string, number> = {
|
||||
tile: 1,
|
||||
scale: 2,
|
||||
epicenter: 3,
|
||||
}
|
||||
|
||||
compounds = [...compounds].sort((a, b) => {
|
||||
if (TYPE_PRIORITY[a.type] !== TYPE_PRIORITY[b.type]) {
|
||||
return (TYPE_PRIORITY[a.type] ?? 99) - (TYPE_PRIORITY[b.type] ?? 99);
|
||||
}
|
||||
|
||||
if (a.type === "scale" && b.type === "scale") {
|
||||
return a.scale - b.scale;
|
||||
}
|
||||
|
||||
return 0;
|
||||
});
|
||||
|
||||
// 案内部分
|
||||
const informationPath = `${import.meta.dirname}/assets/information.png`;
|
||||
const informationBuffer = readFileSync(informationPath);
|
||||
const informationMeta = await sharp(informationPath).metadata();
|
||||
const informationMargin = 20;
|
||||
compounds.push({
|
||||
type: "other",
|
||||
input: informationBuffer,
|
||||
top: HEIGHT - informationMeta.height - informationMargin,
|
||||
left: WIDTH - informationMeta.width - informationMargin,
|
||||
});
|
||||
|
||||
// クレジット部分
|
||||
const creditPath = `${import.meta.dirname}/assets/credit.png`;
|
||||
const creditBuffer = readFileSync(creditPath);
|
||||
const creditMeta = await sharp(creditPath).metadata();
|
||||
compounds.push({
|
||||
type: "other",
|
||||
input: creditBuffer,
|
||||
top: HEIGHT - creditMeta.height,
|
||||
left: 0,
|
||||
});
|
||||
|
||||
result.composite(compounds);
|
||||
|
||||
const buffer = await result.png().toBuffer();
|
||||
return buffer;
|
||||
}
|
||||
@@ -7,6 +7,7 @@ import i18next from "i18next";
|
||||
import { readFileSync } from "node:fs";
|
||||
import { EOL } from "node:os";
|
||||
import { WebSocket } from "ws";
|
||||
import generateImage from "@/feature/earthquake/generateImage";
|
||||
|
||||
await initI18n();
|
||||
|
||||
@@ -68,7 +69,8 @@ if (config.earthquake?.useHistoryData) {
|
||||
processMessage(message);
|
||||
|
||||
if (!config.debug) {
|
||||
mem.processedInfo.concat([id]);
|
||||
const mem = Memory.memory;
|
||||
mem.processedInfo = mem.processedInfo.concat([id]);
|
||||
Memory.memory = mem;
|
||||
}
|
||||
});
|
||||
@@ -87,7 +89,7 @@ const processMessage = async (message: any) => {
|
||||
"30": "震度3",
|
||||
"40": "震度4",
|
||||
"45": "震度5弱",
|
||||
"46": "**推定**震度5弱以上***(正確には不明)***",
|
||||
"46": "**推定**震度5弱以上***(不明)***",
|
||||
"50": "震度5強",
|
||||
"55": "震度6弱",
|
||||
"60": "震度6強",
|
||||
@@ -103,15 +105,6 @@ const processMessage = async (message: any) => {
|
||||
{
|
||||
console.log("地震発生情報を受信しました");
|
||||
|
||||
if (
|
||||
(message.earthquake.maxScale === -1 ||
|
||||
message.earthquake.maxScale === undefined) &&
|
||||
!config.earthquake.canUnknownMaxScale
|
||||
) {
|
||||
console.log("最大震度が不明であり、最大震度が不明な場合の投稿が許可されていないため、スキップします");
|
||||
break;
|
||||
}
|
||||
|
||||
if (
|
||||
message.earthquake.maxScale !== -1 &&
|
||||
message.earthquake.maxScale < config.earthquake.requireMaxScale
|
||||
@@ -120,6 +113,11 @@ const processMessage = async (message: any) => {
|
||||
break;
|
||||
}
|
||||
|
||||
const typeMessage: Record<string, string> = {
|
||||
"ScalePrompt": "震度速報",
|
||||
"Destination": "震源情報",
|
||||
}
|
||||
|
||||
const domesticTsunamiMessages: Record<string, string> = {
|
||||
"None": "😌この地震による**国内**の津波の心配はありません。",
|
||||
"Unknown": "😕この地震による**国内**の***津波情報は***不明です。",
|
||||
@@ -171,8 +169,9 @@ const processMessage = async (message: any) => {
|
||||
.join(EOL.repeat(2))
|
||||
.trim();
|
||||
|
||||
await createUeuse({
|
||||
const earthquakeUeuses = await createUeuse({
|
||||
text: i18next.t("earthquakeNotice", {
|
||||
type: typeMessage[message.issue.type] ?? "地震情報",
|
||||
occuredTime: format(new Date(message.earthquake.time), "yyyy年M月d日 H:mm"),
|
||||
maxScale: scaleMessages[String(message.earthquake.maxScale)],
|
||||
epicenter: message.earthquake.hypocenter.name === ""
|
||||
@@ -197,6 +196,29 @@ const processMessage = async (message: any) => {
|
||||
: EOL + message.comments.freeFormComment + EOL,
|
||||
}),
|
||||
}, "地震発生情報");
|
||||
|
||||
try {
|
||||
const image = await generateImage(message);
|
||||
|
||||
if (typeof image === "string") {
|
||||
throw "情報が不足しているため、地震の画像生成ができませんでした";
|
||||
} else {
|
||||
await createUeuse({
|
||||
text: i18next.t("earthquakeImageGenerated", {
|
||||
url: earthquakeUeuses[0]?.uniqid
|
||||
? `${config.uwuzu.origin}/!${earthquakeUeuses[0].uniqid}`
|
||||
: "不明",
|
||||
}),
|
||||
media: {
|
||||
photo: [
|
||||
image.toString("base64"),
|
||||
],
|
||||
},
|
||||
}, "震度分布画像");
|
||||
}
|
||||
} catch (err) {
|
||||
console.warn(err);
|
||||
}
|
||||
}
|
||||
break;
|
||||
case 552:
|
||||
@@ -2,24 +2,21 @@ import { createUeuse } from "@/lib/client";
|
||||
import initI18n from "@/lib/i18n";
|
||||
import { format } from "date-fns";
|
||||
import i18next from "i18next";
|
||||
import { parentPort } from "node:worker_threads";
|
||||
|
||||
await initI18n();
|
||||
|
||||
parentPort?.on("message", async () => {
|
||||
console.log("新年迎春の投稿を行います");
|
||||
console.log("新年迎春の投稿を行います");
|
||||
|
||||
try {
|
||||
await createUeuse({
|
||||
text: i18next.t("hnyNotice", { year: String(new Date().getFullYear()) }),
|
||||
}, "新年迎春");
|
||||
try {
|
||||
await createUeuse({
|
||||
text: i18next.t("hnyNotice", { year: String(new Date().getFullYear()) }),
|
||||
}, "新年迎春");
|
||||
|
||||
console.log("新年迎春投稿時刻:", format(new Date(), "yyyy/M/d H:mm:ss:SSS"));
|
||||
process.exit(0);
|
||||
} catch (err: any) {
|
||||
console.error("message" in err
|
||||
? err.message
|
||||
: err);
|
||||
process.exit(1);
|
||||
}
|
||||
});
|
||||
console.log("新年迎春投稿時刻:", format(new Date(), "yyyy/M/d H:mm:ss:SSS"));
|
||||
process.exit(0);
|
||||
} catch (err: any) {
|
||||
console.error("message" in err
|
||||
? err.message
|
||||
: err);
|
||||
process.exit(1);
|
||||
}
|
||||
@@ -4,6 +4,7 @@ import { format } from "date-fns";
|
||||
import i18next from "i18next";
|
||||
|
||||
await initI18n();
|
||||
|
||||
console.log("時報の投稿を行います");
|
||||
|
||||
try {
|
||||
|
||||
@@ -57,8 +57,13 @@ const cityList = [
|
||||
"471010",
|
||||
];
|
||||
|
||||
if (!isMainThread && workerData === "scheduledWeatherNotice") {
|
||||
if (
|
||||
!isMainThread &&
|
||||
typeof workerData === "string" &&
|
||||
workerData.startsWith("scheduledWeatherNotice")
|
||||
) {
|
||||
await initI18n();
|
||||
|
||||
console.log("天気予報の投稿を行います");
|
||||
|
||||
try {
|
||||
@@ -67,7 +72,11 @@ if (!isMainThread && workerData === "scheduledWeatherNotice") {
|
||||
|
||||
for (let attempt = 1; attempt <= config.ueuse.maxRetries; attempt++) {
|
||||
provisionalUeuse = await client.request("ueuse/create", {
|
||||
text: i18next.t("weatherProvisional"),
|
||||
text: i18next.t("weatherProvisional", {
|
||||
day: workerData.endsWith("Tomorrow")
|
||||
? "明日"
|
||||
: "今日",
|
||||
}),
|
||||
});
|
||||
|
||||
if (provisionalUeuse.success) {
|
||||
@@ -88,7 +97,7 @@ if (!isMainThread && workerData === "scheduledWeatherNotice") {
|
||||
|
||||
console.log("天気仮投稿:", provisionalUeuse.uniqid);
|
||||
|
||||
weatherReply(provisionalUeuse.uniqid);
|
||||
await weatherReply(provisionalUeuse.uniqid, workerData.endsWith("Tomorrow"));
|
||||
process.exit(0);
|
||||
} catch (err: any) {
|
||||
console.error("message" in err
|
||||
@@ -98,7 +107,7 @@ if (!isMainThread && workerData === "scheduledWeatherNotice") {
|
||||
}
|
||||
}
|
||||
|
||||
export async function weatherReply(uniqid: string) {
|
||||
export async function weatherReply(uniqid: string, isTomorrow: boolean) {
|
||||
// インデックス
|
||||
const aboutFullLength = 3100;
|
||||
const mem = Memory.memory;
|
||||
@@ -137,21 +146,23 @@ export async function weatherReply(uniqid: string) {
|
||||
});
|
||||
|
||||
const data = await res.json();
|
||||
const today = data.forecasts[0];
|
||||
const itDay = isTomorrow
|
||||
? data.forecasts[1]
|
||||
: data.forecasts[0];
|
||||
|
||||
// 天気
|
||||
const weather = today.telop ?? "取得できませんでした";
|
||||
const maxTemp = today.temperature.max.celsius
|
||||
? `${today.temperature.max.celsius}℃`
|
||||
const weather = itDay.telop ?? "取得できませんでした";
|
||||
const maxTemp = itDay.temperature.max.celsius
|
||||
? `${itDay.temperature.max.celsius}℃`
|
||||
: "取得できませんでした";
|
||||
const minTemp = today.temperature.min.celsius
|
||||
? `${today.temperature.min.celsius}℃`
|
||||
const minTemp = itDay.temperature.min.celsius
|
||||
? `${itDay.temperature.min.celsius}℃`
|
||||
: "取得できませんでした";
|
||||
const chanceOfRain = (
|
||||
today.chanceOfRain.T06_12 !== null &&
|
||||
today.chanceOfRain.T06_12 !== "--%"
|
||||
itDay.chanceOfRain.T06_12 !== null &&
|
||||
itDay.chanceOfRain.T06_12 !== "--%"
|
||||
)
|
||||
? today.chanceOfRain.T06_12
|
||||
? itDay.chanceOfRain.T06_12
|
||||
: "取得できませんでした";
|
||||
|
||||
weatherResults[chunkIndex] += `${i18next.t("weatherReply", {
|
||||
|
||||
@@ -20,7 +20,7 @@ try {
|
||||
|
||||
await initData();
|
||||
|
||||
new Worker(`${import.meta.dirname}/feature/earthquakeNotice.js`);
|
||||
new Worker(`${import.meta.dirname}/feature/earthquake/index.js`);
|
||||
|
||||
console.log("Botが起動しました");
|
||||
} catch (err: any) {
|
||||
@@ -36,7 +36,15 @@ try {
|
||||
});
|
||||
|
||||
schedule("0 7 * * *", async () => {
|
||||
new Worker(`${import.meta.dirname}/feature/weatherNotice.js`);
|
||||
new Worker(`${import.meta.dirname}/feature/weatherNotice.js`, {
|
||||
workerData: "scheduledWeatherNotice",
|
||||
});
|
||||
});
|
||||
|
||||
schedule("0 18 * * *", async () => {
|
||||
new Worker(`${import.meta.dirname}/feature/weatherNotice.js`, {
|
||||
workerData: "scheduledWeatherNoticeTomorrow",
|
||||
});
|
||||
});
|
||||
|
||||
schedule(`*/${config.command.interval} * * * *`, async () => {
|
||||
|
||||
@@ -15,12 +15,15 @@ export default client;
|
||||
|
||||
export const createUeuse = async (data: ApiMap["ueuse/create"]["body"], title: string) => {
|
||||
const mem = Memory.memory;
|
||||
const excessedMessage = "👉返信に続きがあります。";
|
||||
const excessedMessage = "**👉返信に続きがあります。**";
|
||||
|
||||
let lines = data.text.split(EOL);
|
||||
let firstUniqid = "";
|
||||
let count = 0;
|
||||
|
||||
type ExtractSuccess<T> = T extends { success: true } ? T : never;
|
||||
const results: ExtractSuccess<ApiMap["ueuse/create"]["response"]>[] = [];
|
||||
|
||||
while (lines.length > 0) {
|
||||
count++;
|
||||
let currentText = "";
|
||||
@@ -76,6 +79,7 @@ export const createUeuse = async (data: ApiMap["ueuse/create"]["body"], title: s
|
||||
if (response.success) {
|
||||
success = true;
|
||||
postedUniqid = response.uniqid;
|
||||
results.push(response);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -99,4 +103,6 @@ export const createUeuse = async (data: ApiMap["ueuse/create"]["body"], title: s
|
||||
lines.shift();
|
||||
}
|
||||
}
|
||||
|
||||
return results;
|
||||
}
|
||||
@@ -20,7 +20,6 @@ const schema = z.object({
|
||||
z.literal(60),
|
||||
z.literal(70),
|
||||
]),
|
||||
canUnknownMaxScale: z.boolean(),
|
||||
useHistoryData: z.boolean(),
|
||||
reconnectInterval: z.number().positive(),
|
||||
}),
|
||||
|
||||
@@ -11,23 +11,20 @@ class MemoryClass {
|
||||
writeFileSync(path, JSON.stringify({
|
||||
processedInfo: [],
|
||||
permissions: {},
|
||||
lastReadMention: "",
|
||||
lastReadReply: "",
|
||||
lastReadMention: 0,
|
||||
lastReadReply: 0,
|
||||
userid: "",
|
||||
max_length: 0,
|
||||
}));
|
||||
}
|
||||
|
||||
this.cachedMemory = JSON.parse(readFileSync(path, "utf-8"));
|
||||
}
|
||||
|
||||
get memory() {
|
||||
return this.cachedMemory;
|
||||
return JSON.parse(readFileSync(path, "utf-8"));
|
||||
}
|
||||
|
||||
set memory(data: any) {
|
||||
this.cachedMemory = data;
|
||||
writeFileSync(path, JSON.stringify(this.cachedMemory), "utf-8");
|
||||
writeFileSync(path, JSON.stringify(data), "utf-8");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||