Compare commits
	
		
			117 Commits
		
	
	
		
			13.0.0-bet
			...
			13.0.0-bet
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | eba6b326fa | ||
|   | 4c9b93a12f | ||
|   | dfee79f841 | ||
|   | 962373cf06 | ||
|   | 13aa4b64b4 | ||
|   | 5ce56886a1 | ||
|   | 2817ca03f5 | ||
|   | e633c3b84b | ||
|   | 8524e9d735 | ||
|   | 91ced90fb2 | ||
|   | 2acb3917ba | ||
|   | dd78ac089c | ||
|   | 10e526ba56 | ||
|   | 7ed905f76b | ||
|   | 5d13e2744f | ||
|   | 1d7e0293a8 | ||
|   | 8977d87021 | ||
|   | 809400ff23 | ||
|   | 4c8dbcc20d | ||
|   | 416dcf884d | ||
|   | 09d3ce444a | ||
|   | 27c2ca5048 | ||
|   | fceeb1b108 | ||
|   | b442c38f41 | ||
|   | 7c2d2676f7 | ||
|   | 1f6a41cea7 | ||
|   | 0d7ee20a77 | ||
|   | dcca2350dd | ||
|   | 1cfdd4c41a | ||
|   | 25f4ee7030 | ||
|   | 5320f23017 | ||
|   | 4ffbbbe6d8 | ||
|   | 132e45dff4 | ||
|   | 01652b72b3 | ||
|   | 8b1fdb5a3b | ||
|   | 192add376c | ||
|   | 244ea9593a | ||
|   | f20d7cba74 | ||
|   | a3e282bc75 | ||
|   | 49a95c34bf | ||
|   | ecbefce2aa | ||
|   | 91356b1805 | ||
|   | 2e2ed1385f | ||
|   | 49f3090edd | ||
|   | 4594fb11de | ||
|   | b93e56d2e5 | ||
|   | c550dafb81 | ||
|   | 8709574f3d | ||
|   | 1b7043fa79 | ||
|   | 55ef2393fb | ||
|   | 7769095efb | ||
|   | b8248bdd65 | ||
|   | 6f4ad581dc | ||
|   | aec94920ab | ||
|   | 155ca39063 | ||
|   | 58bfb4dca4 | ||
|   | 49a0b6c48b | ||
|   | 799a653b44 | ||
|   | d09e1f4925 | ||
|   | cac784af8a | ||
|   | d7e0ddcbca | ||
|   | 8c0811a442 | ||
|   | bab6f75260 | ||
|   | 54e3fccd87 | ||
|   | 6a992b6982 | ||
|   | ecd6fc1db8 | ||
|   | d99be6697e | ||
|   | d2d77b5dc1 | ||
|   | 91503405b4 | ||
|   | c336201084 | ||
|   | 0f3399753d | ||
|   | 5ec89ea0c3 | ||
|   | a42b03c154 | ||
|   | 4b181a30da | ||
|   | 70805e00eb | ||
|   | 3551ac328e | ||
|   | e36e5df635 | ||
|   | 3e7d8b5f17 | ||
|   | 5846198eee | ||
|   | c14063a921 | ||
|   | 457670e730 | ||
|   | 513cef50a2 | ||
|   | 88c64ece78 | ||
|   | a11672d0a5 | ||
|   | 46af9515b0 | ||
|   | c5cb786054 | ||
|   | 4d2d6154a3 | ||
|   | 495d513efd | ||
|   | 3b617fafdd | ||
|   | 82c4f694a0 | ||
|   | dc5b4a0402 | ||
|   | 6adc0521d8 | ||
|   | 9ac86dacbb | ||
|   | 88f0c10d09 | ||
|   | 4abef6161e | ||
|   | f6b6f1bc8b | ||
|   | 6b2b403d94 | ||
|   | e2ca90b0a1 | ||
|   | 9aececc921 | ||
|   | d25f214a09 | ||
|   | aefc8fb7b5 | ||
|   | 372a17d7f0 | ||
|   | bcc3380cfc | ||
|   | 047262ab20 | ||
|   | 58ae2ccbfa | ||
|   | 29f6f5fa5c | ||
|   | 8df7530b54 | ||
|   | ded8584fdd | ||
|   | 9734ad42a1 | ||
|   | d890383a00 | ||
|   | 1cae688ccb | ||
|   | 6f9aa94e3a | ||
|   | df291b00d8 | ||
|   | 5de699e233 | ||
|   | ebe340d510 | ||
|   | 5d904b05dd | ||
|   | b1a75177a0 | 
							
								
								
									
										43
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						| @@ -11,19 +11,35 @@ You should also include the user name that made the change. | |||||||
|  |  | ||||||
| ## 13.0.0 (unreleased) | ## 13.0.0 (unreleased) | ||||||
|  |  | ||||||
|  | ### TL;DR | ||||||
|  | - New features (Play, new widgets, new charts, 🍪👈, etc) | ||||||
|  | - Rewriten backend | ||||||
|  | - Better performance (backend and frontend) | ||||||
|  | - Various usability improvements | ||||||
|  | - Various UI tweaks | ||||||
|  |  | ||||||
| ### Changes | ### Changes | ||||||
|  | #### For server admins | ||||||
| - Node.js 18.x or later is required | - Node.js 18.x or later is required | ||||||
|  | - PostgreSQL 15.x is required | ||||||
|  | 	- Misskey not using 15 specific features at 13.0.0, but may do so in the future. | ||||||
| - Elasticsearchのサポートが削除されました | - Elasticsearchのサポートが削除されました | ||||||
| 	- 代わりに今後任意の検索プロバイダを設定できる仕組みを構想しています。その仕組みを使えば今まで通りElasticsearchも利用できます | 	- 代わりに今後任意の検索プロバイダを設定できる仕組みを構想しています。その仕組みを使えば今まで通りElasticsearchも利用できます | ||||||
| - ノートのウォッチ機能が削除されました |  | ||||||
| - Migrate to Yarn Berry (v3.2.1) @ThatOneCalculator | - Migrate to Yarn Berry (v3.2.1) @ThatOneCalculator | ||||||
| 	- You may have to `yarn run clean-all`, `sudo corepack enable` and `yarn set version berry` before running `yarn install` if you're still on yarn classic | 	- You may have to `yarn run clean-all`, `sudo corepack enable` and `yarn set version berry` before running `yarn install` if you're still on yarn classic | ||||||
|  |  | ||||||
|  | #### For users | ||||||
|  | - ノートのウォッチ機能が削除されました | ||||||
|  | - アンケートに投票された際に通知が作成されなくなりました | ||||||
| - 新たに動的なPagesを作ることはできなくなりました | - 新たに動的なPagesを作ることはできなくなりました | ||||||
| 	- 代わりに今後AiScriptを用いてより柔軟に動的なコンテンツを作成できるMisskey Play機能の実装を予定しています。 | 	- 代わりにAiScriptを用いてより柔軟に動的なコンテンツを作成できるMisskey Play機能が実装されています。 | ||||||
| - AiScriptが0.12.0にアップデートされました | - AiScriptが0.12.2にアップデートされました | ||||||
| 	- 0.12.0の変更点についてはこちら https://github.com/syuilo/aiscript/blob/master/CHANGELOG.md#0120 | 	- 0.12.xの変更点についてはこちら https://github.com/syuilo/aiscript/blob/master/CHANGELOG.md#0120 | ||||||
| 	- 0.12.0未満のプラグインは読み込むことはできません | 	- 0.12.x未満のプラグインは読み込むことはできません | ||||||
| - iOS15以下のデバイスはサポートされなくなりました | - iOS15以下のデバイスはサポートされなくなりました | ||||||
|  | - Firefox109以下はサポートされなくなりました | ||||||
|  |  | ||||||
|  | #### For app developers | ||||||
| - API: カスタム絵文字エンティティに`url`プロパティが含まれなくなりました | - API: カスタム絵文字エンティティに`url`プロパティが含まれなくなりました | ||||||
| 	- 絵文字画像を表示するには、`<instance host>/emoji/<emoji name>.webp`にリクエストすると画像が返ります。 | 	- 絵文字画像を表示するには、`<instance host>/emoji/<emoji name>.webp`にリクエストすると画像が返ります。 | ||||||
| 	- e.g. `https://p1.a9z.dev/emoji/misskey.webp` | 	- e.g. `https://p1.a9z.dev/emoji/misskey.webp` | ||||||
| @@ -33,12 +49,13 @@ You should also include the user name that made the change. | |||||||
| - API: `instance`エンティティに`latestStatus`、`lastCommunicatedAt`、`latestRequestSentAt`プロパティが含まれなくなりました | - API: `instance`エンティティに`latestStatus`、`lastCommunicatedAt`、`latestRequestSentAt`プロパティが含まれなくなりました | ||||||
|  |  | ||||||
| ### Improvements | ### Improvements | ||||||
| - Push notification of Antenna note @tamaina | - Misskey Play @syuilo | ||||||
| - AVIF support @tamaina |  | ||||||
| - Add Cloudflare Turnstile CAPTCHA support @CyberRex0 |  | ||||||
| - Introduce retention-rate aggregation @syuilo | - Introduce retention-rate aggregation @syuilo | ||||||
| - Make possible to export favorited notes @syuilo | - Make possible to export favorited notes @syuilo | ||||||
| - Add per user pv chart @syuilo | - Add per user pv chart @syuilo | ||||||
|  | - Push notification of Antenna note @tamaina | ||||||
|  | - AVIF support @tamaina | ||||||
|  | - Add Cloudflare Turnstile CAPTCHA support @CyberRex0 | ||||||
| - Server: signToActivityPubGet is set to true by default @syuilo | - Server: signToActivityPubGet is set to true by default @syuilo | ||||||
| - Server: improve syslog performance @syuilo | - Server: improve syslog performance @syuilo | ||||||
| - Server: improve note scoring for featured notes @CyberRex0 | - Server: improve note scoring for featured notes @CyberRex0 | ||||||
| @@ -47,6 +64,7 @@ You should also include the user name that made the change. | |||||||
| - Server: delete outdated notes of antenna regularly to improve db performance @syuilo | - Server: delete outdated notes of antenna regularly to improve db performance @syuilo | ||||||
| - Server: improve activitypub deliver performance @syuilo | - Server: improve activitypub deliver performance @syuilo | ||||||
| - Client: use tabler-icons instead of fontawesome to better design @syuilo | - Client: use tabler-icons instead of fontawesome to better design @syuilo | ||||||
|  | - Client: Add AiScript App widget | ||||||
| - Client: Add new gabber kick sounds (thanks for noizenecio) | - Client: Add new gabber kick sounds (thanks for noizenecio) | ||||||
| - Client: Add link to user RSS feed in profile menu @ssmucny | - Client: Add link to user RSS feed in profile menu @ssmucny | ||||||
| - Client: Compress non-animated PNG files @saschanaz | - Client: Compress non-animated PNG files @saschanaz | ||||||
| @@ -57,14 +75,20 @@ You should also include the user name that made the change. | |||||||
| - Client: Make widgets of universal/classic sync between devices @tamaina | - Client: Make widgets of universal/classic sync between devices @tamaina | ||||||
| - Client: Implement the button to subscribe push notification @tamaina | - Client: Implement the button to subscribe push notification @tamaina | ||||||
| - Client: Implement the toggle to or not to close push notifications when notifications or messages are read @tamaina | - Client: Implement the toggle to or not to close push notifications when notifications or messages are read @tamaina | ||||||
|  | - Client: Improve RSS widget @tamaina | ||||||
| - Client: show Unicode emoji tooltip with its name in MkReactionsViewer.reaction @saschanaz | - Client: show Unicode emoji tooltip with its name in MkReactionsViewer.reaction @saschanaz | ||||||
| - Client: OpenSearch support @SoniEx2 @chaoticryptidz | - Client: OpenSearch support @SoniEx2 @chaoticryptidz | ||||||
|  | - Client: Support remote objects in search @SoniEx2 | ||||||
|  | - Client: user activity page @syuilo | ||||||
| - Client: add user list widget @syuilo | - Client: add user list widget @syuilo | ||||||
| - Client: add heatmap of daily active users to about page @syuilo | - Client: add heatmap of daily active users to about page @syuilo | ||||||
| - Client: introduce fluent emoji @syuilo | - Client: introduce fluent emoji @syuilo | ||||||
|  | - Client: add new theme @syuilo | ||||||
|  | - Client: show fireworks when visit user who today is birthday @syuilo | ||||||
| - Client: show bot warning on screen when logged in as bot account @syuilo | - Client: show bot warning on screen when logged in as bot account @syuilo | ||||||
| - Client: improve overall performance of client @syuilo | - Client: improve overall performance of client @syuilo | ||||||
| - Client: ui tweaks @syuilo | - Client: ui tweaks @syuilo | ||||||
|  | - Client: clicker game @syuilo | ||||||
|  |  | ||||||
| ### Bugfixes | ### Bugfixes | ||||||
| - Server: 引用内の文章がnyaizeされてしまう問題を修正 @kabo2468 | - Server: 引用内の文章がnyaizeされてしまう問題を修正 @kabo2468 | ||||||
| @@ -75,10 +99,13 @@ You should also include the user name that made the change. | |||||||
| - Server: アンテナの作成数上限を追加 @syuilo | - Server: アンテナの作成数上限を追加 @syuilo | ||||||
| - Server: pages/likeのエラーIDが重複しているのを修正 @syuilo | - Server: pages/likeのエラーIDが重複しているのを修正 @syuilo | ||||||
| - Server: pages/updateのパラメータによってはsummaryの値が更新されないのを修正 @syuilo | - Server: pages/updateのパラメータによってはsummaryの値が更新されないのを修正 @syuilo | ||||||
|  | - Server: Escape SQL LIKE @mei23 | ||||||
|  | - Server: 非公開のクリップのURLでOGPレンダリングされる問題を修正 @syuilo | ||||||
| - Client: case insensitive emoji search @saschanaz | - Client: case insensitive emoji search @saschanaz | ||||||
| - Client: InAppウィンドウが操作できなくなることがあるのを修正 @tamaina | - Client: InAppウィンドウが操作できなくなることがあるのを修正 @tamaina | ||||||
| - Client: use proxied image for instance icon @syuilo | - Client: use proxied image for instance icon @syuilo | ||||||
| - Client: Webhookの編集画面で、内容を保存することができない問題を修正 @m-hayabusa | - Client: Webhookの編集画面で、内容を保存することができない問題を修正 @m-hayabusa | ||||||
|  | - Client: Page編集でブロックの移動が行えない問題を修正 @syuilo | ||||||
| - Client: update emoji picker immediately on all input @saschanaz | - Client: update emoji picker immediately on all input @saschanaz | ||||||
| - Client: チャートのツールチップが画面に残ることがあるのを修正 @syuilo | - Client: チャートのツールチップが画面に残ることがあるのを修正 @syuilo | ||||||
| - Client: fix wrong link in tutorial @syuilo | - Client: fix wrong link in tutorial @syuilo | ||||||
|   | |||||||
| @@ -380,6 +380,7 @@ administrator: "المدير" | |||||||
| token: "الرمز المميز" | token: "الرمز المميز" | ||||||
| twoStepAuthentication: "الإستيثاق بعاملَيْن" | twoStepAuthentication: "الإستيثاق بعاملَيْن" | ||||||
| moderator: "مشرِف" | moderator: "مشرِف" | ||||||
|  | moderation: "الإشراف" | ||||||
| nUsersMentioned: "{n} مستخدمين أُشير إليهم" | nUsersMentioned: "{n} مستخدمين أُشير إليهم" | ||||||
| securityKey: "مفتاح الأمان" | securityKey: "مفتاح الأمان" | ||||||
| securityKeyName: "اسم المفتاح" | securityKeyName: "اسم المفتاح" | ||||||
| @@ -813,6 +814,9 @@ colored: "ملوّن" | |||||||
| label: "التسمية" | label: "التسمية" | ||||||
| localOnly: "المحلي فقط" | localOnly: "المحلي فقط" | ||||||
| account: "الحسابات" | account: "الحسابات" | ||||||
|  | cannotLoad: "تعذر التحميل" | ||||||
|  | like: "أعجبني" | ||||||
|  | show: "المظهر" | ||||||
| _emailUnavailable: | _emailUnavailable: | ||||||
|   used: "هذا البريد الإلكتروني مستخدم" |   used: "هذا البريد الإلكتروني مستخدم" | ||||||
|   format: "صيغة البريد الإلكتروني غير صالحة" |   format: "صيغة البريد الإلكتروني غير صالحة" | ||||||
| @@ -1228,6 +1232,11 @@ _timelines: | |||||||
|   local: "المحلي" |   local: "المحلي" | ||||||
|   social: "الاجتماعي" |   social: "الاجتماعي" | ||||||
|   global: "الشامل" |   global: "الشامل" | ||||||
|  | _play: | ||||||
|  |   viewSource: "اظهر المصدر" | ||||||
|  |   featured: "الأكثر شعبية" | ||||||
|  |   title: "العنوان" | ||||||
|  |   summary: "الوصف" | ||||||
| _pages: | _pages: | ||||||
|   newPage: "أنشئ صفحة جديدة" |   newPage: "أنشئ صفحة جديدة" | ||||||
|   editPage: "عدّل الصفحة" |   editPage: "عدّل الصفحة" | ||||||
| @@ -1293,6 +1302,7 @@ _notification: | |||||||
|   yourFollowRequestAccepted: "قُبل طلب المتابعة" |   yourFollowRequestAccepted: "قُبل طلب المتابعة" | ||||||
|   youWereInvitedToGroup: "دُعيت إلى فريقٍ" |   youWereInvitedToGroup: "دُعيت إلى فريقٍ" | ||||||
|   pollEnded: "ظهرت نتائج الاستطلاع" |   pollEnded: "ظهرت نتائج الاستطلاع" | ||||||
|  |   unreadAntennaNote: "هوائي {name}" | ||||||
|   _types: |   _types: | ||||||
|     all: "الكل" |     all: "الكل" | ||||||
|     follow: "متابِعون جدد" |     follow: "متابِعون جدد" | ||||||
|   | |||||||
| @@ -851,6 +851,8 @@ colored: "রঙ্গিন" | |||||||
| label: "লেবেল" | label: "লেবেল" | ||||||
| localOnly: "শুধুমাত্র লোকাল" | localOnly: "শুধুমাত্র লোকাল" | ||||||
| account: "অ্যাকাউন্টগুলি" | account: "অ্যাকাউন্টগুলি" | ||||||
|  | like: "পছন্দ করা" | ||||||
|  | show: "প্রদর্শন" | ||||||
| _emailUnavailable: | _emailUnavailable: | ||||||
|   used: "এই ইমেইল ঠিকানাটি ইতোমধ্যে ব্যবহৃত হয়েছে" |   used: "এই ইমেইল ঠিকানাটি ইতোমধ্যে ব্যবহৃত হয়েছে" | ||||||
|   format: "এই ইমেল ঠিকানাটি সঠিকভাবে লিখা হয়নি" |   format: "এই ইমেল ঠিকানাটি সঠিকভাবে লিখা হয়নি" | ||||||
| @@ -1319,6 +1321,12 @@ _timelines: | |||||||
|   local: "স্থানীয়" |   local: "স্থানীয়" | ||||||
|   social: "সামাজিক" |   social: "সামাজিক" | ||||||
|   global: "গ্লোবাল" |   global: "গ্লোবাল" | ||||||
|  | _play: | ||||||
|  |   viewSource: "উৎস দেখুন" | ||||||
|  |   featured: "জনপ্রিয়" | ||||||
|  |   title: "শিরোনাম" | ||||||
|  |   script: "স্ক্রিপ্ট" | ||||||
|  |   summary: "বর্ণনা" | ||||||
| _pages: | _pages: | ||||||
|   newPage: "নতুন পৃষ্ঠা বানান" |   newPage: "নতুন পৃষ্ঠা বানান" | ||||||
|   editPage: "পৃষ্ঠাটি সম্পাদনা করুন" |   editPage: "পৃষ্ঠাটি সম্পাদনা করুন" | ||||||
|   | |||||||
| @@ -610,6 +610,7 @@ speed: "Rychlost" | |||||||
| slow: "Pomalá" | slow: "Pomalá" | ||||||
| fast: "Rychlá" | fast: "Rychlá" | ||||||
| account: "Účty" | account: "Účty" | ||||||
|  | show: "Zobrazit" | ||||||
| _ad: | _ad: | ||||||
|   back: "Zpět" |   back: "Zpět" | ||||||
| _gallery: | _gallery: | ||||||
| @@ -748,6 +749,9 @@ _charts: | |||||||
| _timelines: | _timelines: | ||||||
|   home: "Domů" |   home: "Domů" | ||||||
|   global: "Globální" |   global: "Globální" | ||||||
|  | _play: | ||||||
|  |   script: "Skript" | ||||||
|  |   summary: "Popis" | ||||||
| _pages: | _pages: | ||||||
|   newPage: "Vytvořit novou stránku" |   newPage: "Vytvořit novou stránku" | ||||||
|   editPage: "Upravit stránku" |   editPage: "Upravit stránku" | ||||||
|   | |||||||
| @@ -609,7 +609,7 @@ regexpErrorDescription: "Im regulären Ausdruck deiner {tab}en Wortstummschaltun | |||||||
| instanceMute: "Instanzstummschaltungen" | instanceMute: "Instanzstummschaltungen" | ||||||
| userSaysSomething: "{name} hat etwas gesagt" | userSaysSomething: "{name} hat etwas gesagt" | ||||||
| makeActive: "Aktivieren" | makeActive: "Aktivieren" | ||||||
| display: "Anzeigeart" | display: "Anzeigen" | ||||||
| copy: "Kopieren" | copy: "Kopieren" | ||||||
| metrics: "Metriken" | metrics: "Metriken" | ||||||
| overview: "Übersicht" | overview: "Übersicht" | ||||||
| @@ -916,6 +916,14 @@ loggedInAsBot: "Momentan als Bot angemeldet" | |||||||
| tools: "Werkzeuge" | tools: "Werkzeuge" | ||||||
| cannotLoad: "Kann nicht geladen werden" | cannotLoad: "Kann nicht geladen werden" | ||||||
| numberOfProfileView: "Profilaufrufe" | numberOfProfileView: "Profilaufrufe" | ||||||
|  | like: "Gefällt mir" | ||||||
|  | unlike: "\"Gefällt mir\" entfernen" | ||||||
|  | numberOfLikes: "\"Gefällt mir\"-Anzahl" | ||||||
|  | show: "Anzeigen" | ||||||
|  | neverShow: "Nicht wieder anzeigen" | ||||||
|  | remindMeLater: "Vielleicht später" | ||||||
|  | didYouLikeMisskey: "Gefällt dir Misskey?" | ||||||
|  | pleaseDonate: "Misskey ist die kostenlose Software, die von {host} verwendet wird. Wir würden uns über Spenden freuen, damit dessen Entwicklung weitergeführt werden kann!" | ||||||
| _sensitiveMediaDetection: | _sensitiveMediaDetection: | ||||||
|   description: "Ermöglicht eine Erleichterung der Servermoderation durch die automatische Erkennungen von NSFW-Medien unter Verwendung von Machine Learning. Hierdurch wird die Serverlast etwas erhöht." |   description: "Ermöglicht eine Erleichterung der Servermoderation durch die automatische Erkennungen von NSFW-Medien unter Verwendung von Machine Learning. Hierdurch wird die Serverlast etwas erhöht." | ||||||
|   sensitivity: "Erkennungssensitivität" |   sensitivity: "Erkennungssensitivität" | ||||||
| @@ -1315,6 +1323,7 @@ _widgets: | |||||||
|   jobQueue: "Job-Warteschlange" |   jobQueue: "Job-Warteschlange" | ||||||
|   serverMetric: "Servermetriken" |   serverMetric: "Servermetriken" | ||||||
|   aiscript: "AiScript-Konsole" |   aiscript: "AiScript-Konsole" | ||||||
|  |   aiscriptApp: "AiScript-Anwendung" | ||||||
|   aichan: "Ai" |   aichan: "Ai" | ||||||
|   userList: "Benutzerliste" |   userList: "Benutzerliste" | ||||||
|   _userList: |   _userList: | ||||||
| @@ -1420,6 +1429,21 @@ _timelines: | |||||||
|   local: "Lokal" |   local: "Lokal" | ||||||
|   social: "Sozial" |   social: "Sozial" | ||||||
|   global: "Global" |   global: "Global" | ||||||
|  | _play: | ||||||
|  |   new: "Play erstellen" | ||||||
|  |   edit: "Play bearbeiten" | ||||||
|  |   created: "Play erfolgreich erstellt" | ||||||
|  |   updated: "Play erfolgreich aktualisiert" | ||||||
|  |   deleted: "Play erfolgreich gelöscht" | ||||||
|  |   pageSetting: "Play-Einstellungen" | ||||||
|  |   editThisPage: "Dieses Play bearbeiten" | ||||||
|  |   viewSource: "Quelltext anzeigen" | ||||||
|  |   my: "Meine Plays" | ||||||
|  |   liked: "Mit \"Gefällt mir\" markierte Plays" | ||||||
|  |   featured: "Beliebt" | ||||||
|  |   title: "Titel" | ||||||
|  |   script: "Skript" | ||||||
|  |   summary: "Beschreibung" | ||||||
| _pages: | _pages: | ||||||
|   newPage: "Seite erstellen" |   newPage: "Seite erstellen" | ||||||
|   editPage: "Seite bearbeiten" |   editPage: "Seite bearbeiten" | ||||||
|   | |||||||
| @@ -916,6 +916,14 @@ loggedInAsBot: "Currently logged in as bot" | |||||||
| tools: "Tools" | tools: "Tools" | ||||||
| cannotLoad: "Unable to load" | cannotLoad: "Unable to load" | ||||||
| numberOfProfileView: "Profile views" | numberOfProfileView: "Profile views" | ||||||
|  | like: "Like" | ||||||
|  | unlike: "Unlike" | ||||||
|  | numberOfLikes: "Likes" | ||||||
|  | show: "Show" | ||||||
|  | neverShow: "Don't show again" | ||||||
|  | remindMeLater: "Maybe later" | ||||||
|  | didYouLikeMisskey: "Have you taken a liking to Misskey?" | ||||||
|  | pleaseDonate: "{host} uses the free software, Misskey. We would highly appreciate your donations so development of Misskey can continue!" | ||||||
| _sensitiveMediaDetection: | _sensitiveMediaDetection: | ||||||
|   description: "Reduces the effort of server moderation through automatically recognizing NSFW media via Machine Learning. This will slightly increase the load on the server." |   description: "Reduces the effort of server moderation through automatically recognizing NSFW media via Machine Learning. This will slightly increase the load on the server." | ||||||
|   sensitivity: "Detection sensitivity" |   sensitivity: "Detection sensitivity" | ||||||
| @@ -1315,6 +1323,7 @@ _widgets: | |||||||
|   jobQueue: "Job Queue" |   jobQueue: "Job Queue" | ||||||
|   serverMetric: "Server metrics" |   serverMetric: "Server metrics" | ||||||
|   aiscript: "AiScript console" |   aiscript: "AiScript console" | ||||||
|  |   aiscriptApp: "AiScript App" | ||||||
|   aichan: "Ai" |   aichan: "Ai" | ||||||
|   userList: "User list" |   userList: "User list" | ||||||
|   _userList: |   _userList: | ||||||
| @@ -1420,6 +1429,21 @@ _timelines: | |||||||
|   local: "Local" |   local: "Local" | ||||||
|   social: "Social" |   social: "Social" | ||||||
|   global: "Global" |   global: "Global" | ||||||
|  | _play: | ||||||
|  |   new: "Create Play" | ||||||
|  |   edit: "Edit Play" | ||||||
|  |   created: "Play created" | ||||||
|  |   updated: "Play edited" | ||||||
|  |   deleted: "Play deleted" | ||||||
|  |   pageSetting: "Play settings" | ||||||
|  |   editThisPage: "Edit this Play" | ||||||
|  |   viewSource: "View source" | ||||||
|  |   my: "My Plays" | ||||||
|  |   liked: "Liked Plays" | ||||||
|  |   featured: "Popular" | ||||||
|  |   title: "Title" | ||||||
|  |   script: "Script" | ||||||
|  |   summary: "Description" | ||||||
| _pages: | _pages: | ||||||
|   newPage: "Create a new Page" |   newPage: "Create a new Page" | ||||||
|   editPage: "Edit this Page" |   editPage: "Edit this Page" | ||||||
|   | |||||||
| @@ -916,6 +916,8 @@ loggedInAsBot: "Inicio sesión como cuenta bot." | |||||||
| tools: "Utilidades" | tools: "Utilidades" | ||||||
| cannotLoad: "No se puede cargar." | cannotLoad: "No se puede cargar." | ||||||
| numberOfProfileView: "Número de vistas de perfil" | numberOfProfileView: "Número de vistas de perfil" | ||||||
|  | like: "¡Muy bien!" | ||||||
|  | show: "Apariencia" | ||||||
| _sensitiveMediaDetection: | _sensitiveMediaDetection: | ||||||
|   description: "Reduce el esfuerzo de la moderación el el servidor a través del reconocimiento automático de contenido NSFW usando 'Machine Learning'. Esto puede incrementar ligeramente la carga en el servidor." |   description: "Reduce el esfuerzo de la moderación el el servidor a través del reconocimiento automático de contenido NSFW usando 'Machine Learning'. Esto puede incrementar ligeramente la carga en el servidor." | ||||||
|   sensitivity: "Sensibilidad de detección" |   sensitivity: "Sensibilidad de detección" | ||||||
| @@ -1420,6 +1422,12 @@ _timelines: | |||||||
|   local: "Local" |   local: "Local" | ||||||
|   social: "Social" |   social: "Social" | ||||||
|   global: "Global" |   global: "Global" | ||||||
|  | _play: | ||||||
|  |   viewSource: "Ver la fuente" | ||||||
|  |   featured: "Popular" | ||||||
|  |   title: "Título" | ||||||
|  |   script: "Script" | ||||||
|  |   summary: "Descripción" | ||||||
| _pages: | _pages: | ||||||
|   newPage: "Crear página" |   newPage: "Crear página" | ||||||
|   editPage: "Editar página" |   editPage: "Editar página" | ||||||
|   | |||||||
| @@ -910,6 +910,8 @@ caption: "Libellé" | |||||||
| loggedInAsBot: "Connecté actuellement en tant que bot" | loggedInAsBot: "Connecté actuellement en tant que bot" | ||||||
| tools: "Outils" | tools: "Outils" | ||||||
| cannotLoad: "Chargement impossible" | cannotLoad: "Chargement impossible" | ||||||
|  | like: "J'aime" | ||||||
|  | show: "Affichage" | ||||||
| _sensitiveMediaDetection: | _sensitiveMediaDetection: | ||||||
|   description: "L'apprentissage automatique peut être utilisé pour détecter automatiquement les médias sensibles à modérer. La sollicitation des serveurs augmente légèrement." |   description: "L'apprentissage automatique peut être utilisé pour détecter automatiquement les médias sensibles à modérer. La sollicitation des serveurs augmente légèrement." | ||||||
|   sensitivity: "Sensibilité de la détection" |   sensitivity: "Sensibilité de la détection" | ||||||
| @@ -1411,6 +1413,12 @@ _timelines: | |||||||
|   local: "Local" |   local: "Local" | ||||||
|   social: "Social" |   social: "Social" | ||||||
|   global: "Global" |   global: "Global" | ||||||
|  | _play: | ||||||
|  |   viewSource: "Afficher la source" | ||||||
|  |   featured: "Populaire" | ||||||
|  |   title: "Titre" | ||||||
|  |   script: "Script" | ||||||
|  |   summary: "Description" | ||||||
| _pages: | _pages: | ||||||
|   newPage: "Créer une page" |   newPage: "Créer une page" | ||||||
|   editPage: "Modifier une page" |   editPage: "Modifier une page" | ||||||
|   | |||||||
| @@ -855,6 +855,10 @@ colored: "Diwarnai" | |||||||
| label: "Label" | label: "Label" | ||||||
| localOnly: "Hanya lokal" | localOnly: "Hanya lokal" | ||||||
| account: "Akun" | account: "Akun" | ||||||
|  | like: "Suka" | ||||||
|  | unlike: "Tidak Suka" | ||||||
|  | numberOfLikes: "Jumlah yang disukai" | ||||||
|  | show: "Tampilkan" | ||||||
| _emailUnavailable: | _emailUnavailable: | ||||||
|   used: "Alamat surel ini telah digunakan" |   used: "Alamat surel ini telah digunakan" | ||||||
|   format: "Format tidak valid." |   format: "Format tidak valid." | ||||||
| @@ -1220,6 +1224,7 @@ _widgets: | |||||||
|   jobQueue: "Antrian kerja" |   jobQueue: "Antrian kerja" | ||||||
|   serverMetric: "Statistik peladen" |   serverMetric: "Statistik peladen" | ||||||
|   aiscript: "Konsol AiScript" |   aiscript: "Konsol AiScript" | ||||||
|  |   aiscriptApp: "Aplikasi AiScript" | ||||||
|   aichan: "Ai" |   aichan: "Ai" | ||||||
|   _userList: |   _userList: | ||||||
|     chooseList: "Pilih daftar" |     chooseList: "Pilih daftar" | ||||||
| @@ -1323,6 +1328,21 @@ _timelines: | |||||||
|   local: "Lokal" |   local: "Lokal" | ||||||
|   social: "Sosial" |   social: "Sosial" | ||||||
|   global: "Global" |   global: "Global" | ||||||
|  | _play: | ||||||
|  |   new: "Membuat Permainan" | ||||||
|  |   edit: "Menyunting Permainan" | ||||||
|  |   created: "Permainan sudah dibuat" | ||||||
|  |   updated: "Permainan sudah diperbaharui" | ||||||
|  |   deleted: "Hapus permainan" | ||||||
|  |   pageSetting: "Pengaturan permainan" | ||||||
|  |   editThisPage: "Sunting Permainan ini" | ||||||
|  |   viewSource: "Lihat sumber" | ||||||
|  |   my: "Permainan saya" | ||||||
|  |   liked: "Permainan Disukai" | ||||||
|  |   featured: "Populer" | ||||||
|  |   title: "Judul" | ||||||
|  |   script: "Script" | ||||||
|  |   summary: "Deskripsi" | ||||||
| _pages: | _pages: | ||||||
|   newPage: "Buat halaman baru" |   newPage: "Buat halaman baru" | ||||||
|   editPage: "Sunting halaman" |   editPage: "Sunting halaman" | ||||||
|   | |||||||
| @@ -1,7 +1,7 @@ | |||||||
| --- | --- | ||||||
| _lang_: "Italiano" | _lang_: "Italiano" | ||||||
| headlineMisskey: "Rete collegata tramite note" | headlineMisskey: "Rete collegata tramite note" | ||||||
| introMisskey: "Benvenut@! Misskey è un servizio di microblogging decentralizzato, libero e aperto. \nScrivi \"note\" per condividere ciò che sta succedendo adesso o per dire a tutti qualcosa di te. 📡\nGrazie alla funzione \"reazioni\" puoi anche mandare reazioni rapide alle note delle altre persone del Fediverso. 👍\nEsplora un nuovo mondo! 🚀" | introMisskey: "Eccoci! Misskey è un servizio di microblogging decentralizzato, libero e aperto. \n📡 Puoi pubblicare «Note» per condividere ciò che sta succedendo o per dire a tutti qualcosa su di te. \n👍 Puoi reagire inviando emoji rapidi alle «Note» provenienti da altri profili nel Fediverso.\n🚀 Esplora un nuovo mondo insieme a noi!" | ||||||
| poweredByMisskeyDescription: "{name} è uno dei servizi (chiamati istanze) che utilizzano la piattaforma open source <b>Misskey</b>." | poweredByMisskeyDescription: "{name} è uno dei servizi (chiamati istanze) che utilizzano la piattaforma open source <b>Misskey</b>." | ||||||
| monthAndDay: "{day}/{month}" | monthAndDay: "{day}/{month}" | ||||||
| search: "Cerca" | search: "Cerca" | ||||||
| @@ -28,7 +28,7 @@ timeline: "Timeline" | |||||||
| noAccountDescription: "L'utente non ha ancora scritto niente nella biografia di profilo." | noAccountDescription: "L'utente non ha ancora scritto niente nella biografia di profilo." | ||||||
| login: "Accedi" | login: "Accedi" | ||||||
| loggingIn: "Accesso in corso..." | loggingIn: "Accesso in corso..." | ||||||
| logout: "Esci" | logout: "Uscita" | ||||||
| signup: "Iscriviti" | signup: "Iscriviti" | ||||||
| uploading: "Caricamento..." | uploading: "Caricamento..." | ||||||
| save: "Salva" | save: "Salva" | ||||||
| @@ -876,7 +876,7 @@ deleteAccount: "Eliminazione profilo" | |||||||
| document: "Documento" | document: "Documento" | ||||||
| numberOfPageCache: "Numero di pagine cache" | numberOfPageCache: "Numero di pagine cache" | ||||||
| numberOfPageCacheDescription: "Aumenta l'usabilità, ma aumenta anche il carico e l'utilizzo della memoria." | numberOfPageCacheDescription: "Aumenta l'usabilità, ma aumenta anche il carico e l'utilizzo della memoria." | ||||||
| logoutConfirm: "Sei sicuro di voler effettuare il logout?" | logoutConfirm: "Vuoi davvero uscire da Misskey? " | ||||||
| lastActiveDate: "Data dell'ultimo utilizzo" | lastActiveDate: "Data dell'ultimo utilizzo" | ||||||
| statusbar: "Barra di stato" | statusbar: "Barra di stato" | ||||||
| pleaseSelect: "Scegli un'opzione" | pleaseSelect: "Scegli un'opzione" | ||||||
| @@ -916,6 +916,8 @@ loggedInAsBot: "Connessione come Bot" | |||||||
| tools: "Strumenti" | tools: "Strumenti" | ||||||
| cannotLoad: "Caricamento impossibile" | cannotLoad: "Caricamento impossibile" | ||||||
| numberOfProfileView: "Visualizzazioni profilo" | numberOfProfileView: "Visualizzazioni profilo" | ||||||
|  | like: "Mi piace!" | ||||||
|  | show: "Visualizza" | ||||||
| _sensitiveMediaDetection: | _sensitiveMediaDetection: | ||||||
|   description: "L'apprendimento automatico può essere utilizzato per individuare automaticamente i media sensibili da moderare. Il carico del server aumenta leggermente." |   description: "L'apprendimento automatico può essere utilizzato per individuare automaticamente i media sensibili da moderare. Il carico del server aumenta leggermente." | ||||||
|   sensitivity: "Sensibilità di rilevamento" |   sensitivity: "Sensibilità di rilevamento" | ||||||
| @@ -1067,7 +1069,7 @@ _mfm: | |||||||
|   sparkleDescription: "Aggiungere effetti particellari scintillanti." |   sparkleDescription: "Aggiungere effetti particellari scintillanti." | ||||||
|   rotate: "Ruota" |   rotate: "Ruota" | ||||||
|   rotateDescription: "Ruota con un angolo specificato." |   rotateDescription: "Ruota con un angolo specificato." | ||||||
|   plain: "aereo" |   plain: "Testo semplice" | ||||||
|   plainDescription: "Disattiva tutta la sintassi interna." |   plainDescription: "Disattiva tutta la sintassi interna." | ||||||
| _instanceTicker: | _instanceTicker: | ||||||
|   none: "Nascondi" |   none: "Nascondi" | ||||||
| @@ -1205,13 +1207,13 @@ _time: | |||||||
|   day: "giorni" |   day: "giorni" | ||||||
| _tutorial: | _tutorial: | ||||||
|   title: "Come usare Misskey" |   title: "Come usare Misskey" | ||||||
|   step1_1: "Benvenuto/a!" |   step1_1: "Eccoci!" | ||||||
|   step1_2: "Questa pagina si chiama una \" Timeline \". Mostra in ordine cronologico le \" note \" delle persone che segui." |   step1_2: "Questa pagina si chiama una \" Timeline \". Mostra in ordine cronologico le \" note \" delle persone che segui." | ||||||
|   step1_3: "Attualmente la tua Timeline è vuota perché non segui alcun profilo e non hai pubblicato alcuna nota ancora." |   step1_3: "Attualmente la tua Timeline è vuota perché non segui alcun profilo e non hai pubblicato alcuna nota ancora." | ||||||
|   step2_1: "Prima di scrivere una nota o di seguire altri profili, imposta il tuo di profilo!" |   step2_1: "Prima di scrivere una «Nota» o di seguire altri profili, prepara il tuo profilo!" | ||||||
|   step2_2: "Aggiungere qualche informazione su di te aumenterà le tue possibilità di essere seguit@ da altre persone. " |   step2_2: "Aggiungere qualche informazione su di te aumenterà le tue possibilità di essere seguit@ da altre persone. " | ||||||
|   step3_1: "Hai finito di impostare il tuo profilo?" |   step3_1: "Hai finito di impostare il tuo profilo?" | ||||||
|   step3_2: "Ora, puoi pubblicare una nota. Facciamo una prova! Premi il pulsante a forma di penna in cima allo schermo per aprire una finestra di dialogo.  " |   step3_2: "Ora puoi pubblicare una «Nota». Proviamo subito! Premi il bottone con l'icona «penna» per iniziare a scrivere in una finestra di dialogo.  " | ||||||
|   step3_3: "Scritto il testo della nota, puoi pubblicarla premendo il pulsante nella parte superiore destra della finestra di dialogo." |   step3_3: "Scritto il testo della nota, puoi pubblicarla premendo il pulsante nella parte superiore destra della finestra di dialogo." | ||||||
|   step3_4: "Non ti viene niente in mente? Perché non scrivi semplicemente \"Ho appena cominciato a usare Misskey\"?" |   step3_4: "Non ti viene niente in mente? Perché non scrivi semplicemente \"Ho appena cominciato a usare Misskey\"?" | ||||||
|   step4_1: "Hai pubblicato qualcosa?" |   step4_1: "Hai pubblicato qualcosa?" | ||||||
| @@ -1223,7 +1225,7 @@ _tutorial: | |||||||
|   step6_1: "Adesso, dovresti essere in grado di vedere le note dagli altri profili sulla tua timeline." |   step6_1: "Adesso, dovresti essere in grado di vedere le note dagli altri profili sulla tua timeline." | ||||||
|   step6_2: "Puoi anche rispondere alle note con un click, scegliendo le reazioni immediate." |   step6_2: "Puoi anche rispondere alle note con un click, scegliendo le reazioni immediate." | ||||||
|   step6_3: "Per inviare una reazione, premi l'icona + della nota e scegli l'emoji che vuoi mandare." |   step6_3: "Per inviare una reazione, premi l'icona + della nota e scegli l'emoji che vuoi mandare." | ||||||
|   step7_1: "Complimenti! Sei arrivat@ alla fine dell'esercitazione di base su come usare Misskey. " |   step7_1: "Congratulazioni! Hai completato l'esercitazione iniziale su come usare Misskey." | ||||||
|   step7_2: "Se vuoi saperne di più su Misskey, puoi dare un'occhiata alla sezione {help}." |   step7_2: "Se vuoi saperne di più su Misskey, puoi dare un'occhiata alla sezione {help}." | ||||||
|   step7_3: "Da ultimo, buon divertimento su Misskey! 🚀" |   step7_3: "Da ultimo, buon divertimento su Misskey! 🚀" | ||||||
|   step8_1: "Per concludere, vuoi attivare le notifiche push?" |   step8_1: "Per concludere, vuoi attivare le notifiche push?" | ||||||
| @@ -1315,7 +1317,7 @@ _widgets: | |||||||
|   jobQueue: "Coda di lavoro" |   jobQueue: "Coda di lavoro" | ||||||
|   serverMetric: "Statistiche server" |   serverMetric: "Statistiche server" | ||||||
|   aiscript: "Console AiScript" |   aiscript: "Console AiScript" | ||||||
|   aichan: "indaco (tintura)" |   aichan: "Mascotte Ai" | ||||||
|   userList: "Elenco utenti" |   userList: "Elenco utenti" | ||||||
|   _userList: |   _userList: | ||||||
|     chooseList: "Seleziona una lista" |     chooseList: "Seleziona una lista" | ||||||
| @@ -1420,6 +1422,12 @@ _timelines: | |||||||
|   local: "Locale" |   local: "Locale" | ||||||
|   social: "Sociale" |   social: "Sociale" | ||||||
|   global: "Federata" |   global: "Federata" | ||||||
|  | _play: | ||||||
|  |   viewSource: "Visualizza sorgente" | ||||||
|  |   featured: "Popolari" | ||||||
|  |   title: "Titolo" | ||||||
|  |   script: "Script" | ||||||
|  |   summary: "Descrizione" | ||||||
| _pages: | _pages: | ||||||
|   newPage: "Crea pagina" |   newPage: "Crea pagina" | ||||||
|   editPage: "Modifica pagina" |   editPage: "Modifica pagina" | ||||||
|   | |||||||
| @@ -916,6 +916,14 @@ loggedInAsBot: "Botアカウントでログイン中" | |||||||
| tools: "ツール" | tools: "ツール" | ||||||
| cannotLoad: "読み込めません" | cannotLoad: "読み込めません" | ||||||
| numberOfProfileView: "プロフィール表示回数" | numberOfProfileView: "プロフィール表示回数" | ||||||
|  | like: "いいね!" | ||||||
|  | unlike: "いいねを解除" | ||||||
|  | numberOfLikes: "いいね数" | ||||||
|  | show: "表示" | ||||||
|  | neverShow: "今後表示しない" | ||||||
|  | remindMeLater: "また後で" | ||||||
|  | didYouLikeMisskey: "Misskeyを気に入っていただけましたか?" | ||||||
|  | pleaseDonate: "Misskeyは{host}が使用している無料のソフトウェアです。これからも開発を続けられるように、ぜひ寄付をお願いします!" | ||||||
|  |  | ||||||
| _sensitiveMediaDetection: | _sensitiveMediaDetection: | ||||||
|   description: "機械学習を使って自動でセンシティブなメディアを検出し、モデレーションに役立てることができます。サーバーの負荷が少し増えます。" |   description: "機械学習を使って自動でセンシティブなメディアを検出し、モデレーションに役立てることができます。サーバーの負荷が少し増えます。" | ||||||
| @@ -1348,10 +1356,12 @@ _widgets: | |||||||
|   jobQueue: "ジョブキュー" |   jobQueue: "ジョブキュー" | ||||||
|   serverMetric: "サーバーメトリクス" |   serverMetric: "サーバーメトリクス" | ||||||
|   aiscript: "AiScriptコンソール" |   aiscript: "AiScriptコンソール" | ||||||
|  |   aiscriptApp: "AiScript App" | ||||||
|   aichan: "藍" |   aichan: "藍" | ||||||
|   userList: "ユーザーリスト" |   userList: "ユーザーリスト" | ||||||
|   _userList: |   _userList: | ||||||
|     chooseList: "リストを選択" |     chooseList: "リストを選択" | ||||||
|  |   clicker: "クリッカー" | ||||||
|  |  | ||||||
| _cw: | _cw: | ||||||
|   hide: "隠す" |   hide: "隠す" | ||||||
| @@ -1463,6 +1473,22 @@ _timelines: | |||||||
|   social: "ソーシャル" |   social: "ソーシャル" | ||||||
|   global: "グローバル" |   global: "グローバル" | ||||||
|  |  | ||||||
|  | _play: | ||||||
|  |   new: "Playの作成" | ||||||
|  |   edit: "Playの編集" | ||||||
|  |   created: "Playを作成しました" | ||||||
|  |   updated: "Playを更新しました" | ||||||
|  |   deleted: "Playを削除しました" | ||||||
|  |   pageSetting: "Play設定" | ||||||
|  |   editThisPage: "このPlayを編集" | ||||||
|  |   viewSource: "ソースを表示" | ||||||
|  |   my: "自分のPlay" | ||||||
|  |   liked: "いいねしたPlay" | ||||||
|  |   featured: "人気" | ||||||
|  |   title: "タイトル" | ||||||
|  |   script: "スクリプト" | ||||||
|  |   summary: "説明" | ||||||
|  |  | ||||||
| _pages: | _pages: | ||||||
|   newPage: "ページの作成" |   newPage: "ページの作成" | ||||||
|   editPage: "ページの編集" |   editPage: "ページの編集" | ||||||
| @@ -1525,7 +1551,6 @@ _notification: | |||||||
|   youGotReply: "{name}からのリプライ" |   youGotReply: "{name}からのリプライ" | ||||||
|   youGotQuote: "{name}による引用" |   youGotQuote: "{name}による引用" | ||||||
|   youRenoted: "{name}がRenoteしました" |   youRenoted: "{name}がRenoteしました" | ||||||
|   youGotPoll: "{name}が投票しました" |  | ||||||
|   youGotMessagingMessageFromUser: "{name}からのチャットがあります" |   youGotMessagingMessageFromUser: "{name}からのチャットがあります" | ||||||
|   youGotMessagingMessageFromGroup: "{name}のチャットがあります" |   youGotMessagingMessageFromGroup: "{name}のチャットがあります" | ||||||
|   youWereFollowed: "フォローされました" |   youWereFollowed: "フォローされました" | ||||||
| @@ -1544,7 +1569,6 @@ _notification: | |||||||
|     renote: "Renote" |     renote: "Renote" | ||||||
|     quote: "引用" |     quote: "引用" | ||||||
|     reaction: "リアクション" |     reaction: "リアクション" | ||||||
|     pollVote: "アンケートに投票された" |  | ||||||
|     pollEnded: "アンケートが終了" |     pollEnded: "アンケートが終了" | ||||||
|     receiveFollowRequest: "フォロー申請を受け取った" |     receiveFollowRequest: "フォロー申請を受け取った" | ||||||
|     followRequestAccepted: "フォローが受理された" |     followRequestAccepted: "フォローが受理された" | ||||||
|   | |||||||
| @@ -915,6 +915,8 @@ caption: "キャプション" | |||||||
| loggedInAsBot: "Botアカウントでログイン中やで" | loggedInAsBot: "Botアカウントでログイン中やで" | ||||||
| tools: "ツール" | tools: "ツール" | ||||||
| cannotLoad: "読み込めへんで" | cannotLoad: "読み込めへんで" | ||||||
|  | like: "ええやん!" | ||||||
|  | show: "表示" | ||||||
| _sensitiveMediaDetection: | _sensitiveMediaDetection: | ||||||
|   description: "機械学習を使って自動でセンシティブなメディアを検出して、モデレーションに役立てることができるで。サーバーの負荷が少し増えてまうなあ。" |   description: "機械学習を使って自動でセンシティブなメディアを検出して、モデレーションに役立てることができるで。サーバーの負荷が少し増えてまうなあ。" | ||||||
|   sensitivity: "検出感度やで" |   sensitivity: "検出感度やで" | ||||||
| @@ -1418,6 +1420,12 @@ _timelines: | |||||||
|   local: "ローカル" |   local: "ローカル" | ||||||
|   social: "ソーシャル" |   social: "ソーシャル" | ||||||
|   global: "グローバル" |   global: "グローバル" | ||||||
|  | _play: | ||||||
|  |   viewSource: "ソースを表示" | ||||||
|  |   featured: "人気" | ||||||
|  |   title: "タイトル" | ||||||
|  |   script: "スクリプト" | ||||||
|  |   summary: "説明" | ||||||
| _pages: | _pages: | ||||||
|   newPage: "ページを作る" |   newPage: "ページを作る" | ||||||
|   editPage: "ページの編集" |   editPage: "ページの編集" | ||||||
|   | |||||||
| @@ -916,6 +916,14 @@ loggedInAsBot: "봇 계정으로 로그인중" | |||||||
| tools: "도구" | tools: "도구" | ||||||
| cannotLoad: "불러오지 못했습니다" | cannotLoad: "불러오지 못했습니다" | ||||||
| numberOfProfileView: "프로필 뷰 수" | numberOfProfileView: "프로필 뷰 수" | ||||||
|  | like: "좋아요!" | ||||||
|  | unlike: "좋아요 취소" | ||||||
|  | numberOfLikes: "좋아요 수" | ||||||
|  | show: "표시" | ||||||
|  | neverShow: "다시 보지 않기" | ||||||
|  | remindMeLater: "나중에 알림" | ||||||
|  | didYouLikeMisskey: "Misskey가 마음에 드시나요?" | ||||||
|  | pleaseDonate: "{host}은(는) 무료 소프트웨어 Misskey를 사용합니다. 후원을 통해 저희의 개발이 이어질 수 있게 도와주세요!" | ||||||
| _sensitiveMediaDetection: | _sensitiveMediaDetection: | ||||||
|   description: "기계학습을 통해 자동으로 민감한 미디어를 탐지하여, 모더레이션에 참고할 수 있도록 합니다. 서버의 부하를 약간 증가시킵니다." |   description: "기계학습을 통해 자동으로 민감한 미디어를 탐지하여, 모더레이션에 참고할 수 있도록 합니다. 서버의 부하를 약간 증가시킵니다." | ||||||
|   sensitivity: "탐지 민감도" |   sensitivity: "탐지 민감도" | ||||||
| @@ -1315,6 +1323,7 @@ _widgets: | |||||||
|   jobQueue: "작업 대기열" |   jobQueue: "작업 대기열" | ||||||
|   serverMetric: "서버 통계" |   serverMetric: "서버 통계" | ||||||
|   aiscript: "AiScript 콘솔" |   aiscript: "AiScript 콘솔" | ||||||
|  |   aiscriptApp: "AiScript 앱" | ||||||
|   aichan: "아이" |   aichan: "아이" | ||||||
|   userList: "사용자 목록" |   userList: "사용자 목록" | ||||||
|   _userList: |   _userList: | ||||||
| @@ -1420,6 +1429,21 @@ _timelines: | |||||||
|   local: "로컬" |   local: "로컬" | ||||||
|   social: "소셜" |   social: "소셜" | ||||||
|   global: "글로벌" |   global: "글로벌" | ||||||
|  | _play: | ||||||
|  |   new: "Play 만들기" | ||||||
|  |   edit: "Play 수정하기" | ||||||
|  |   created: "Play를 생성했습니다" | ||||||
|  |   updated: "Play를 갱신했습니다" | ||||||
|  |   deleted: "Play를 삭제했습니다" | ||||||
|  |   pageSetting: "Play 설정" | ||||||
|  |   editThisPage: "이 Play를 수정" | ||||||
|  |   viewSource: "소스 보기" | ||||||
|  |   my: "나의 Play" | ||||||
|  |   liked: "좋아요 한 Play" | ||||||
|  |   featured: "인기" | ||||||
|  |   title: "제목" | ||||||
|  |   script: "스크립트" | ||||||
|  |   summary: "설명" | ||||||
| _pages: | _pages: | ||||||
|   newPage: "페이지 만들기" |   newPage: "페이지 만들기" | ||||||
|   editPage: "페이지 수정" |   editPage: "페이지 수정" | ||||||
|   | |||||||
| @@ -866,6 +866,8 @@ pushNotificationNotSupported: "Przeglądarka lub instancja nie obsługuje powiad | |||||||
| sendPushNotificationReadMessage: "Usuń powiadomienia push po przeczytaniu powiadomień i wiadomości." | sendPushNotificationReadMessage: "Usuń powiadomienia push po przeczytaniu powiadomień i wiadomości." | ||||||
| sendPushNotificationReadMessageCaption: "Chwilowo pojawi się powiadomienie \"{emptyPushNotificationMessage}\". Może wzrosnąć zużycie baterii urządzenia." | sendPushNotificationReadMessageCaption: "Chwilowo pojawi się powiadomienie \"{emptyPushNotificationMessage}\". Może wzrosnąć zużycie baterii urządzenia." | ||||||
| loggedInAsBot: "Jesteś obecnie zalogowany/a jako bot" | loggedInAsBot: "Jesteś obecnie zalogowany/a jako bot" | ||||||
|  | like: "Polub" | ||||||
|  | show: "Wyświetlanie" | ||||||
| _sensitiveMediaDetection: | _sensitiveMediaDetection: | ||||||
|   description: "Zmniejsza wysiłek związany z moderacją serwera dzięki automatycznemu rozpoznawaniu zawartości NSFW za pomocą uczenia maszynowego. To nieznacznie zwiększy obciążenie serwera." |   description: "Zmniejsza wysiłek związany z moderacją serwera dzięki automatycznemu rozpoznawaniu zawartości NSFW za pomocą uczenia maszynowego. To nieznacznie zwiększy obciążenie serwera." | ||||||
|   setSensitiveFlagAutomatically: "Oznacz jako NSFW" |   setSensitiveFlagAutomatically: "Oznacz jako NSFW" | ||||||
| @@ -1313,6 +1315,12 @@ _timelines: | |||||||
|   local: "Lokalne" |   local: "Lokalne" | ||||||
|   social: "Społeczność" |   social: "Społeczność" | ||||||
|   global: "Globalna" |   global: "Globalna" | ||||||
|  | _play: | ||||||
|  |   viewSource: "Zobacz źródło" | ||||||
|  |   featured: "Wyróżnione" | ||||||
|  |   title: "Tytuł" | ||||||
|  |   script: "Skrypt" | ||||||
|  |   summary: "Opis" | ||||||
| _pages: | _pages: | ||||||
|   newPage: "Utwórz stronę" |   newPage: "Utwórz stronę" | ||||||
|   editPage: "Edytuj tę stronę" |   editPage: "Edytuj tę stronę" | ||||||
|   | |||||||
| @@ -647,6 +647,7 @@ middle: "Mediu" | |||||||
| sent: "Trimite" | sent: "Trimite" | ||||||
| searchByGoogle: "Caută" | searchByGoogle: "Caută" | ||||||
| file: "Fișiere" | file: "Fișiere" | ||||||
|  | show: "Arată" | ||||||
| _email: | _email: | ||||||
|   _follow: |   _follow: | ||||||
|     title: "te-a urmărit" |     title: "te-a urmărit" | ||||||
| @@ -690,6 +691,9 @@ _charts: | |||||||
|   federation: "Federație" |   federation: "Federație" | ||||||
| _timelines: | _timelines: | ||||||
|   home: "Acasă" |   home: "Acasă" | ||||||
|  | _play: | ||||||
|  |   script: "Script" | ||||||
|  |   summary: "Descriere" | ||||||
| _pages: | _pages: | ||||||
|   blocks: |   blocks: | ||||||
|     image: "Imagini" |     image: "Imagini" | ||||||
|   | |||||||
| @@ -864,6 +864,8 @@ enableAutoSensitiveDescription: "Если доступно, используйт | |||||||
| account: "Учётные записи" | account: "Учётные записи" | ||||||
| windowMaximize: "Развернуть" | windowMaximize: "Развернуть" | ||||||
| windowRestore: "Восстановить" | windowRestore: "Восстановить" | ||||||
|  | like: "Нравится!" | ||||||
|  | show: "Отображение" | ||||||
| _sensitiveMediaDetection: | _sensitiveMediaDetection: | ||||||
|   description: "Машинное обучение может быть использовано для автоматического обнаружения чувствительных медиа для модерации. Нагрузка на сервер увеличивается незначительно." |   description: "Машинное обучение может быть использовано для автоматического обнаружения чувствительных медиа для модерации. Нагрузка на сервер увеличивается незначительно." | ||||||
|   setSensitiveFlagAutomatically: "Установить флаг NSFW" |   setSensitiveFlagAutomatically: "Установить флаг NSFW" | ||||||
| @@ -1332,6 +1334,12 @@ _timelines: | |||||||
|   local: "Местная" |   local: "Местная" | ||||||
|   social: "Социальная" |   social: "Социальная" | ||||||
|   global: "Всеобщая" |   global: "Всеобщая" | ||||||
|  | _play: | ||||||
|  |   viewSource: "Просмотр исходника" | ||||||
|  |   featured: "Популярные" | ||||||
|  |   title: "Заголовок" | ||||||
|  |   script: "Скрипт" | ||||||
|  |   summary: "Описание" | ||||||
| _pages: | _pages: | ||||||
|   newPage: "Создать страницу" |   newPage: "Создать страницу" | ||||||
|   editPage: "Править страницу" |   editPage: "Править страницу" | ||||||
|   | |||||||
| @@ -911,6 +911,12 @@ windowRestore: "Obnoviť" | |||||||
| caption: "Nadpis" | caption: "Nadpis" | ||||||
| tools: "Nástroje" | tools: "Nástroje" | ||||||
| cannotLoad: "Nedá sa načítať." | cannotLoad: "Nedá sa načítať." | ||||||
|  | like: "Páči sa mi" | ||||||
|  | show: "Zobraziť" | ||||||
|  | neverShow: "Nabudúce nezobrazovať" | ||||||
|  | remindMeLater: "Pripomenúť neskôr" | ||||||
|  | didYouLikeMisskey: "Páči sa vám Misskey?" | ||||||
|  | pleaseDonate: "Misskey je bezplatný softvér, ktorý používa {host}. Prosím, prispejte, aby sme ho mohli ďalej rozvíjať!" | ||||||
| _sensitiveMediaDetection: | _sensitiveMediaDetection: | ||||||
|   description: "Strojové učenie sa použije na automatickú detekciu citlivých médií na účely ich moderovania. Mierne sa zvýši zaťaženie servera." |   description: "Strojové učenie sa použije na automatickú detekciu citlivých médií na účely ich moderovania. Mierne sa zvýši zaťaženie servera." | ||||||
|   sensitivity: "Citlivosť detekcie" |   sensitivity: "Citlivosť detekcie" | ||||||
| @@ -1413,6 +1419,12 @@ _timelines: | |||||||
|   local: "Lokálne" |   local: "Lokálne" | ||||||
|   social: "Sociálne" |   social: "Sociálne" | ||||||
|   global: "Globálne" |   global: "Globálne" | ||||||
|  | _play: | ||||||
|  |   viewSource: "Ukázať zdroj" | ||||||
|  |   featured: "Význačné" | ||||||
|  |   title: "Nadpis" | ||||||
|  |   script: "Skript" | ||||||
|  |   summary: "Popis" | ||||||
| _pages: | _pages: | ||||||
|   newPage: "Vytvoriť novú stránku" |   newPage: "Vytvoriť novú stránku" | ||||||
|   editPage: "Upraviť túto stránku" |   editPage: "Upraviť túto stránku" | ||||||
|   | |||||||
| @@ -2,6 +2,7 @@ | |||||||
| _lang_: "Svenska" | _lang_: "Svenska" | ||||||
| headlineMisskey: "Ett nätverk kopplat av noter" | headlineMisskey: "Ett nätverk kopplat av noter" | ||||||
| introMisskey: "Välkommen! Misskey är en öppen och decentraliserad mikrobloggningstjänst.\nSkapa en \"not\" och dela dina tankar med alla runtomkring dig. 📡\nMed \"reaktioner\" kan du snabbt uttrycka dina känslor kring andras noter.👍\nLåt oss utforska en nya värld!🚀" | introMisskey: "Välkommen! Misskey är en öppen och decentraliserad mikrobloggningstjänst.\nSkapa en \"not\" och dela dina tankar med alla runtomkring dig. 📡\nMed \"reaktioner\" kan du snabbt uttrycka dina känslor kring andras noter.👍\nLåt oss utforska en nya värld!🚀" | ||||||
|  | poweredByMisskeyDescription: "{name} är en tjänst driven av den öppna källkodsplatformen <b>Misskey</b> (benämns \"Misskey instans\")." | ||||||
| monthAndDay: "{day}/{month}" | monthAndDay: "{day}/{month}" | ||||||
| search: "Sök" | search: "Sök" | ||||||
| notifications: "Notifikationer" | notifications: "Notifikationer" | ||||||
| @@ -12,6 +13,7 @@ fetchingAsApObject: "Hämtar från Fediversum..." | |||||||
| ok: "OK" | ok: "OK" | ||||||
| gotIt: "Uppfattat!" | gotIt: "Uppfattat!" | ||||||
| cancel: "Avbryt" | cancel: "Avbryt" | ||||||
|  | noThankYou: "Nej tack" | ||||||
| enterUsername: "Ange användarnamn" | enterUsername: "Ange användarnamn" | ||||||
| renotedBy: "Omnoterad av {user}" | renotedBy: "Omnoterad av {user}" | ||||||
| noNotes: "Inga noteringar" | noNotes: "Inga noteringar" | ||||||
| @@ -47,11 +49,13 @@ deleteAndEdit: "Radera och ändra" | |||||||
| deleteAndEditConfirm: "Är du säker att du vill radera denna not och ändra den? Du kommer förlora alla reaktioner, omnoteringar och svar till den." | deleteAndEditConfirm: "Är du säker att du vill radera denna not och ändra den? Du kommer förlora alla reaktioner, omnoteringar och svar till den." | ||||||
| addToList: "Lägg till i lista" | addToList: "Lägg till i lista" | ||||||
| sendMessage: "Skicka ett meddelande" | sendMessage: "Skicka ett meddelande" | ||||||
|  | copyRSS: "Kopiera RSS" | ||||||
| copyUsername: "Kopiera användarnamn" | copyUsername: "Kopiera användarnamn" | ||||||
| searchUser: "Sök användare" | searchUser: "Sök användare" | ||||||
| reply: "Svara" | reply: "Svara" | ||||||
| loadMore: "Ladda mer" | loadMore: "Ladda mer" | ||||||
| showMore: "Visa mer" | showMore: "Visa mer" | ||||||
|  | showLess: "Stäng" | ||||||
| youGotNewFollower: "följde dig" | youGotNewFollower: "följde dig" | ||||||
| receiveFollowRequest: "Följarförfrågan mottagen" | receiveFollowRequest: "Följarförfrågan mottagen" | ||||||
| followRequestAccepted: "Följarförfrågan accepterad" | followRequestAccepted: "Följarförfrågan accepterad" | ||||||
| @@ -238,6 +242,17 @@ saved: "Sparad" | |||||||
| messaging: "Chatt" | messaging: "Chatt" | ||||||
| upload: "Ladda upp" | upload: "Ladda upp" | ||||||
| keepOriginalUploading: "Behåll originalbild" | keepOriginalUploading: "Behåll originalbild" | ||||||
|  | keepOriginalUploadingDescription: "Sparar den originellt uppladdade bilden i sitt i befintliga skick. Om avstängd, kommer en webbversion bli genererad vid uppladdning." | ||||||
|  | fromDrive: "Från Drive" | ||||||
|  | fromUrl: "Från en länk" | ||||||
|  | uploadFromUrl: "Ladda upp från länk" | ||||||
|  | uploadFromUrlDescription: "Länken av filen du vill ladda upp" | ||||||
|  | uploadFromUrlRequested: "Uppladdning begärd" | ||||||
|  | uploadFromUrlMayTakeTime: "Det kan ta tid tills att uppladdningen blir klar." | ||||||
|  | explore: "Utforska" | ||||||
|  | messageRead: "Läs" | ||||||
|  | noMoreHistory: "Det finns ingen mer historik" | ||||||
|  | startMessaging: "Starta en chatt" | ||||||
| nsfw: "Känsligt innehåll" | nsfw: "Känsligt innehåll" | ||||||
| pinnedNotes: "Fästad not" | pinnedNotes: "Fästad not" | ||||||
| userList: "Listor" | userList: "Listor" | ||||||
|   | |||||||
| @@ -916,6 +916,10 @@ loggedInAsBot: "ล็อกอินเป็นบอตอยู่ในข | |||||||
| tools: "เครื่องมือ" | tools: "เครื่องมือ" | ||||||
| cannotLoad: "ไม่สามารถโหลดได้" | cannotLoad: "ไม่สามารถโหลดได้" | ||||||
| numberOfProfileView: "มุมมองโปรไฟล์" | numberOfProfileView: "มุมมองโปรไฟล์" | ||||||
|  | like: "ชื่นชอบ" | ||||||
|  | unlike: "ไม่ชอบ" | ||||||
|  | numberOfLikes: "จำนวนไลค์" | ||||||
|  | show: "แสดงผล" | ||||||
| _sensitiveMediaDetection: | _sensitiveMediaDetection: | ||||||
|   description: "ลดความพยายามในการดูแลเซิร์ฟเวอร์ผ่านการจดจำสื่อ NSFW โดยอัตโนมัติผ่านการเรียนรู้ของเครื่อง การทำสิ่งนี้อาจจะเพิ่มภาระบนเซิร์ฟเวอร์เล็กน้อย" |   description: "ลดความพยายามในการดูแลเซิร์ฟเวอร์ผ่านการจดจำสื่อ NSFW โดยอัตโนมัติผ่านการเรียนรู้ของเครื่อง การทำสิ่งนี้อาจจะเพิ่มภาระบนเซิร์ฟเวอร์เล็กน้อย" | ||||||
|   sensitivity: "การตรวจจับความไว" |   sensitivity: "การตรวจจับความไว" | ||||||
| @@ -1315,6 +1319,7 @@ _widgets: | |||||||
|   jobQueue: "คิวงาน" |   jobQueue: "คิวงาน" | ||||||
|   serverMetric: "ตัวชี้วัดเซิร์ฟเวอร์" |   serverMetric: "ตัวชี้วัดเซิร์ฟเวอร์" | ||||||
|   aiscript: "AiScript คอนโซล" |   aiscript: "AiScript คอนโซล" | ||||||
|  |   aiscriptApp: "AiScript แอพ" | ||||||
|   aichan: "เอไอ" |   aichan: "เอไอ" | ||||||
|   userList: "รายชื่อผู้ใช้" |   userList: "รายชื่อผู้ใช้" | ||||||
|   _userList: |   _userList: | ||||||
| @@ -1420,6 +1425,21 @@ _timelines: | |||||||
|   local: "ในพื้นที่" |   local: "ในพื้นที่" | ||||||
|   social: "โซเชี่ยล" |   social: "โซเชี่ยล" | ||||||
|   global: "ทั่วโลก" |   global: "ทั่วโลก" | ||||||
|  | _play: | ||||||
|  |   new: "สร้างการเล่น" | ||||||
|  |   edit: "แก้ไขเล่น" | ||||||
|  |   created: "สร้างการเล่นแล้ว" | ||||||
|  |   updated: "แก้ไขการเล่นแล้ว" | ||||||
|  |   deleted: "ลบการเล่นแล้ว" | ||||||
|  |   pageSetting: "ตั้งค่าการเล่น" | ||||||
|  |   editThisPage: "แก้ไข Play นี้" | ||||||
|  |   viewSource: "ดูต้นฉบับ" | ||||||
|  |   my: "มาย เพลย์" | ||||||
|  |   liked: "ไลค์ เพลย์" | ||||||
|  |   featured: "เป็นที่นิยม" | ||||||
|  |   title: "หัวข้อ" | ||||||
|  |   script: "สคริปต์" | ||||||
|  |   summary: "รายละเอียด" | ||||||
| _pages: | _pages: | ||||||
|   newPage: "สร้างหน้าเพจใหม่" |   newPage: "สร้างหน้าเพจใหม่" | ||||||
|   editPage: "แก้ไขหน้าเพจ" |   editPage: "แก้ไขหน้าเพจ" | ||||||
|   | |||||||
| @@ -892,6 +892,8 @@ unsubscribePushNotification: "Вимкнути push-сповіщення" | |||||||
| windowMaximize: "Розгорнути" | windowMaximize: "Розгорнути" | ||||||
| windowRestore: "Відновити" | windowRestore: "Відновити" | ||||||
| caption: "Підпис" | caption: "Підпис" | ||||||
|  | like: "Вподобати" | ||||||
|  | show: "Відображення" | ||||||
| _sensitiveMediaDetection: | _sensitiveMediaDetection: | ||||||
|   sensitivity: "Чутливість детектування" |   sensitivity: "Чутливість детектування" | ||||||
|   setSensitiveFlagAutomatically: "Позначити як NSFW" |   setSensitiveFlagAutomatically: "Позначити як NSFW" | ||||||
| @@ -1348,6 +1350,12 @@ _timelines: | |||||||
|   local: "Локальна" |   local: "Локальна" | ||||||
|   social: "Соціальна" |   social: "Соціальна" | ||||||
|   global: "Глобальна" |   global: "Глобальна" | ||||||
|  | _play: | ||||||
|  |   viewSource: "Переглянути вихідний код" | ||||||
|  |   featured: "Популярні" | ||||||
|  |   title: "Заголовок" | ||||||
|  |   script: "Скрипт" | ||||||
|  |   summary: "Опис" | ||||||
| _pages: | _pages: | ||||||
|   newPage: "Створити сторінку" |   newPage: "Створити сторінку" | ||||||
|   editPage: "Редагувати сторінку" |   editPage: "Редагувати сторінку" | ||||||
|   | |||||||
| @@ -894,6 +894,8 @@ navbar: "Thanh điều hướng" | |||||||
| shuffle: "Xáo trộn" | shuffle: "Xáo trộn" | ||||||
| account: "Tài khoản của bạn" | account: "Tài khoản của bạn" | ||||||
| move: "Di chuyển" | move: "Di chuyển" | ||||||
|  | like: "Thích" | ||||||
|  | show: "Hiển thị" | ||||||
| _sensitiveMediaDetection: | _sensitiveMediaDetection: | ||||||
|   description: "Giảm nỗ lực kiểm duyệt máy chủ thông qua việc tự động nhận dạng media NSFW thông qua học máy. Điều này sẽ làm tăng một chút áp lực trên máy chủ." |   description: "Giảm nỗ lực kiểm duyệt máy chủ thông qua việc tự động nhận dạng media NSFW thông qua học máy. Điều này sẽ làm tăng một chút áp lực trên máy chủ." | ||||||
|   sensitivity: "Phát hiện nhạy cảm" |   sensitivity: "Phát hiện nhạy cảm" | ||||||
| @@ -1393,6 +1395,12 @@ _timelines: | |||||||
|   local: "Máy chủ này" |   local: "Máy chủ này" | ||||||
|   social: "Xã hội" |   social: "Xã hội" | ||||||
|   global: "Liên hợp" |   global: "Liên hợp" | ||||||
|  | _play: | ||||||
|  |   viewSource: "Xem mã nguồn" | ||||||
|  |   featured: "Nổi tiếng" | ||||||
|  |   title: "Tựa đề" | ||||||
|  |   script: "Kịch bản" | ||||||
|  |   summary: "Mô tả" | ||||||
| _pages: | _pages: | ||||||
|   newPage: "Tạo Trang mới" |   newPage: "Tạo Trang mới" | ||||||
|   editPage: "Sửa Trang này" |   editPage: "Sửa Trang này" | ||||||
|   | |||||||
| @@ -916,6 +916,10 @@ loggedInAsBot: "以Bot账户登录" | |||||||
| tools: "工具" | tools: "工具" | ||||||
| cannotLoad: "无法加载" | cannotLoad: "无法加载" | ||||||
| numberOfProfileView: "个人资料展示次数" | numberOfProfileView: "个人资料展示次数" | ||||||
|  | like: "点赞!" | ||||||
|  | unlike: "取消赞" | ||||||
|  | numberOfLikes: "点赞数" | ||||||
|  | show: "显示" | ||||||
| _sensitiveMediaDetection: | _sensitiveMediaDetection: | ||||||
|   description: "可以使用机器学习技术自动检测敏感媒体,以便进行审核。服务器负载将略微增加。" |   description: "可以使用机器学习技术自动检测敏感媒体,以便进行审核。服务器负载将略微增加。" | ||||||
|   sensitivity: "检测敏感度" |   sensitivity: "检测敏感度" | ||||||
| @@ -1049,8 +1053,8 @@ _mfm: | |||||||
|   shakeDescription: "显示摇晃的动画效果。" |   shakeDescription: "显示摇晃的动画效果。" | ||||||
|   twitch: "动画(颤抖)" |   twitch: "动画(颤抖)" | ||||||
|   twitchDescription: "显示强烈颤抖的动画效果。" |   twitchDescription: "显示强烈颤抖的动画效果。" | ||||||
|   spin: "动画(回转)" |   spin: "动画(旋转)" | ||||||
|   spinDescription: "显示回转的动画效果。" |   spinDescription: "显示旋转的动画效果。" | ||||||
|   x2: "大" |   x2: "大" | ||||||
|   x2Description: "以大尺寸显示内容。" |   x2Description: "以大尺寸显示内容。" | ||||||
|   x3: "非常大" |   x3: "非常大" | ||||||
| @@ -1315,6 +1319,7 @@ _widgets: | |||||||
|   jobQueue: "作业队列" |   jobQueue: "作业队列" | ||||||
|   serverMetric: "服务器指标" |   serverMetric: "服务器指标" | ||||||
|   aiscript: "AiScript控制台" |   aiscript: "AiScript控制台" | ||||||
|  |   aiscriptApp: "AiScript App" | ||||||
|   aichan: "小蓝" |   aichan: "小蓝" | ||||||
|   userList: "用户列表" |   userList: "用户列表" | ||||||
|   _userList: |   _userList: | ||||||
| @@ -1420,6 +1425,21 @@ _timelines: | |||||||
|   local: "本地" |   local: "本地" | ||||||
|   social: "社交" |   social: "社交" | ||||||
|   global: "全局" |   global: "全局" | ||||||
|  | _play: | ||||||
|  |   new: "创建Play" | ||||||
|  |   edit: "编辑Play" | ||||||
|  |   created: "创建了一个Play" | ||||||
|  |   updated: "更新了Play" | ||||||
|  |   deleted: "删除了Play" | ||||||
|  |   pageSetting: "Play设置" | ||||||
|  |   editThisPage: "编辑此Play" | ||||||
|  |   viewSource: "查看源代码" | ||||||
|  |   my: "我的Play" | ||||||
|  |   liked: "点赞的Play" | ||||||
|  |   featured: "热门" | ||||||
|  |   title: "标题" | ||||||
|  |   script: "脚本" | ||||||
|  |   summary: "描述" | ||||||
| _pages: | _pages: | ||||||
|   newPage: "创建页面" |   newPage: "创建页面" | ||||||
|   editPage: "编辑页面" |   editPage: "编辑页面" | ||||||
|   | |||||||
| @@ -916,6 +916,13 @@ loggedInAsBot: "以機器人帳號登入中" | |||||||
| tools: "工具" | tools: "工具" | ||||||
| cannotLoad: "無法載入" | cannotLoad: "無法載入" | ||||||
| numberOfProfileView: "個人檔案檢視次數" | numberOfProfileView: "個人檔案檢視次數" | ||||||
|  | like: "讚" | ||||||
|  | unlike: "收回讚" | ||||||
|  | numberOfLikes: "讚數" | ||||||
|  | show: "檢視" | ||||||
|  | neverShow: "不再顯示" | ||||||
|  | remindMeLater: "以後再說" | ||||||
|  | didYouLikeMisskey: "您是否喜愛Misskey呢?" | ||||||
| _sensitiveMediaDetection: | _sensitiveMediaDetection: | ||||||
|   description: "您可以使用機器學習自動檢測敏感媒體並將其用於審核。 伺服器的負荷會稍微增加。" |   description: "您可以使用機器學習自動檢測敏感媒體並將其用於審核。 伺服器的負荷會稍微增加。" | ||||||
|   sensitivity: "檢測敏感度" |   sensitivity: "檢測敏感度" | ||||||
| @@ -1315,6 +1322,7 @@ _widgets: | |||||||
|   jobQueue: "佇列" |   jobQueue: "佇列" | ||||||
|   serverMetric: "服務器指標 " |   serverMetric: "服務器指標 " | ||||||
|   aiscript: "AiScript控制台" |   aiscript: "AiScript控制台" | ||||||
|  |   aiscriptApp: "AiScript App" | ||||||
|   aichan: "小藍" |   aichan: "小藍" | ||||||
|   userList: "使用者列表" |   userList: "使用者列表" | ||||||
|   _userList: |   _userList: | ||||||
| @@ -1420,6 +1428,21 @@ _timelines: | |||||||
|   local: "本地" |   local: "本地" | ||||||
|   social: "社群" |   social: "社群" | ||||||
|   global: "公開" |   global: "公開" | ||||||
|  | _play: | ||||||
|  |   new: "新增Play" | ||||||
|  |   edit: "編輯Play" | ||||||
|  |   created: "已新增Play" | ||||||
|  |   updated: "已更新Play" | ||||||
|  |   deleted: "已刪除Play" | ||||||
|  |   pageSetting: "Play設定" | ||||||
|  |   editThisPage: "編輯這個Play" | ||||||
|  |   viewSource: "檢視原始碼" | ||||||
|  |   my: "自己的Play" | ||||||
|  |   liked: "按了讚的Play" | ||||||
|  |   featured: "人氣" | ||||||
|  |   title: "標題" | ||||||
|  |   script: "腳本" | ||||||
|  |   summary: "描述" | ||||||
| _pages: | _pages: | ||||||
|   newPage: "建立頁面" |   newPage: "建立頁面" | ||||||
|   editPage: "編輯頁面" |   editPage: "編輯頁面" | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| { | { | ||||||
| 	"name": "misskey", | 	"name": "misskey", | ||||||
| 	"version": "13.0.0-beta.21", | 	"version": "13.0.0-beta.32", | ||||||
| 	"codename": "indigo", | 	"codename": "indigo", | ||||||
| 	"repository": { | 	"repository": { | ||||||
| 		"type": "git", | 		"type": "git", | ||||||
| @@ -53,10 +53,10 @@ | |||||||
| 	"devDependencies": { | 	"devDependencies": { | ||||||
| 		"@types/gulp": "4.0.10", | 		"@types/gulp": "4.0.10", | ||||||
| 		"@types/gulp-rename": "2.0.1", | 		"@types/gulp-rename": "2.0.1", | ||||||
| 		"@typescript-eslint/eslint-plugin": "5.47.1", | 		"@typescript-eslint/eslint-plugin": "5.48.0", | ||||||
| 		"@typescript-eslint/parser": "5.47.1", | 		"@typescript-eslint/parser": "5.48.0", | ||||||
| 		"cross-env": "7.0.3", | 		"cross-env": "7.0.3", | ||||||
| 		"cypress": "12.2.0", | 		"cypress": "12.3.0", | ||||||
| 		"eslint": "^8.31.0", | 		"eslint": "^8.31.0", | ||||||
| 		"start-server-and-test": "1.15.2", | 		"start-server-and-test": "1.15.2", | ||||||
| 		"typescript": "4.9.4" | 		"typescript": "4.9.4" | ||||||
|   | |||||||
							
								
								
									
										
											BIN
										
									
								
								packages/backend/assets/emoji-unknown.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 3.4 KiB | 
| @@ -1,5 +0,0 @@ | |||||||
| Font Awesome Icons |  | ||||||
| ------------------------- |  | ||||||
|  |  | ||||||
| Ⓒ Font Awesome |  | ||||||
| CC BY 4.0 (https://creativecommons.org/licenses/by/4.0/) |  | ||||||
| Before Width: | Height: | Size: 1.7 KiB | 
| Before Width: | Height: | Size: 577 B | 
| Before Width: | Height: | Size: 1.4 KiB | 
| Before Width: | Height: | Size: 1.1 KiB | 
| Before Width: | Height: | Size: 1.1 KiB | 
| Before Width: | Height: | Size: 844 B | 
| Before Width: | Height: | Size: 507 B | 
| Before Width: | Height: | Size: 689 B | 
| Before Width: | Height: | Size: 772 B | 
| Before Width: | Height: | Size: 930 B | 
| Before Width: | Height: | Size: 798 B | 
| Before Width: | Height: | Size: 1.7 KiB | 
| Before Width: | Height: | Size: 991 B | 
							
								
								
									
										24
									
								
								packages/backend/assets/tabler-badges/LICENSE
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,24 @@ | |||||||
|  | Tabler Icons   | ||||||
|  | https://github.com/tabler/tabler-icons/blob/master/LICENSE | ||||||
|  | ==== | ||||||
|  | MIT License | ||||||
|  |  | ||||||
|  | Copyright (c) 2020-2022 Paweł Kuna | ||||||
|  |  | ||||||
|  | Permission is hereby granted, free of charge, to any person obtaining a copy | ||||||
|  | of this software and associated documentation files (the "Software"), to deal | ||||||
|  | in the Software without restriction, including without limitation the rights | ||||||
|  | to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||||||
|  | copies of the Software, and to permit persons to whom the Software is | ||||||
|  | furnished to do so, subject to the following conditions: | ||||||
|  |  | ||||||
|  | The above copyright notice and this permission notice shall be included in all | ||||||
|  | copies or substantial portions of the Software. | ||||||
|  |  | ||||||
|  | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||||||
|  | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||||||
|  | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||||||
|  | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||||||
|  | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||||||
|  | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||||||
|  | SOFTWARE. | ||||||
							
								
								
									
										
											BIN
										
									
								
								packages/backend/assets/tabler-badges/antenna.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 516 B | 
							
								
								
									
										
											BIN
										
									
								
								packages/backend/assets/tabler-badges/arrow-back-up.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 952 B | 
							
								
								
									
										
											BIN
										
									
								
								packages/backend/assets/tabler-badges/at.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 2.8 KiB | 
							
								
								
									
										
											BIN
										
									
								
								packages/backend/assets/tabler-badges/chart-arrows.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 829 B | 
							
								
								
									
										
											BIN
										
									
								
								packages/backend/assets/tabler-badges/circle-check.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 2.3 KiB | 
							
								
								
									
										
											BIN
										
									
								
								packages/backend/assets/tabler-badges/messages.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 1.0 KiB | 
| Before Width: | Height: | Size: 174 B After Width: | Height: | Size: 174 B | 
							
								
								
									
										
											BIN
										
									
								
								packages/backend/assets/tabler-badges/plus.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 414 B | 
							
								
								
									
										
											BIN
										
									
								
								packages/backend/assets/tabler-badges/quote.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 1011 B | 
							
								
								
									
										
											BIN
										
									
								
								packages/backend/assets/tabler-badges/repeat.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 1.2 KiB | 
							
								
								
									
										
											BIN
										
									
								
								packages/backend/assets/tabler-badges/user-plus.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 1.4 KiB | 
							
								
								
									
										
											BIN
										
									
								
								packages/backend/assets/tabler-badges/users.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 1.9 KiB | 
							
								
								
									
										29
									
								
								packages/backend/migration/1672822262496-Flash.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,29 @@ | |||||||
|  | export class Flash1672822262496 { | ||||||
|  |     name = 'Flash1672822262496' | ||||||
|  |  | ||||||
|  |     async up(queryRunner) { | ||||||
|  |         await queryRunner.query(`CREATE TABLE "flash" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "updatedAt" TIMESTAMP WITH TIME ZONE NOT NULL, "title" character varying(256) NOT NULL, "summary" character varying(1024) NOT NULL, "userId" character varying(32) NOT NULL, "script" character varying(16384) NOT NULL, "permissions" character varying(256) array NOT NULL DEFAULT '{}', "likedCount" integer NOT NULL DEFAULT '0', CONSTRAINT "PK_0c01a2c1c5f2266942dd1b3fdbc" PRIMARY KEY ("id")); COMMENT ON COLUMN "flash"."createdAt" IS 'The created date of the Flash.'; COMMENT ON COLUMN "flash"."updatedAt" IS 'The updated date of the Flash.'; COMMENT ON COLUMN "flash"."userId" IS 'The ID of author.'`); | ||||||
|  |         await queryRunner.query(`CREATE INDEX "IDX_149d2e44785707548c82999b01" ON "flash" ("createdAt") `); | ||||||
|  |         await queryRunner.query(`CREATE INDEX "IDX_3aa8ea9a8f15214ad91638c0a7" ON "flash" ("updatedAt") `); | ||||||
|  |         await queryRunner.query(`CREATE INDEX "IDX_9b88250fc2fd009b8f1b5623ed" ON "flash" ("userId") `); | ||||||
|  |         await queryRunner.query(`CREATE TABLE "flash_like" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "flashId" character varying(32) NOT NULL, CONSTRAINT "PK_d110109ee310588d63d6183b233" PRIMARY KEY ("id"))`); | ||||||
|  |         await queryRunner.query(`CREATE INDEX "IDX_60c4af1c19a7a75f1592f93b28" ON "flash_like" ("userId") `); | ||||||
|  |         await queryRunner.query(`CREATE UNIQUE INDEX "IDX_cfbfeeccb0cbedcd660b17eb07" ON "flash_like" ("userId", "flashId") `); | ||||||
|  |         await queryRunner.query(`ALTER TABLE "flash" ADD CONSTRAINT "FK_9b88250fc2fd009b8f1b5623ed5" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`); | ||||||
|  |         await queryRunner.query(`ALTER TABLE "flash_like" ADD CONSTRAINT "FK_60c4af1c19a7a75f1592f93b287" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`); | ||||||
|  |         await queryRunner.query(`ALTER TABLE "flash_like" ADD CONSTRAINT "FK_6c16fe0e93b7a1951eca624b76a" FOREIGN KEY ("flashId") REFERENCES "flash"("id") ON DELETE CASCADE ON UPDATE NO ACTION`); | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     async down(queryRunner) { | ||||||
|  |         await queryRunner.query(`ALTER TABLE "flash_like" DROP CONSTRAINT "FK_6c16fe0e93b7a1951eca624b76a"`); | ||||||
|  |         await queryRunner.query(`ALTER TABLE "flash_like" DROP CONSTRAINT "FK_60c4af1c19a7a75f1592f93b287"`); | ||||||
|  |         await queryRunner.query(`ALTER TABLE "flash" DROP CONSTRAINT "FK_9b88250fc2fd009b8f1b5623ed5"`); | ||||||
|  |         await queryRunner.query(`DROP INDEX "public"."IDX_cfbfeeccb0cbedcd660b17eb07"`); | ||||||
|  |         await queryRunner.query(`DROP INDEX "public"."IDX_60c4af1c19a7a75f1592f93b28"`); | ||||||
|  |         await queryRunner.query(`DROP TABLE "flash_like"`); | ||||||
|  |         await queryRunner.query(`DROP INDEX "public"."IDX_9b88250fc2fd009b8f1b5623ed"`); | ||||||
|  |         await queryRunner.query(`DROP INDEX "public"."IDX_3aa8ea9a8f15214ad91638c0a7"`); | ||||||
|  |         await queryRunner.query(`DROP INDEX "public"."IDX_149d2e44785707548c82999b01"`); | ||||||
|  |         await queryRunner.query(`DROP TABLE "flash"`); | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -21,9 +21,9 @@ | |||||||
| 		"@tensorflow/tfjs-node": "4.1.0" | 		"@tensorflow/tfjs-node": "4.1.0" | ||||||
| 	}, | 	}, | ||||||
| 	"dependencies": { | 	"dependencies": { | ||||||
| 		"@bull-board/api": "^4.10.0", | 		"@bull-board/api": "^4.10.1", | ||||||
| 		"@bull-board/fastify": "^4.10.0", | 		"@bull-board/fastify": "^4.10.1", | ||||||
| 		"@bull-board/ui": "^4.10.0", | 		"@bull-board/ui": "^4.10.1", | ||||||
| 		"@discordapp/twemoji": "14.0.2", | 		"@discordapp/twemoji": "14.0.2", | ||||||
| 		"@fastify/accepts": "4.1.0", | 		"@fastify/accepts": "4.1.0", | ||||||
| 		"@fastify/cookie": "^8.3.0", | 		"@fastify/cookie": "^8.3.0", | ||||||
| @@ -38,10 +38,10 @@ | |||||||
| 		"@peertube/http-signature": "1.7.0", | 		"@peertube/http-signature": "1.7.0", | ||||||
| 		"@sinonjs/fake-timers": "10.0.2", | 		"@sinonjs/fake-timers": "10.0.2", | ||||||
| 		"accepts": "^1.3.8", | 		"accepts": "^1.3.8", | ||||||
| 		"ajv": "8.11.2", | 		"ajv": "8.12.0", | ||||||
| 		"archiver": "5.3.1", | 		"archiver": "5.3.1", | ||||||
| 		"autwh": "0.1.0", | 		"autwh": "0.1.0", | ||||||
| 		"aws-sdk": "2.1286.0", | 		"aws-sdk": "2.1289.0", | ||||||
| 		"bcryptjs": "2.4.3", | 		"bcryptjs": "2.4.3", | ||||||
| 		"blurhash": "2.0.4", | 		"blurhash": "2.0.4", | ||||||
| 		"bull": "4.10.2", | 		"bull": "4.10.2", | ||||||
| @@ -110,8 +110,8 @@ | |||||||
| 		"stringz": "2.1.0", | 		"stringz": "2.1.0", | ||||||
| 		"summaly": "2.7.0", | 		"summaly": "2.7.0", | ||||||
| 		"syslog-pro": "git+https://github.com/misskey-dev/SyslogPro#0.2.9-misskey.2", | 		"syslog-pro": "git+https://github.com/misskey-dev/SyslogPro#0.2.9-misskey.2", | ||||||
| 		"systeminformation": "5.16.9", | 		"systeminformation": "5.17.1", | ||||||
| 		"tinycolor2": "1.5.1", | 		"tinycolor2": "1.5.2", | ||||||
| 		"tmp": "0.2.1", | 		"tmp": "0.2.1", | ||||||
| 		"tsc-alias": "1.8.2", | 		"tsc-alias": "1.8.2", | ||||||
| 		"tsconfig-paths": "4.1.2", | 		"tsconfig-paths": "4.1.2", | ||||||
| @@ -128,7 +128,7 @@ | |||||||
| 	}, | 	}, | ||||||
| 	"devDependencies": { | 	"devDependencies": { | ||||||
| 		"@redocly/openapi-core": "1.0.0-beta.117", | 		"@redocly/openapi-core": "1.0.0-beta.117", | ||||||
| 		"@swc/core": "1.3.24", | 		"@swc/core": "1.3.25", | ||||||
| 		"@swc/jest": "0.2.24", | 		"@swc/jest": "0.2.24", | ||||||
| 		"@types/accepts": "1.3.5", | 		"@types/accepts": "1.3.5", | ||||||
| 		"@types/archiver": "5.3.1", | 		"@types/archiver": "5.3.1", | ||||||
| @@ -172,8 +172,8 @@ | |||||||
| 		"@types/web-push": "3.3.2", | 		"@types/web-push": "3.3.2", | ||||||
| 		"@types/websocket": "1.0.5", | 		"@types/websocket": "1.0.5", | ||||||
| 		"@types/ws": "8.5.4", | 		"@types/ws": "8.5.4", | ||||||
| 		"@typescript-eslint/eslint-plugin": "5.47.1", | 		"@typescript-eslint/eslint-plugin": "5.48.0", | ||||||
| 		"@typescript-eslint/parser": "5.47.1", | 		"@typescript-eslint/parser": "5.48.0", | ||||||
| 		"cross-env": "7.0.3", | 		"cross-env": "7.0.3", | ||||||
| 		"eslint": "8.31.0", | 		"eslint": "8.31.0", | ||||||
| 		"eslint-plugin-import": "2.26.0", | 		"eslint-plugin-import": "2.26.0", | ||||||
|   | |||||||
| @@ -95,6 +95,8 @@ import { UserEntityService } from './entities/UserEntityService.js'; | |||||||
| import { UserGroupEntityService } from './entities/UserGroupEntityService.js'; | import { UserGroupEntityService } from './entities/UserGroupEntityService.js'; | ||||||
| import { UserGroupInvitationEntityService } from './entities/UserGroupInvitationEntityService.js'; | import { UserGroupInvitationEntityService } from './entities/UserGroupInvitationEntityService.js'; | ||||||
| import { UserListEntityService } from './entities/UserListEntityService.js'; | import { UserListEntityService } from './entities/UserListEntityService.js'; | ||||||
|  | import { FlashEntityService } from './entities/FlashEntityService.js'; | ||||||
|  | import { FlashLikeEntityService } from './entities/FlashLikeEntityService.js'; | ||||||
| import { ApAudienceService } from './activitypub/ApAudienceService.js'; | import { ApAudienceService } from './activitypub/ApAudienceService.js'; | ||||||
| import { ApDbResolverService } from './activitypub/ApDbResolverService.js'; | import { ApDbResolverService } from './activitypub/ApDbResolverService.js'; | ||||||
| import { ApDeliverManagerService } from './activitypub/ApDeliverManagerService.js'; | import { ApDeliverManagerService } from './activitypub/ApDeliverManagerService.js'; | ||||||
| @@ -216,6 +218,8 @@ const $UserEntityService: Provider = { provide: 'UserEntityService', useExisting | |||||||
| const $UserGroupEntityService: Provider = { provide: 'UserGroupEntityService', useExisting: UserGroupEntityService }; | const $UserGroupEntityService: Provider = { provide: 'UserGroupEntityService', useExisting: UserGroupEntityService }; | ||||||
| const $UserGroupInvitationEntityService: Provider = { provide: 'UserGroupInvitationEntityService', useExisting: UserGroupInvitationEntityService }; | const $UserGroupInvitationEntityService: Provider = { provide: 'UserGroupInvitationEntityService', useExisting: UserGroupInvitationEntityService }; | ||||||
| const $UserListEntityService: Provider = { provide: 'UserListEntityService', useExisting: UserListEntityService }; | const $UserListEntityService: Provider = { provide: 'UserListEntityService', useExisting: UserListEntityService }; | ||||||
|  | const $FlashEntityService: Provider = { provide: 'FlashEntityService', useExisting: FlashEntityService }; | ||||||
|  | const $FlashLikeEntityService: Provider = { provide: 'FlashLikeEntityService', useExisting: FlashLikeEntityService }; | ||||||
|  |  | ||||||
| const $ApAudienceService: Provider = { provide: 'ApAudienceService', useExisting: ApAudienceService }; | const $ApAudienceService: Provider = { provide: 'ApAudienceService', useExisting: ApAudienceService }; | ||||||
| const $ApDbResolverService: Provider = { provide: 'ApDbResolverService', useExisting: ApDbResolverService }; | const $ApDbResolverService: Provider = { provide: 'ApDbResolverService', useExisting: ApDbResolverService }; | ||||||
| @@ -338,6 +342,8 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting | |||||||
| 		UserGroupEntityService, | 		UserGroupEntityService, | ||||||
| 		UserGroupInvitationEntityService, | 		UserGroupInvitationEntityService, | ||||||
| 		UserListEntityService, | 		UserListEntityService, | ||||||
|  | 		FlashEntityService, | ||||||
|  | 		FlashLikeEntityService, | ||||||
| 		ApAudienceService, | 		ApAudienceService, | ||||||
| 		ApDbResolverService, | 		ApDbResolverService, | ||||||
| 		ApDeliverManagerService, | 		ApDeliverManagerService, | ||||||
| @@ -455,6 +461,8 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting | |||||||
| 		$UserGroupEntityService, | 		$UserGroupEntityService, | ||||||
| 		$UserGroupInvitationEntityService, | 		$UserGroupInvitationEntityService, | ||||||
| 		$UserListEntityService, | 		$UserListEntityService, | ||||||
|  | 		$FlashEntityService, | ||||||
|  | 		$FlashLikeEntityService, | ||||||
| 		$ApAudienceService, | 		$ApAudienceService, | ||||||
| 		$ApDbResolverService, | 		$ApDbResolverService, | ||||||
| 		$ApDeliverManagerService, | 		$ApDeliverManagerService, | ||||||
| @@ -572,6 +580,8 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting | |||||||
| 		UserGroupEntityService, | 		UserGroupEntityService, | ||||||
| 		UserGroupInvitationEntityService, | 		UserGroupInvitationEntityService, | ||||||
| 		UserListEntityService, | 		UserListEntityService, | ||||||
|  | 		FlashEntityService, | ||||||
|  | 		FlashLikeEntityService, | ||||||
| 		ApAudienceService, | 		ApAudienceService, | ||||||
| 		ApDbResolverService, | 		ApDbResolverService, | ||||||
| 		ApDeliverManagerService, | 		ApDeliverManagerService, | ||||||
| @@ -688,6 +698,8 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting | |||||||
| 		$UserGroupEntityService, | 		$UserGroupEntityService, | ||||||
| 		$UserGroupInvitationEntityService, | 		$UserGroupInvitationEntityService, | ||||||
| 		$UserListEntityService, | 		$UserListEntityService, | ||||||
|  | 		$FlashEntityService, | ||||||
|  | 		$FlashLikeEntityService, | ||||||
| 		$ApAudienceService, | 		$ApAudienceService, | ||||||
| 		$ApDbResolverService, | 		$ApDbResolverService, | ||||||
| 		$ApDeliverManagerService, | 		$ApDeliverManagerService, | ||||||
|   | |||||||
| @@ -92,13 +92,6 @@ export class PollService { | |||||||
| 			choice: choice, | 			choice: choice, | ||||||
| 			userId: user.id, | 			userId: user.id, | ||||||
| 		}); | 		}); | ||||||
| 	 |  | ||||||
| 		// Notify |  | ||||||
| 		this.createNotificationService.createNotification(note.userId, 'pollVote', { |  | ||||||
| 			notifierId: user.id, |  | ||||||
| 			noteId: note.id, |  | ||||||
| 			choice: choice, |  | ||||||
| 		}); |  | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	@bindThis | 	@bindThis | ||||||
|   | |||||||
							
								
								
									
										55
									
								
								packages/backend/src/core/entities/FlashEntityService.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,55 @@ | |||||||
|  | import { Inject, Injectable } from '@nestjs/common'; | ||||||
|  | import { DI } from '@/di-symbols.js'; | ||||||
|  | import type { FlashsRepository, FlashLikesRepository } from '@/models/index.js'; | ||||||
|  | import { awaitAll } from '@/misc/prelude/await-all.js'; | ||||||
|  | import type { Packed } from '@/misc/schema.js'; | ||||||
|  | import type { } from '@/models/entities/Blocking.js'; | ||||||
|  | import type { User } from '@/models/entities/User.js'; | ||||||
|  | import type { Flash } from '@/models/entities/Flash.js'; | ||||||
|  | import { bindThis } from '@/decorators.js'; | ||||||
|  | import { UserEntityService } from './UserEntityService.js'; | ||||||
|  |  | ||||||
|  | @Injectable() | ||||||
|  | export class FlashEntityService { | ||||||
|  | 	constructor( | ||||||
|  | 		@Inject(DI.flashsRepository) | ||||||
|  | 		private flashsRepository: FlashsRepository, | ||||||
|  |  | ||||||
|  | 		@Inject(DI.flashLikesRepository) | ||||||
|  | 		private flashLikesRepository: FlashLikesRepository, | ||||||
|  |  | ||||||
|  | 		private userEntityService: UserEntityService, | ||||||
|  | 	) { | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	@bindThis | ||||||
|  | 	public async pack( | ||||||
|  | 		src: Flash['id'] | Flash, | ||||||
|  | 		me?: { id: User['id'] } | null | undefined, | ||||||
|  | 	): Promise<Packed<'Flash'>> { | ||||||
|  | 		const meId = me ? me.id : null; | ||||||
|  | 		const flash = typeof src === 'object' ? src : await this.flashsRepository.findOneByOrFail({ id: src }); | ||||||
|  |  | ||||||
|  | 		return await awaitAll({ | ||||||
|  | 			id: flash.id, | ||||||
|  | 			createdAt: flash.createdAt.toISOString(), | ||||||
|  | 			updatedAt: flash.updatedAt.toISOString(), | ||||||
|  | 			userId: flash.userId, | ||||||
|  | 			user: this.userEntityService.pack(flash.user ?? flash.userId, me), // { detail: true } すると無限ループするので注意 | ||||||
|  | 			title: flash.title, | ||||||
|  | 			summary: flash.summary, | ||||||
|  | 			script: flash.script, | ||||||
|  | 			likedCount: flash.likedCount, | ||||||
|  | 			isLiked: meId ? await this.flashLikesRepository.findOneBy({ flashId: flash.id, userId: meId }).then(x => x != null) : undefined, | ||||||
|  | 		}); | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	@bindThis | ||||||
|  | 	public packMany( | ||||||
|  | 		flashs: Flash[], | ||||||
|  | 		me?: { id: User['id'] } | null | undefined, | ||||||
|  | 	) { | ||||||
|  | 		return Promise.all(flashs.map(x => this.pack(x, me))); | ||||||
|  | 	} | ||||||
|  | } | ||||||
|  |  | ||||||
							
								
								
									
										44
									
								
								packages/backend/src/core/entities/FlashLikeEntityService.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,44 @@ | |||||||
|  | import { Inject, Injectable } from '@nestjs/common'; | ||||||
|  | import { DI } from '@/di-symbols.js'; | ||||||
|  | import type { FlashLikesRepository } from '@/models/index.js'; | ||||||
|  | import { awaitAll } from '@/misc/prelude/await-all.js'; | ||||||
|  | import type { Packed } from '@/misc/schema.js'; | ||||||
|  | import type { } from '@/models/entities/Blocking.js'; | ||||||
|  | import type { User } from '@/models/entities/User.js'; | ||||||
|  | import type { FlashLike } from '@/models/entities/FlashLike.js'; | ||||||
|  | import { bindThis } from '@/decorators.js'; | ||||||
|  | import { UserEntityService } from './UserEntityService.js'; | ||||||
|  | import { FlashEntityService } from './FlashEntityService.js'; | ||||||
|  |  | ||||||
|  | @Injectable() | ||||||
|  | export class FlashLikeEntityService { | ||||||
|  | 	constructor( | ||||||
|  | 		@Inject(DI.flashLikesRepository) | ||||||
|  | 		private flashLikesRepository: FlashLikesRepository, | ||||||
|  |  | ||||||
|  | 		private flashEntityService: FlashEntityService, | ||||||
|  | 	) { | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	@bindThis | ||||||
|  | 	public async pack( | ||||||
|  | 		src: FlashLike['id'] | FlashLike, | ||||||
|  | 		me?: { id: User['id'] } | null | undefined, | ||||||
|  | 	) { | ||||||
|  | 		const like = typeof src === 'object' ? src : await this.flashLikesRepository.findOneByOrFail({ id: src }); | ||||||
|  |  | ||||||
|  | 		return { | ||||||
|  | 			id: like.id, | ||||||
|  | 			flash: await this.flashEntityService.pack(like.flash ?? like.flashId, me), | ||||||
|  | 		}; | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	@bindThis | ||||||
|  | 	public packMany( | ||||||
|  | 		likes: any[], | ||||||
|  | 		me: { id: User['id'] }, | ||||||
|  | 	) { | ||||||
|  | 		return Promise.all(likes.map(x => this.pack(x, me))); | ||||||
|  | 	} | ||||||
|  | } | ||||||
|  |  | ||||||
| @@ -98,7 +98,7 @@ export class NotificationEntityService implements OnModuleInit { | |||||||
| 				}), | 				}), | ||||||
| 				reaction: notification.reaction, | 				reaction: notification.reaction, | ||||||
| 			} : {}), | 			} : {}), | ||||||
| 			...(notification.type === 'pollVote' ? { | 			...(notification.type === 'pollVote' ? { // TODO: そのうち消す | ||||||
| 				note: this.noteEntityService.pack(notification.note ?? notification.noteId!, { id: notification.notifieeId }, { | 				note: this.noteEntityService.pack(notification.note ?? notification.noteId!, { id: notification.notifieeId }, { | ||||||
| 					detail: true, | 					detail: true, | ||||||
| 					_hint_: options._hintForEachNotes_, | 					_hint_: options._hintForEachNotes_, | ||||||
|   | |||||||
| @@ -69,5 +69,7 @@ export const DI = { | |||||||
| 	adsRepository: Symbol('adsRepository'), | 	adsRepository: Symbol('adsRepository'), | ||||||
| 	passwordResetRequestsRepository: Symbol('passwordResetRequestsRepository'), | 	passwordResetRequestsRepository: Symbol('passwordResetRequestsRepository'), | ||||||
| 	retentionAggregationsRepository: Symbol('retentionAggregationsRepository'), | 	retentionAggregationsRepository: Symbol('retentionAggregationsRepository'), | ||||||
|  | 	flashsRepository: Symbol('flashsRepository'), | ||||||
|  | 	flashLikesRepository: Symbol('flashLikesRepository'), | ||||||
| 	//#endregion | 	//#endregion | ||||||
| }; | }; | ||||||
|   | |||||||
| @@ -3,6 +3,7 @@ import { FILE_TYPE_BROWSERSAFE } from '@/const.js'; | |||||||
| const dictionary = { | const dictionary = { | ||||||
| 	'safe-file': FILE_TYPE_BROWSERSAFE, | 	'safe-file': FILE_TYPE_BROWSERSAFE, | ||||||
| 	'sharp-convertible-image': ['image/jpeg', 'image/png', 'image/gif', 'image/apng', 'image/vnd.mozilla.apng', 'image/webp', 'image/avif', 'image/svg+xml'], | 	'sharp-convertible-image': ['image/jpeg', 'image/png', 'image/gif', 'image/apng', 'image/vnd.mozilla.apng', 'image/webp', 'image/avif', 'image/svg+xml'], | ||||||
|  | 	'sharp-animation-convertible-image': ['image/jpeg', 'image/png', 'image/gif', 'image/webp', 'image/avif', 'image/svg+xml'], | ||||||
| }; | }; | ||||||
|  |  | ||||||
| export const isMimeImage = (mime: string, type: keyof typeof dictionary): boolean => dictionary[type].includes(mime); | export const isMimeImage = (mime: string, type: keyof typeof dictionary): boolean => dictionary[type].includes(mime); | ||||||
|   | |||||||
							
								
								
									
										3
									
								
								packages/backend/src/misc/sql-like-escape.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,3 @@ | |||||||
|  | export function sqlLikeEscape(s: string) { | ||||||
|  | 	return s.replace(/([%_])/g, '\\$1'); | ||||||
|  | } | ||||||
| @@ -1,6 +1,6 @@ | |||||||
| import { Module } from '@nestjs/common'; | import { Module } from '@nestjs/common'; | ||||||
| import { DI } from '@/di-symbols.js'; | import { DI } from '@/di-symbols.js'; | ||||||
| import { User, Note, Announcement, AnnouncementRead, App, NoteFavorite, NoteThreadMuting, NoteReaction, NoteUnread, Notification, Poll, PollVote, UserProfile, UserKeypair, UserPending, AttestationChallenge, UserSecurityKey, UserPublickey, UserList, UserListJoining, UserGroup, UserGroupJoining, UserGroupInvitation, UserNotePining, UserIp, UsedUsername, Following, FollowRequest, Instance, Emoji, DriveFile, DriveFolder, Meta, Muting, Blocking, SwSubscription, Hashtag, AbuseUserReport, RegistrationTicket, AuthSession, AccessToken, Signin, MessagingMessage, Page, PageLike, GalleryPost, GalleryLike, ModerationLog, Clip, ClipNote, Antenna, AntennaNote, PromoNote, PromoRead, Relay, MutedNote, Channel, ChannelFollowing, ChannelNotePining, RegistryItem, Webhook, Ad, PasswordResetRequest, RetentionAggregation } from './index.js'; | import { User, Note, Announcement, AnnouncementRead, App, NoteFavorite, NoteThreadMuting, NoteReaction, NoteUnread, Notification, Poll, PollVote, UserProfile, UserKeypair, UserPending, AttestationChallenge, UserSecurityKey, UserPublickey, UserList, UserListJoining, UserGroup, UserGroupJoining, UserGroupInvitation, UserNotePining, UserIp, UsedUsername, Following, FollowRequest, Instance, Emoji, DriveFile, DriveFolder, Meta, Muting, Blocking, SwSubscription, Hashtag, AbuseUserReport, RegistrationTicket, AuthSession, AccessToken, Signin, MessagingMessage, Page, PageLike, GalleryPost, GalleryLike, ModerationLog, Clip, ClipNote, Antenna, AntennaNote, PromoNote, PromoRead, Relay, MutedNote, Channel, ChannelFollowing, ChannelNotePining, RegistryItem, Webhook, Ad, PasswordResetRequest, RetentionAggregation, FlashLike, Flash } from './index.js'; | ||||||
| import type { DataSource } from 'typeorm'; | import type { DataSource } from 'typeorm'; | ||||||
| import type { Provider } from '@nestjs/common'; | import type { Provider } from '@nestjs/common'; | ||||||
|  |  | ||||||
| @@ -388,6 +388,18 @@ const $retentionAggregationsRepository: Provider = { | |||||||
| 	inject: [DI.db], | 	inject: [DI.db], | ||||||
| }; | }; | ||||||
|  |  | ||||||
|  | const $flashsRepository: Provider = { | ||||||
|  | 	provide: DI.flashsRepository, | ||||||
|  | 	useFactory: (db: DataSource) => db.getRepository(Flash), | ||||||
|  | 	inject: [DI.db], | ||||||
|  | }; | ||||||
|  |  | ||||||
|  | const $flashLikesRepository: Provider = { | ||||||
|  | 	provide: DI.flashLikesRepository, | ||||||
|  | 	useFactory: (db: DataSource) => db.getRepository(FlashLike), | ||||||
|  | 	inject: [DI.db], | ||||||
|  | }; | ||||||
|  |  | ||||||
| @Module({ | @Module({ | ||||||
| 	imports: [ | 	imports: [ | ||||||
| 	], | 	], | ||||||
| @@ -456,6 +468,8 @@ const $retentionAggregationsRepository: Provider = { | |||||||
| 		$adsRepository, | 		$adsRepository, | ||||||
| 		$passwordResetRequestsRepository, | 		$passwordResetRequestsRepository, | ||||||
| 		$retentionAggregationsRepository, | 		$retentionAggregationsRepository, | ||||||
|  | 		$flashsRepository, | ||||||
|  | 		$flashLikesRepository, | ||||||
| 	], | 	], | ||||||
| 	exports: [ | 	exports: [ | ||||||
| 		$usersRepository, | 		$usersRepository, | ||||||
| @@ -522,6 +536,8 @@ const $retentionAggregationsRepository: Provider = { | |||||||
| 		$adsRepository, | 		$adsRepository, | ||||||
| 		$passwordResetRequestsRepository, | 		$passwordResetRequestsRepository, | ||||||
| 		$retentionAggregationsRepository, | 		$retentionAggregationsRepository, | ||||||
|  | 		$flashsRepository, | ||||||
|  | 		$flashLikesRepository, | ||||||
| 	], | 	], | ||||||
| }) | }) | ||||||
| export class RepositoryModule {} | export class RepositoryModule {} | ||||||
|   | |||||||
							
								
								
									
										60
									
								
								packages/backend/src/models/entities/Flash.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,60 @@ | |||||||
|  | import { Entity, Index, JoinColumn, Column, PrimaryColumn, ManyToOne } from 'typeorm'; | ||||||
|  | import { id } from '../id.js'; | ||||||
|  | import { User } from './User.js'; | ||||||
|  | import { DriveFile } from './DriveFile.js'; | ||||||
|  |  | ||||||
|  | @Entity() | ||||||
|  | export class Flash { | ||||||
|  | 	@PrimaryColumn(id()) | ||||||
|  | 	public id: string; | ||||||
|  |  | ||||||
|  | 	@Index() | ||||||
|  | 	@Column('timestamp with time zone', { | ||||||
|  | 		comment: 'The created date of the Flash.', | ||||||
|  | 	}) | ||||||
|  | 	public createdAt: Date; | ||||||
|  |  | ||||||
|  | 	@Index() | ||||||
|  | 	@Column('timestamp with time zone', { | ||||||
|  | 		comment: 'The updated date of the Flash.', | ||||||
|  | 	}) | ||||||
|  | 	public updatedAt: Date; | ||||||
|  |  | ||||||
|  | 	@Column('varchar', { | ||||||
|  | 		length: 256, | ||||||
|  | 	}) | ||||||
|  | 	public title: string; | ||||||
|  |  | ||||||
|  | 	@Column('varchar', { | ||||||
|  | 		length: 1024, | ||||||
|  | 	}) | ||||||
|  | 	public summary: string; | ||||||
|  |  | ||||||
|  | 	@Index() | ||||||
|  | 	@Column({ | ||||||
|  | 		...id(), | ||||||
|  | 		comment: 'The ID of author.', | ||||||
|  | 	}) | ||||||
|  | 	public userId: User['id']; | ||||||
|  |  | ||||||
|  | 	@ManyToOne(type => User, { | ||||||
|  | 		onDelete: 'CASCADE', | ||||||
|  | 	}) | ||||||
|  | 	@JoinColumn() | ||||||
|  | 	public user: User | null; | ||||||
|  |  | ||||||
|  | 	@Column('varchar', { | ||||||
|  | 		length: 16384, | ||||||
|  | 	}) | ||||||
|  | 	public script: string; | ||||||
|  |  | ||||||
|  | 	@Column('varchar', { | ||||||
|  | 		length: 256, array: true, default: '{}', | ||||||
|  | 	}) | ||||||
|  | 	public permissions: string[]; | ||||||
|  |  | ||||||
|  | 	@Column('integer', { | ||||||
|  | 		default: 0, | ||||||
|  | 	}) | ||||||
|  | 	public likedCount: number; | ||||||
|  | } | ||||||
							
								
								
									
										33
									
								
								packages/backend/src/models/entities/FlashLike.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,33 @@ | |||||||
|  | import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; | ||||||
|  | import { id } from '../id.js'; | ||||||
|  | import { User } from './User.js'; | ||||||
|  | import { Flash } from './Flash.js'; | ||||||
|  |  | ||||||
|  | @Entity() | ||||||
|  | @Index(['userId', 'flashId'], { unique: true }) | ||||||
|  | export class FlashLike { | ||||||
|  | 	@PrimaryColumn(id()) | ||||||
|  | 	public id: string; | ||||||
|  |  | ||||||
|  | 	@Column('timestamp with time zone') | ||||||
|  | 	public createdAt: Date; | ||||||
|  |  | ||||||
|  | 	@Index() | ||||||
|  | 	@Column(id()) | ||||||
|  | 	public userId: User['id']; | ||||||
|  |  | ||||||
|  | 	@ManyToOne(type => User, { | ||||||
|  | 		onDelete: 'CASCADE', | ||||||
|  | 	}) | ||||||
|  | 	@JoinColumn() | ||||||
|  | 	public user: User | null; | ||||||
|  |  | ||||||
|  | 	@Column(id()) | ||||||
|  | 	public flashId: Flash['id']; | ||||||
|  |  | ||||||
|  | 	@ManyToOne(type => Flash, { | ||||||
|  | 		onDelete: 'CASCADE', | ||||||
|  | 	}) | ||||||
|  | 	@JoinColumn() | ||||||
|  | 	public flash: Flash | null; | ||||||
|  | } | ||||||
| @@ -55,11 +55,11 @@ export class Notification { | |||||||
| 	 * 通知の種類。 | 	 * 通知の種類。 | ||||||
| 	 * follow - フォローされた | 	 * follow - フォローされた | ||||||
| 	 * mention - 投稿で自分が言及された | 	 * mention - 投稿で自分が言及された | ||||||
| 	 * reply - (自分または自分がWatchしている)投稿が返信された | 	 * reply - 投稿に返信された | ||||||
| 	 * renote - (自分または自分がWatchしている)投稿がRenoteされた | 	 * renote - 投稿がRenoteされた | ||||||
| 	 * quote - (自分または自分がWatchしている)投稿が引用Renoteされた | 	 * quote - 投稿が引用Renoteされた | ||||||
| 	 * reaction - (自分または自分がWatchしている)投稿にリアクションされた | 	 * reaction - 投稿にリアクションされた | ||||||
| 	 * pollVote - (自分または自分がWatchしている)投稿のアンケートに投票された | 	 * pollVote - 投稿のアンケートに投票された (廃止) | ||||||
| 	 * pollEnded - 自分のアンケートもしくは自分が投票したアンケートが終了した | 	 * pollEnded - 自分のアンケートもしくは自分が投票したアンケートが終了した | ||||||
| 	 * receiveFollowRequest - フォローリクエストされた | 	 * receiveFollowRequest - フォローリクエストされた | ||||||
| 	 * followRequestAccepted - 自分の送ったフォローリクエストが承認された | 	 * followRequestAccepted - 自分の送ったフォローリクエストが承認された | ||||||
|   | |||||||
| @@ -62,6 +62,8 @@ import { UserSecurityKey } from '@/models/entities/UserSecurityKey.js'; | |||||||
| import { Webhook } from '@/models/entities/Webhook.js'; | import { Webhook } from '@/models/entities/Webhook.js'; | ||||||
| import { Channel } from '@/models/entities/Channel.js'; | import { Channel } from '@/models/entities/Channel.js'; | ||||||
| import { RetentionAggregation } from '@/models/entities/RetentionAggregation.js'; | import { RetentionAggregation } from '@/models/entities/RetentionAggregation.js'; | ||||||
|  | import { Flash } from '@/models/entities/Flash.js'; | ||||||
|  | import { FlashLike } from '@/models/entities/FlashLike.js'; | ||||||
| import type { Repository } from 'typeorm'; | import type { Repository } from 'typeorm'; | ||||||
|  |  | ||||||
| export { | export { | ||||||
| @@ -129,6 +131,8 @@ export { | |||||||
| 	Webhook, | 	Webhook, | ||||||
| 	Channel, | 	Channel, | ||||||
| 	RetentionAggregation, | 	RetentionAggregation, | ||||||
|  | 	Flash, | ||||||
|  | 	FlashLike, | ||||||
| }; | }; | ||||||
|  |  | ||||||
| export type AbuseUserReportsRepository = Repository<AbuseUserReport>; | export type AbuseUserReportsRepository = Repository<AbuseUserReport>; | ||||||
| @@ -195,3 +199,5 @@ export type UserSecurityKeysRepository = Repository<UserSecurityKey>; | |||||||
| export type WebhooksRepository = Repository<Webhook>; | export type WebhooksRepository = Repository<Webhook>; | ||||||
| export type ChannelsRepository = Repository<Channel>; | export type ChannelsRepository = Repository<Channel>; | ||||||
| export type RetentionAggregationsRepository = Repository<RetentionAggregation>; | export type RetentionAggregationsRepository = Repository<RetentionAggregation>; | ||||||
|  | export type FlashsRepository = Repository<Flash>; | ||||||
|  | export type FlashLikesRepository = Repository<FlashLike>; | ||||||
|   | |||||||
| @@ -70,6 +70,8 @@ import { UserSecurityKey } from '@/models/entities/UserSecurityKey.js'; | |||||||
| import { Webhook } from '@/models/entities/Webhook.js'; | import { Webhook } from '@/models/entities/Webhook.js'; | ||||||
| import { Channel } from '@/models/entities/Channel.js'; | import { Channel } from '@/models/entities/Channel.js'; | ||||||
| import { RetentionAggregation } from '@/models/entities/RetentionAggregation.js'; | import { RetentionAggregation } from '@/models/entities/RetentionAggregation.js'; | ||||||
|  | import { Flash } from '@/models/entities/Flash.js'; | ||||||
|  | import { FlashLike } from '@/models/entities/FlashLike.js'; | ||||||
|  |  | ||||||
| import { Config } from '@/config.js'; | import { Config } from '@/config.js'; | ||||||
| import MisskeyLogger from '@/logger.js'; | import MisskeyLogger from '@/logger.js'; | ||||||
| @@ -184,6 +186,8 @@ export const entities = [ | |||||||
| 	Webhook, | 	Webhook, | ||||||
| 	UserIp, | 	UserIp, | ||||||
| 	RetentionAggregation, | 	RetentionAggregation, | ||||||
|  | 	Flash, | ||||||
|  | 	FlashLike, | ||||||
| 	...charts, | 	...charts, | ||||||
| ]; | ]; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -79,9 +79,17 @@ export class MediaProxyServerService { | |||||||
| 	 | 	 | ||||||
| 			const { mime, ext } = await this.fileInfoService.detectType(path); | 			const { mime, ext } = await this.fileInfoService.detectType(path); | ||||||
| 			const isConvertibleImage = isMimeImage(mime, 'sharp-convertible-image'); | 			const isConvertibleImage = isMimeImage(mime, 'sharp-convertible-image'); | ||||||
|  | 			const isAnimationConvertibleImage = isMimeImage(mime, 'sharp-animation-convertible-image'); | ||||||
| 	 | 	 | ||||||
| 			let image: IImage; | 			let image: IImage; | ||||||
| 			if ('emoji' in request.query && isConvertibleImage) { | 			if ('emoji' in request.query && isConvertibleImage) { | ||||||
|  | 				if (!isAnimationConvertibleImage && !('static' in request.query)) { | ||||||
|  | 					image = { | ||||||
|  | 						data: fs.readFileSync(path), | ||||||
|  | 						ext, | ||||||
|  | 						type: mime, | ||||||
|  | 					}; | ||||||
|  | 				} else { | ||||||
| 					const data = await sharp(path, { animated: !('static' in request.query) }) | 					const data = await sharp(path, { animated: !('static' in request.query) }) | ||||||
| 					.resize({ | 					.resize({ | ||||||
| 						height: 128, | 						height: 128, | ||||||
| @@ -95,6 +103,7 @@ export class MediaProxyServerService { | |||||||
| 						ext: 'webp', | 						ext: 'webp', | ||||||
| 						type: 'image/webp', | 						type: 'image/webp', | ||||||
| 					}; | 					}; | ||||||
|  | 				} | ||||||
| 			} else if ('static' in request.query && isConvertibleImage) { | 			} else if ('static' in request.query && isConvertibleImage) { | ||||||
| 				image = await this.imageProcessingService.convertToWebp(path, 498, 280); | 				image = await this.imageProcessingService.convertToWebp(path, 498, 280); | ||||||
| 			} else if ('preview' in request.query && isConvertibleImage) { | 			} else if ('preview' in request.query && isConvertibleImage) { | ||||||
|   | |||||||
| @@ -1,12 +1,11 @@ | |||||||
| import cluster from 'node:cluster'; | import cluster from 'node:cluster'; | ||||||
| import * as fs from 'node:fs'; | import * as fs from 'node:fs'; | ||||||
| import * as http from 'node:http'; |  | ||||||
| import { Inject, Injectable } from '@nestjs/common'; | import { Inject, Injectable } from '@nestjs/common'; | ||||||
| import Fastify from 'fastify'; | import Fastify from 'fastify'; | ||||||
| import { IsNull } from 'typeorm'; | import { IsNull } from 'typeorm'; | ||||||
| import { GlobalEventService } from '@/core/GlobalEventService.js'; | import { GlobalEventService } from '@/core/GlobalEventService.js'; | ||||||
| import type { Config } from '@/config.js'; | import type { Config } from '@/config.js'; | ||||||
| import type { UserProfilesRepository, UsersRepository } from '@/models/index.js'; | import type { EmojisRepository, UserProfilesRepository, UsersRepository } from '@/models/index.js'; | ||||||
| import { DI } from '@/di-symbols.js'; | import { DI } from '@/di-symbols.js'; | ||||||
| import type Logger from '@/logger.js'; | import type Logger from '@/logger.js'; | ||||||
| import { envOption } from '@/env.js'; | import { envOption } from '@/env.js'; | ||||||
| @@ -39,6 +38,9 @@ export class ServerService { | |||||||
| 		@Inject(DI.userProfilesRepository) | 		@Inject(DI.userProfilesRepository) | ||||||
| 		private userProfilesRepository: UserProfilesRepository, | 		private userProfilesRepository: UserProfilesRepository, | ||||||
|  |  | ||||||
|  | 		@Inject(DI.emojisRepository) | ||||||
|  | 		private emojisRepository: EmojisRepository, | ||||||
|  |  | ||||||
| 		private userEntityService: UserEntityService, | 		private userEntityService: UserEntityService, | ||||||
| 		private apiServerService: ApiServerService, | 		private apiServerService: ApiServerService, | ||||||
| 		private streamingApiServerService: StreamingApiServerService, | 		private streamingApiServerService: StreamingApiServerService, | ||||||
| @@ -77,6 +79,43 @@ export class ServerService { | |||||||
| 		fastify.register(this.nodeinfoServerService.createServer); | 		fastify.register(this.nodeinfoServerService.createServer); | ||||||
| 		fastify.register(this.wellKnownServerService.createServer); | 		fastify.register(this.wellKnownServerService.createServer); | ||||||
|  |  | ||||||
|  | 		fastify.get<{ Params: { path: string }; Querystring: { static?: any; }; }>('/emoji/:path(.*)', async (request, reply) => { | ||||||
|  | 			const path = request.params.path; | ||||||
|  |  | ||||||
|  | 			if (!path.match(/^[a-zA-Z0-9\-_@\.]+?\.webp$/)) { | ||||||
|  | 				reply.code(404); | ||||||
|  | 				return; | ||||||
|  | 			} | ||||||
|  |  | ||||||
|  | 			reply.header('Cache-Control', 'public, max-age=86400'); | ||||||
|  |  | ||||||
|  | 			const name = path.split('@')[0].replace('.webp', ''); | ||||||
|  | 			const host = path.split('@')[1]?.replace('.webp', ''); | ||||||
|  |  | ||||||
|  | 			const emoji = await this.emojisRepository.findOneBy({ | ||||||
|  | 				// `@.` is the spec of ReactionService.decodeReaction | ||||||
|  | 				host: (host == null || host === '.') ? IsNull() : host, | ||||||
|  | 				name: name, | ||||||
|  | 			}); | ||||||
|  |  | ||||||
|  | 			reply.header('Content-Security-Policy', 'default-src \'none\'; style-src \'unsafe-inline\''); | ||||||
|  |  | ||||||
|  | 			if (emoji == null) { | ||||||
|  | 				return await reply.redirect('/static-assets/emoji-unknown.png'); | ||||||
|  | 			} | ||||||
|  |  | ||||||
|  | 			const url = new URL('/proxy/emoji.webp', this.config.url); | ||||||
|  | 			// || emoji.originalUrl してるのは後方互換性のため(publicUrlはstringなので??はだめ) | ||||||
|  | 			url.searchParams.set('url', emoji.publicUrl || emoji.originalUrl); | ||||||
|  | 			url.searchParams.set('emoji', '1'); | ||||||
|  | 			if ('static' in request.query) url.searchParams.set('static', '1'); | ||||||
|  |  | ||||||
|  | 			return await reply.redirect( | ||||||
|  | 				301, | ||||||
|  | 				url.toString(), | ||||||
|  | 			); | ||||||
|  | 		}); | ||||||
|  |  | ||||||
| 		fastify.get<{ Params: { acct: string } }>('/avatar/@:acct', async (request, reply) => { | 		fastify.get<{ Params: { acct: string } }>('/avatar/@:acct', async (request, reply) => { | ||||||
| 			const { username, host } = Acct.parse(request.params.acct); | 			const { username, host } = Acct.parse(request.params.acct); | ||||||
| 			const user = await this.usersRepository.findOne({ | 			const user = await this.usersRepository.findOne({ | ||||||
|   | |||||||
| @@ -266,6 +266,15 @@ import * as ep___pages_like from './endpoints/pages/like.js'; | |||||||
| import * as ep___pages_show from './endpoints/pages/show.js'; | import * as ep___pages_show from './endpoints/pages/show.js'; | ||||||
| import * as ep___pages_unlike from './endpoints/pages/unlike.js'; | import * as ep___pages_unlike from './endpoints/pages/unlike.js'; | ||||||
| import * as ep___pages_update from './endpoints/pages/update.js'; | import * as ep___pages_update from './endpoints/pages/update.js'; | ||||||
|  | import * as ep___flash_create from './endpoints/flash/create.js'; | ||||||
|  | import * as ep___flash_delete from './endpoints/flash/delete.js'; | ||||||
|  | import * as ep___flash_featured from './endpoints/flash/featured.js'; | ||||||
|  | import * as ep___flash_like from './endpoints/flash/like.js'; | ||||||
|  | import * as ep___flash_show from './endpoints/flash/show.js'; | ||||||
|  | import * as ep___flash_unlike from './endpoints/flash/unlike.js'; | ||||||
|  | import * as ep___flash_update from './endpoints/flash/update.js'; | ||||||
|  | import * as ep___flash_my from './endpoints/flash/my.js'; | ||||||
|  | import * as ep___flash_myLikes from './endpoints/flash/my-likes.js'; | ||||||
| import * as ep___ping from './endpoints/ping.js'; | import * as ep___ping from './endpoints/ping.js'; | ||||||
| import * as ep___pinnedUsers from './endpoints/pinned-users.js'; | import * as ep___pinnedUsers from './endpoints/pinned-users.js'; | ||||||
| import * as ep___promo_read from './endpoints/promo/read.js'; | import * as ep___promo_read from './endpoints/promo/read.js'; | ||||||
| @@ -587,6 +596,15 @@ const $pages_like: Provider = { provide: 'ep:pages/like', useClass: ep___pages_l | |||||||
| const $pages_show: Provider = { provide: 'ep:pages/show', useClass: ep___pages_show.default }; | const $pages_show: Provider = { provide: 'ep:pages/show', useClass: ep___pages_show.default }; | ||||||
| const $pages_unlike: Provider = { provide: 'ep:pages/unlike', useClass: ep___pages_unlike.default }; | const $pages_unlike: Provider = { provide: 'ep:pages/unlike', useClass: ep___pages_unlike.default }; | ||||||
| const $pages_update: Provider = { provide: 'ep:pages/update', useClass: ep___pages_update.default }; | const $pages_update: Provider = { provide: 'ep:pages/update', useClass: ep___pages_update.default }; | ||||||
|  | const $flash_create: Provider = { provide: 'ep:flash/create', useClass: ep___flash_create.default }; | ||||||
|  | const $flash_delete: Provider = { provide: 'ep:flash/delete', useClass: ep___flash_delete.default }; | ||||||
|  | const $flash_featured: Provider = { provide: 'ep:flash/featured', useClass: ep___flash_featured.default }; | ||||||
|  | const $flash_like: Provider = { provide: 'ep:flash/like', useClass: ep___flash_like.default }; | ||||||
|  | const $flash_show: Provider = { provide: 'ep:flash/show', useClass: ep___flash_show.default }; | ||||||
|  | const $flash_unlike: Provider = { provide: 'ep:flash/unlike', useClass: ep___flash_unlike.default }; | ||||||
|  | const $flash_update: Provider = { provide: 'ep:flash/update', useClass: ep___flash_update.default }; | ||||||
|  | const $flash_my: Provider = { provide: 'ep:flash/my', useClass: ep___flash_my.default }; | ||||||
|  | const $flash_myLikes: Provider = { provide: 'ep:flash/my-likes', useClass: ep___flash_myLikes.default }; | ||||||
| const $ping: Provider = { provide: 'ep:ping', useClass: ep___ping.default }; | const $ping: Provider = { provide: 'ep:ping', useClass: ep___ping.default }; | ||||||
| const $pinnedUsers: Provider = { provide: 'ep:pinned-users', useClass: ep___pinnedUsers.default }; | const $pinnedUsers: Provider = { provide: 'ep:pinned-users', useClass: ep___pinnedUsers.default }; | ||||||
| const $promo_read: Provider = { provide: 'ep:promo/read', useClass: ep___promo_read.default }; | const $promo_read: Provider = { provide: 'ep:promo/read', useClass: ep___promo_read.default }; | ||||||
| @@ -912,6 +930,15 @@ const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention | |||||||
| 		$pages_show, | 		$pages_show, | ||||||
| 		$pages_unlike, | 		$pages_unlike, | ||||||
| 		$pages_update, | 		$pages_update, | ||||||
|  | 		$flash_create, | ||||||
|  | 		$flash_delete, | ||||||
|  | 		$flash_featured, | ||||||
|  | 		$flash_like, | ||||||
|  | 		$flash_show, | ||||||
|  | 		$flash_unlike, | ||||||
|  | 		$flash_update, | ||||||
|  | 		$flash_my, | ||||||
|  | 		$flash_myLikes, | ||||||
| 		$ping, | 		$ping, | ||||||
| 		$pinnedUsers, | 		$pinnedUsers, | ||||||
| 		$promo_read, | 		$promo_read, | ||||||
| @@ -1231,6 +1258,15 @@ const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention | |||||||
| 		$pages_show, | 		$pages_show, | ||||||
| 		$pages_unlike, | 		$pages_unlike, | ||||||
| 		$pages_update, | 		$pages_update, | ||||||
|  | 		$flash_create, | ||||||
|  | 		$flash_delete, | ||||||
|  | 		$flash_featured, | ||||||
|  | 		$flash_like, | ||||||
|  | 		$flash_show, | ||||||
|  | 		$flash_unlike, | ||||||
|  | 		$flash_update, | ||||||
|  | 		$flash_my, | ||||||
|  | 		$flash_myLikes, | ||||||
| 		$ping, | 		$ping, | ||||||
| 		$pinnedUsers, | 		$pinnedUsers, | ||||||
| 		$promo_read, | 		$promo_read, | ||||||
|   | |||||||
| @@ -265,6 +265,15 @@ import * as ep___pages_like from './endpoints/pages/like.js'; | |||||||
| import * as ep___pages_show from './endpoints/pages/show.js'; | import * as ep___pages_show from './endpoints/pages/show.js'; | ||||||
| import * as ep___pages_unlike from './endpoints/pages/unlike.js'; | import * as ep___pages_unlike from './endpoints/pages/unlike.js'; | ||||||
| import * as ep___pages_update from './endpoints/pages/update.js'; | import * as ep___pages_update from './endpoints/pages/update.js'; | ||||||
|  | import * as ep___flash_create from './endpoints/flash/create.js'; | ||||||
|  | import * as ep___flash_delete from './endpoints/flash/delete.js'; | ||||||
|  | import * as ep___flash_featured from './endpoints/flash/featured.js'; | ||||||
|  | import * as ep___flash_like from './endpoints/flash/like.js'; | ||||||
|  | import * as ep___flash_show from './endpoints/flash/show.js'; | ||||||
|  | import * as ep___flash_unlike from './endpoints/flash/unlike.js'; | ||||||
|  | import * as ep___flash_update from './endpoints/flash/update.js'; | ||||||
|  | import * as ep___flash_my from './endpoints/flash/my.js'; | ||||||
|  | import * as ep___flash_myLikes from './endpoints/flash/my-likes.js'; | ||||||
| import * as ep___ping from './endpoints/ping.js'; | import * as ep___ping from './endpoints/ping.js'; | ||||||
| import * as ep___pinnedUsers from './endpoints/pinned-users.js'; | import * as ep___pinnedUsers from './endpoints/pinned-users.js'; | ||||||
| import * as ep___promo_read from './endpoints/promo/read.js'; | import * as ep___promo_read from './endpoints/promo/read.js'; | ||||||
| @@ -584,6 +593,15 @@ const eps = [ | |||||||
| 	['pages/show', ep___pages_show], | 	['pages/show', ep___pages_show], | ||||||
| 	['pages/unlike', ep___pages_unlike], | 	['pages/unlike', ep___pages_unlike], | ||||||
| 	['pages/update', ep___pages_update], | 	['pages/update', ep___pages_update], | ||||||
|  | 	['flash/create', ep___flash_create], | ||||||
|  | 	['flash/delete', ep___flash_delete], | ||||||
|  | 	['flash/featured', ep___flash_featured], | ||||||
|  | 	['flash/like', ep___flash_like], | ||||||
|  | 	['flash/show', ep___flash_show], | ||||||
|  | 	['flash/unlike', ep___flash_unlike], | ||||||
|  | 	['flash/update', ep___flash_update], | ||||||
|  | 	['flash/my', ep___flash_my], | ||||||
|  | 	['flash/my-likes', ep___flash_myLikes], | ||||||
| 	['ping', ep___ping], | 	['ping', ep___ping], | ||||||
| 	['pinned-users', ep___pinnedUsers], | 	['pinned-users', ep___pinnedUsers], | ||||||
| 	['promo/read', ep___promo_read], | 	['promo/read', ep___promo_read], | ||||||
|   | |||||||
| @@ -8,7 +8,7 @@ import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.j | |||||||
| export const meta = { | export const meta = { | ||||||
| 	tags: ['admin'], | 	tags: ['admin'], | ||||||
|  |  | ||||||
| 	requireCredential: false, | 	requireCredential: true, | ||||||
| 	requireModerator: true, | 	requireModerator: true, | ||||||
|  |  | ||||||
| 	res: { | 	res: { | ||||||
|   | |||||||
| @@ -5,6 +5,7 @@ import { QueryService } from '@/core/QueryService.js'; | |||||||
| import { UtilityService } from '@/core/UtilityService.js'; | import { UtilityService } from '@/core/UtilityService.js'; | ||||||
| import { EmojiEntityService } from '@/core/entities/EmojiEntityService.js'; | import { EmojiEntityService } from '@/core/entities/EmojiEntityService.js'; | ||||||
| import { DI } from '@/di-symbols.js'; | import { DI } from '@/di-symbols.js'; | ||||||
|  | import { sqlLikeEscape } from '@/misc/sql-like-escape.js'; | ||||||
|  |  | ||||||
| export const meta = { | export const meta = { | ||||||
| 	tags: ['admin'], | 	tags: ['admin'], | ||||||
| @@ -92,7 +93,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { | |||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 			if (ps.query) { | 			if (ps.query) { | ||||||
| 				q.andWhere('emoji.name like :query', { query: '%' + ps.query + '%' }); | 				q.andWhere('emoji.name like :query', { query: '%' + sqlLikeEscape(ps.query) + '%' }); | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 			const emojis = await q | 			const emojis = await q | ||||||
|   | |||||||
| @@ -5,6 +5,7 @@ import type { Emoji } from '@/models/entities/Emoji.js'; | |||||||
| import { QueryService } from '@/core/QueryService.js'; | import { QueryService } from '@/core/QueryService.js'; | ||||||
| import { DI } from '@/di-symbols.js'; | import { DI } from '@/di-symbols.js'; | ||||||
| import { EmojiEntityService } from '@/core/entities/EmojiEntityService.js'; | import { EmojiEntityService } from '@/core/entities/EmojiEntityService.js'; | ||||||
|  | //import { sqlLikeEscape } from '@/misc/sql-like-escape.js'; | ||||||
|  |  | ||||||
| export const meta = { | export const meta = { | ||||||
| 	tags: ['admin'], | 	tags: ['admin'], | ||||||
| @@ -82,7 +83,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { | |||||||
| 			let emojis: Emoji[]; | 			let emojis: Emoji[]; | ||||||
|  |  | ||||||
| 			if (ps.query) { | 			if (ps.query) { | ||||||
| 				//q.andWhere('emoji.name ILIKE :q', { q: `%${ps.query}%` }); | 				//q.andWhere('emoji.name ILIKE :q', { q: `%${ sqlLikeEscape(ps.query) }%` }); | ||||||
| 				//const emojis = await q.take(ps.limit).getMany(); | 				//const emojis = await q.take(ps.limit).getMany(); | ||||||
|  |  | ||||||
| 				emojis = await q.getMany(); | 				emojis = await q.getMany(); | ||||||
|   | |||||||
| @@ -3,6 +3,7 @@ import type { UsersRepository } from '@/models/index.js'; | |||||||
| import { Endpoint } from '@/server/api/endpoint-base.js'; | import { Endpoint } from '@/server/api/endpoint-base.js'; | ||||||
| import { DI } from '@/di-symbols.js'; | import { DI } from '@/di-symbols.js'; | ||||||
| import { UserEntityService } from '@/core/entities/UserEntityService.js'; | import { UserEntityService } from '@/core/entities/UserEntityService.js'; | ||||||
|  | import { sqlLikeEscape } from '@/misc/sql-like-escape.js'; | ||||||
|  |  | ||||||
| export const meta = { | export const meta = { | ||||||
| 	tags: ['admin'], | 	tags: ['admin'], | ||||||
| @@ -68,7 +69,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { | |||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 			if (ps.username) { | 			if (ps.username) { | ||||||
| 				query.andWhere('user.usernameLower like :username', { username: ps.username.toLowerCase() + '%' }); | 				query.andWhere('user.usernameLower like :username', { username: sqlLikeEscape(ps.username.toLowerCase()) + '%' }); | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 			if (ps.hostname) { | 			if (ps.hostname) { | ||||||
|   | |||||||
| @@ -4,6 +4,7 @@ import type { InstancesRepository } from '@/models/index.js'; | |||||||
| import { InstanceEntityService } from '@/core/entities/InstanceEntityService.js'; | import { InstanceEntityService } from '@/core/entities/InstanceEntityService.js'; | ||||||
| import { MetaService } from '@/core/MetaService.js'; | import { MetaService } from '@/core/MetaService.js'; | ||||||
| import { DI } from '@/di-symbols.js'; | import { DI } from '@/di-symbols.js'; | ||||||
|  | import { sqlLikeEscape } from '@/misc/sql-like-escape.js'; | ||||||
|  |  | ||||||
| export const meta = { | export const meta = { | ||||||
| 	tags: ['federation'], | 	tags: ['federation'], | ||||||
| @@ -64,8 +65,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { | |||||||
| 				case '-followers': query.orderBy('instance.followersCount', 'ASC'); break; | 				case '-followers': query.orderBy('instance.followersCount', 'ASC'); break; | ||||||
| 				case '+caughtAt': query.orderBy('instance.caughtAt', 'DESC'); break; | 				case '+caughtAt': query.orderBy('instance.caughtAt', 'DESC'); break; | ||||||
| 				case '-caughtAt': query.orderBy('instance.caughtAt', 'ASC'); break; | 				case '-caughtAt': query.orderBy('instance.caughtAt', 'ASC'); break; | ||||||
| 				case '+latestRequestReceivedAt': query.orderBy('instance.latestRequestReceivedAt', 'DESC'); break; | 				case '+latestRequestReceivedAt': query.orderBy('instance.latestRequestReceivedAt', 'DESC', 'NULLS LAST'); break; | ||||||
| 				case '-latestRequestReceivedAt': query.orderBy('instance.latestRequestReceivedAt', 'ASC'); break; | 				case '-latestRequestReceivedAt': query.orderBy('instance.latestRequestReceivedAt', 'ASC', 'NULLS FIRST'); break; | ||||||
|  |  | ||||||
| 				default: query.orderBy('instance.id', 'DESC'); break; | 				default: query.orderBy('instance.id', 'DESC'); break; | ||||||
| 			} | 			} | ||||||
| @@ -120,7 +121,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { | |||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 			if (ps.host) { | 			if (ps.host) { | ||||||
| 				query.andWhere('instance.host like :host', { host: '%' + ps.host.toLowerCase() + '%' }); | 				query.andWhere('instance.host like :host', { host: '%' + sqlLikeEscape(ps.host.toLowerCase()) + '%' }); | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 			const instances = await query.take(ps.limit).skip(ps.offset).getMany(); | 			const instances = await query.take(ps.limit).skip(ps.offset).getMany(); | ||||||
|   | |||||||
							
								
								
									
										66
									
								
								packages/backend/src/server/api/endpoints/flash/create.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,66 @@ | |||||||
|  | import ms from 'ms'; | ||||||
|  | import { Inject, Injectable } from '@nestjs/common'; | ||||||
|  | import type { DriveFilesRepository, FlashsRepository, PagesRepository } from '@/models/index.js'; | ||||||
|  | import { IdService } from '@/core/IdService.js'; | ||||||
|  | import { Page } from '@/models/entities/Page.js'; | ||||||
|  | import { Endpoint } from '@/server/api/endpoint-base.js'; | ||||||
|  | import { PageEntityService } from '@/core/entities/PageEntityService.js'; | ||||||
|  | import { DI } from '@/di-symbols.js'; | ||||||
|  | import { FlashEntityService } from '@/core/entities/FlashEntityService.js'; | ||||||
|  | import { ApiError } from '../../error.js'; | ||||||
|  |  | ||||||
|  | export const meta = { | ||||||
|  | 	tags: ['flash'], | ||||||
|  |  | ||||||
|  | 	requireCredential: true, | ||||||
|  |  | ||||||
|  | 	kind: 'write:flash', | ||||||
|  |  | ||||||
|  | 	limit: { | ||||||
|  | 		duration: ms('1hour'), | ||||||
|  | 		max: 10, | ||||||
|  | 	}, | ||||||
|  |  | ||||||
|  | 	errors: { | ||||||
|  | 	}, | ||||||
|  | } as const; | ||||||
|  |  | ||||||
|  | export const paramDef = { | ||||||
|  | 	type: 'object', | ||||||
|  | 	properties: { | ||||||
|  | 		title: { type: 'string' }, | ||||||
|  | 		summary: { type: 'string' }, | ||||||
|  | 		script: { type: 'string' }, | ||||||
|  | 		permissions: { type: 'array', items: { | ||||||
|  | 			type: 'string', | ||||||
|  | 		} }, | ||||||
|  | 	}, | ||||||
|  | 	required: ['title', 'summary', 'script', 'permissions'], | ||||||
|  | } as const; | ||||||
|  |  | ||||||
|  | // eslint-disable-next-line import/no-default-export | ||||||
|  | @Injectable() | ||||||
|  | export default class extends Endpoint<typeof meta, typeof paramDef> { | ||||||
|  | 	constructor( | ||||||
|  | 		@Inject(DI.flashsRepository) | ||||||
|  | 		private flashsRepository: FlashsRepository, | ||||||
|  |  | ||||||
|  | 		private flashEntityService: FlashEntityService, | ||||||
|  | 		private idService: IdService, | ||||||
|  | 	) { | ||||||
|  | 		super(meta, paramDef, async (ps, me) => { | ||||||
|  | 			const flash = await this.flashsRepository.insert({ | ||||||
|  | 				id: this.idService.genId(), | ||||||
|  | 				userId: me.id, | ||||||
|  | 				createdAt: new Date(), | ||||||
|  | 				updatedAt: new Date(), | ||||||
|  | 				title: ps.title, | ||||||
|  | 				summary: ps.summary, | ||||||
|  | 				script: ps.script, | ||||||
|  | 				permissions: ps.permissions, | ||||||
|  | 			}).then(x => this.flashsRepository.findOneByOrFail(x.identifiers[0])); | ||||||
|  |  | ||||||
|  | 			return await this.flashEntityService.pack(flash); | ||||||
|  | 		}); | ||||||
|  | 	} | ||||||
|  | } | ||||||
							
								
								
									
										56
									
								
								packages/backend/src/server/api/endpoints/flash/delete.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,56 @@ | |||||||
|  | import { Inject, Injectable } from '@nestjs/common'; | ||||||
|  | import type { FlashsRepository } from '@/models/index.js'; | ||||||
|  | import { Endpoint } from '@/server/api/endpoint-base.js'; | ||||||
|  | import { DI } from '@/di-symbols.js'; | ||||||
|  | import { ApiError } from '../../error.js'; | ||||||
|  |  | ||||||
|  | export const meta = { | ||||||
|  | 	tags: ['flashs'], | ||||||
|  |  | ||||||
|  | 	requireCredential: true, | ||||||
|  |  | ||||||
|  | 	kind: 'write:flash', | ||||||
|  |  | ||||||
|  | 	errors: { | ||||||
|  | 		noSuchFlash: { | ||||||
|  | 			message: 'No such flash.', | ||||||
|  | 			code: 'NO_SUCH_FLASH', | ||||||
|  | 			id: 'de1623ef-bbb3-4289-a71e-14cfa83d9740', | ||||||
|  | 		}, | ||||||
|  |  | ||||||
|  | 		accessDenied: { | ||||||
|  | 			message: 'Access denied.', | ||||||
|  | 			code: 'ACCESS_DENIED', | ||||||
|  | 			id: '1036ad7b-9f92-4fff-89c3-0e50dc941704', | ||||||
|  | 		}, | ||||||
|  | 	}, | ||||||
|  | } as const; | ||||||
|  |  | ||||||
|  | export const paramDef = { | ||||||
|  | 	type: 'object', | ||||||
|  | 	properties: { | ||||||
|  | 		flashId: { type: 'string', format: 'misskey:id' }, | ||||||
|  | 	}, | ||||||
|  | 	required: ['flashId'], | ||||||
|  | } as const; | ||||||
|  |  | ||||||
|  | // eslint-disable-next-line import/no-default-export | ||||||
|  | @Injectable() | ||||||
|  | export default class extends Endpoint<typeof meta, typeof paramDef> { | ||||||
|  | 	constructor( | ||||||
|  | 		@Inject(DI.flashsRepository) | ||||||
|  | 		private flashsRepository: FlashsRepository, | ||||||
|  | 	) { | ||||||
|  | 		super(meta, paramDef, async (ps, me) => { | ||||||
|  | 			const flash = await this.flashsRepository.findOneBy({ id: ps.flashId }); | ||||||
|  | 			if (flash == null) { | ||||||
|  | 				throw new ApiError(meta.errors.noSuchFlash); | ||||||
|  | 			} | ||||||
|  | 			if (flash.userId !== me.id) { | ||||||
|  | 				throw new ApiError(meta.errors.accessDenied); | ||||||
|  | 			} | ||||||
|  |  | ||||||
|  | 			await this.flashsRepository.delete(flash.id); | ||||||
|  | 		}); | ||||||
|  | 	} | ||||||
|  | } | ||||||
							
								
								
									
										48
									
								
								packages/backend/src/server/api/endpoints/flash/featured.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,48 @@ | |||||||
|  | import { Inject, Injectable } from '@nestjs/common'; | ||||||
|  | import type { FlashsRepository } from '@/models/index.js'; | ||||||
|  | import { Endpoint } from '@/server/api/endpoint-base.js'; | ||||||
|  | import { FlashEntityService } from '@/core/entities/FlashEntityService.js'; | ||||||
|  | import { DI } from '@/di-symbols.js'; | ||||||
|  |  | ||||||
|  | export const meta = { | ||||||
|  | 	tags: ['flash'], | ||||||
|  |  | ||||||
|  | 	requireCredential: false, | ||||||
|  |  | ||||||
|  | 	res: { | ||||||
|  | 		type: 'array', | ||||||
|  | 		optional: false, nullable: false, | ||||||
|  | 		items: { | ||||||
|  | 			type: 'object', | ||||||
|  | 			optional: false, nullable: false, | ||||||
|  | 			ref: 'Flash', | ||||||
|  | 		}, | ||||||
|  | 	}, | ||||||
|  | } as const; | ||||||
|  |  | ||||||
|  | export const paramDef = { | ||||||
|  | 	type: 'object', | ||||||
|  | 	properties: {}, | ||||||
|  | 	required: [], | ||||||
|  | } as const; | ||||||
|  |  | ||||||
|  | // eslint-disable-next-line import/no-default-export | ||||||
|  | @Injectable() | ||||||
|  | export default class extends Endpoint<typeof meta, typeof paramDef> { | ||||||
|  | 	constructor( | ||||||
|  | 		@Inject(DI.flashsRepository) | ||||||
|  | 		private flashsRepository: FlashsRepository, | ||||||
|  |  | ||||||
|  | 		private flashEntityService: FlashEntityService, | ||||||
|  | 	) { | ||||||
|  | 		super(meta, paramDef, async (ps, me) => { | ||||||
|  | 			const query = this.flashsRepository.createQueryBuilder('flash') | ||||||
|  | 				.andWhere('flash.likedCount > 0') | ||||||
|  | 				.orderBy('flash.likedCount', 'DESC'); | ||||||
|  |  | ||||||
|  | 			const flashs = await query.take(10).getMany(); | ||||||
|  |  | ||||||
|  | 			return await this.flashEntityService.packMany(flashs, me); | ||||||
|  | 		}); | ||||||
|  | 	} | ||||||
|  | } | ||||||
							
								
								
									
										87
									
								
								packages/backend/src/server/api/endpoints/flash/like.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,87 @@ | |||||||
|  | import { Inject, Injectable } from '@nestjs/common'; | ||||||
|  | import type { FlashsRepository, FlashLikesRepository } from '@/models/index.js'; | ||||||
|  | import { IdService } from '@/core/IdService.js'; | ||||||
|  | import { Endpoint } from '@/server/api/endpoint-base.js'; | ||||||
|  | import { DI } from '@/di-symbols.js'; | ||||||
|  | import { ApiError } from '../../error.js'; | ||||||
|  |  | ||||||
|  | export const meta = { | ||||||
|  | 	tags: ['flash'], | ||||||
|  |  | ||||||
|  | 	requireCredential: true, | ||||||
|  |  | ||||||
|  | 	kind: 'write:flash-likes', | ||||||
|  |  | ||||||
|  | 	errors: { | ||||||
|  | 		noSuchFlash: { | ||||||
|  | 			message: 'No such flash.', | ||||||
|  | 			code: 'NO_SUCH_FLASH', | ||||||
|  | 			id: 'c07c1491-9161-4c5c-9d75-01906f911f73', | ||||||
|  | 		}, | ||||||
|  |  | ||||||
|  | 		yourFlash: { | ||||||
|  | 			message: 'You cannot like your flash.', | ||||||
|  | 			code: 'YOUR_FLASH', | ||||||
|  | 			id: '3fd8a0e7-5955-4ba9-85bb-bf3e0c30e13b', | ||||||
|  | 		}, | ||||||
|  |  | ||||||
|  | 		alreadyLiked: { | ||||||
|  | 			message: 'The flash has already been liked.', | ||||||
|  | 			code: 'ALREADY_LIKED', | ||||||
|  | 			id: '010065cf-ad43-40df-8067-abff9f4686e3', | ||||||
|  | 		}, | ||||||
|  | 	}, | ||||||
|  | } as const; | ||||||
|  |  | ||||||
|  | export const paramDef = { | ||||||
|  | 	type: 'object', | ||||||
|  | 	properties: { | ||||||
|  | 		flashId: { type: 'string', format: 'misskey:id' }, | ||||||
|  | 	}, | ||||||
|  | 	required: ['flashId'], | ||||||
|  | } as const; | ||||||
|  |  | ||||||
|  | // eslint-disable-next-line import/no-default-export | ||||||
|  | @Injectable() | ||||||
|  | export default class extends Endpoint<typeof meta, typeof paramDef> { | ||||||
|  | 	constructor( | ||||||
|  | 		@Inject(DI.flashsRepository) | ||||||
|  | 		private flashsRepository: FlashsRepository, | ||||||
|  |  | ||||||
|  | 		@Inject(DI.flashLikesRepository) | ||||||
|  | 		private flashLikesRepository: FlashLikesRepository, | ||||||
|  |  | ||||||
|  | 		private idService: IdService, | ||||||
|  | 	) { | ||||||
|  | 		super(meta, paramDef, async (ps, me) => { | ||||||
|  | 			const flash = await this.flashsRepository.findOneBy({ id: ps.flashId }); | ||||||
|  | 			if (flash == null) { | ||||||
|  | 				throw new ApiError(meta.errors.noSuchFlash); | ||||||
|  | 			} | ||||||
|  |  | ||||||
|  | 			if (flash.userId === me.id) { | ||||||
|  | 				throw new ApiError(meta.errors.yourFlash); | ||||||
|  | 			} | ||||||
|  |  | ||||||
|  | 			// if already liked | ||||||
|  | 			const exist = await this.flashLikesRepository.findOneBy({ | ||||||
|  | 				flashId: flash.id, | ||||||
|  | 				userId: me.id, | ||||||
|  | 			}); | ||||||
|  |  | ||||||
|  | 			if (exist != null) { | ||||||
|  | 				throw new ApiError(meta.errors.alreadyLiked); | ||||||
|  | 			} | ||||||
|  |  | ||||||
|  | 			// Create like | ||||||
|  | 			await this.flashLikesRepository.insert({ | ||||||
|  | 				id: this.idService.genId(), | ||||||
|  | 				createdAt: new Date(), | ||||||
|  | 				flashId: flash.id, | ||||||
|  | 				userId: me.id, | ||||||
|  | 			}); | ||||||
|  |  | ||||||
|  | 			this.flashsRepository.increment({ id: flash.id }, 'likedCount', 1); | ||||||
|  | 		}); | ||||||
|  | 	} | ||||||
|  | } | ||||||
							
								
								
									
										68
									
								
								packages/backend/src/server/api/endpoints/flash/my-likes.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,68 @@ | |||||||
|  | import { Inject, Injectable } from '@nestjs/common'; | ||||||
|  | import { Endpoint } from '@/server/api/endpoint-base.js'; | ||||||
|  | import type { FlashLikesRepository } from '@/models/index.js'; | ||||||
|  | import { QueryService } from '@/core/QueryService.js'; | ||||||
|  | import { FlashLikeEntityService } from '@/core/entities/FlashLikeEntityService.js'; | ||||||
|  | import { DI } from '@/di-symbols.js'; | ||||||
|  |  | ||||||
|  | export const meta = { | ||||||
|  | 	tags: ['account', 'flash'], | ||||||
|  |  | ||||||
|  | 	requireCredential: true, | ||||||
|  |  | ||||||
|  | 	kind: 'read:flash-likes', | ||||||
|  |  | ||||||
|  | 	res: { | ||||||
|  | 		type: 'array', | ||||||
|  | 		optional: false, nullable: false, | ||||||
|  | 		items: { | ||||||
|  | 			type: 'object', | ||||||
|  | 			properties: { | ||||||
|  | 				id: { | ||||||
|  | 					type: 'string', | ||||||
|  | 					optional: false, nullable: false, | ||||||
|  | 					format: 'id', | ||||||
|  | 				}, | ||||||
|  | 				flash: { | ||||||
|  | 					type: 'object', | ||||||
|  | 					optional: false, nullable: false, | ||||||
|  | 					ref: 'Flash', | ||||||
|  | 				}, | ||||||
|  | 			}, | ||||||
|  | 		}, | ||||||
|  | 	}, | ||||||
|  | } as const; | ||||||
|  |  | ||||||
|  | export const paramDef = { | ||||||
|  | 	type: 'object', | ||||||
|  | 	properties: { | ||||||
|  | 		limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 }, | ||||||
|  | 		sinceId: { type: 'string', format: 'misskey:id' }, | ||||||
|  | 		untilId: { type: 'string', format: 'misskey:id' }, | ||||||
|  | 	}, | ||||||
|  | 	required: [], | ||||||
|  | } as const; | ||||||
|  |  | ||||||
|  | // eslint-disable-next-line import/no-default-export | ||||||
|  | @Injectable() | ||||||
|  | export default class extends Endpoint<typeof meta, typeof paramDef> { | ||||||
|  | 	constructor( | ||||||
|  | 		@Inject(DI.flashLikesRepository) | ||||||
|  | 		private flashLikesRepository: FlashLikesRepository, | ||||||
|  |  | ||||||
|  | 		private flashLikeEntityService: FlashLikeEntityService, | ||||||
|  | 		private queryService: QueryService, | ||||||
|  | 	) { | ||||||
|  | 		super(meta, paramDef, async (ps, me) => { | ||||||
|  | 			const query = this.queryService.makePaginationQuery(this.flashLikesRepository.createQueryBuilder('like'), ps.sinceId, ps.untilId) | ||||||
|  | 				.andWhere('like.userId = :meId', { meId: me.id }) | ||||||
|  | 				.leftJoinAndSelect('like.flash', 'flash'); | ||||||
|  |  | ||||||
|  | 			const likes = await query | ||||||
|  | 				.take(ps.limit) | ||||||
|  | 				.getMany(); | ||||||
|  |  | ||||||
|  | 			return this.flashLikeEntityService.packMany(likes, me); | ||||||
|  | 		}); | ||||||
|  | 	} | ||||||
|  | } | ||||||
							
								
								
									
										57
									
								
								packages/backend/src/server/api/endpoints/flash/my.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,57 @@ | |||||||
|  | import { Inject, Injectable } from '@nestjs/common'; | ||||||
|  | import { Endpoint } from '@/server/api/endpoint-base.js'; | ||||||
|  | import type { FlashsRepository } from '@/models/index.js'; | ||||||
|  | import { QueryService } from '@/core/QueryService.js'; | ||||||
|  | import { FlashEntityService } from '@/core/entities/FlashEntityService.js'; | ||||||
|  | import { DI } from '@/di-symbols.js'; | ||||||
|  |  | ||||||
|  | export const meta = { | ||||||
|  | 	tags: ['account', 'flash'], | ||||||
|  |  | ||||||
|  | 	requireCredential: true, | ||||||
|  |  | ||||||
|  | 	kind: 'read:flash', | ||||||
|  |  | ||||||
|  | 	res: { | ||||||
|  | 		type: 'array', | ||||||
|  | 		optional: false, nullable: false, | ||||||
|  | 		items: { | ||||||
|  | 			type: 'object', | ||||||
|  | 			optional: false, nullable: false, | ||||||
|  | 			ref: 'Flash', | ||||||
|  | 		}, | ||||||
|  | 	}, | ||||||
|  | } as const; | ||||||
|  |  | ||||||
|  | export const paramDef = { | ||||||
|  | 	type: 'object', | ||||||
|  | 	properties: { | ||||||
|  | 		limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 }, | ||||||
|  | 		sinceId: { type: 'string', format: 'misskey:id' }, | ||||||
|  | 		untilId: { type: 'string', format: 'misskey:id' }, | ||||||
|  | 	}, | ||||||
|  | 	required: [], | ||||||
|  | } as const; | ||||||
|  |  | ||||||
|  | // eslint-disable-next-line import/no-default-export | ||||||
|  | @Injectable() | ||||||
|  | export default class extends Endpoint<typeof meta, typeof paramDef> { | ||||||
|  | 	constructor( | ||||||
|  | 		@Inject(DI.flashsRepository) | ||||||
|  | 		private flashsRepository: FlashsRepository, | ||||||
|  |  | ||||||
|  | 		private flashEntityService: FlashEntityService, | ||||||
|  | 		private queryService: QueryService, | ||||||
|  | 	) { | ||||||
|  | 		super(meta, paramDef, async (ps, me) => { | ||||||
|  | 			const query = this.queryService.makePaginationQuery(this.flashsRepository.createQueryBuilder('flash'), ps.sinceId, ps.untilId) | ||||||
|  | 				.andWhere('flash.userId = :meId', { meId: me.id }); | ||||||
|  |  | ||||||
|  | 			const flashs = await query | ||||||
|  | 				.take(ps.limit) | ||||||
|  | 				.getMany(); | ||||||
|  |  | ||||||
|  | 			return await this.flashEntityService.packMany(flashs); | ||||||
|  | 		}); | ||||||
|  | 	} | ||||||
|  | } | ||||||
							
								
								
									
										60
									
								
								packages/backend/src/server/api/endpoints/flash/show.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,60 @@ | |||||||
|  | import { IsNull } from 'typeorm'; | ||||||
|  | import { Inject, Injectable } from '@nestjs/common'; | ||||||
|  | import type { UsersRepository, FlashsRepository } from '@/models/index.js'; | ||||||
|  | import type { Flash } from '@/models/entities/Flash.js'; | ||||||
|  | import { Endpoint } from '@/server/api/endpoint-base.js'; | ||||||
|  | import { FlashEntityService } from '@/core/entities/FlashEntityService.js'; | ||||||
|  | import { DI } from '@/di-symbols.js'; | ||||||
|  | import { ApiError } from '../../error.js'; | ||||||
|  |  | ||||||
|  | export const meta = { | ||||||
|  | 	tags: ['flashs'], | ||||||
|  |  | ||||||
|  | 	requireCredential: false, | ||||||
|  |  | ||||||
|  | 	res: { | ||||||
|  | 		type: 'object', | ||||||
|  | 		optional: false, nullable: false, | ||||||
|  | 		ref: 'Flash', | ||||||
|  | 	}, | ||||||
|  |  | ||||||
|  | 	errors: { | ||||||
|  | 		noSuchFlash: { | ||||||
|  | 			message: 'No such flash.', | ||||||
|  | 			code: 'NO_SUCH_FLASH', | ||||||
|  | 			id: 'f0d34a1a-d29a-401d-90ba-1982122b5630', | ||||||
|  | 		}, | ||||||
|  | 	}, | ||||||
|  | } as const; | ||||||
|  |  | ||||||
|  | export const paramDef = { | ||||||
|  | 	type: 'object', | ||||||
|  | 	properties: { | ||||||
|  | 		flashId: { type: 'string', format: 'misskey:id' }, | ||||||
|  | 	}, | ||||||
|  | 	required: ['flashId'], | ||||||
|  | } as const; | ||||||
|  |  | ||||||
|  | // eslint-disable-next-line import/no-default-export | ||||||
|  | @Injectable() | ||||||
|  | export default class extends Endpoint<typeof meta, typeof paramDef> { | ||||||
|  | 	constructor( | ||||||
|  | 		@Inject(DI.usersRepository) | ||||||
|  | 		private usersRepository: UsersRepository, | ||||||
|  |  | ||||||
|  | 		@Inject(DI.flashsRepository) | ||||||
|  | 		private flashsRepository: FlashsRepository, | ||||||
|  |  | ||||||
|  | 		private flashEntityService: FlashEntityService, | ||||||
|  | 	) { | ||||||
|  | 		super(meta, paramDef, async (ps, me) => { | ||||||
|  | 			const flash = await this.flashsRepository.findOneBy({ id: ps.flashId }); | ||||||
|  |  | ||||||
|  | 			if (flash == null) { | ||||||
|  | 				throw new ApiError(meta.errors.noSuchFlash); | ||||||
|  | 			} | ||||||
|  |  | ||||||
|  | 			return await this.flashEntityService.pack(flash, me); | ||||||
|  | 		}); | ||||||
|  | 	} | ||||||
|  | } | ||||||
							
								
								
									
										68
									
								
								packages/backend/src/server/api/endpoints/flash/unlike.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,68 @@ | |||||||
|  | import { Inject, Injectable } from '@nestjs/common'; | ||||||
|  | import type { FlashsRepository, FlashLikesRepository } from '@/models/index.js'; | ||||||
|  | import { Endpoint } from '@/server/api/endpoint-base.js'; | ||||||
|  | import { DI } from '@/di-symbols.js'; | ||||||
|  | import { ApiError } from '../../error.js'; | ||||||
|  |  | ||||||
|  | export const meta = { | ||||||
|  | 	tags: ['flash'], | ||||||
|  |  | ||||||
|  | 	requireCredential: true, | ||||||
|  |  | ||||||
|  | 	kind: 'write:flash-likes', | ||||||
|  |  | ||||||
|  | 	errors: { | ||||||
|  | 		noSuchFlash: { | ||||||
|  | 			message: 'No such flash.', | ||||||
|  | 			code: 'NO_SUCH_FLASH', | ||||||
|  | 			id: 'afe8424a-a69e-432d-a5f2-2f0740c62410', | ||||||
|  | 		}, | ||||||
|  |  | ||||||
|  | 		notLiked: { | ||||||
|  | 			message: 'You have not liked that flash.', | ||||||
|  | 			code: 'NOT_LIKED', | ||||||
|  | 			id: '755f25a7-9871-4f65-9f34-51eaad9ae0ac', | ||||||
|  | 		}, | ||||||
|  | 	}, | ||||||
|  | } as const; | ||||||
|  |  | ||||||
|  | export const paramDef = { | ||||||
|  | 	type: 'object', | ||||||
|  | 	properties: { | ||||||
|  | 		flashId: { type: 'string', format: 'misskey:id' }, | ||||||
|  | 	}, | ||||||
|  | 	required: ['flashId'], | ||||||
|  | } as const; | ||||||
|  |  | ||||||
|  | // eslint-disable-next-line import/no-default-export | ||||||
|  | @Injectable() | ||||||
|  | export default class extends Endpoint<typeof meta, typeof paramDef> { | ||||||
|  | 	constructor( | ||||||
|  | 		@Inject(DI.flashsRepository) | ||||||
|  | 		private flashsRepository: FlashsRepository, | ||||||
|  |  | ||||||
|  | 		@Inject(DI.flashLikesRepository) | ||||||
|  | 		private flashLikesRepository: FlashLikesRepository, | ||||||
|  | 	) { | ||||||
|  | 		super(meta, paramDef, async (ps, me) => { | ||||||
|  | 			const flash = await this.flashsRepository.findOneBy({ id: ps.flashId }); | ||||||
|  | 			if (flash == null) { | ||||||
|  | 				throw new ApiError(meta.errors.noSuchFlash); | ||||||
|  | 			} | ||||||
|  |  | ||||||
|  | 			const exist = await this.flashLikesRepository.findOneBy({ | ||||||
|  | 				flashId: flash.id, | ||||||
|  | 				userId: me.id, | ||||||
|  | 			}); | ||||||
|  |  | ||||||
|  | 			if (exist == null) { | ||||||
|  | 				throw new ApiError(meta.errors.notLiked); | ||||||
|  | 			} | ||||||
|  |  | ||||||
|  | 			// Delete like | ||||||
|  | 			await this.flashLikesRepository.delete(exist.id); | ||||||
|  |  | ||||||
|  | 			this.flashsRepository.decrement({ id: flash.id }, 'likedCount', 1); | ||||||
|  | 		}); | ||||||
|  | 	} | ||||||
|  | } | ||||||
							
								
								
									
										78
									
								
								packages/backend/src/server/api/endpoints/flash/update.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,78 @@ | |||||||
|  | import ms from 'ms'; | ||||||
|  | import { Not } from 'typeorm'; | ||||||
|  | import { Inject, Injectable } from '@nestjs/common'; | ||||||
|  | import type { FlashsRepository, DriveFilesRepository } from '@/models/index.js'; | ||||||
|  | import { Endpoint } from '@/server/api/endpoint-base.js'; | ||||||
|  | import { DI } from '@/di-symbols.js'; | ||||||
|  | import { ApiError } from '../../error.js'; | ||||||
|  |  | ||||||
|  | export const meta = { | ||||||
|  | 	tags: ['flash'], | ||||||
|  |  | ||||||
|  | 	requireCredential: true, | ||||||
|  |  | ||||||
|  | 	kind: 'write:flash', | ||||||
|  |  | ||||||
|  | 	limit: { | ||||||
|  | 		duration: ms('1hour'), | ||||||
|  | 		max: 300, | ||||||
|  | 	}, | ||||||
|  |  | ||||||
|  | 	errors: { | ||||||
|  | 		noSuchFlash: { | ||||||
|  | 			message: 'No such flash.', | ||||||
|  | 			code: 'NO_SUCH_FLASH', | ||||||
|  | 			id: '611e13d2-309e-419a-a5e4-e0422da39b02', | ||||||
|  | 		}, | ||||||
|  |  | ||||||
|  | 		accessDenied: { | ||||||
|  | 			message: 'Access denied.', | ||||||
|  | 			code: 'ACCESS_DENIED', | ||||||
|  | 			id: '08e60c88-5948-478e-a132-02ec701d67b2', | ||||||
|  | 		}, | ||||||
|  | 	}, | ||||||
|  | } as const; | ||||||
|  |  | ||||||
|  | export const paramDef = { | ||||||
|  | 	type: 'object', | ||||||
|  | 	properties: { | ||||||
|  | 		flashId: { type: 'string', format: 'misskey:id' }, | ||||||
|  | 		title: { type: 'string' }, | ||||||
|  | 		summary: { type: 'string' }, | ||||||
|  | 		script: { type: 'string' }, | ||||||
|  | 		permissions: { type: 'array', items: { | ||||||
|  | 			type: 'string', | ||||||
|  | 		} }, | ||||||
|  | 	}, | ||||||
|  | 	required: ['flashId', 'title', 'summary', 'script', 'permissions'], | ||||||
|  | } as const; | ||||||
|  |  | ||||||
|  | // eslint-disable-next-line import/no-default-export | ||||||
|  | @Injectable() | ||||||
|  | export default class extends Endpoint<typeof meta, typeof paramDef> { | ||||||
|  | 	constructor( | ||||||
|  | 		@Inject(DI.flashsRepository) | ||||||
|  | 		private flashsRepository: FlashsRepository, | ||||||
|  |  | ||||||
|  | 		@Inject(DI.driveFilesRepository) | ||||||
|  | 		private driveFilesRepository: DriveFilesRepository, | ||||||
|  | 	) { | ||||||
|  | 		super(meta, paramDef, async (ps, me) => { | ||||||
|  | 			const flash = await this.flashsRepository.findOneBy({ id: ps.flashId }); | ||||||
|  | 			if (flash == null) { | ||||||
|  | 				throw new ApiError(meta.errors.noSuchFlash); | ||||||
|  | 			} | ||||||
|  | 			if (flash.userId !== me.id) { | ||||||
|  | 				throw new ApiError(meta.errors.accessDenied); | ||||||
|  | 			} | ||||||
|  |  | ||||||
|  | 			await this.flashsRepository.update(flash.id, { | ||||||
|  | 				updatedAt: new Date(), | ||||||
|  | 				title: ps.title, | ||||||
|  | 				summary: ps.summary, | ||||||
|  | 				script: ps.script, | ||||||
|  | 				permissions: ps.permissions, | ||||||
|  | 			}); | ||||||
|  | 		}); | ||||||
|  | 	} | ||||||
|  | } | ||||||
| @@ -2,6 +2,7 @@ import { Inject, Injectable } from '@nestjs/common'; | |||||||
| import { Endpoint } from '@/server/api/endpoint-base.js'; | import { Endpoint } from '@/server/api/endpoint-base.js'; | ||||||
| import type { HashtagsRepository } from '@/models/index.js'; | import type { HashtagsRepository } from '@/models/index.js'; | ||||||
| import { DI } from '@/di-symbols.js'; | import { DI } from '@/di-symbols.js'; | ||||||
|  | import { sqlLikeEscape } from '@/misc/sql-like-escape.js'; | ||||||
|  |  | ||||||
| export const meta = { | export const meta = { | ||||||
| 	tags: ['hashtags'], | 	tags: ['hashtags'], | ||||||
| @@ -37,7 +38,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { | |||||||
| 	) { | 	) { | ||||||
| 		super(meta, paramDef, async (ps, me) => { | 		super(meta, paramDef, async (ps, me) => { | ||||||
| 			const hashtags = await this.hashtagsRepository.createQueryBuilder('tag') | 			const hashtags = await this.hashtagsRepository.createQueryBuilder('tag') | ||||||
| 				.where('tag.name like :q', { q: ps.query.toLowerCase() + '%' }) | 				.where('tag.name like :q', { q: sqlLikeEscape(ps.query.toLowerCase()) + '%' }) | ||||||
| 				.orderBy('tag.count', 'DESC') | 				.orderBy('tag.count', 'DESC') | ||||||
| 				.groupBy('tag.id') | 				.groupBy('tag.id') | ||||||
| 				.take(ps.limit) | 				.take(ps.limit) | ||||||
|   | |||||||
| @@ -162,13 +162,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { | |||||||
| 				userId: me.id, | 				userId: me.id, | ||||||
| 			}); | 			}); | ||||||
|  |  | ||||||
| 			// Notify |  | ||||||
| 			this.createNotificationService.createNotification(note.userId, 'pollVote', { |  | ||||||
| 				notifierId: me.id, |  | ||||||
| 				noteId: note.id, |  | ||||||
| 				choice: ps.choice, |  | ||||||
| 			}); |  | ||||||
|  |  | ||||||
| 			// リモート投票の場合リプライ送信 | 			// リモート投票の場合リプライ送信 | ||||||
| 			if (note.userHost != null) { | 			if (note.userHost != null) { | ||||||
| 				const pollOwner = await this.usersRepository.findOneByOrFail({ id: note.userId }) as IRemoteUser; | 				const pollOwner = await this.usersRepository.findOneByOrFail({ id: note.userId }) as IRemoteUser; | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ import { QueryService } from '@/core/QueryService.js'; | |||||||
| import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; | import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; | ||||||
| import type { Config } from '@/config.js'; | import type { Config } from '@/config.js'; | ||||||
| import { DI } from '@/di-symbols.js'; | import { DI } from '@/di-symbols.js'; | ||||||
|  | import { sqlLikeEscape } from '@/misc/sql-like-escape.js'; | ||||||
|  |  | ||||||
| export const meta = { | export const meta = { | ||||||
| 	tags: ['notes'], | 	tags: ['notes'], | ||||||
| @@ -70,7 +71,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { | |||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 			query | 			query | ||||||
| 				.andWhere('note.text ILIKE :q', { q: `%${ps.query}%` }) | 				.andWhere('note.text ILIKE :q', { q: `%${ sqlLikeEscape(ps.query) }%` }) | ||||||
| 				.innerJoinAndSelect('note.user', 'user') | 				.innerJoinAndSelect('note.user', 'user') | ||||||
| 				.leftJoinAndSelect('user.avatar', 'avatar') | 				.leftJoinAndSelect('user.avatar', 'avatar') | ||||||
| 				.leftJoinAndSelect('user.banner', 'banner') | 				.leftJoinAndSelect('user.banner', 'banner') | ||||||
|   | |||||||
| @@ -6,6 +6,7 @@ import type { User } from '@/models/entities/User.js'; | |||||||
| import { Endpoint } from '@/server/api/endpoint-base.js'; | import { Endpoint } from '@/server/api/endpoint-base.js'; | ||||||
| import { UserEntityService } from '@/core/entities/UserEntityService.js'; | import { UserEntityService } from '@/core/entities/UserEntityService.js'; | ||||||
| import { DI } from '@/di-symbols.js'; | import { DI } from '@/di-symbols.js'; | ||||||
|  | import { sqlLikeEscape } from '@/misc/sql-like-escape.js'; | ||||||
|  |  | ||||||
| export const meta = { | export const meta = { | ||||||
| 	tags: ['users'], | 	tags: ['users'], | ||||||
| @@ -59,10 +60,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { | |||||||
| 			if (ps.host) { | 			if (ps.host) { | ||||||
| 				const q = this.usersRepository.createQueryBuilder('user') | 				const q = this.usersRepository.createQueryBuilder('user') | ||||||
| 					.where('user.isSuspended = FALSE') | 					.where('user.isSuspended = FALSE') | ||||||
| 					.andWhere('user.host LIKE :host', { host: ps.host.toLowerCase() + '%' }); | 					.andWhere('user.host LIKE :host', { host: sqlLikeEscape(ps.host.toLowerCase()) + '%' }); | ||||||
|  |  | ||||||
| 				if (ps.username) { | 				if (ps.username) { | ||||||
| 					q.andWhere('user.usernameLower LIKE :username', { username: ps.username.toLowerCase() + '%' }); | 					q.andWhere('user.usernameLower LIKE :username', { username: sqlLikeEscape(ps.username.toLowerCase()) + '%' }); | ||||||
| 				} | 				} | ||||||
|  |  | ||||||
| 				q.andWhere('user.updatedAt IS NOT NULL'); | 				q.andWhere('user.updatedAt IS NOT NULL'); | ||||||
| @@ -83,7 +84,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { | |||||||
| 						.where(`user.id IN (${ followingQuery.getQuery() })`) | 						.where(`user.id IN (${ followingQuery.getQuery() })`) | ||||||
| 						.andWhere('user.id != :meId', { meId: me.id }) | 						.andWhere('user.id != :meId', { meId: me.id }) | ||||||
| 						.andWhere('user.isSuspended = FALSE') | 						.andWhere('user.isSuspended = FALSE') | ||||||
| 						.andWhere('user.usernameLower LIKE :username', { username: ps.username.toLowerCase() + '%' }) | 						.andWhere('user.usernameLower LIKE :username', { username: sqlLikeEscape(ps.username.toLowerCase()) + '%' }) | ||||||
| 						.andWhere(new Brackets(qb => { qb | 						.andWhere(new Brackets(qb => { qb | ||||||
| 							.where('user.updatedAt IS NULL') | 							.where('user.updatedAt IS NULL') | ||||||
| 							.orWhere('user.updatedAt > :activeThreshold', { activeThreshold: activeThreshold }); | 							.orWhere('user.updatedAt > :activeThreshold', { activeThreshold: activeThreshold }); | ||||||
| @@ -101,7 +102,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { | |||||||
| 							.where(`user.id NOT IN (${ followingQuery.getQuery() })`) | 							.where(`user.id NOT IN (${ followingQuery.getQuery() })`) | ||||||
| 							.andWhere('user.id != :meId', { meId: me.id }) | 							.andWhere('user.id != :meId', { meId: me.id }) | ||||||
| 							.andWhere('user.isSuspended = FALSE') | 							.andWhere('user.isSuspended = FALSE') | ||||||
| 							.andWhere('user.usernameLower LIKE :username', { username: ps.username.toLowerCase() + '%' }) | 							.andWhere('user.usernameLower LIKE :username', { username: sqlLikeEscape(ps.username.toLowerCase()) + '%' }) | ||||||
| 							.andWhere('user.updatedAt IS NOT NULL'); | 							.andWhere('user.updatedAt IS NOT NULL'); | ||||||
|  |  | ||||||
| 						otherQuery.setParameters(followingQuery.getParameters()); | 						otherQuery.setParameters(followingQuery.getParameters()); | ||||||
| @@ -116,7 +117,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { | |||||||
| 				} else { | 				} else { | ||||||
| 					users = await this.usersRepository.createQueryBuilder('user') | 					users = await this.usersRepository.createQueryBuilder('user') | ||||||
| 						.where('user.isSuspended = FALSE') | 						.where('user.isSuspended = FALSE') | ||||||
| 						.andWhere('user.usernameLower LIKE :username', { username: ps.username.toLowerCase() + '%' }) | 						.andWhere('user.usernameLower LIKE :username', { username: sqlLikeEscape(ps.username.toLowerCase()) + '%' }) | ||||||
| 						.andWhere('user.updatedAt IS NOT NULL') | 						.andWhere('user.updatedAt IS NOT NULL') | ||||||
| 						.orderBy('user.updatedAt', 'DESC') | 						.orderBy('user.updatedAt', 'DESC') | ||||||
| 						.take(ps.limit - users.length) | 						.take(ps.limit - users.length) | ||||||
|   | |||||||
| @@ -5,6 +5,7 @@ import type { User } from '@/models/entities/User.js'; | |||||||
| import { Endpoint } from '@/server/api/endpoint-base.js'; | import { Endpoint } from '@/server/api/endpoint-base.js'; | ||||||
| import { UserEntityService } from '@/core/entities/UserEntityService.js'; | import { UserEntityService } from '@/core/entities/UserEntityService.js'; | ||||||
| import { DI } from '@/di-symbols.js'; | import { DI } from '@/di-symbols.js'; | ||||||
|  | import { sqlLikeEscape } from '@/misc/sql-like-escape.js'; | ||||||
|  |  | ||||||
| export const meta = { | export const meta = { | ||||||
| 	tags: ['users'], | 	tags: ['users'], | ||||||
| @@ -57,7 +58,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { | |||||||
|  |  | ||||||
| 			if (isUsername) { | 			if (isUsername) { | ||||||
| 				const usernameQuery = this.usersRepository.createQueryBuilder('user') | 				const usernameQuery = this.usersRepository.createQueryBuilder('user') | ||||||
| 					.where('user.usernameLower LIKE :username', { username: ps.query.replace('@', '').toLowerCase() + '%' }) | 					.where('user.usernameLower LIKE :username', { username: sqlLikeEscape(ps.query.replace('@', '').toLowerCase()) + '%' }) | ||||||
| 					.andWhere(new Brackets(qb => { qb | 					.andWhere(new Brackets(qb => { qb | ||||||
| 						.where('user.updatedAt IS NULL') | 						.where('user.updatedAt IS NULL') | ||||||
| 						.orWhere('user.updatedAt > :activeThreshold', { activeThreshold: activeThreshold }); | 						.orWhere('user.updatedAt > :activeThreshold', { activeThreshold: activeThreshold }); | ||||||
| @@ -78,11 +79,11 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { | |||||||
| 			} else { | 			} else { | ||||||
| 				const nameQuery = this.usersRepository.createQueryBuilder('user') | 				const nameQuery = this.usersRepository.createQueryBuilder('user') | ||||||
| 					.where(new Brackets(qb => {  | 					.where(new Brackets(qb => {  | ||||||
| 						qb.where('user.name ILIKE :query', { query: '%' + ps.query + '%' }); | 						qb.where('user.name ILIKE :query', { query: '%' + sqlLikeEscape(ps.query) + '%' }); | ||||||
|  |  | ||||||
| 						// Also search username if it qualifies as username | 						// Also search username if it qualifies as username | ||||||
| 						if (this.userEntityService.validateLocalUsername(ps.query)) { | 						if (this.userEntityService.validateLocalUsername(ps.query)) { | ||||||
| 							qb.orWhere('user.usernameLower LIKE :username', { username: '%' + ps.query.toLowerCase() + '%' }); | 							qb.orWhere('user.usernameLower LIKE :username', { username: '%' + sqlLikeEscape(ps.query.toLowerCase()) + '%' }); | ||||||
| 						} | 						} | ||||||
| 					})) | 					})) | ||||||
| 					.andWhere(new Brackets(qb => { qb | 					.andWhere(new Brackets(qb => { qb | ||||||
| @@ -106,7 +107,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { | |||||||
| 				if (users.length < ps.limit) { | 				if (users.length < ps.limit) { | ||||||
| 					const profQuery = this.userProfilesRepository.createQueryBuilder('prof') | 					const profQuery = this.userProfilesRepository.createQueryBuilder('prof') | ||||||
| 						.select('prof.userId') | 						.select('prof.userId') | ||||||
| 						.where('prof.description ILIKE :query', { query: '%' + ps.query + '%' }); | 						.where('prof.description ILIKE :query', { query: '%' + sqlLikeEscape(ps.query) + '%' }); | ||||||
|  |  | ||||||
| 					if (ps.origin === 'local') { | 					if (ps.origin === 'local') { | ||||||
| 						profQuery.andWhere('prof.userHost IS NULL'); | 						profQuery.andWhere('prof.userHost IS NULL'); | ||||||
|   | |||||||
| @@ -1,6 +1,5 @@ | |||||||
| import { dirname } from 'node:path'; | import { dirname } from 'node:path'; | ||||||
| import { fileURLToPath } from 'node:url'; | import { fileURLToPath } from 'node:url'; | ||||||
| import { PathOrFileDescriptor, readFileSync } from 'node:fs'; |  | ||||||
| import { Inject, Injectable } from '@nestjs/common'; | import { Inject, Injectable } from '@nestjs/common'; | ||||||
| import { createBullBoard } from '@bull-board/api'; | import { createBullBoard } from '@bull-board/api'; | ||||||
| import { BullAdapter } from '@bull-board/api/bullAdapter.js'; | import { BullAdapter } from '@bull-board/api/bullAdapter.js'; | ||||||
| @@ -26,9 +25,10 @@ import { PageEntityService } from '@/core/entities/PageEntityService.js'; | |||||||
| import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js'; | import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js'; | ||||||
| import { ClipEntityService } from '@/core/entities/ClipEntityService.js'; | import { ClipEntityService } from '@/core/entities/ClipEntityService.js'; | ||||||
| import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js'; | import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js'; | ||||||
| import type { ChannelsRepository, ClipsRepository, EmojisRepository, GalleryPostsRepository, NotesRepository, PagesRepository, UserProfilesRepository, UsersRepository } from '@/models/index.js'; | import type { ChannelsRepository, ClipsRepository, EmojisRepository, FlashsRepository, GalleryPostsRepository, NotesRepository, PagesRepository, UserProfilesRepository, UsersRepository } from '@/models/index.js'; | ||||||
| import { deepClone } from '@/misc/clone.js'; | import { deepClone } from '@/misc/clone.js'; | ||||||
| import { bindThis } from '@/decorators.js'; | import { bindThis } from '@/decorators.js'; | ||||||
|  | import { FlashEntityService } from '@/core/entities/FlashEntityService.js'; | ||||||
| import manifest from './manifest.json' assert { type: 'json' }; | import manifest from './manifest.json' assert { type: 'json' }; | ||||||
| import { FeedService } from './FeedService.js'; | import { FeedService } from './FeedService.js'; | ||||||
| import { UrlPreviewService } from './UrlPreviewService.js'; | import { UrlPreviewService } from './UrlPreviewService.js'; | ||||||
| @@ -70,9 +70,10 @@ export class ClientServerService { | |||||||
| 		@Inject(DI.pagesRepository) | 		@Inject(DI.pagesRepository) | ||||||
| 		private pagesRepository: PagesRepository, | 		private pagesRepository: PagesRepository, | ||||||
|  |  | ||||||
| 		@Inject(DI.emojisRepository) | 		@Inject(DI.flashsRepository) | ||||||
| 		private emojisRepository: EmojisRepository, | 		private flashsRepository: FlashsRepository, | ||||||
|  |  | ||||||
|  | 		private flashEntityService: FlashEntityService, | ||||||
| 		private userEntityService: UserEntityService, | 		private userEntityService: UserEntityService, | ||||||
| 		private noteEntityService: NoteEntityService, | 		private noteEntityService: NoteEntityService, | ||||||
| 		private pageEntityService: PageEntityService, | 		private pageEntityService: PageEntityService, | ||||||
| @@ -220,44 +221,6 @@ export class ClientServerService { | |||||||
| 			return reply.sendFile('/apple-touch-icon.png', staticAssets); | 			return reply.sendFile('/apple-touch-icon.png', staticAssets); | ||||||
| 		}); | 		}); | ||||||
|  |  | ||||||
| 		fastify.get<{ Params: { path: string }; Querystring: { static?: any; }; }>('/emoji/:path(.*)', async (request, reply) => { |  | ||||||
| 			const path = request.params.path; |  | ||||||
|  |  | ||||||
| 			if (!path.match(/^[a-zA-Z0-9\-_@\.]+?\.webp$/)) { |  | ||||||
| 				reply.code(404); |  | ||||||
| 				return; |  | ||||||
| 			} |  | ||||||
|  |  | ||||||
| 			reply.header('Cache-Control', 'public, max-age=86400'); |  | ||||||
|  |  | ||||||
| 			const name = path.split('@')[0].replace('.webp', ''); |  | ||||||
| 			const host = path.split('@')[1]?.replace('.webp', ''); |  | ||||||
|  |  | ||||||
| 			const emoji = await this.emojisRepository.findOneBy({ |  | ||||||
| 				// `@.` is the spec of ReactionService.decodeReaction |  | ||||||
| 				host: (host == null || host === '.') ? IsNull() : host, |  | ||||||
| 				name: name, |  | ||||||
| 			}); |  | ||||||
|  |  | ||||||
| 			if (emoji == null) { |  | ||||||
| 				reply.code(404); |  | ||||||
| 				return; |  | ||||||
| 			} |  | ||||||
|  |  | ||||||
| 			reply.header('Content-Security-Policy', 'default-src \'none\'; style-src \'unsafe-inline\''); |  | ||||||
|  |  | ||||||
| 			const url = new URL('/proxy/emoji.webp', this.config.url); |  | ||||||
| 			// || emoji.originalUrl してるのは後方互換性のため(publicUrlはstringなので??はだめ) |  | ||||||
| 			url.searchParams.set('url', emoji.publicUrl || emoji.originalUrl); |  | ||||||
| 			url.searchParams.set('emoji', '1'); |  | ||||||
| 			if ('static' in request.query) url.searchParams.set('static', '1'); |  | ||||||
|  |  | ||||||
| 			return await reply.redirect( |  | ||||||
| 				301, |  | ||||||
| 				url.toString(), |  | ||||||
| 			); |  | ||||||
| 		}); |  | ||||||
|  |  | ||||||
| 		fastify.get<{ Params: { path: string } }>('/fluent-emoji/:path(.*)', async (request, reply) => { | 		fastify.get<{ Params: { path: string } }>('/fluent-emoji/:path(.*)', async (request, reply) => { | ||||||
| 			const path = request.params.path; | 			const path = request.params.path; | ||||||
|  |  | ||||||
| @@ -349,10 +312,10 @@ export class ClientServerService { | |||||||
| 		fastify.get('/opensearch.xml', async (request, reply) => { | 		fastify.get('/opensearch.xml', async (request, reply) => { | ||||||
| 			const meta = await this.metaService.fetch(); | 			const meta = await this.metaService.fetch(); | ||||||
|  |  | ||||||
| 			const name = meta.name || 'Misskey'; | 			const name = meta.name ?? 'Misskey'; | ||||||
| 			let content = ''; | 			let content = ''; | ||||||
| 			content += '<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/">'; | 			content += '<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/">'; | ||||||
| 			content += `<ShortName>${name} Search</ShortName>`; | 			content += `<ShortName>${name}</ShortName>`; | ||||||
| 			content += `<Description>${name} Search</Description>`; | 			content += `<Description>${name} Search</Description>`; | ||||||
| 			content += '<InputEncoding>UTF-8</InputEncoding>'; | 			content += '<InputEncoding>UTF-8</InputEncoding>'; | ||||||
| 			content += `<Image width="16" height="16" type="image/x-icon">${this.config.url}/favicon.ico</Image>`; | 			content += `<Image width="16" height="16" type="image/x-icon">${this.config.url}/favicon.ico</Image>`; | ||||||
| @@ -545,14 +508,37 @@ export class ClientServerService { | |||||||
| 			} | 			} | ||||||
| 		}); | 		}); | ||||||
|  |  | ||||||
|  | 		// Flash | ||||||
|  | 		fastify.get<{ Params: { id: string; } }>('/play/:id', async (request, reply) => { | ||||||
|  | 			const flash = await this.flashsRepository.findOneBy({ | ||||||
|  | 				id: request.params.id, | ||||||
|  | 			}); | ||||||
|  |  | ||||||
|  | 			if (flash) { | ||||||
|  | 				const _flash = await this.flashEntityService.pack(flash); | ||||||
|  | 				const profile = await this.userProfilesRepository.findOneByOrFail({ userId: flash.userId }); | ||||||
|  | 				const meta = await this.metaService.fetch(); | ||||||
|  | 				reply.header('Cache-Control', 'public, max-age=15'); | ||||||
|  | 				return await reply.view('flash', { | ||||||
|  | 					flash: _flash, | ||||||
|  | 					profile, | ||||||
|  | 					avatarUrl: await this.userEntityService.getAvatarUrl(await this.usersRepository.findOneByOrFail({ id: flash.userId })), | ||||||
|  | 					instanceName: meta.name ?? 'Misskey', | ||||||
|  | 					icon: meta.iconUrl, | ||||||
|  | 					themeColor: meta.themeColor, | ||||||
|  | 				}); | ||||||
|  | 			} else { | ||||||
|  | 				return await renderBase(reply); | ||||||
|  | 			} | ||||||
|  | 		}); | ||||||
|  |  | ||||||
| 		// Clip | 		// Clip | ||||||
| 		// TODO: 非publicなclipのハンドリング |  | ||||||
| 		fastify.get<{ Params: { clip: string; } }>('/clips/:clip', async (request, reply) => { | 		fastify.get<{ Params: { clip: string; } }>('/clips/:clip', async (request, reply) => { | ||||||
| 			const clip = await this.clipsRepository.findOneBy({ | 			const clip = await this.clipsRepository.findOneBy({ | ||||||
| 				id: request.params.clip, | 				id: request.params.clip, | ||||||
| 			}); | 			}); | ||||||
|  |  | ||||||
| 			if (clip) { | 			if (clip && clip.isPublic) { | ||||||
| 				const _clip = await this.clipEntityService.pack(clip); | 				const _clip = await this.clipEntityService.pack(clip); | ||||||
| 				const profile = await this.userProfilesRepository.findOneByOrFail({ userId: clip.userId }); | 				const profile = await this.userProfilesRepository.findOneByOrFail({ userId: clip.userId }); | ||||||
| 				const meta = await this.metaService.fetch(); | 				const meta = await this.metaService.fetch(); | ||||||
|   | |||||||
| @@ -31,7 +31,7 @@ html | |||||||
| 		link(rel='icon' href= icon || '/favicon.ico') | 		link(rel='icon' href= icon || '/favicon.ico') | ||||||
| 		link(rel='apple-touch-icon' href= icon || '/apple-touch-icon.png') | 		link(rel='apple-touch-icon' href= icon || '/apple-touch-icon.png') | ||||||
| 		link(rel='manifest' href='/manifest.json') | 		link(rel='manifest' href='/manifest.json') | ||||||
| 		link(rel='search' type='application/opensearchdescription+xml' title=((title || "Misskey") + " Search") href=`${url}/opensearch.xml`) | 		link(rel='search' type='application/opensearchdescription+xml' title=(title || "Misskey") href=`${url}/opensearch.xml`) | ||||||
| 		link(rel='prefetch' href='https://xn--931a.moe/assets/info.jpg') | 		link(rel='prefetch' href='https://xn--931a.moe/assets/info.jpg') | ||||||
| 		link(rel='prefetch' href='https://xn--931a.moe/assets/not-found.jpg') | 		link(rel='prefetch' href='https://xn--931a.moe/assets/not-found.jpg') | ||||||
| 		link(rel='prefetch' href='https://xn--931a.moe/assets/error.jpg') | 		link(rel='prefetch' href='https://xn--931a.moe/assets/error.jpg') | ||||||
|   | |||||||
							
								
								
									
										31
									
								
								packages/backend/src/server/web/views/flash.pug
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,31 @@ | |||||||
|  | extends ./base | ||||||
|  |  | ||||||
|  | block vars | ||||||
|  | 	- const user = flash.user; | ||||||
|  | 	- const title = flash.title; | ||||||
|  | 	- const url = `${config.url}/play/${flash.id}`; | ||||||
|  |  | ||||||
|  | block title | ||||||
|  | 	= `${title} | ${instanceName}` | ||||||
|  |  | ||||||
|  | block desc | ||||||
|  | 	meta(name='description' content= flash.summary) | ||||||
|  |  | ||||||
|  | block og | ||||||
|  | 	meta(property='og:type'        content='article') | ||||||
|  | 	meta(property='og:title'       content= title) | ||||||
|  | 	meta(property='og:description' content= flash.summary) | ||||||
|  | 	meta(property='og:url'         content= url) | ||||||
|  | 	meta(property='og:image'       content= avatarUrl) | ||||||
|  |  | ||||||
|  | block meta | ||||||
|  | 	if profile.noCrawle | ||||||
|  | 		meta(name='robots' content='noindex') | ||||||
|  |  | ||||||
|  | 	meta(name='misskey:user-username' content=user.username) | ||||||
|  | 	meta(name='misskey:user-id' content=user.id) | ||||||
|  | 	meta(name='misskey:flash-id' content=flash.id) | ||||||
|  |  | ||||||
|  | 	// todo | ||||||
|  | 	if user.twitter | ||||||
|  | 		meta(name='twitter:creator' content=`@${user.twitter.screenName}`) | ||||||
							
								
								
									
										
											BIN
										
									
								
								packages/frontend/assets/cookie.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 38 KiB | 
| @@ -11,7 +11,7 @@ | |||||||
| 		"@rollup/plugin-alias": "4.0.2", | 		"@rollup/plugin-alias": "4.0.2", | ||||||
| 		"@rollup/plugin-json": "6.0.0", | 		"@rollup/plugin-json": "6.0.0", | ||||||
| 		"@rollup/pluginutils": "5.0.2", | 		"@rollup/pluginutils": "5.0.2", | ||||||
| 		"@syuilo/aiscript": "0.12.0", | 		"@syuilo/aiscript": "0.12.2", | ||||||
| 		"@tabler/icons": "^1.118.0", | 		"@tabler/icons": "^1.118.0", | ||||||
| 		"@vitejs/plugin-vue": "4.0.0", | 		"@vitejs/plugin-vue": "4.0.0", | ||||||
| 		"@vue/compiler-sfc": "3.2.45", | 		"@vue/compiler-sfc": "3.2.45", | ||||||
| @@ -20,7 +20,8 @@ | |||||||
| 		"blurhash": "2.0.4", | 		"blurhash": "2.0.4", | ||||||
| 		"broadcast-channel": "4.19.1", | 		"broadcast-channel": "4.19.1", | ||||||
| 		"browser-image-resizer": "git+https://github.com/misskey-dev/browser-image-resizer#v2.2.1-misskey.3", | 		"browser-image-resizer": "git+https://github.com/misskey-dev/browser-image-resizer#v2.2.1-misskey.3", | ||||||
| 		"chart.js": "4.1.1", | 		"canvas-confetti": "^1.6.0", | ||||||
|  | 		"chart.js": "4.1.2", | ||||||
| 		"chartjs-adapter-date-fns": "3.0.0", | 		"chartjs-adapter-date-fns": "3.0.0", | ||||||
| 		"chartjs-chart-matrix": "^1.3.0", | 		"chartjs-chart-matrix": "^1.3.0", | ||||||
| 		"chartjs-plugin-gradient": "0.6.1", | 		"chartjs-plugin-gradient": "0.6.1", | ||||||
| @@ -35,7 +36,7 @@ | |||||||
| 		"insert-text-at-cursor": "0.3.0", | 		"insert-text-at-cursor": "0.3.0", | ||||||
| 		"is-file-animated": "1.0.2", | 		"is-file-animated": "1.0.2", | ||||||
| 		"json5": "2.2.3", | 		"json5": "2.2.3", | ||||||
| 		"katex": "0.15.6", | 		"katex": "0.16.4", | ||||||
| 		"matter-js": "0.18.0", | 		"matter-js": "0.18.0", | ||||||
| 		"mfm-js": "0.23.0", | 		"mfm-js": "0.23.0", | ||||||
| 		"misskey-js": "0.0.14", | 		"misskey-js": "0.0.14", | ||||||
| @@ -44,7 +45,7 @@ | |||||||
| 		"punycode": "2.1.1", | 		"punycode": "2.1.1", | ||||||
| 		"querystring": "0.2.1", | 		"querystring": "0.2.1", | ||||||
| 		"rndstr": "1.0.0", | 		"rndstr": "1.0.0", | ||||||
| 		"rollup": "3.9.0", | 		"rollup": "3.9.1", | ||||||
| 		"s-age": "1.1.2", | 		"s-age": "1.1.2", | ||||||
| 		"sanitize-html": "^2.8.1", | 		"sanitize-html": "^2.8.1", | ||||||
| 		"sass": "1.57.1", | 		"sass": "1.57.1", | ||||||
| @@ -55,14 +56,14 @@ | |||||||
| 		"textarea-caret": "3.1.0", | 		"textarea-caret": "3.1.0", | ||||||
| 		"three": "0.148.0", | 		"three": "0.148.0", | ||||||
| 		"throttle-debounce": "5.0.0", | 		"throttle-debounce": "5.0.0", | ||||||
| 		"tinycolor2": "1.5.1", | 		"tinycolor2": "1.5.2", | ||||||
| 		"tsc-alias": "1.8.2", | 		"tsc-alias": "1.8.2", | ||||||
| 		"tsconfig-paths": "4.1.2", | 		"tsconfig-paths": "4.1.2", | ||||||
| 		"twemoji-parser": "14.0.0", | 		"twemoji-parser": "14.0.0", | ||||||
| 		"typescript": "4.9.4", | 		"typescript": "4.9.4", | ||||||
| 		"uuid": "9.0.0", | 		"uuid": "9.0.0", | ||||||
| 		"vanilla-tilt": "1.8.0", | 		"vanilla-tilt": "1.8.0", | ||||||
| 		"vite": "4.0.3", | 		"vite": "4.0.4", | ||||||
| 		"vue": "3.2.45", | 		"vue": "3.2.45", | ||||||
| 		"vue-prism-editor": "2.0.0-alpha.2", | 		"vue-prism-editor": "2.0.0-alpha.2", | ||||||
| 		"vuedraggable": "next" | 		"vuedraggable": "next" | ||||||
| @@ -72,7 +73,7 @@ | |||||||
| 		"@types/glob": "8.0.0", | 		"@types/glob": "8.0.0", | ||||||
| 		"@types/gulp": "4.0.10", | 		"@types/gulp": "4.0.10", | ||||||
| 		"@types/gulp-rename": "2.0.1", | 		"@types/gulp-rename": "2.0.1", | ||||||
| 		"@types/katex": "0.14.0", | 		"@types/katex": "0.16.0", | ||||||
| 		"@types/matter-js": "0.18.2", | 		"@types/matter-js": "0.18.2", | ||||||
| 		"@types/punycode": "2.1.0", | 		"@types/punycode": "2.1.0", | ||||||
| 		"@types/sanitize-html": "^2.8.0", | 		"@types/sanitize-html": "^2.8.0", | ||||||
| @@ -82,16 +83,16 @@ | |||||||
| 		"@types/uuid": "9.0.0", | 		"@types/uuid": "9.0.0", | ||||||
| 		"@types/websocket": "1.0.5", | 		"@types/websocket": "1.0.5", | ||||||
| 		"@types/ws": "8.5.4", | 		"@types/ws": "8.5.4", | ||||||
| 		"@typescript-eslint/eslint-plugin": "5.47.1", | 		"@typescript-eslint/eslint-plugin": "5.48.0", | ||||||
| 		"@typescript-eslint/parser": "5.47.1", | 		"@typescript-eslint/parser": "5.48.0", | ||||||
| 		"@vue/runtime-core": "3.2.45", | 		"@vue/runtime-core": "3.2.45", | ||||||
| 		"cross-env": "7.0.3", | 		"cross-env": "7.0.3", | ||||||
| 		"cypress": "12.2.0", | 		"cypress": "12.3.0", | ||||||
| 		"eslint": "8.31.0", | 		"eslint": "8.31.0", | ||||||
| 		"eslint-plugin-import": "2.26.0", | 		"eslint-plugin-import": "2.26.0", | ||||||
| 		"eslint-plugin-vue": "9.8.0", | 		"eslint-plugin-vue": "9.8.0", | ||||||
| 		"start-server-and-test": "1.15.2", | 		"start-server-and-test": "1.15.2", | ||||||
| 		"vue-eslint-parser": "^9.1.0", | 		"vue-eslint-parser": "^9.1.0", | ||||||
| 		"vue-tsc": "^1.0.19" | 		"vue-tsc": "^1.0.22" | ||||||
| 	} | 	} | ||||||
| } | } | ||||||
|   | |||||||
| @@ -6,12 +6,13 @@ import { del, get, set } from '@/scripts/idb-proxy'; | |||||||
| import { apiUrl } from '@/config'; | import { apiUrl } from '@/config'; | ||||||
| import { waiting, api, popup, popupMenu, success, alert } from '@/os'; | import { waiting, api, popup, popupMenu, success, alert } from '@/os'; | ||||||
| import { unisonReload, reloadChannel } from '@/scripts/unison-reload'; | import { unisonReload, reloadChannel } from '@/scripts/unison-reload'; | ||||||
|  | import { miLocalStorage } from './local-storage'; | ||||||
|  |  | ||||||
| // TODO: 他のタブと永続化されたstateを同期 | // TODO: 他のタブと永続化されたstateを同期 | ||||||
|  |  | ||||||
| type Account = misskey.entities.MeDetailed; | type Account = misskey.entities.MeDetailed; | ||||||
|  |  | ||||||
| const accountData = localStorage.getItem('account'); | const accountData = miLocalStorage.getItem('account'); | ||||||
|  |  | ||||||
| // TODO: 外部からはreadonlyに | // TODO: 外部からはreadonlyに | ||||||
| export const $i = accountData ? reactive(JSON.parse(accountData) as Account) : null; | export const $i = accountData ? reactive(JSON.parse(accountData) as Account) : null; | ||||||
| @@ -21,7 +22,7 @@ export const iAmAdmin = $i != null && $i.isAdmin; | |||||||
|  |  | ||||||
| export async function signout() { | export async function signout() { | ||||||
| 	waiting(); | 	waiting(); | ||||||
| 	localStorage.removeItem('account'); | 	miLocalStorage.removeItem('account'); | ||||||
|  |  | ||||||
| 	await removeAccount($i.id); | 	await removeAccount($i.id); | ||||||
|  |  | ||||||
| @@ -119,7 +120,7 @@ export function updateAccount(accountData) { | |||||||
| 	for (const [key, value] of Object.entries(accountData)) { | 	for (const [key, value] of Object.entries(accountData)) { | ||||||
| 		$i[key] = value; | 		$i[key] = value; | ||||||
| 	} | 	} | ||||||
| 	localStorage.setItem('account', JSON.stringify($i)); | 	miLocalStorage.setItem('account', JSON.stringify($i)); | ||||||
| } | } | ||||||
|  |  | ||||||
| export function refreshAccount() { | export function refreshAccount() { | ||||||
| @@ -130,7 +131,7 @@ export async function login(token: Account['token'], redirect?: string) { | |||||||
| 	waiting(); | 	waiting(); | ||||||
| 	if (_DEV_) console.log('logging as token ', token); | 	if (_DEV_) console.log('logging as token ', token); | ||||||
| 	const me = await fetchAccount(token); | 	const me = await fetchAccount(token); | ||||||
| 	localStorage.setItem('account', JSON.stringify(me)); | 	miLocalStorage.setItem('account', JSON.stringify(me)); | ||||||
| 	document.cookie = `token=${token}; path=/; max-age=31536000`; // bull dashboardの認証とかで使う | 	document.cookie = `token=${token}; path=/; max-age=31536000`; // bull dashboardの認証とかで使う | ||||||
| 	await addAccount(me.id, token); | 	await addAccount(me.id, token); | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| <template> | <template> | ||||||
| <div class="bcekxzvu _gap _panel"> | <div class="bcekxzvu _margin _panel"> | ||||||
| 	<div class="target"> | 	<div class="target"> | ||||||
| 		<MkA v-user-preview="report.targetUserId" class="info" :to="`/user-info/${report.targetUserId}`"> | 		<MkA v-user-preview="report.targetUserId" class="info" :to="`/user-info/${report.targetUserId}`"> | ||||||
| 			<MkAvatar class="avatar" :user="report.targetUser" :show-indicator="true" :disable-link="true"/> | 			<MkAvatar class="avatar" :user="report.targetUser" :show-indicator="true" :disable-link="true"/> | ||||||
| @@ -8,7 +8,7 @@ | |||||||
| 				<MkAcct class="acct" :user="report.targetUser" style="display: block;"/> | 				<MkAcct class="acct" :user="report.targetUser" style="display: block;"/> | ||||||
| 			</div> | 			</div> | ||||||
| 		</MkA> | 		</MkA> | ||||||
| 		<MkKeyValue class="_formBlock"> | 		<MkKeyValue> | ||||||
| 			<template #key>{{ i18n.ts.registeredDate }}</template> | 			<template #key>{{ i18n.ts.registeredDate }}</template> | ||||||
| 			<template #value>{{ dateString(report.targetUser.createdAt) }} (<MkTime :time="report.targetUser.createdAt"/>)</template> | 			<template #value>{{ dateString(report.targetUser.createdAt) }} (<MkTime :time="report.targetUser.createdAt"/>)</template> | ||||||
| 		</MkKeyValue> | 		</MkKeyValue> | ||||||
| @@ -37,7 +37,7 @@ | |||||||
|  |  | ||||||
| <script lang="ts" setup> | <script lang="ts" setup> | ||||||
| import MkButton from '@/components/MkButton.vue'; | import MkButton from '@/components/MkButton.vue'; | ||||||
| import MkSwitch from '@/components/form/switch.vue'; | import MkSwitch from '@/components/MkSwitch.vue'; | ||||||
| import MkKeyValue from '@/components/MkKeyValue.vue'; | import MkKeyValue from '@/components/MkKeyValue.vue'; | ||||||
| import { acct, userPage } from '@/filters/user'; | import { acct, userPage } from '@/filters/user'; | ||||||
| import * as os from '@/os'; | import * as os from '@/os'; | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| <template> | <template> | ||||||
| <XWindow ref="uiWindow" :initial-width="400" :initial-height="500" :can-resize="true" @closed="emit('closed')"> | <MkWindow ref="uiWindow" :initial-width="400" :initial-height="500" :can-resize="true" @closed="emit('closed')"> | ||||||
| 	<template #header> | 	<template #header> | ||||||
| 		<i class="ti ti-exclamation-circle" style="margin-right: 0.5em;"></i> | 		<i class="ti ti-exclamation-circle" style="margin-right: 0.5em;"></i> | ||||||
| 		<I18n :src="i18n.ts.reportAbuseOf" tag="span"> | 		<I18n :src="i18n.ts.reportAbuseOf" tag="span"> | ||||||
| @@ -8,25 +8,27 @@ | |||||||
| 			</template> | 			</template> | ||||||
| 		</I18n> | 		</I18n> | ||||||
| 	</template> | 	</template> | ||||||
| 	<div class="dpvffvvy _monolithic_"> | 	<MkSpacer :margin-min="20" :margin-max="28"> | ||||||
| 		<div class="_section"> | 		<div class="dpvffvvy _gaps_m"> | ||||||
|  | 			<div class=""> | ||||||
| 				<MkTextarea v-model="comment"> | 				<MkTextarea v-model="comment"> | ||||||
| 					<template #label>{{ i18n.ts.details }}</template> | 					<template #label>{{ i18n.ts.details }}</template> | ||||||
| 					<template #caption>{{ i18n.ts.fillAbuseReportDescription }}</template> | 					<template #caption>{{ i18n.ts.fillAbuseReportDescription }}</template> | ||||||
| 				</MkTextarea> | 				</MkTextarea> | ||||||
| 			</div> | 			</div> | ||||||
| 		<div class="_section"> | 			<div class=""> | ||||||
| 				<MkButton primary full :disabled="comment.length === 0" @click="send">{{ i18n.ts.send }}</MkButton> | 				<MkButton primary full :disabled="comment.length === 0" @click="send">{{ i18n.ts.send }}</MkButton> | ||||||
| 			</div> | 			</div> | ||||||
| 		</div> | 		</div> | ||||||
| </XWindow> | 	</MkSpacer> | ||||||
|  | </MkWindow> | ||||||
| </template> | </template> | ||||||
|  |  | ||||||
| <script setup lang="ts"> | <script setup lang="ts"> | ||||||
| import { ref, shallowRef } from 'vue'; | import { ref, shallowRef } from 'vue'; | ||||||
| import * as Misskey from 'misskey-js'; | import * as Misskey from 'misskey-js'; | ||||||
| import XWindow from '@/components/MkWindow.vue'; | import MkWindow from '@/components/MkWindow.vue'; | ||||||
| import MkTextarea from '@/components/form/textarea.vue'; | import MkTextarea from '@/components/MkTextarea.vue'; | ||||||
| import MkButton from '@/components/MkButton.vue'; | import MkButton from '@/components/MkButton.vue'; | ||||||
| import * as os from '@/os'; | import * as os from '@/os'; | ||||||
| import { i18n } from '@/i18n'; | import { i18n } from '@/i18n'; | ||||||
| @@ -40,7 +42,7 @@ const emit = defineEmits<{ | |||||||
| 	(ev: 'closed'): void; | 	(ev: 'closed'): void; | ||||||
| }>(); | }>(); | ||||||
|  |  | ||||||
| const uiWindow = shallowRef<InstanceType<typeof XWindow>>(); | const uiWindow = shallowRef<InstanceType<typeof MkWindow>>(); | ||||||
| const comment = ref(props.initialComment || ''); | const comment = ref(props.initialComment || ''); | ||||||
|  |  | ||||||
| function send() { | function send() { | ||||||
|   | |||||||
							
								
								
									
										114
									
								
								packages/frontend/src/components/MkAsUi.vue
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,114 @@ | |||||||
|  | <template> | ||||||
|  | <div> | ||||||
|  | 	<div v-if="c.type === 'root'" :class="$style.root"> | ||||||
|  | 		<template v-for="child in c.children" :key="child"> | ||||||
|  | 			<MkAsUi v-if="!g(child).hidden" :component="g(child)" :components="props.components" :size="size"/> | ||||||
|  | 		</template> | ||||||
|  | 	</div> | ||||||
|  | 	<span v-else-if="c.type === 'text'" :class="{ [$style.fontSerif]: c.font === 'serif', [$style.fontMonospace]: c.font === 'monospace' }" :style="{ fontSize: c.size ? `${c.size * 100}%` : null, fontWeight: c.bold ? 'bold' : null, color: c.color ?? null }">{{ c.text }}</span> | ||||||
|  | 	<Mfm v-else-if="c.type === 'mfm'" :class="{ [$style.fontSerif]: c.font === 'serif', [$style.fontMonospace]: c.font === 'monospace' }" :style="{ fontSize: c.size ? `${c.size * 100}%` : null, color: c.color ?? null }" :text="c.text"/> | ||||||
|  | 	<MkButton v-else-if="c.type === 'button'" :primary="c.primary" :rounded="c.rounded" :small="size === 'small'" @click="c.onClick">{{ c.text }}</MkButton> | ||||||
|  | 	<div v-else-if="c.type === 'buttons'" class="_buttons"> | ||||||
|  | 		<MkButton v-for="button in c.buttons" :primary="button.primary" :rounded="button.rounded" :small="size === 'small'" @click="button.onClick">{{ button.text }}</MkButton> | ||||||
|  | 	</div> | ||||||
|  | 	<MkSwitch v-else-if="c.type === 'switch'" :model-value="valueForSwitch" @update:model-value="onSwitchUpdate"> | ||||||
|  | 		<template v-if="c.label" #label>{{ c.label }}</template> | ||||||
|  | 		<template v-if="c.caption" #caption>{{ c.caption }}</template> | ||||||
|  | 	</MkSwitch> | ||||||
|  | 	<MkTextarea v-else-if="c.type === 'textarea'" :model-value="c.default" @update:model-value="c.onInput"> | ||||||
|  | 		<template v-if="c.label" #label>{{ c.label }}</template> | ||||||
|  | 		<template v-if="c.caption" #caption>{{ c.caption }}</template> | ||||||
|  | 	</MkTextarea> | ||||||
|  | 	<MkInput v-else-if="c.type === 'textInput'" :small="size === 'small'" :model-value="c.default" @update:model-value="c.onInput"> | ||||||
|  | 		<template v-if="c.label" #label>{{ c.label }}</template> | ||||||
|  | 		<template v-if="c.caption" #caption>{{ c.caption }}</template> | ||||||
|  | 	</MkInput> | ||||||
|  | 	<MkInput v-else-if="c.type === 'numberInput'" :small="size === 'small'" :model-value="c.default" type="number" @update:model-value="c.onInput"> | ||||||
|  | 		<template v-if="c.label" #label>{{ c.label }}</template> | ||||||
|  | 		<template v-if="c.caption" #caption>{{ c.caption }}</template> | ||||||
|  | 	</MkInput> | ||||||
|  | 	<MkSelect v-else-if="c.type === 'select'" :small="size === 'small'" :model-value="c.default" @update:model-value="c.onChange"> | ||||||
|  | 		<template v-if="c.label" #label>{{ c.label }}</template> | ||||||
|  | 		<template v-if="c.caption" #caption>{{ c.caption }}</template> | ||||||
|  | 		<option v-for="item in c.items" :key="item.value" :value="item.value">{{ item.text }}</option> | ||||||
|  | 	</MkSelect> | ||||||
|  | 	<MkButton v-else-if="c.type === 'postFormButton'" :primary="c.primary" :rounded="c.rounded" :small="size === 'small'" @click="openPostForm">{{ c.text }}</MkButton> | ||||||
|  | 	<MkFolder v-else-if="c.type === 'folder'" :default-open="c.opened"> | ||||||
|  | 		<template #label>{{ c.title }}</template> | ||||||
|  | 		<template v-for="child in c.children" :key="child"> | ||||||
|  | 			<MkAsUi v-if="!g(child).hidden" :component="g(child)" :components="props.components" :size="size"/> | ||||||
|  | 		</template> | ||||||
|  | 	</MkFolder> | ||||||
|  | 	<div v-else-if="c.type === 'container'" :class="[$style.container, { [$style.fontSerif]: c.font === 'serif', [$style.fontMonospace]: c.font === 'monospace', [$style.containerCenter]: c.align === 'center' }]" :style="{ backgroundColor: c.bgColor ?? null, color: c.fgColor ?? null, borderWidth: c.borderWidth ? `${c.borderWidth}px` : 0, borderColor: c.borderColor ?? 'var(--divider)', padding: c.padding ? `${c.padding}px` : 0, borderRadius: c.rounded ? '8px' : 0 }"> | ||||||
|  | 		<template v-for="child in c.children" :key="child"> | ||||||
|  | 			<MkAsUi v-if="!g(child).hidden" :component="g(child)" :components="props.components" :size="size"/> | ||||||
|  | 		</template> | ||||||
|  | 	</div> | ||||||
|  | </div> | ||||||
|  | </template> | ||||||
|  |  | ||||||
|  | <script lang="ts" setup> | ||||||
|  | import { computed, defineAsyncComponent, onMounted, onUnmounted, Ref } from 'vue'; | ||||||
|  | import * as os from '@/os'; | ||||||
|  | import MkButton from '@/components/MkButton.vue'; | ||||||
|  | import MkInput from '@/components/MkInput.vue'; | ||||||
|  | import MkSwitch from '@/components/MkSwitch.vue'; | ||||||
|  | import MkTextarea from '@/components/MkTextarea.vue'; | ||||||
|  | import MkSelect from '@/components/MkSelect.vue'; | ||||||
|  | import { AsUiComponent } from '@/scripts/aiscript/ui'; | ||||||
|  | import MkFolder from '@/components/MkFolder.vue'; | ||||||
|  |  | ||||||
|  | const props = withDefaults(defineProps<{ | ||||||
|  | 	component: AsUiComponent; | ||||||
|  | 	components: Ref<AsUiComponent>[]; | ||||||
|  | 	size: 'small' | 'medium' | 'large'; | ||||||
|  | }>(), { | ||||||
|  | 	size: 'medium', | ||||||
|  | }); | ||||||
|  |  | ||||||
|  | const c = props.component; | ||||||
|  |  | ||||||
|  | function g(id) { | ||||||
|  | 	return props.components.find(x => x.value.id === id).value; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | let valueForSwitch = $ref(c.default ?? false); | ||||||
|  |  | ||||||
|  | function onSwitchUpdate(v) { | ||||||
|  | 	valueForSwitch = v; | ||||||
|  | 	if (c.onChange) c.onChange(v); | ||||||
|  | } | ||||||
|  |  | ||||||
|  | function openPostForm() { | ||||||
|  | 	os.post({ | ||||||
|  | 		initialText: c.form.text, | ||||||
|  | 		instant: true, | ||||||
|  | 	}); | ||||||
|  | } | ||||||
|  | </script> | ||||||
|  |  | ||||||
|  | <style lang="scss" module> | ||||||
|  | .root { | ||||||
|  | 	display: flex; | ||||||
|  | 	flex-direction: column; | ||||||
|  | 	gap: 12px; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .container { | ||||||
|  | 	display: flex; | ||||||
|  | 	flex-direction: column; | ||||||
|  | 	gap: 12px; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .containerCenter { | ||||||
|  | 	text-align: center; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .fontSerif { | ||||||
|  | 	font-family: serif; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .fontMonospace { | ||||||
|  | 	font-family: Fira code, Fira Mono, Consolas, Menlo, Courier, monospace; | ||||||
|  | } | ||||||
|  | </style> | ||||||