mirror of
https://github.com/kokonect-link/cherrypick
synced 2024-11-28 06:48:36 +09:00
Bump base to 13.5.5
This commit is contained in:
commit
55c1e4b4cb
39
CHANGELOG.md
39
CHANGELOG.md
@ -8,6 +8,45 @@
|
|||||||
|
|
||||||
You should also include the user name that made the change.
|
You should also include the user name that made the change.
|
||||||
-->
|
-->
|
||||||
|
## 13.5.4 (2023/02/09)
|
||||||
|
|
||||||
|
### Improvements
|
||||||
|
- Server: UIのHTML(ノートなどの特別なページを除く)のキャッシュ時間を15秒から30秒に
|
||||||
|
- i/notificationsのレートリミットを緩和
|
||||||
|
|
||||||
|
### Bugfixes
|
||||||
|
- fix(client): validate url to improve security
|
||||||
|
- fix(client): dateの初期値が正常に入らない時がある
|
||||||
|
|
||||||
|
## 13.5.3 (2023/02/09)
|
||||||
|
|
||||||
|
### Improvements
|
||||||
|
- Client: デッキにチャンネルカラムを追加
|
||||||
|
|
||||||
|
## 13.5.2 (2023/02/08)
|
||||||
|
|
||||||
|
### Changes
|
||||||
|
- Revert: perf(client): do not render custom emojis in user names
|
||||||
|
|
||||||
|
### Bugfixes
|
||||||
|
- Client: register_note_view_interruptor not working
|
||||||
|
- Client: ログイントークンの再生成が出来ない
|
||||||
|
|
||||||
|
## 13.5.0 (2023/02/08)
|
||||||
|
|
||||||
|
### Changes
|
||||||
|
- perf(client): do not render custom emojis in user names
|
||||||
|
|
||||||
|
### Improvements
|
||||||
|
- Client: disableShowingAnimatedImagesのデフォルト値をprefers-reduced-motionにする
|
||||||
|
- enhance(client): tweak medialist style
|
||||||
|
|
||||||
|
### Bugfixes
|
||||||
|
- fix docker health check
|
||||||
|
- Client: MkEmojiPickerでもChromeで検索ダイアログで変換確定するとそのまま検索されてしまうのを修正
|
||||||
|
- fix(mfm): default degree not used in rotate
|
||||||
|
- fix(server): validate urls from ap to improve security
|
||||||
|
|
||||||
## 13.4.0 (2023/02/05)
|
## 13.4.0 (2023/02/05)
|
||||||
|
|
||||||
### Improvements
|
### Improvements
|
||||||
|
@ -6,16 +6,13 @@ Also, the later tasks are more indefinite and are subject to change as developme
|
|||||||
This is the phase we are at now. We need to make a high-maintenance environment that can withstand future development.
|
This is the phase we are at now. We need to make a high-maintenance environment that can withstand future development.
|
||||||
|
|
||||||
- Make the number of type errors zero (backend)
|
- Make the number of type errors zero (backend)
|
||||||
- Probably need to switch some libraries to others that make it difficult to reduce type errors
|
|
||||||
- e.g. koa to fastify https://github.com/misskey-dev/misskey/issues/7537
|
|
||||||
- Improve CI
|
- Improve CI
|
||||||
- Fix tests
|
- Fix tests
|
||||||
- mocha, jest, etc. do not support the combination of `TypeScript + ESM + Path alias`, and the tests currently do not work.
|
|
||||||
- Fix random test failures - https://github.com/misskey-dev/misskey/issues/7985 and https://github.com/misskey-dev/misskey/issues/7986
|
- Fix random test failures - https://github.com/misskey-dev/misskey/issues/7985 and https://github.com/misskey-dev/misskey/issues/7986
|
||||||
- Add more tests
|
- Add more tests
|
||||||
- May need to implement a mechanism that allows for DI
|
- ~~May need to implement a mechanism that allows for DI~~ → Done ✔️
|
||||||
- https://github.com/misskey-dev/misskey/pull/9085
|
- https://github.com/misskey-dev/misskey/pull/9085
|
||||||
- Measure coverage
|
- ~~Measure coverage~~ → Done ✔️
|
||||||
- https://github.com/misskey-dev/misskey/pull/9081
|
- https://github.com/misskey-dev/misskey/pull/9081
|
||||||
- Improve documentation
|
- Improve documentation
|
||||||
- Refactoring
|
- Refactoring
|
||||||
|
@ -1345,5 +1345,6 @@ _deck:
|
|||||||
tl: "الخيط الزمني"
|
tl: "الخيط الزمني"
|
||||||
antenna: "الهوائيات"
|
antenna: "الهوائيات"
|
||||||
list: "القوائم"
|
list: "القوائم"
|
||||||
|
channel: "القنوات"
|
||||||
mentions: "الإشارات"
|
mentions: "الإشارات"
|
||||||
direct: "مباشرة"
|
direct: "مباشرة"
|
||||||
|
@ -1441,5 +1441,6 @@ _deck:
|
|||||||
tl: "টাইমলাইন"
|
tl: "টাইমলাইন"
|
||||||
antenna: "অ্যান্টেনা"
|
antenna: "অ্যান্টেনা"
|
||||||
list: "লিস্ট"
|
list: "লিস্ট"
|
||||||
|
channel: "চ্যানেলগুলি"
|
||||||
mentions: "উল্লেখসমূহ"
|
mentions: "উল্লেখসমূহ"
|
||||||
direct: "ডাইরেক্ট নোটগুলি"
|
direct: "ডাইরেক্ট নোটগুলি"
|
||||||
|
@ -804,4 +804,5 @@ _deck:
|
|||||||
tl: "Časová osa"
|
tl: "Časová osa"
|
||||||
antenna: "Antény"
|
antenna: "Antény"
|
||||||
list: "Seznamy"
|
list: "Seznamy"
|
||||||
|
channel: "Kanály"
|
||||||
mentions: "Zmínění"
|
mentions: "Zmínění"
|
||||||
|
@ -129,6 +129,7 @@ unblockConfirm: "Möchtest du diese Blockierung wirklich aufheben?"
|
|||||||
suspendConfirm: "Möchtest du diesen Benutzer wirklich sperren?"
|
suspendConfirm: "Möchtest du diesen Benutzer wirklich sperren?"
|
||||||
unsuspendConfirm: "Möchtest du diesen Benutzer wirklich entsperren?"
|
unsuspendConfirm: "Möchtest du diesen Benutzer wirklich entsperren?"
|
||||||
selectList: "Liste auswählen"
|
selectList: "Liste auswählen"
|
||||||
|
selectChannel: "Kanal auswählen"
|
||||||
selectAntenna: "Antenne auswählen"
|
selectAntenna: "Antenne auswählen"
|
||||||
selectWidget: "Widget auswählen"
|
selectWidget: "Widget auswählen"
|
||||||
editWidgets: "Widgets bearbeiten"
|
editWidgets: "Widgets bearbeiten"
|
||||||
@ -1869,5 +1870,6 @@ _deck:
|
|||||||
tl: "Chronik"
|
tl: "Chronik"
|
||||||
antenna: "Antennen"
|
antenna: "Antennen"
|
||||||
list: "Listen"
|
list: "Listen"
|
||||||
|
channel: "Kanal"
|
||||||
mentions: "Erwähnungen"
|
mentions: "Erwähnungen"
|
||||||
direct: "Direktnachrichten"
|
direct: "Direktnachrichten"
|
||||||
|
@ -129,6 +129,7 @@ unblockConfirm: "Are you sure that you want to unblock this account?"
|
|||||||
suspendConfirm: "Are you sure that you want to suspend this account?"
|
suspendConfirm: "Are you sure that you want to suspend this account?"
|
||||||
unsuspendConfirm: "Are you sure that you want to unsuspend this account?"
|
unsuspendConfirm: "Are you sure that you want to unsuspend this account?"
|
||||||
selectList: "Select a list"
|
selectList: "Select a list"
|
||||||
|
selectChannel: "Select a channel"
|
||||||
selectAntenna: "Select an antenna"
|
selectAntenna: "Select an antenna"
|
||||||
selectWidget: "Select a widget"
|
selectWidget: "Select a widget"
|
||||||
editWidgets: "Edit widgets"
|
editWidgets: "Edit widgets"
|
||||||
@ -1872,5 +1873,6 @@ _deck:
|
|||||||
tl: "Timeline"
|
tl: "Timeline"
|
||||||
antenna: "Antennas"
|
antenna: "Antennas"
|
||||||
list: "List"
|
list: "List"
|
||||||
|
channel: "Channel"
|
||||||
mentions: "Mentions"
|
mentions: "Mentions"
|
||||||
direct: "Direct notes"
|
direct: "Direct notes"
|
||||||
|
@ -129,6 +129,7 @@ unblockConfirm: "¿Quiere dejar de bloquear esta cuenta?"
|
|||||||
suspendConfirm: "¿Quiere suspender esta cuenta?"
|
suspendConfirm: "¿Quiere suspender esta cuenta?"
|
||||||
unsuspendConfirm: "¿Quiere dejar de suspender esta cuenta?"
|
unsuspendConfirm: "¿Quiere dejar de suspender esta cuenta?"
|
||||||
selectList: "Seleccione una lista"
|
selectList: "Seleccione una lista"
|
||||||
|
selectChannel: "Seleccionar canal"
|
||||||
selectAntenna: "Seleccionar antena"
|
selectAntenna: "Seleccionar antena"
|
||||||
selectWidget: "Seleccionar widget"
|
selectWidget: "Seleccionar widget"
|
||||||
editWidgets: "Editar widgets"
|
editWidgets: "Editar widgets"
|
||||||
@ -1869,5 +1870,6 @@ _deck:
|
|||||||
tl: "Linea de tiempo"
|
tl: "Linea de tiempo"
|
||||||
antenna: "Antenas"
|
antenna: "Antenas"
|
||||||
list: "Listas"
|
list: "Listas"
|
||||||
|
channel: "Canal"
|
||||||
mentions: "Menciones"
|
mentions: "Menciones"
|
||||||
direct: "Mensaje directo"
|
direct: "Mensaje directo"
|
||||||
|
@ -1541,5 +1541,6 @@ _deck:
|
|||||||
tl: "Fil"
|
tl: "Fil"
|
||||||
antenna: "Antennes"
|
antenna: "Antennes"
|
||||||
list: "Listes"
|
list: "Listes"
|
||||||
|
channel: "Canaux"
|
||||||
mentions: "Mentions"
|
mentions: "Mentions"
|
||||||
direct: "Direct"
|
direct: "Direct"
|
||||||
|
@ -1673,5 +1673,6 @@ _deck:
|
|||||||
tl: "Linimasa"
|
tl: "Linimasa"
|
||||||
antenna: "Antena"
|
antenna: "Antena"
|
||||||
list: "Daftar"
|
list: "Daftar"
|
||||||
|
channel: "Kanal"
|
||||||
mentions: "Sebutan"
|
mentions: "Sebutan"
|
||||||
direct: "Langsung"
|
direct: "Langsung"
|
||||||
|
@ -1044,7 +1044,7 @@ _achievements:
|
|||||||
flavor: "Grazie per aver usato Misskey!"
|
flavor: "Grazie per aver usato Misskey!"
|
||||||
_noteClipped1:
|
_noteClipped1:
|
||||||
title: "Devo clippare!"
|
title: "Devo clippare!"
|
||||||
description: "Ho raccolto in Clip la prima Nota"
|
description: "Hai raccolto la tua prima Nota in una Clip"
|
||||||
_noteFavorited1:
|
_noteFavorited1:
|
||||||
title: "Guarda le stelle"
|
title: "Guarda le stelle"
|
||||||
description: "Aggiungi una Nota ai preferiti per la prima volta"
|
description: "Aggiungi una Nota ai preferiti per la prima volta"
|
||||||
@ -1080,7 +1080,7 @@ _achievements:
|
|||||||
title: "Follow me!"
|
title: "Follow me!"
|
||||||
description: "Hai ottenuto 10 profili Follower"
|
description: "Hai ottenuto 10 profili Follower"
|
||||||
_followers50:
|
_followers50:
|
||||||
title: "Follower a frotte"
|
title: "Un gregge di Follower"
|
||||||
description: "Hai ottenuto 50 Follower"
|
description: "Hai ottenuto 50 Follower"
|
||||||
_followers100:
|
_followers100:
|
||||||
title: "Popolare"
|
title: "Popolare"
|
||||||
@ -1108,7 +1108,7 @@ _achievements:
|
|||||||
title: "Caccia al tesoro"
|
title: "Caccia al tesoro"
|
||||||
description: "Hai trovato un tesoro nascosto"
|
description: "Hai trovato un tesoro nascosto"
|
||||||
_client30min:
|
_client30min:
|
||||||
title: "Piccola pausa"
|
title: "Piccola grande pausa"
|
||||||
description: "Hai passato più di 30 minuti su Misskey"
|
description: "Hai passato più di 30 minuti su Misskey"
|
||||||
_noteDeletedWithin1min:
|
_noteDeletedWithin1min:
|
||||||
title: "Ooops!"
|
title: "Ooops!"
|
||||||
@ -1134,7 +1134,7 @@ _achievements:
|
|||||||
title: "Hello, world!"
|
title: "Hello, world!"
|
||||||
description: "Hai scritto «Hello world» nel blocco appunti"
|
description: "Hai scritto «Hello world» nel blocco appunti"
|
||||||
_open3windows:
|
_open3windows:
|
||||||
title: "Finestrato"
|
title: "Apri le finestre!"
|
||||||
description: "Hai aperto almeno 3 finestre contemporaneamente"
|
description: "Hai aperto almeno 3 finestre contemporaneamente"
|
||||||
_driveFolderCircularReference:
|
_driveFolderCircularReference:
|
||||||
title: "Riferimento circolare"
|
title: "Riferimento circolare"
|
||||||
@ -1170,7 +1170,7 @@ _achievements:
|
|||||||
_cookieClicked:
|
_cookieClicked:
|
||||||
title: "Clicca il biscotto"
|
title: "Clicca il biscotto"
|
||||||
description: "Hai giocato a cliccare il cookie"
|
description: "Hai giocato a cliccare il cookie"
|
||||||
flavor: "Hai autorizzato i cookie?"
|
flavor: "È il sito giusto?"
|
||||||
_brainDiver:
|
_brainDiver:
|
||||||
title: "Brain Diver"
|
title: "Brain Diver"
|
||||||
description: "Pubblica un link a Brain Diver"
|
description: "Pubblica un link a Brain Diver"
|
||||||
@ -1195,6 +1195,9 @@ _role:
|
|||||||
baseRole: "Ruolo di base"
|
baseRole: "Ruolo di base"
|
||||||
useBaseValue: "Eredita dal ruolo base"
|
useBaseValue: "Eredita dal ruolo base"
|
||||||
chooseRoleToAssign: "Seleziona il ruolo da assegnare"
|
chooseRoleToAssign: "Seleziona il ruolo da assegnare"
|
||||||
|
iconUrl: "URL dell'icona"
|
||||||
|
asBadge: "Mostra come badge"
|
||||||
|
descriptionOfAsBadge: "Se indicato, accanto al nome utente viene visualizzata l'icona del ruolo."
|
||||||
canEditMembersByModerator: "Anche i Moderatori assegnano profili a questo ruolo"
|
canEditMembersByModerator: "Anche i Moderatori assegnano profili a questo ruolo"
|
||||||
descriptionOfCanEditMembersByModerator: "Se disattivo, potranno farlo solamente gli Amministratori."
|
descriptionOfCanEditMembersByModerator: "Se disattivo, potranno farlo solamente gli Amministratori."
|
||||||
priority: "Priorità"
|
priority: "Priorità"
|
||||||
@ -1866,5 +1869,6 @@ _deck:
|
|||||||
tl: "Timeline"
|
tl: "Timeline"
|
||||||
antenna: "Antenne"
|
antenna: "Antenne"
|
||||||
list: "Liste"
|
list: "Liste"
|
||||||
|
channel: "Canale"
|
||||||
mentions: "Menzioni"
|
mentions: "Menzioni"
|
||||||
direct: "Diretta"
|
direct: "Diretta"
|
||||||
|
@ -129,6 +129,7 @@ unblockConfirm: "ブロック解除しますか?"
|
|||||||
suspendConfirm: "凍結しますか?"
|
suspendConfirm: "凍結しますか?"
|
||||||
unsuspendConfirm: "解凍しますか?"
|
unsuspendConfirm: "解凍しますか?"
|
||||||
selectList: "リストを選択"
|
selectList: "リストを選択"
|
||||||
|
selectChannel: "チャンネルを選択"
|
||||||
selectAntenna: "アンテナを選択"
|
selectAntenna: "アンテナを選択"
|
||||||
selectWidget: "ウィジェットを選択"
|
selectWidget: "ウィジェットを選択"
|
||||||
editWidgets: "ウィジェットを編集"
|
editWidgets: "ウィジェットを編集"
|
||||||
@ -942,6 +943,8 @@ cannotPerformTemporaryDescription: "操作回数が制限を超過するため
|
|||||||
preset: "プリセット"
|
preset: "プリセット"
|
||||||
selectFromPresets: "プリセットから選択"
|
selectFromPresets: "プリセットから選択"
|
||||||
achievements: "実績"
|
achievements: "実績"
|
||||||
|
gotInvalidResponseError: "サーバーの応答が無効です"
|
||||||
|
gotInvalidResponseErrorDescription: "サーバーがダウンまたはメンテナンスしている可能性があります。しばらくしてから再度お試しください。"
|
||||||
|
|
||||||
_achievements:
|
_achievements:
|
||||||
earnedAt: "獲得日時"
|
earnedAt: "獲得日時"
|
||||||
@ -1925,5 +1928,6 @@ _deck:
|
|||||||
tl: "タイムライン"
|
tl: "タイムライン"
|
||||||
antenna: "アンテナ"
|
antenna: "アンテナ"
|
||||||
list: "リスト"
|
list: "リスト"
|
||||||
|
channel: "チャンネル"
|
||||||
mentions: "あなた宛て"
|
mentions: "あなた宛て"
|
||||||
direct: "ダイレクト"
|
direct: "ダイレクト"
|
||||||
|
@ -1628,5 +1628,6 @@ _deck:
|
|||||||
tl: "タイムライン"
|
tl: "タイムライン"
|
||||||
antenna: "アンテナ"
|
antenna: "アンテナ"
|
||||||
list: "リスト"
|
list: "リスト"
|
||||||
|
channel: "チャンネル"
|
||||||
mentions: "あんた宛て"
|
mentions: "あんた宛て"
|
||||||
direct: "ダイレクト"
|
direct: "ダイレクト"
|
||||||
|
@ -1869,5 +1869,6 @@ _deck:
|
|||||||
tl: "타임라인"
|
tl: "타임라인"
|
||||||
antenna: "안테나"
|
antenna: "안테나"
|
||||||
list: "리스트"
|
list: "리스트"
|
||||||
|
channel: "채널"
|
||||||
mentions: "받은 멘션"
|
mentions: "받은 멘션"
|
||||||
direct: "다이렉트"
|
direct: "다이렉트"
|
||||||
|
@ -1,2 +1,162 @@
|
|||||||
---
|
---
|
||||||
_lang_: "ພາສາລາວ"
|
_lang_: "ພາສາລາວ"
|
||||||
|
headlineMisskey: "ເຊື່ອມຕໍ່ເຄືອຂ່າຍໂດຍຫມາຍເຫດ"
|
||||||
|
introMisskey: "ຍິນດີຕ້ອນຮັບ! Misskey ເປັນແຫຼ່ງເປີດ, ການບໍລິການ microblogging ກະຈາຍ\nສ້າງ \"ບັນທຶກ\" ເພື່ອແບ່ງປັນຄວາມຄິດຂອງທ່ານກັບທຸກໆຄົນທີ່ຢູ່ອ້ອມຮອບທ່ານ 📡\nດ້ວຍ \"ປະຕິກິລິຍາ\", ທ່ານຍັງສາມາດສະແດງຄວາມຮູ້ສຶກຂອງທ່ານຢ່າງໄວວາກ່ຽວກັບບັນທຶກຂອງທຸກໆຄົນ 👍\nມາສຳຫຼວດໂລກໃໝ່! 🚀"
|
||||||
|
poweredByMisskeyDescription: "{name} ແມ່ນສ່ວນໜຶ່ງຂອງການບໍລິການທີ່ຂັບເຄື່ອນໂດຍແພລດຟອມ open source. <b>Misskey</b> (ເອີ້ນວ່າ \"Misskey instance\")"
|
||||||
|
monthAndDay: "{ເດືອນ}/{ມື້}"
|
||||||
|
search: "ຄົ້ນຫາ"
|
||||||
|
notifications: "ການແຈ້ງເຕືອນ"
|
||||||
|
username: "ຊື່ຜູ້ໃຊ້"
|
||||||
|
password: "ລະຫັດຜ່ານ"
|
||||||
|
forgotPassword: "ລືມລະຫັດຜ່ານ"
|
||||||
|
fetchingAsApObject: "ກຳລັງດຶງຂໍ້ມູນຈາກ fediverse..."
|
||||||
|
ok: "ຕົກລົງ"
|
||||||
|
gotIt: "ເຂົ້າໃຈແລ້ວ!"
|
||||||
|
cancel: "ຍົກເລີກ"
|
||||||
|
noThankYou: "ບໍ່ແມ່ນຕອນນີ້"
|
||||||
|
enterUsername: "ປ້ອນຊື່ຜູ້ໃຊ້"
|
||||||
|
renotedBy: "Renoted ໂດຍ {ຜູ້ໃຊ້}"
|
||||||
|
noNotes: "ບໍ່ມີຫມາຍເຫດ"
|
||||||
|
noNotifications: "ບໍ່ມີການແຈ້ງເຕືອນ"
|
||||||
|
instance: "ອີນສະແຕນ"
|
||||||
|
settings: "ກຳນົດຄ່າ"
|
||||||
|
basicSettings: "ການຕັ້ງຄ່າພື້ນຖານ"
|
||||||
|
otherSettings: "ການຕັ້ງຄ່າອື່ນໆ"
|
||||||
|
openInWindow: "ເປີດຢູ່ໃນປ່ອງຢ້ຽມ"
|
||||||
|
profile: "ໂພຼຟາຍ"
|
||||||
|
timeline: "ເສັ້ນກຳນົດເວລາ"
|
||||||
|
noAccountDescription: "ຜູ້ໃຊ້ນີ້ຍັງບໍ່ໄດ້ຂຽນໃນຊີວະປະຫວັດຂອງເຂົາເຈົ້າເທື່ອ"
|
||||||
|
login: "ເຂົ້າສູ່ລະບົບ"
|
||||||
|
loggingIn: "ກຳລັງເຂົ້າສູ່ລະບົບ..."
|
||||||
|
logout: "ອອກຈາກລະບົບ"
|
||||||
|
signup: "ລົງທະບຽນ"
|
||||||
|
uploading: "ການອັບໂຫຼດ..."
|
||||||
|
save: "ບັນທຶກ"
|
||||||
|
users: "ຜູ້ໃຊ້ຕ່າງໆ"
|
||||||
|
addUser: "ເພີ່ມຜູ້ໃຊ້"
|
||||||
|
favorite: "ເພີ່ມໃສ່ລາຍການທີ່ມັກ"
|
||||||
|
favorites: "ລາຍການທີ່ມັກ"
|
||||||
|
unfavorite: "ລຶບອອກຈາກລາຍການທີ່ມັກ"
|
||||||
|
favorited: "ເພີ່ມໃສ່ລາຍການທີ່ມັກແລ້ວ"
|
||||||
|
alreadyFavorited: "ເພີ່ມເຂົ້າໃນລາຍການທີ່ມັກແລ້ວ."
|
||||||
|
cantFavorite: "ບໍ່ສາມາດເພີ່ມໃສ່ລາຍການທີ່ມັກໄດ້."
|
||||||
|
pin: "ປັກໝຸດໄປຫາໂປຣໄຟລ໌"
|
||||||
|
unpin: "ຖອດປັກໝຸດອອກຈາກໂປຣໄຟລ໌"
|
||||||
|
copyContent: "ຄັດລອກເນື້ອຫາ"
|
||||||
|
copyLink: "ສຳເນົາລິ້ງ"
|
||||||
|
delete: "ລຶບ"
|
||||||
|
deleteAndEdit: "ລົບແລະແກ້ໄຂ"
|
||||||
|
deleteAndEditConfirm: "ເຈົ້າແນ່ໃຈບໍ່? ທີ່ທ່ານຕ້ອງການທີ່ຈະລຶບບັນທຶກນີ້ແລະແກ້ໄຂມັນ ທ່ານອາດຈະສູນເສຍການໂຕ້ຕອບ, ບັນທຶກ, ແລະການຕອບກັບທັງໝົດ"
|
||||||
|
addToList: "ເພີ່ມໃສ່ລາຍຊື່"
|
||||||
|
sendMessage: "ສົ່ງຂໍ້ຄວາມ"
|
||||||
|
copyRSS: "ສຳເນົາ RSS"
|
||||||
|
copyUsername: "ສຳເນົາຊື່ຜູ້ໃຊ້"
|
||||||
|
searchUser: "ຄົ້ນຫາຜູ້ໃຊ້"
|
||||||
|
reply: "ຕອບໄປທີ"
|
||||||
|
loadMore: "ໂຫຼດເພີ່ມເຕີມ"
|
||||||
|
showMore: "ໂຫຼດເພີ່ມເຕີມ"
|
||||||
|
showLess: "ປິດ"
|
||||||
|
youGotNewFollower: "ໄດ້ຕິດຕາມທ່ານ"
|
||||||
|
receiveFollowRequest: "ປະຕິບັດຕາມຄໍາຮ້ອງຂໍທີ່ໄດ້ຮັບ"
|
||||||
|
followRequestAccepted: "ຜູ້ຕິດຕາມໄດ້ຍອມຮັບຄໍາຮ້ອງຂໍຂອງທ່ານ"
|
||||||
|
mention: "ໄດ້ກ່າວມາ"
|
||||||
|
mentions: "ກ່າວເຖິງ"
|
||||||
|
directNotes: "ໂດຍກົງຫມາຍເຫດ"
|
||||||
|
importAndExport: "ນໍາເຂົ້າ / ສົ່ງອອກ"
|
||||||
|
import: "ນຳເຂົ້າ"
|
||||||
|
export: "ນຳອອກ"
|
||||||
|
files: "ໄຟລ໌"
|
||||||
|
download: "ດາວໂຫລດ"
|
||||||
|
driveFileDeleteConfirm: "ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການລຶບໄຟລ໌ \"{name}\"? ບັນທຶກທີ່ມີໄຟລ໌ແນບນີ້ຈະຖືກລຶບຖິ້ມ"
|
||||||
|
unfollowConfirm: "ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການເຊົາຕິດຕາມ {name}?"
|
||||||
|
exportRequested: "ໃນເວລາທີ່ທ່ານໄດ້ຮ້ອງຂໍການສົ່ງອອກ ມັນອາດຈະໃຊ້ເວລາບາງເວລາ ແລະມັນຈະຖືກເພີ່ມໃສ່ drive ຂອງທ່ານເມື່ອມັນສຳເລັດແລ້ວ"
|
||||||
|
importRequested: "ໃນເວລາທີ່ທ່ານໄດ້ຮ້ອງຂໍການນໍາເຂົ້າ ມັນອາດຈະໃຊ້ເວລາບາງເວລາ"
|
||||||
|
lists: "ລາຍການ"
|
||||||
|
noLists: "ທ່ານບໍ່ມີລາຍການໃດໆ"
|
||||||
|
note: "ບັນທຶກ"
|
||||||
|
notes: "ບັນທຶກ"
|
||||||
|
following: "ກຳລັງຕິດຕາມ"
|
||||||
|
followers: "ຜູ້ຕິດຕາມ"
|
||||||
|
followsYou: "ຕິດຕາມເຈົ້າ"
|
||||||
|
createList: "ສ້າງລາຍຊື່"
|
||||||
|
manageLists: "ການບໍລິຫານບັນຊີລາຍການ"
|
||||||
|
error: "ຂໍ້ຜິດພາດ"
|
||||||
|
somethingHappened: "ອຸຍ, ມີບາງຢ່າງຜິດພາດ"
|
||||||
|
retry: "ລອງໃຫມ່"
|
||||||
|
pageLoadError: "ເກີດຄວາມຜິດພາດໃນການໂຫລດໜ້ານີ້"
|
||||||
|
pageLoadErrorDescription: "ປົກກະຕິແລ້ວມັນເກີດຈາກຄວາມຜິດພາດເຄືອຂ່າຍ ຫຼື cache ຂອງຕົວທ່ອງເວັບ ລອງລຶບລ້າງແຄດແລ້ວລອງໃໝ່ພາຍຫຼັງສອງສາມນາທີ"
|
||||||
|
serverIsDead: "ເຊີບເວີນີ້ບໍ່ຕອບສະໜອງ ກະລຸນາລໍຖ້າຈັກໜ່ອຍແລ້ວລອງໃໝ່ອີກຄັ້ງ"
|
||||||
|
youShouldUpgradeClient: "ເພື່ອເບິ່ງໜ້ານີ້, ກະລຸນາໂຫຼດຂໍ້ມູນຄືນໃໝ່ເພື່ອອັບເດດລູກຄ້າຂອງທ່ານ"
|
||||||
|
enterListName: "ໃສ່ຊື່ສຳລັບລາຍຊື່"
|
||||||
|
privacy: "ຄວາມເປັນສ່ວນຕົວ"
|
||||||
|
makeFollowManuallyApprove: "ປະຕິບັດຕາມການຮ້ອງຂໍຮຽກຮ້ອງໃຫ້ມີການອະນຸມັດ"
|
||||||
|
defaultNoteVisibility: "ເປັນຄ່າເລີ່ມຕົ້ນ"
|
||||||
|
follow: "ກຳລັງຕິດຕາມ"
|
||||||
|
followRequest: "ສົ່ງການຮ້ອງຂໍປະຕິບຕາມ"
|
||||||
|
followRequests: "ປະຕິບັດຕາມຄໍາຮ້ອງຂໍ"
|
||||||
|
unfollow: "ເຊົາຕິດຕາມ"
|
||||||
|
followRequestPending: "ປະຕິບັດຕາມຄໍາຮ້ອງຂໍທີ່ລໍຖ້າຢູ່"
|
||||||
|
enterEmoji: "ປ້ອນອີໂມຈິ"
|
||||||
|
renote: "Renote"
|
||||||
|
unrenote: "ເລີກ Renote"
|
||||||
|
pinned: "ປັກໝຸດໄປຫາໂປຣໄຟລ໌"
|
||||||
|
addAccount: "ເພີ່ມບັນຊີ"
|
||||||
|
loginFailed: "ການເຂົ້າສູ່ລະບົບບໍ່ສຳເລັດ"
|
||||||
|
general: "ທົ່ວໄປ"
|
||||||
|
wallpaper: "ພາບພື້ນຫລັງ"
|
||||||
|
setWallpaper: "ຕັ້ງເປັນພາບພື້ນຫຼັງ"
|
||||||
|
instances: "ອີນສະແຕນ"
|
||||||
|
statistics: "ສະຖິຕິ"
|
||||||
|
clearQueue: "ລ້າງຄິວ"
|
||||||
|
clearCachedFiles: "ລຶບລ້າງແຄສ"
|
||||||
|
editProfile: "ແກ້ໄຂໂປຣໄຟລ໌"
|
||||||
|
remove: "ລຶບ"
|
||||||
|
userList: "ລາຍການ"
|
||||||
|
smtpUser: "ຊື່ຜູ້ໃຊ້"
|
||||||
|
smtpPass: "ລະຫັດຜ່ານ"
|
||||||
|
clearCache: "ລຶບລ້າງແຄສ"
|
||||||
|
user: "ຜູ້ໃຊ້ຕ່າງໆ"
|
||||||
|
searchByGoogle: "ຄົ້ນຫາ"
|
||||||
|
file: "ໄຟລ໌"
|
||||||
|
_email:
|
||||||
|
_follow:
|
||||||
|
title: "ໄດ້ຕິດຕາມທ່ານ"
|
||||||
|
_mfm:
|
||||||
|
mention: "ໄດ້ກ່າວມາ"
|
||||||
|
search: "ຄົ້ນຫາ"
|
||||||
|
_theme:
|
||||||
|
keys:
|
||||||
|
mention: "ໄດ້ກ່າວມາ"
|
||||||
|
renote: "Renote"
|
||||||
|
_sfx:
|
||||||
|
note: "ບັນທຶກ"
|
||||||
|
notification: "ການແຈ້ງເຕືອນ"
|
||||||
|
_widgets:
|
||||||
|
profile: "ໂພຼຟາຍ"
|
||||||
|
notifications: "ການແຈ້ງເຕືອນ"
|
||||||
|
timeline: "ເສັ້ນກຳນົດເວລາ"
|
||||||
|
_cw:
|
||||||
|
show: "ໂຫຼດເພີ່ມເຕີມ"
|
||||||
|
_visibility:
|
||||||
|
followers: "ຜູ້ຕິດຕາມ"
|
||||||
|
_profile:
|
||||||
|
username: "ຊື່ຜູ້ໃຊ້"
|
||||||
|
_exportOrImport:
|
||||||
|
followingList: "ກຳລັງຕິດຕາມ"
|
||||||
|
userLists: "ລາຍການ"
|
||||||
|
_notification:
|
||||||
|
youWereFollowed: "ໄດ້ຕິດຕາມທ່ານ"
|
||||||
|
_types:
|
||||||
|
follow: "ກຳລັງຕິດຕາມ"
|
||||||
|
mention: "ໄດ້ກ່າວມາ"
|
||||||
|
renote: "Renote"
|
||||||
|
_actions:
|
||||||
|
reply: "ຕອບໄປທີ"
|
||||||
|
renote: "Renote"
|
||||||
|
_deck:
|
||||||
|
_columns:
|
||||||
|
notifications: "ການແຈ້ງເຕືອນ"
|
||||||
|
tl: "ເສັ້ນກຳນົດເວລາ"
|
||||||
|
list: "ລາຍການ"
|
||||||
|
channel: "ຊ່ອງ"
|
||||||
|
mentions: "ກ່າວເຖິງ"
|
||||||
|
@ -1438,5 +1438,6 @@ _deck:
|
|||||||
tl: "Oś czasu"
|
tl: "Oś czasu"
|
||||||
antenna: "Anteny"
|
antenna: "Anteny"
|
||||||
list: "Listy"
|
list: "Listy"
|
||||||
|
channel: "Kanały"
|
||||||
mentions: "Wspomnienia"
|
mentions: "Wspomnienia"
|
||||||
direct: "Bezpośredni"
|
direct: "Bezpośredni"
|
||||||
|
@ -721,4 +721,5 @@ _deck:
|
|||||||
tl: "Cronologie"
|
tl: "Cronologie"
|
||||||
antenna: "Antene"
|
antenna: "Antene"
|
||||||
list: "Liste"
|
list: "Liste"
|
||||||
|
channel: "Canale"
|
||||||
mentions: "Mențiuni"
|
mentions: "Mențiuni"
|
||||||
|
@ -1845,5 +1845,6 @@ _deck:
|
|||||||
tl: "Лента"
|
tl: "Лента"
|
||||||
antenna: "Антенны"
|
antenna: "Антенны"
|
||||||
list: "Списки"
|
list: "Списки"
|
||||||
|
channel: "Каналы"
|
||||||
mentions: "Упоминания"
|
mentions: "Упоминания"
|
||||||
direct: "Личное"
|
direct: "Личное"
|
||||||
|
@ -1545,5 +1545,6 @@ _deck:
|
|||||||
tl: "Časová os"
|
tl: "Časová os"
|
||||||
antenna: "Antény"
|
antenna: "Antény"
|
||||||
list: "Zoznam"
|
list: "Zoznam"
|
||||||
|
channel: "Kanály"
|
||||||
mentions: "Zmienky"
|
mentions: "Zmienky"
|
||||||
direct: "Priame poznámky"
|
direct: "Priame poznámky"
|
||||||
|
@ -129,6 +129,7 @@ unblockConfirm: "คุณแน่ใจแล้วเหรอ? ว่าต
|
|||||||
suspendConfirm: "นายแน่ใจแล้วเหรอว่าต้องการระงับบัญชีนี้อ่ะ?"
|
suspendConfirm: "นายแน่ใจแล้วเหรอว่าต้องการระงับบัญชีนี้อ่ะ?"
|
||||||
unsuspendConfirm: "นายแน่ใจแล้วหรอ? ว่าต้องการยกเลิกการระงับบัญชีนี้"
|
unsuspendConfirm: "นายแน่ใจแล้วหรอ? ว่าต้องการยกเลิกการระงับบัญชีนี้"
|
||||||
selectList: "เลือกรายการ"
|
selectList: "เลือกรายการ"
|
||||||
|
selectChannel: "เลือกแชนแนล"
|
||||||
selectAntenna: "เลือกเสาอากาศ"
|
selectAntenna: "เลือกเสาอากาศ"
|
||||||
selectWidget: "เลือกวิดเจ็ต"
|
selectWidget: "เลือกวิดเจ็ต"
|
||||||
editWidgets: "แก้ไขวิดเจ็ต"
|
editWidgets: "แก้ไขวิดเจ็ต"
|
||||||
@ -1147,7 +1148,7 @@ _achievements:
|
|||||||
description: "คุณได้คลิกที่นี่"
|
description: "คุณได้คลิกที่นี่"
|
||||||
_justPlainLucky:
|
_justPlainLucky:
|
||||||
title: "แค่ลัคกี้ธรรมดา"
|
title: "แค่ลัคกี้ธรรมดา"
|
||||||
description: "มีโอกาสที่จะได้รับด้วยความน่าจะเป็นไปได้ 0.01% ทุก ๆ 10 วินาที"
|
description: "มีโอกาสที่จะได้รับด้วยความน่าจะเป็นไปได้ 0.005% ทุก ๆ 10 วินาที"
|
||||||
_setNameToSyuilo:
|
_setNameToSyuilo:
|
||||||
title: "พระเจ้าคอมเพล็กซ์"
|
title: "พระเจ้าคอมเพล็กซ์"
|
||||||
description: "ตั้งชื่อของคุณเป็น \"syuilo\""
|
description: "ตั้งชื่อของคุณเป็น \"syuilo\""
|
||||||
@ -1182,7 +1183,7 @@ _role:
|
|||||||
description: "คำอธิบายบทบาท"
|
description: "คำอธิบายบทบาท"
|
||||||
permission: "สิทธิ์ตามบทบาท"
|
permission: "สิทธิ์ตามบทบาท"
|
||||||
descriptionOfPermission: "<b>ผู้ดูแลกลั่นกรองเนื้อหา</b> สามารถดำเนินการดูแลขั้นพื้นฐานได้นะ\n<b>ผู้ดูแลระบบ</b> สามารถเปลี่ยนการตั้งค่าทั้งหมดของอินสแตนซ์ได้นะ"
|
descriptionOfPermission: "<b>ผู้ดูแลกลั่นกรองเนื้อหา</b> สามารถดำเนินการดูแลขั้นพื้นฐานได้นะ\n<b>ผู้ดูแลระบบ</b> สามารถเปลี่ยนการตั้งค่าทั้งหมดของอินสแตนซ์ได้นะ"
|
||||||
assignTarget: "กำหนดเป้าหมาย"
|
assignTarget: "มอบหมาย"
|
||||||
descriptionOfAssignTarget: "<b>แมนนวล</b> เพื่อเปลี่ยนผู้ที่เป็นส่วนหนึ่งของบทบาทนี้และใครที่ไม่ใช่ด้วยตนเอง\n<b>เงื่อนไข</b> เพื่อให้ผู้ใช้ได้รับการกำหนดและนำออกจากบทบาทนี้โดยอัตโนมัติตามเงื่อนไขชุดหนึ่ง"
|
descriptionOfAssignTarget: "<b>แมนนวล</b> เพื่อเปลี่ยนผู้ที่เป็นส่วนหนึ่งของบทบาทนี้และใครที่ไม่ใช่ด้วยตนเอง\n<b>เงื่อนไข</b> เพื่อให้ผู้ใช้ได้รับการกำหนดและนำออกจากบทบาทนี้โดยอัตโนมัติตามเงื่อนไขชุดหนึ่ง"
|
||||||
manual: "ปรับเอง"
|
manual: "ปรับเอง"
|
||||||
conditional: "มีเงื่อนไข"
|
conditional: "มีเงื่อนไข"
|
||||||
@ -1869,5 +1870,6 @@ _deck:
|
|||||||
tl: "ไทม์ไลน์"
|
tl: "ไทม์ไลน์"
|
||||||
antenna: "เสาอากาศ"
|
antenna: "เสาอากาศ"
|
||||||
list: "รายการ"
|
list: "รายการ"
|
||||||
|
channel: "แชนแนล"
|
||||||
mentions: "พูดถึง"
|
mentions: "พูดถึง"
|
||||||
direct: "ไดเร็ค"
|
direct: "ไดเร็ค"
|
||||||
|
@ -1382,8 +1382,8 @@ _tutorial:
|
|||||||
step1_1: "Ласкаво просимо!"
|
step1_1: "Ласкаво просимо!"
|
||||||
step1_2: "Ця сторінка має назву \"стрічка подій\". На ній з'являються записи користувачів на яких ви підписані."
|
step1_2: "Ця сторінка має назву \"стрічка подій\". На ній з'являються записи користувачів на яких ви підписані."
|
||||||
step1_3: "Наразі ваша стрічка порожня, оскільки ви ще не написали жодної нотатки і не підписані на інших."
|
step1_3: "Наразі ваша стрічка порожня, оскільки ви ще не написали жодної нотатки і не підписані на інших."
|
||||||
step2_1: "Перш ніж зробити запис або підписатись на когось, спочатку заповніть свій обліковий запис."
|
step2_1: "Перш ніж зробити запис або підписатись на когось, заповніть свій профіль."
|
||||||
step2_2: "Надання деякої інформації про себе дозволить іншим користувачам підписатись на вас."
|
step2_2: "Надання деякої інформації про себе допоможе іншим користувачам вирішити підписатись на вас."
|
||||||
step3_1: "Ви успішно налаштували свій обліковий запис?"
|
step3_1: "Ви успішно налаштували свій обліковий запис?"
|
||||||
step3_2: "Наступним кроком є написання нотатки. Це можна зробити, натиснувши зображення олівця на екрані."
|
step3_2: "Наступним кроком є написання нотатки. Це можна зробити, натиснувши зображення олівця на екрані."
|
||||||
step3_3: "Після написання вмісту ви можете опублікувати його, натиснувши кнопку у верхньому правому куті форми."
|
step3_3: "Після написання вмісту ви можете опублікувати його, натиснувши кнопку у верхньому правому куті форми."
|
||||||
@ -1689,5 +1689,6 @@ _deck:
|
|||||||
tl: "Стрічка"
|
tl: "Стрічка"
|
||||||
antenna: "Антени"
|
antenna: "Антени"
|
||||||
list: "Списки"
|
list: "Списки"
|
||||||
|
channel: "Канали"
|
||||||
mentions: "Згадки"
|
mentions: "Згадки"
|
||||||
direct: "Особисте"
|
direct: "Особисте"
|
||||||
|
@ -1520,5 +1520,6 @@ _deck:
|
|||||||
tl: "Bảng tin"
|
tl: "Bảng tin"
|
||||||
antenna: "Trạm phát sóng"
|
antenna: "Trạm phát sóng"
|
||||||
list: "Danh sách"
|
list: "Danh sách"
|
||||||
|
channel: "Kênh"
|
||||||
mentions: "Lượt nhắc"
|
mentions: "Lượt nhắc"
|
||||||
direct: "Nhắn riêng"
|
direct: "Nhắn riêng"
|
||||||
|
@ -1872,5 +1872,6 @@ _deck:
|
|||||||
tl: "时间线"
|
tl: "时间线"
|
||||||
antenna: "天线"
|
antenna: "天线"
|
||||||
list: "列表"
|
list: "列表"
|
||||||
|
channel: "频道"
|
||||||
mentions: "提及"
|
mentions: "提及"
|
||||||
direct: "指定用户"
|
direct: "指定用户"
|
||||||
|
@ -326,7 +326,7 @@ connectService: "己連結"
|
|||||||
disconnectService: "己斷開 "
|
disconnectService: "己斷開 "
|
||||||
enableLocalTimeline: "開啟本地時間軸"
|
enableLocalTimeline: "開啟本地時間軸"
|
||||||
enableGlobalTimeline: "啟用全域時間軸"
|
enableGlobalTimeline: "啟用全域時間軸"
|
||||||
disablingTimelinesInfo: "為了方便,即使您關閉了時間線功能,管理員和審核員仍可以繼續使用。"
|
disablingTimelinesInfo: "為了方便,即使您關閉了時間線功能,管理員和審查員仍可以繼續使用。"
|
||||||
registration: "註冊"
|
registration: "註冊"
|
||||||
enableRegistration: "開啟新使用者註冊"
|
enableRegistration: "開啟新使用者註冊"
|
||||||
invite: "邀請"
|
invite: "邀請"
|
||||||
@ -389,8 +389,8 @@ aboutMisskey: "關於 Misskey"
|
|||||||
administrator: "管理員"
|
administrator: "管理員"
|
||||||
token: "權杖"
|
token: "權杖"
|
||||||
twoStepAuthentication: "兩階段驗證"
|
twoStepAuthentication: "兩階段驗證"
|
||||||
moderator: "審核員"
|
moderator: "審查員"
|
||||||
moderation: "監察"
|
moderation: "審查"
|
||||||
nUsersMentioned: "提到了{n}"
|
nUsersMentioned: "提到了{n}"
|
||||||
securityKey: "安全金鑰"
|
securityKey: "安全金鑰"
|
||||||
securityKeyName: "金鑰名稱"
|
securityKeyName: "金鑰名稱"
|
||||||
@ -607,7 +607,7 @@ testEmail: "測試郵件發送"
|
|||||||
wordMute: "被靜音的文字"
|
wordMute: "被靜音的文字"
|
||||||
regexpError: "正規表達式錯誤"
|
regexpError: "正規表達式錯誤"
|
||||||
regexpErrorDescription: "{tab} 靜音文字的第 {line} 行的正規表達式有錯誤:"
|
regexpErrorDescription: "{tab} 靜音文字的第 {line} 行的正規表達式有錯誤:"
|
||||||
instanceMute: "實例的靜音"
|
instanceMute: "被靜音的實例"
|
||||||
userSaysSomething: "{name}說了什麼"
|
userSaysSomething: "{name}說了什麼"
|
||||||
makeActive: "啟用"
|
makeActive: "啟用"
|
||||||
display: "檢視"
|
display: "檢視"
|
||||||
@ -939,6 +939,8 @@ cannotPerformTemporaryDescription: "由於超過操作次數限制,暫時無
|
|||||||
preset: "預設值"
|
preset: "預設值"
|
||||||
selectFromPresets: "從預設值中選擇"
|
selectFromPresets: "從預設值中選擇"
|
||||||
achievements: "成就"
|
achievements: "成就"
|
||||||
|
gotInvalidResponseError: "伺服器的回應無效"
|
||||||
|
gotInvalidResponseErrorDescription: "伺服器可能已關閉或者在維護中,請稍後再試。"
|
||||||
_achievements:
|
_achievements:
|
||||||
earnedAt: "獲得日期"
|
earnedAt: "獲得日期"
|
||||||
_types:
|
_types:
|
||||||
@ -1181,7 +1183,7 @@ _role:
|
|||||||
name: "角色名稱"
|
name: "角色名稱"
|
||||||
description: "角色描述 "
|
description: "角色描述 "
|
||||||
permission: "角色的權限"
|
permission: "角色的權限"
|
||||||
descriptionOfPermission: "<b>審核員</b>執行與審核相關的基本操作。\n<b>管理員</b>能變更實例的全部設定。"
|
descriptionOfPermission: "<b>審查員</b>執行與審查相關的基本操作。\n<b>管理員</b>能變更實例的全部設定"
|
||||||
assignTarget: "指派目標"
|
assignTarget: "指派目標"
|
||||||
descriptionOfAssignTarget: "<b>手動</b>是以手動管理這個角色包含的人員。\n<b>符合條件</b>是設定條件以自動包含符合條件的使用者。"
|
descriptionOfAssignTarget: "<b>手動</b>是以手動管理這個角色包含的人員。\n<b>符合條件</b>是設定條件以自動包含符合條件的使用者。"
|
||||||
manual: "手動"
|
manual: "手動"
|
||||||
@ -1198,8 +1200,8 @@ _role:
|
|||||||
iconUrl: "圖示的URL"
|
iconUrl: "圖示的URL"
|
||||||
asBadge: "顯示為徽章"
|
asBadge: "顯示為徽章"
|
||||||
descriptionOfAsBadge: "開啟的話,角色圖示會顯示在用戶名旁邊。"
|
descriptionOfAsBadge: "開啟的話,角色圖示會顯示在用戶名旁邊。"
|
||||||
canEditMembersByModerator: "允許編輯監察員的成員"
|
canEditMembersByModerator: "允許編輯審查員的成員"
|
||||||
descriptionOfCanEditMembersByModerator: "如果開啟,管理員與監察員都可以為使用者指派/解除指派該角色。如果關閉,則只有管理員可以執行。"
|
descriptionOfCanEditMembersByModerator: "如果開啟,管理員與審查員都可以為使用者指派/解除指派該角色。如果關閉,則只有管理員可以執行。"
|
||||||
priority: "優先級"
|
priority: "優先級"
|
||||||
_priority:
|
_priority:
|
||||||
low: "低"
|
low: "低"
|
||||||
@ -1236,7 +1238,7 @@ _role:
|
|||||||
or: "~或~"
|
or: "~或~"
|
||||||
not: "~否"
|
not: "~否"
|
||||||
_sensitiveMediaDetection:
|
_sensitiveMediaDetection:
|
||||||
description: "您可以使用機器學習自動檢測敏感媒體並將其用於審核。 伺服器的負荷會稍微增加。"
|
description: "您可以使用機器學習自動檢測敏感媒體並將其用於審查。 伺服器的負荷會稍微增加。"
|
||||||
sensitivity: "檢測敏感度"
|
sensitivity: "檢測敏感度"
|
||||||
sensitivityDescription: "敏感度低時,誤檢測(偽陽性)會減少。敏感度高時,漏檢(偽陰性)會減少。"
|
sensitivityDescription: "敏感度低時,誤檢測(偽陽性)會減少。敏感度高時,漏檢(偽陰性)會減少。"
|
||||||
setSensitiveFlagAutomatically: "設定 NSFW 旗標"
|
setSensitiveFlagAutomatically: "設定 NSFW 旗標"
|
||||||
@ -1869,5 +1871,6 @@ _deck:
|
|||||||
tl: "時間軸"
|
tl: "時間軸"
|
||||||
antenna: "天線"
|
antenna: "天線"
|
||||||
list: "清單"
|
list: "清單"
|
||||||
|
channel: "頻道"
|
||||||
mentions: "提及"
|
mentions: "提及"
|
||||||
direct: "指定使用者"
|
direct: "指定使用者"
|
||||||
|
12
package.json
12
package.json
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "misskey",
|
"name": "misskey",
|
||||||
"version": "13.4.0+klapy",
|
"version": "13.5.5+klapy",
|
||||||
"codename": "nasubi",
|
"codename": "nasubi",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
@ -19,7 +19,7 @@
|
|||||||
"start": "cd packages/backend && node ./built/boot/index.js",
|
"start": "cd packages/backend && node ./built/boot/index.js",
|
||||||
"start:test": "cd packages/backend && cross-env NODE_ENV=test node ./built/boot/index.js",
|
"start:test": "cd packages/backend && cross-env NODE_ENV=test node ./built/boot/index.js",
|
||||||
"init": "pnpm migrate",
|
"init": "pnpm migrate",
|
||||||
"migrate": "cd packages/backend && pnpm typeorm migration:run -d ormconfig.js",
|
"migrate": "cd packages/backend && pnpm migrate",
|
||||||
"migrateandstart": "pnpm migrate && pnpm start",
|
"migrateandstart": "pnpm migrate && pnpm start",
|
||||||
"gulp": "pnpm exec gulp build",
|
"gulp": "pnpm exec gulp build",
|
||||||
"watch": "pnpm dev",
|
"watch": "pnpm dev",
|
||||||
@ -28,8 +28,8 @@
|
|||||||
"cy:open": "pnpm cypress open --browser --e2e --config-file=cypress.config.ts",
|
"cy:open": "pnpm cypress open --browser --e2e --config-file=cypress.config.ts",
|
||||||
"cy:run": "pnpm cypress run",
|
"cy:run": "pnpm cypress run",
|
||||||
"e2e": "pnpm start-server-and-test start:test http://localhost:61812 cy:run",
|
"e2e": "pnpm start-server-and-test start:test http://localhost:61812 cy:run",
|
||||||
"jest": "cd packages/backend && pnpm cross-env NODE_ENV=test node --experimental-vm-modules --experimental-import-meta-resolve node_modules/jest/bin/jest.js --forceExit --runInBand",
|
"jest": "cd packages/backend && pnpm jest",
|
||||||
"jest-and-coverage": "cd packages/backend && pnpm cross-env NODE_ENV=test node --experimental-vm-modules --experimental-import-meta-resolve node_modules/jest/bin/jest.js --coverage --forceExit --runInBand",
|
"jest-and-coverage": "cd packages/backend && pnpm jest-and-coverage",
|
||||||
"test": "pnpm jest",
|
"test": "pnpm jest",
|
||||||
"test-and-coverage": "pnpm jest-and-coverage",
|
"test-and-coverage": "pnpm jest-and-coverage",
|
||||||
"format": "pnpm exec gulp format",
|
"format": "pnpm exec gulp format",
|
||||||
@ -55,8 +55,8 @@
|
|||||||
"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.50.0",
|
"@typescript-eslint/eslint-plugin": "5.51.0",
|
||||||
"@typescript-eslint/parser": "5.50.0",
|
"@typescript-eslint/parser": "5.51.0",
|
||||||
"cross-env": "7.0.3",
|
"cross-env": "7.0.3",
|
||||||
"cypress": "12.5.1",
|
"cypress": "12.5.1",
|
||||||
"eslint": "8.33.0",
|
"eslint": "8.33.0",
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import { DataSource } from 'typeorm';
|
import { DataSource } from 'typeorm';
|
||||||
import { loadConfig } from './built/config.js';
|
import { loadConfig } from './built/config.js';
|
||||||
import { entities } from './built/postgre.js';
|
import { entities } from './built/postgres.js';
|
||||||
|
|
||||||
const config = loadConfig();
|
const config = loadConfig();
|
||||||
|
|
||||||
|
@ -23,9 +23,9 @@
|
|||||||
"@tensorflow/tfjs-node": "4.2.0"
|
"@tensorflow/tfjs-node": "4.2.0"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@bull-board/api": "4.11.0",
|
"@bull-board/api": "4.11.1",
|
||||||
"@bull-board/fastify": "4.11.0",
|
"@bull-board/fastify": "4.11.1",
|
||||||
"@bull-board/ui": "4.11.0",
|
"@bull-board/ui": "4.11.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",
|
||||||
@ -34,9 +34,9 @@
|
|||||||
"@fastify/multipart": "7.4.0",
|
"@fastify/multipart": "7.4.0",
|
||||||
"@fastify/static": "6.8.0",
|
"@fastify/static": "6.8.0",
|
||||||
"@fastify/view": "7.4.1",
|
"@fastify/view": "7.4.1",
|
||||||
"@nestjs/common": "9.3.1",
|
"@nestjs/common": "9.3.7",
|
||||||
"@nestjs/core": "9.3.1",
|
"@nestjs/core": "9.3.7",
|
||||||
"@nestjs/testing": "9.3.1",
|
"@nestjs/testing": "9.3.7",
|
||||||
"@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",
|
||||||
@ -46,7 +46,7 @@
|
|||||||
"aws-sdk": "2.1295.0",
|
"aws-sdk": "2.1295.0",
|
||||||
"bcryptjs": "2.4.3",
|
"bcryptjs": "2.4.3",
|
||||||
"blurhash": "2.0.4",
|
"blurhash": "2.0.4",
|
||||||
"bull": "4.10.2",
|
"bull": "4.10.3",
|
||||||
"cacheable-lookup": "6.1.0",
|
"cacheable-lookup": "6.1.0",
|
||||||
"cbor": "8.1.0",
|
"cbor": "8.1.0",
|
||||||
"chalk": "5.2.0",
|
"chalk": "5.2.0",
|
||||||
@ -90,7 +90,7 @@
|
|||||||
"promise-limit": "2.7.0",
|
"promise-limit": "2.7.0",
|
||||||
"pug": "3.0.2",
|
"pug": "3.0.2",
|
||||||
"punycode": "2.3.0",
|
"punycode": "2.3.0",
|
||||||
"pureimage": "0.3.15",
|
"pureimage": "0.3.17",
|
||||||
"qrcode": "1.5.1",
|
"qrcode": "1.5.1",
|
||||||
"random-seed": "0.3.0",
|
"random-seed": "0.3.0",
|
||||||
"ratelimiter": "3.4.1",
|
"ratelimiter": "3.4.1",
|
||||||
@ -111,12 +111,12 @@
|
|||||||
"stringz": "2.1.0",
|
"stringz": "2.1.0",
|
||||||
"summaly": "2.7.0",
|
"summaly": "2.7.0",
|
||||||
"systeminformation": "5.17.8",
|
"systeminformation": "5.17.8",
|
||||||
"tinycolor2": "1.5.2",
|
"tinycolor2": "1.6.0",
|
||||||
"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",
|
||||||
"twemoji-parser": "14.0.0",
|
"twemoji-parser": "14.0.0",
|
||||||
"typeorm": "0.3.11",
|
"typeorm": "0.3.12",
|
||||||
"typescript": "4.9.5",
|
"typescript": "4.9.5",
|
||||||
"ulid": "2.3.0",
|
"ulid": "2.3.0",
|
||||||
"unzipper": "0.10.11",
|
"unzipper": "0.10.11",
|
||||||
@ -128,10 +128,10 @@
|
|||||||
"xev": "3.0.2"
|
"xev": "3.0.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@jest/globals": "29.4.1",
|
"@jest/globals": "29.4.2",
|
||||||
"@redocly/openapi-core": "1.0.0-beta.123",
|
"@redocly/openapi-core": "1.0.0-beta.123",
|
||||||
"@swc/cli": "0.1.61",
|
"@swc/cli": "0.1.61",
|
||||||
"@swc/core": "1.3.32",
|
"@swc/core": "1.3.34",
|
||||||
"@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",
|
||||||
@ -145,11 +145,11 @@
|
|||||||
"@types/ioredis": "4.28.10",
|
"@types/ioredis": "4.28.10",
|
||||||
"@types/jest": "29.4.0",
|
"@types/jest": "29.4.0",
|
||||||
"@types/js-yaml": "4.0.5",
|
"@types/js-yaml": "4.0.5",
|
||||||
"@types/jsdom": "20.0.1",
|
"@types/jsdom": "21.1.0",
|
||||||
"@types/jsonld": "1.5.8",
|
"@types/jsonld": "1.5.8",
|
||||||
"@types/jsrsasign": "10.5.5",
|
"@types/jsrsasign": "10.5.5",
|
||||||
"@types/mime-types": "2.1.1",
|
"@types/mime-types": "2.1.1",
|
||||||
"@types/node": "18.11.18",
|
"@types/node": "18.13.0",
|
||||||
"@types/node-fetch": "3.0.3",
|
"@types/node-fetch": "3.0.3",
|
||||||
"@types/nodemailer": "6.4.7",
|
"@types/nodemailer": "6.4.7",
|
||||||
"@types/oauth": "0.9.1",
|
"@types/oauth": "0.9.1",
|
||||||
@ -174,13 +174,13 @@
|
|||||||
"@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.50.0",
|
"@typescript-eslint/eslint-plugin": "5.51.0",
|
||||||
"@typescript-eslint/parser": "5.50.0",
|
"@typescript-eslint/parser": "5.51.0",
|
||||||
"cross-env": "7.0.3",
|
"cross-env": "7.0.3",
|
||||||
"eslint": "8.33.0",
|
"eslint": "8.33.0",
|
||||||
"eslint-plugin-import": "2.27.5",
|
"eslint-plugin-import": "2.27.5",
|
||||||
"execa": "6.1.0",
|
"execa": "6.1.0",
|
||||||
"jest": "29.4.1",
|
"jest": "29.4.2",
|
||||||
"jest-mock": "29.4.1"
|
"jest-mock": "29.4.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4,7 +4,7 @@ import { DataSource } from 'typeorm';
|
|||||||
import { createRedisConnection } from '@/redis.js';
|
import { createRedisConnection } from '@/redis.js';
|
||||||
import { DI } from './di-symbols.js';
|
import { DI } from './di-symbols.js';
|
||||||
import { loadConfig } from './config.js';
|
import { loadConfig } from './config.js';
|
||||||
import { createPostgreDataSource } from './postgre.js';
|
import { createPostgresDataSource } from './postgres.js';
|
||||||
import { RepositoryModule } from './models/RepositoryModule.js';
|
import { RepositoryModule } from './models/RepositoryModule.js';
|
||||||
import type { Provider, OnApplicationShutdown } from '@nestjs/common';
|
import type { Provider, OnApplicationShutdown } from '@nestjs/common';
|
||||||
|
|
||||||
@ -18,7 +18,7 @@ const $config: Provider = {
|
|||||||
const $db: Provider = {
|
const $db: Provider = {
|
||||||
provide: DI.db,
|
provide: DI.db,
|
||||||
useFactory: async (config) => {
|
useFactory: async (config) => {
|
||||||
const db = createPostgreDataSource(config);
|
const db = createPostgresDataSource(config);
|
||||||
return await db.initialize();
|
return await db.initialize();
|
||||||
},
|
},
|
||||||
inject: [DI.config],
|
inject: [DI.config],
|
||||||
|
@ -5,7 +5,7 @@ import { DI } from '@/di-symbols.js';
|
|||||||
import { bindThis } from '@/decorators.js';
|
import { bindThis } from '@/decorators.js';
|
||||||
import { CreateNotificationService } from '@/core/CreateNotificationService.js';
|
import { CreateNotificationService } from '@/core/CreateNotificationService.js';
|
||||||
|
|
||||||
const ACHIEVEMENT_TYPES = [
|
export const ACHIEVEMENT_TYPES = [
|
||||||
'notes1',
|
'notes1',
|
||||||
'notes10',
|
'notes10',
|
||||||
'notes100',
|
'notes100',
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
import { Inject, Injectable } from '@nestjs/common';
|
import { Inject, Injectable } from '@nestjs/common';
|
||||||
import { Brackets } from 'typeorm';
|
import { Brackets, ObjectLiteral } from 'typeorm';
|
||||||
import { DI } from '@/di-symbols.js';
|
import { DI } from '@/di-symbols.js';
|
||||||
import type { User } from '@/models/entities/User.js';
|
import type { User } from '@/models/entities/User.js';
|
||||||
import type { UserProfilesRepository, FollowingsRepository, ChannelFollowingsRepository, MutedNotesRepository, BlockingsRepository, NoteThreadMutingsRepository, MutingsRepository } from '@/models/index.js';
|
import type { UserProfilesRepository, FollowingsRepository, ChannelFollowingsRepository, MutedNotesRepository, BlockingsRepository, NoteThreadMutingsRepository, MutingsRepository } from '@/models/index.js';
|
||||||
import type { SelectQueryBuilder } from 'typeorm';
|
|
||||||
import { bindThis } from '@/decorators.js';
|
import { bindThis } from '@/decorators.js';
|
||||||
|
import type { SelectQueryBuilder } from 'typeorm';
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class QueryService {
|
export class QueryService {
|
||||||
@ -32,7 +32,7 @@ export class QueryService {
|
|||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
public makePaginationQuery<T>(q: SelectQueryBuilder<T>, sinceId?: string, untilId?: string, sinceDate?: number, untilDate?: number): SelectQueryBuilder<T> {
|
public makePaginationQuery<T extends ObjectLiteral>(q: SelectQueryBuilder<T>, sinceId?: string, untilId?: string, sinceDate?: number, untilDate?: number): SelectQueryBuilder<T> {
|
||||||
if (sinceId && untilId) {
|
if (sinceId && untilId) {
|
||||||
q.andWhere(`${q.alias}.id > :sinceId`, { sinceId: sinceId });
|
q.andWhere(`${q.alias}.id > :sinceId`, { sinceId: sinceId });
|
||||||
q.andWhere(`${q.alias}.id < :untilId`, { untilId: untilId });
|
q.andWhere(`${q.alias}.id < :untilId`, { untilId: untilId });
|
||||||
|
@ -48,6 +48,10 @@ export class ApImageService {
|
|||||||
throw new Error('invalid image: url not privided');
|
throw new Error('invalid image: url not privided');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!image.url.startsWith('https://')) {
|
||||||
|
throw new Error('invalid image: unexpected shcema of url: ' + image.url);
|
||||||
|
}
|
||||||
|
|
||||||
this.logger.info(`Creating the Image: ${image.url}`);
|
this.logger.info(`Creating the Image: ${image.url}`);
|
||||||
|
|
||||||
const instance = await this.metaService.fetch();
|
const instance = await this.metaService.fetch();
|
||||||
|
@ -1,8 +1,7 @@
|
|||||||
import { forwardRef, Inject, Injectable } from '@nestjs/common';
|
import { forwardRef, Inject, Injectable } from '@nestjs/common';
|
||||||
import promiseLimit from 'promise-limit';
|
import promiseLimit from 'promise-limit';
|
||||||
import { DI } from '@/di-symbols.js';
|
import { DI } from '@/di-symbols.js';
|
||||||
import type { MessagingMessagesRepository, PollsRepository, EmojisRepository } from '@/models/index.js';
|
import type { MessagingMessagesRepository, PollsRepository, EmojisRepository, UsersRepository } from '@/models/index.js';
|
||||||
import type { UsersRepository } from '@/models/index.js';
|
|
||||||
import type { Config } from '@/config.js';
|
import type { Config } from '@/config.js';
|
||||||
import type { CacheableRemoteUser } from '@/models/entities/User.js';
|
import type { CacheableRemoteUser } from '@/models/entities/User.js';
|
||||||
import type { Note } from '@/models/entities/Note.js';
|
import type { Note } from '@/models/entities/Note.js';
|
||||||
@ -18,6 +17,7 @@ import { PollService } from '@/core/PollService.js';
|
|||||||
import { StatusError } from '@/misc/status-error.js';
|
import { StatusError } from '@/misc/status-error.js';
|
||||||
import { UtilityService } from '@/core/UtilityService.js';
|
import { UtilityService } from '@/core/UtilityService.js';
|
||||||
import { MessagingService } from '@/core/MessagingService.js';
|
import { MessagingService } from '@/core/MessagingService.js';
|
||||||
|
import { bindThis } from '@/decorators.js';
|
||||||
import { getOneApId, getApId, getOneApHrefNullable, validPost, isEmoji, getApType } from '../type.js';
|
import { getOneApId, getApId, getOneApHrefNullable, validPost, isEmoji, getApType } from '../type.js';
|
||||||
// eslint-disable-next-line @typescript-eslint/consistent-type-imports
|
// eslint-disable-next-line @typescript-eslint/consistent-type-imports
|
||||||
import { ApLoggerService } from '../ApLoggerService.js';
|
import { ApLoggerService } from '../ApLoggerService.js';
|
||||||
@ -32,7 +32,6 @@ import { ApQuestionService } from './ApQuestionService.js';
|
|||||||
import { ApImageService } from './ApImageService.js';
|
import { ApImageService } from './ApImageService.js';
|
||||||
import type { Resolver } from '../ApResolverService.js';
|
import type { Resolver } from '../ApResolverService.js';
|
||||||
import type { IObject, IPost } from '../type.js';
|
import type { IObject, IPost } from '../type.js';
|
||||||
import { bindThis } from '@/decorators.js';
|
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class ApNoteService {
|
export class ApNoteService {
|
||||||
@ -133,6 +132,16 @@ export class ApNoteService {
|
|||||||
const note: IPost = object;
|
const note: IPost = object;
|
||||||
|
|
||||||
this.logger.debug(`Note fetched: ${JSON.stringify(note, null, 2)}`);
|
this.logger.debug(`Note fetched: ${JSON.stringify(note, null, 2)}`);
|
||||||
|
|
||||||
|
if (note.id && !note.id.startsWith('https://')) {
|
||||||
|
throw new Error('unexpected shcema of note.id: ' + note.id);
|
||||||
|
}
|
||||||
|
|
||||||
|
const url = getOneApHrefNullable(note.url);
|
||||||
|
|
||||||
|
if (url && !url.startsWith('https://')) {
|
||||||
|
throw new Error('unexpected shcema of note url: ' + url);
|
||||||
|
}
|
||||||
|
|
||||||
this.logger.info(`Creating the Note: ${note.id}`);
|
this.logger.info(`Creating the Note: ${note.id}`);
|
||||||
|
|
||||||
@ -307,7 +316,7 @@ export class ApNoteService {
|
|||||||
apEmojis,
|
apEmojis,
|
||||||
poll,
|
poll,
|
||||||
uri: note.id,
|
uri: note.id,
|
||||||
url: getOneApHrefNullable(note.url),
|
url: url,
|
||||||
}, silent);
|
}, silent);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -252,6 +252,12 @@ export class ApPersonService implements OnModuleInit {
|
|||||||
|
|
||||||
const bday = person['vcard:bday']?.match(/^\d{4}-\d{2}-\d{2}/);
|
const bday = person['vcard:bday']?.match(/^\d{4}-\d{2}-\d{2}/);
|
||||||
|
|
||||||
|
const url = getOneApHrefNullable(person.url);
|
||||||
|
|
||||||
|
if (url && !url.startsWith('https://')) {
|
||||||
|
throw new Error('unexpected shcema of person url: ' + url);
|
||||||
|
}
|
||||||
|
|
||||||
// Create user
|
// Create user
|
||||||
let user: IRemoteUser;
|
let user: IRemoteUser;
|
||||||
try {
|
try {
|
||||||
@ -283,7 +289,7 @@ export class ApPersonService implements OnModuleInit {
|
|||||||
await transactionalEntityManager.save(new UserProfile({
|
await transactionalEntityManager.save(new UserProfile({
|
||||||
userId: user.id,
|
userId: user.id,
|
||||||
description: person.summary ? this.apMfmService.htmlToMfm(truncate(person.summary, summaryLength), person.tag) : null,
|
description: person.summary ? this.apMfmService.htmlToMfm(truncate(person.summary, summaryLength), person.tag) : null,
|
||||||
url: getOneApHrefNullable(person.url),
|
url: url,
|
||||||
fields,
|
fields,
|
||||||
birthday: bday ? bday[0] : null,
|
birthday: bday ? bday[0] : null,
|
||||||
location: person['vcard:Address'] ?? null,
|
location: person['vcard:Address'] ?? null,
|
||||||
@ -425,6 +431,12 @@ export class ApPersonService implements OnModuleInit {
|
|||||||
|
|
||||||
const bday = person['vcard:bday']?.match(/^\d{4}-\d{2}-\d{2}/);
|
const bday = person['vcard:bday']?.match(/^\d{4}-\d{2}-\d{2}/);
|
||||||
|
|
||||||
|
const url = getOneApHrefNullable(person.url);
|
||||||
|
|
||||||
|
if (url && !url.startsWith('https://')) {
|
||||||
|
throw new Error('unexpected shcema of person url: ' + url);
|
||||||
|
}
|
||||||
|
|
||||||
const updates = {
|
const updates = {
|
||||||
lastFetchedAt: new Date(),
|
lastFetchedAt: new Date(),
|
||||||
inbox: person.inbox,
|
inbox: person.inbox,
|
||||||
@ -459,7 +471,7 @@ export class ApPersonService implements OnModuleInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
await this.userProfilesRepository.update({ userId: exist.id }, {
|
await this.userProfilesRepository.update({ userId: exist.id }, {
|
||||||
url: getOneApHrefNullable(person.url),
|
url: url,
|
||||||
fields,
|
fields,
|
||||||
description: person.summary ? this.apMfmService.htmlToMfm(truncate(person.summary, summaryLength), person.tag) : null,
|
description: person.summary ? this.apMfmService.htmlToMfm(truncate(person.summary, summaryLength), person.tag) : null,
|
||||||
birthday: bday ? bday[0] : null,
|
birthday: bday ? bday[0] : null,
|
||||||
|
@ -20,6 +20,7 @@ type PackOptions = {
|
|||||||
withUser?: boolean,
|
withUser?: boolean,
|
||||||
};
|
};
|
||||||
import { bindThis } from '@/decorators.js';
|
import { bindThis } from '@/decorators.js';
|
||||||
|
import { isMimeImage } from '@/misc/is-mime-image.js';
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class DriveFileEntityService {
|
export class DriveFileEntityService {
|
||||||
@ -82,7 +83,9 @@ export class DriveFileEntityService {
|
|||||||
|
|
||||||
// リモートかつメディアプロキシ
|
// リモートかつメディアプロキシ
|
||||||
if (file.uri != null && file.userHost != null && this.config.externalMediaProxyEnabled) {
|
if (file.uri != null && file.userHost != null && this.config.externalMediaProxyEnabled) {
|
||||||
return proxiedUrl(file.uri);
|
if (!(mode === 'static' && file.type.startsWith('video'))) {
|
||||||
|
return proxiedUrl(file.uri);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// リモートかつ期限切れはローカルプロキシを試みる
|
// リモートかつ期限切れはローカルプロキシを試みる
|
||||||
@ -91,20 +94,19 @@ export class DriveFileEntityService {
|
|||||||
|
|
||||||
if (key && !key.match('/')) { // 古いものはここにオブジェクトストレージキーが入ってるので除外
|
if (key && !key.match('/')) { // 古いものはここにオブジェクトストレージキーが入ってるので除外
|
||||||
const url = `${this.config.url}/files/${key}`;
|
const url = `${this.config.url}/files/${key}`;
|
||||||
if (mode === 'avatar') return proxiedUrl(url);
|
if (mode === 'avatar') return proxiedUrl(file.uri);
|
||||||
return url;
|
return url;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const isImage = file.type && ['image/png', 'image/apng', 'image/gif', 'image/jpeg', 'image/webp', 'image/avif', 'image/svg+xml'].includes(file.type);
|
|
||||||
|
|
||||||
if (mode === 'static') {
|
|
||||||
return file.thumbnailUrl ?? (isImage ? (file.webpublicUrl ?? file.url) : null);
|
|
||||||
}
|
|
||||||
|
|
||||||
const url = file.webpublicUrl ?? file.url;
|
const url = file.webpublicUrl ?? file.url;
|
||||||
|
|
||||||
if (mode === 'avatar') return proxiedUrl(url);
|
if (mode === 'static') {
|
||||||
|
return file.thumbnailUrl ?? (isMimeImage(file.type, 'sharp-convertible-image') ? proxiedUrl(url) : null);
|
||||||
|
}
|
||||||
|
if (mode === 'avatar') {
|
||||||
|
return proxiedUrl(url);
|
||||||
|
}
|
||||||
return url;
|
return url;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
* The getter will return a .bind version of the function
|
* The getter will return a .bind version of the function
|
||||||
* and memoize the result against a symbol on the instance
|
* and memoize the result against a symbol on the instance
|
||||||
*/
|
*/
|
||||||
export function bindThis(target, key, descriptor) {
|
export function bindThis(target: any, key: string, descriptor: any) {
|
||||||
let fn = descriptor.value;
|
let fn = descriptor.value;
|
||||||
|
|
||||||
if (typeof fn !== 'function') {
|
if (typeof fn !== 'function') {
|
||||||
@ -34,7 +34,7 @@ export function bindThis(target, key, descriptor) {
|
|||||||
});
|
});
|
||||||
return boundFn;
|
return boundFn;
|
||||||
},
|
},
|
||||||
set(value) {
|
set(value: any) {
|
||||||
fn = value;
|
fn = value;
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
@ -45,7 +45,7 @@ export default class Logger {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const time = dateFormat(new Date(), 'HH:mm:ss');
|
const time = dateFormat(new Date(), 'HH:mm:ss');
|
||||||
const worker = cluster.isPrimary ? '*' : cluster.worker.id;
|
const worker = cluster.isPrimary ? '*' : cluster.worker!.id;
|
||||||
const l =
|
const l =
|
||||||
level === 'error' ? important ? chalk.bgRed.white('ERR ') : chalk.red('ERR ') :
|
level === 'error' ? important ? chalk.bgRed.white('ERR ') : chalk.red('ERR ') :
|
||||||
level === 'warning' ? chalk.yellow('WARN') :
|
level === 'warning' ? chalk.yellow('WARN') :
|
||||||
|
@ -51,7 +51,7 @@ export function genIdenticon(seed: string, stream: WriteStream): Promise<void> {
|
|||||||
bg.addColorStop(0, bgColors[0]);
|
bg.addColorStop(0, bgColors[0]);
|
||||||
bg.addColorStop(1, bgColors[1]);
|
bg.addColorStop(1, bgColors[1]);
|
||||||
|
|
||||||
ctx.fillStyle = bg;
|
ctx.fillStyle = bg as any;
|
||||||
ctx.beginPath();
|
ctx.beginPath();
|
||||||
ctx.fillRect(0, 0, size, size);
|
ctx.fillRect(0, 0, size, size);
|
||||||
|
|
||||||
|
@ -11,10 +11,9 @@ export class I18n<T extends Record<string, any>> {
|
|||||||
|
|
||||||
// string にしているのは、ドット区切りでのパス指定を許可するため
|
// string にしているのは、ドット区切りでのパス指定を許可するため
|
||||||
// なるべくこのメソッド使うよりもlocale直接参照の方がvueのキャッシュ効いてパフォーマンスが良いかも
|
// なるべくこのメソッド使うよりもlocale直接参照の方がvueのキャッシュ効いてパフォーマンスが良いかも
|
||||||
@bindThis
|
|
||||||
public t(key: string, args?: Record<string, any>): string {
|
public t(key: string, args?: Record<string, any>): string {
|
||||||
try {
|
try {
|
||||||
let str = key.split('.').reduce((o, i) => o[i], this.locale) as string;
|
let str = key.split('.').reduce((o, i) => o[i], this.locale as any) as string;
|
||||||
|
|
||||||
if (args) {
|
if (args) {
|
||||||
for (const [k, v] of Object.entries(args)) {
|
for (const [k, v] of Object.entries(args)) {
|
||||||
|
@ -197,7 +197,7 @@ export const entities = [
|
|||||||
|
|
||||||
const log = process.env.NODE_ENV !== 'production';
|
const log = process.env.NODE_ENV !== 'production';
|
||||||
|
|
||||||
export function createPostgreDataSource(config: Config) {
|
export function createPostgresDataSource(config: Config) {
|
||||||
return new DataSource({
|
return new DataSource({
|
||||||
type: 'postgres',
|
type: 'postgres',
|
||||||
host: config.db.host,
|
host: config.db.host,
|
@ -1,3 +1,4 @@
|
|||||||
|
import { IncomingMessage } from 'node:http';
|
||||||
import { Inject, Injectable } from '@nestjs/common';
|
import { Inject, Injectable } from '@nestjs/common';
|
||||||
import fastifyAccepts from '@fastify/accepts';
|
import fastifyAccepts from '@fastify/accepts';
|
||||||
import httpSignature from '@peertube/http-signature';
|
import httpSignature from '@peertube/http-signature';
|
||||||
@ -19,6 +20,7 @@ import { QueryService } from '@/core/QueryService.js';
|
|||||||
import { UtilityService } from '@/core/UtilityService.js';
|
import { UtilityService } from '@/core/UtilityService.js';
|
||||||
import { UserEntityService } from '@/core/entities/UserEntityService.js';
|
import { UserEntityService } from '@/core/entities/UserEntityService.js';
|
||||||
import { bindThis } from '@/decorators.js';
|
import { bindThis } from '@/decorators.js';
|
||||||
|
import { IActivity } from '@/core/activitypub/type.js';
|
||||||
import type { FastifyInstance, FastifyRequest, FastifyReply, FastifyPluginOptions } from 'fastify';
|
import type { FastifyInstance, FastifyRequest, FastifyReply, FastifyPluginOptions } from 'fastify';
|
||||||
import type { FindOptionsWhere } from 'typeorm';
|
import type { FindOptionsWhere } from 'typeorm';
|
||||||
|
|
||||||
@ -97,7 +99,8 @@ export class ActivityPubServerService {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.queueService.inbox(request.body, signature);
|
// TODO: request.bodyのバリデーション?
|
||||||
|
this.queueService.inbox(request.body as IActivity, signature);
|
||||||
|
|
||||||
reply.code(202);
|
reply.code(202);
|
||||||
}
|
}
|
||||||
@ -413,20 +416,21 @@ export class ActivityPubServerService {
|
|||||||
|
|
||||||
@bindThis
|
@bindThis
|
||||||
public createServer(fastify: FastifyInstance, options: FastifyPluginOptions, done: (err?: Error) => void) {
|
public createServer(fastify: FastifyInstance, options: FastifyPluginOptions, done: (err?: Error) => void) {
|
||||||
fastify.addConstraintStrategy({
|
// addConstraintStrategy の型定義がおかしいため
|
||||||
|
(fastify.addConstraintStrategy as any)({
|
||||||
name: 'apOrHtml',
|
name: 'apOrHtml',
|
||||||
storage() {
|
storage() {
|
||||||
const store = {};
|
const store = {} as any;
|
||||||
return {
|
return {
|
||||||
get(key) {
|
get(key: string) {
|
||||||
return store[key] ?? null;
|
return store[key] ?? null;
|
||||||
},
|
},
|
||||||
set(key, value) {
|
set(key: string, value: any) {
|
||||||
store[key] = value;
|
store[key] = value;
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
deriveConstraint(request, ctx) {
|
deriveConstraint(request: IncomingMessage) {
|
||||||
const accepted = accepts(request).type(['html', ACTIVITY_JSON, LD_JSON]);
|
const accepted = accepts(request).type(['html', ACTIVITY_JSON, LD_JSON]);
|
||||||
const isAp = typeof accepted === 'string' && !accepted.match(/html/);
|
const isAp = typeof accepted === 'string' && !accepted.match(/html/);
|
||||||
return isAp ? 'ap' : 'html';
|
return isAp ? 'ap' : 'html';
|
||||||
@ -536,6 +540,7 @@ export class ActivityPubServerService {
|
|||||||
return (this.apRendererService.renderActivity(this.apRendererService.renderKey(user, keypair)));
|
return (this.apRendererService.renderActivity(this.apRendererService.renderKey(user, keypair)));
|
||||||
} else {
|
} else {
|
||||||
reply.code(400);
|
reply.code(400);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -166,6 +166,7 @@ export class ServerService {
|
|||||||
return 'Verify succeeded!';
|
return 'Verify succeeded!';
|
||||||
} else {
|
} else {
|
||||||
reply.code(404);
|
reply.code(404);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -34,7 +34,7 @@ export class RateLimiterService {
|
|||||||
const min = (): void => {
|
const min = (): void => {
|
||||||
const minIntervalLimiter = new Limiter({
|
const minIntervalLimiter = new Limiter({
|
||||||
id: `${actor}:${limitation.key}:min`,
|
id: `${actor}:${limitation.key}:min`,
|
||||||
duration: limitation.minInterval * factor,
|
duration: limitation.minInterval! * factor,
|
||||||
max: 1,
|
max: 1,
|
||||||
db: this.redisClient,
|
db: this.redisClient,
|
||||||
});
|
});
|
||||||
@ -62,8 +62,8 @@ export class RateLimiterService {
|
|||||||
const max = (): void => {
|
const max = (): void => {
|
||||||
const limiter = new Limiter({
|
const limiter = new Limiter({
|
||||||
id: `${actor}:${limitation.key}`,
|
id: `${actor}:${limitation.key}`,
|
||||||
duration: limitation.duration * factor,
|
duration: limitation.duration! * factor,
|
||||||
max: limitation.max / factor,
|
max: limitation.max! / factor,
|
||||||
db: this.redisClient,
|
db: this.redisClient,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -10,9 +10,9 @@ import { getIpHash } from '@/misc/get-ip-hash.js';
|
|||||||
import type { ILocalUser } from '@/models/entities/User.js';
|
import type { ILocalUser } from '@/models/entities/User.js';
|
||||||
import { IdService } from '@/core/IdService.js';
|
import { IdService } from '@/core/IdService.js';
|
||||||
import { TwoFactorAuthenticationService } from '@/core/TwoFactorAuthenticationService.js';
|
import { TwoFactorAuthenticationService } from '@/core/TwoFactorAuthenticationService.js';
|
||||||
|
import { bindThis } from '@/decorators.js';
|
||||||
import { RateLimiterService } from './RateLimiterService.js';
|
import { RateLimiterService } from './RateLimiterService.js';
|
||||||
import { SigninService } from './SigninService.js';
|
import { SigninService } from './SigninService.js';
|
||||||
import { bindThis } from '@/decorators.js';
|
|
||||||
import type { FastifyRequest, FastifyReply } from 'fastify';
|
import type { FastifyRequest, FastifyReply } from 'fastify';
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
@ -131,7 +131,7 @@ export class SigninApiService {
|
|||||||
createdAt: new Date(),
|
createdAt: new Date(),
|
||||||
userId: user.id,
|
userId: user.id,
|
||||||
ip: request.ip,
|
ip: request.ip,
|
||||||
headers: request.headers,
|
headers: request.headers as any,
|
||||||
success: false,
|
success: false,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@ export class SigninService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@bindThis
|
@bindThis
|
||||||
public signin(request: FastifyRequest, reply: FastifyReply, user: ILocalUser, redirect = false) {
|
public signin(request: FastifyRequest, reply: FastifyReply, user: ILocalUser) {
|
||||||
setImmediate(async () => {
|
setImmediate(async () => {
|
||||||
// Append signin history
|
// Append signin history
|
||||||
const record = await this.signinsRepository.insert({
|
const record = await this.signinsRepository.insert({
|
||||||
@ -33,7 +33,7 @@ export class SigninService {
|
|||||||
createdAt: new Date(),
|
createdAt: new Date(),
|
||||||
userId: user.id,
|
userId: user.id,
|
||||||
ip: request.ip,
|
ip: request.ip,
|
||||||
headers: request.headers,
|
headers: request.headers as any,
|
||||||
success: true,
|
success: true,
|
||||||
}).then(x => this.signinsRepository.findOneByOrFail(x.identifiers[0]));
|
}).then(x => this.signinsRepository.findOneByOrFail(x.identifiers[0]));
|
||||||
|
|
||||||
@ -41,25 +41,11 @@ export class SigninService {
|
|||||||
this.globalEventService.publishMainStream(user.id, 'signin', await this.signinEntityService.pack(record));
|
this.globalEventService.publishMainStream(user.id, 'signin', await this.signinEntityService.pack(record));
|
||||||
});
|
});
|
||||||
|
|
||||||
if (redirect) {
|
reply.code(200);
|
||||||
//#region Cookie
|
return {
|
||||||
reply.setCookie('igi', user.token!, {
|
id: user.id,
|
||||||
path: '/',
|
i: user.token,
|
||||||
// SEE: https://github.com/koajs/koa/issues/974
|
};
|
||||||
// When using a SSL proxy it should be configured to add the "X-Forwarded-Proto: https" header
|
|
||||||
secure: this.config.url.startsWith('https'),
|
|
||||||
httpOnly: false,
|
|
||||||
});
|
|
||||||
//#endregion
|
|
||||||
|
|
||||||
reply.redirect(this.config.url);
|
|
||||||
} else {
|
|
||||||
reply.code(200);
|
|
||||||
return {
|
|
||||||
id: user.id,
|
|
||||||
i: user.token,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -146,6 +146,7 @@ export class SignupApiService {
|
|||||||
`To complete signup, please click this link: ${link}`);
|
`To complete signup, please click this link: ${link}`);
|
||||||
|
|
||||||
reply.code(204);
|
reply.code(204);
|
||||||
|
return;
|
||||||
} else {
|
} else {
|
||||||
try {
|
try {
|
||||||
const { account, secret } = await this.signupService.signup({
|
const { account, secret } = await this.signupService.signup({
|
||||||
@ -162,7 +163,7 @@ export class SignupApiService {
|
|||||||
token: secret,
|
token: secret,
|
||||||
};
|
};
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
throw new FastifyReplyError(400, err);
|
throw new FastifyReplyError(400, typeof err === 'string' ? err : (err as Error).toString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -195,7 +196,7 @@ export class SignupApiService {
|
|||||||
|
|
||||||
return this.signinService.signin(request, reply, account as ILocalUser);
|
return this.signinService.signin(request, reply, account as ILocalUser);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
throw new FastifyReplyError(400, err);
|
throw new FastifyReplyError(400, typeof err === 'string' ? err : (err as Error).toString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -20,7 +20,7 @@ export const paramDef = {
|
|||||||
description: { type: 'string' },
|
description: { type: 'string' },
|
||||||
color: { type: 'string', nullable: true },
|
color: { type: 'string', nullable: true },
|
||||||
iconUrl: { type: 'string', nullable: true },
|
iconUrl: { type: 'string', nullable: true },
|
||||||
target: { type: 'string' },
|
target: { type: 'string', enum: ['manual', 'conditional'] },
|
||||||
condFormula: { type: 'object' },
|
condFormula: { type: 'object' },
|
||||||
isPublic: { type: 'boolean' },
|
isPublic: { type: 'boolean' },
|
||||||
isModerator: { type: 'boolean' },
|
isModerator: { type: 'boolean' },
|
||||||
|
@ -28,7 +28,7 @@ export const paramDef = {
|
|||||||
description: { type: 'string' },
|
description: { type: 'string' },
|
||||||
color: { type: 'string', nullable: true },
|
color: { type: 'string', nullable: true },
|
||||||
iconUrl: { type: 'string', nullable: true },
|
iconUrl: { type: 'string', nullable: true },
|
||||||
target: { type: 'string' },
|
target: { type: 'string', enum: ['manual', 'conditional'] },
|
||||||
condFormula: { type: 'object' },
|
condFormula: { type: 'object' },
|
||||||
isPublic: { type: 'boolean' },
|
isPublic: { type: 'boolean' },
|
||||||
isModerator: { type: 'boolean' },
|
isModerator: { type: 'boolean' },
|
||||||
|
@ -2,7 +2,7 @@ import { Inject, Injectable } from '@nestjs/common';
|
|||||||
import { getJsonSchema } from '@/core/chart/core.js';
|
import { getJsonSchema } from '@/core/chart/core.js';
|
||||||
import { Endpoint } from '@/server/api/endpoint-base.js';
|
import { Endpoint } from '@/server/api/endpoint-base.js';
|
||||||
import PerUserPvChart from '@/core/chart/charts/per-user-pv.js';
|
import PerUserPvChart from '@/core/chart/charts/per-user-pv.js';
|
||||||
import { schema } from '@/core/chart/charts/entities/per-user-notes.js';
|
import { schema } from '@/core/chart/charts/entities/per-user-pv.js';
|
||||||
|
|
||||||
export const meta = {
|
export const meta = {
|
||||||
tags: ['charts', 'users'],
|
tags: ['charts', 'users'],
|
||||||
|
@ -27,7 +27,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
|
|||||||
return {
|
return {
|
||||||
params: Object.entries(ep.params.properties ?? {}).map(([k, v]) => ({
|
params: Object.entries(ep.params.properties ?? {}).map(([k, v]) => ({
|
||||||
name: k,
|
name: k,
|
||||||
type: v.type.charAt(0).toUpperCase() + v.type.slice(1),
|
type: v.type ? v.type.charAt(0).toUpperCase() + v.type.slice(1) : 'string',
|
||||||
})),
|
})),
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import { Inject, Injectable } from '@nestjs/common';
|
import { Inject, Injectable } from '@nestjs/common';
|
||||||
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 { AchievementService } from '@/core/AchievementService.js';
|
import { AchievementService, ACHIEVEMENT_TYPES } from '@/core/AchievementService.js';
|
||||||
|
|
||||||
export const meta = {
|
export const meta = {
|
||||||
requireCredential: true,
|
requireCredential: true,
|
||||||
@ -10,7 +10,7 @@ export const meta = {
|
|||||||
export const paramDef = {
|
export const paramDef = {
|
||||||
type: 'object',
|
type: 'object',
|
||||||
properties: {
|
properties: {
|
||||||
name: { type: 'string' },
|
name: { type: 'string', enum: ACHIEVEMENT_TYPES },
|
||||||
},
|
},
|
||||||
required: ['name'],
|
required: ['name'],
|
||||||
} as const;
|
} as const;
|
||||||
|
@ -15,8 +15,8 @@ export const meta = {
|
|||||||
requireCredential: true,
|
requireCredential: true,
|
||||||
|
|
||||||
limit: {
|
limit: {
|
||||||
duration: 60000,
|
duration: 30000,
|
||||||
max: 15,
|
max: 30,
|
||||||
},
|
},
|
||||||
|
|
||||||
kind: 'read:notifications',
|
kind: 'read:notifications',
|
||||||
|
@ -155,7 +155,7 @@ export class ClientServerService {
|
|||||||
});
|
});
|
||||||
|
|
||||||
serverAdapter.setBasePath(bullBoardPath);
|
serverAdapter.setBasePath(bullBoardPath);
|
||||||
fastify.register(serverAdapter.registerPlugin(), { prefix: bullBoardPath });
|
(fastify.register as any)(serverAdapter.registerPlugin(), { prefix: bullBoardPath });
|
||||||
//#endregion
|
//#endregion
|
||||||
|
|
||||||
fastify.register(fastifyView, {
|
fastify.register(fastifyView, {
|
||||||
@ -337,7 +337,7 @@ export class ClientServerService {
|
|||||||
|
|
||||||
const renderBase = async (reply: FastifyReply) => {
|
const renderBase = async (reply: FastifyReply) => {
|
||||||
const meta = await this.metaService.fetch();
|
const meta = await this.metaService.fetch();
|
||||||
reply.header('Cache-Control', 'public, max-age=15');
|
reply.header('Cache-Control', 'public, max-age=30');
|
||||||
return await reply.view('base', {
|
return await reply.view('base', {
|
||||||
img: meta.bannerUrl,
|
img: meta.bannerUrl,
|
||||||
title: meta.name ?? 'Misskey',
|
title: meta.name ?? 'Misskey',
|
||||||
@ -372,6 +372,7 @@ export class ClientServerService {
|
|||||||
return feed.atom1();
|
return feed.atom1();
|
||||||
} else {
|
} else {
|
||||||
reply.code(404);
|
reply.code(404);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -384,6 +385,7 @@ export class ClientServerService {
|
|||||||
return feed.rss2();
|
return feed.rss2();
|
||||||
} else {
|
} else {
|
||||||
reply.code(404);
|
reply.code(404);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -396,6 +398,7 @@ export class ClientServerService {
|
|||||||
return feed.json1();
|
return feed.json1();
|
||||||
} else {
|
} else {
|
||||||
reply.code(404);
|
reply.code(404);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -35,7 +35,8 @@ html
|
|||||||
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')
|
||||||
link(rel='stylesheet' href='/assets/tabler-icons/tabler-icons.min.css')
|
//- https://github.com/misskey-dev/misskey/issues/9842
|
||||||
|
link(rel='stylesheet' href='/assets/tabler-icons/tabler-icons.min.css?v2.2.0')
|
||||||
link(rel='modulepreload' href=`/vite/${clientEntry.file}`)
|
link(rel='modulepreload' href=`/vite/${clientEntry.file}`)
|
||||||
|
|
||||||
if !config.clientManifestExists
|
if !config.clientManifestExists
|
||||||
|
@ -11,7 +11,7 @@ import FormData from 'form-data';
|
|||||||
import { DataSource } from 'typeorm';
|
import { DataSource } from 'typeorm';
|
||||||
import got, { RequestError } from 'got';
|
import got, { RequestError } from 'got';
|
||||||
import loadConfig from '../src/config/load.js';
|
import loadConfig from '../src/config/load.js';
|
||||||
import { entities } from '../src/postgre.js';
|
import { entities } from '@/postgres.js';
|
||||||
import type * as misskey from 'misskey-js';
|
import type * as misskey from 'misskey-js';
|
||||||
|
|
||||||
const _filename = fileURLToPath(import.meta.url);
|
const _filename = fileURLToPath(import.meta.url);
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
"@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.4",
|
"@syuilo/aiscript": "0.12.4",
|
||||||
"@tabler/icons-webfont": "2.1.2",
|
"@tabler/icons-webfont": "2.2.0",
|
||||||
"@vitejs/plugin-vue": "4.0.0",
|
"@vitejs/plugin-vue": "4.0.0",
|
||||||
"@vue/compiler-sfc": "3.2.47",
|
"@vue/compiler-sfc": "3.2.47",
|
||||||
"autobind-decorator": "2.4.0",
|
"autobind-decorator": "2.4.0",
|
||||||
@ -23,7 +23,7 @@
|
|||||||
"canvas-confetti": "1.6.0",
|
"canvas-confetti": "1.6.0",
|
||||||
"chart.js": "4.2.0",
|
"chart.js": "4.2.0",
|
||||||
"chartjs-adapter-date-fns": "3.0.0",
|
"chartjs-adapter-date-fns": "3.0.0",
|
||||||
"chartjs-chart-matrix": "1.3.0",
|
"chartjs-chart-matrix": "2.0.1",
|
||||||
"chartjs-plugin-gradient": "0.6.1",
|
"chartjs-plugin-gradient": "0.6.1",
|
||||||
"chartjs-plugin-zoom": "2.0.0",
|
"chartjs-plugin-zoom": "2.0.0",
|
||||||
"compare-versions": "5.0.1",
|
"compare-versions": "5.0.1",
|
||||||
@ -44,7 +44,7 @@
|
|||||||
"punycode": "2.3.0",
|
"punycode": "2.3.0",
|
||||||
"querystring": "0.2.1",
|
"querystring": "0.2.1",
|
||||||
"rndstr": "1.0.0",
|
"rndstr": "1.0.0",
|
||||||
"rollup": "3.12.1",
|
"rollup": "3.14.0",
|
||||||
"s-age": "1.1.2",
|
"s-age": "1.1.2",
|
||||||
"sanitize-html": "2.9.0",
|
"sanitize-html": "2.9.0",
|
||||||
"sass": "1.58.0",
|
"sass": "1.58.0",
|
||||||
@ -55,7 +55,7 @@
|
|||||||
"textarea-caret": "3.1.0",
|
"textarea-caret": "3.1.0",
|
||||||
"three": "0.149.0",
|
"three": "0.149.0",
|
||||||
"throttle-debounce": "5.0.0",
|
"throttle-debounce": "5.0.0",
|
||||||
"tinycolor2": "1.5.2",
|
"tinycolor2": "1.6.0",
|
||||||
"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",
|
||||||
@ -74,7 +74,7 @@
|
|||||||
"@types/gulp": "4.0.10",
|
"@types/gulp": "4.0.10",
|
||||||
"@types/gulp-rename": "2.0.1",
|
"@types/gulp-rename": "2.0.1",
|
||||||
"@types/matter-js": "0.18.2",
|
"@types/matter-js": "0.18.2",
|
||||||
"@types/node": "18.11.18",
|
"@types/node": "18.13.0",
|
||||||
"@types/punycode": "2.1.0",
|
"@types/punycode": "2.1.0",
|
||||||
"@types/sanitize-html": "2.8.0",
|
"@types/sanitize-html": "2.8.0",
|
||||||
"@types/seedrandom": "3.0.4",
|
"@types/seedrandom": "3.0.4",
|
||||||
@ -83,8 +83,8 @@
|
|||||||
"@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.50.0",
|
"@typescript-eslint/eslint-plugin": "5.51.0",
|
||||||
"@typescript-eslint/parser": "5.50.0",
|
"@typescript-eslint/parser": "5.51.0",
|
||||||
"@vue/runtime-core": "3.2.47",
|
"@vue/runtime-core": "3.2.47",
|
||||||
"cross-env": "7.0.3",
|
"cross-env": "7.0.3",
|
||||||
"cypress": "12.5.1",
|
"cypress": "12.5.1",
|
||||||
|
@ -61,8 +61,6 @@ export async function signout() {
|
|||||||
} catch (err) {}
|
} catch (err) {}
|
||||||
//#endregion
|
//#endregion
|
||||||
|
|
||||||
document.cookie = 'igi=; path=/';
|
|
||||||
|
|
||||||
if (accounts.length > 0) login(accounts[0].token);
|
if (accounts.length > 0) login(accounts[0].token);
|
||||||
else unisonReload('/');
|
else unisonReload('/');
|
||||||
}
|
}
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</Transition>
|
</Transition>
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<img ref="imgEl" :src="imgUrl" style="display: none;" @load="onImageLoad">
|
<img ref="imgEl" :src="imgUrl" style="display: none;" crossorigin="anonymous" @load="onImageLoad">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="omfetrab" :class="['s' + size, 'w' + width, 'h' + height, { asDrawer, asWindow }]" :style="{ maxHeight: maxHeight ? maxHeight + 'px' : undefined }">
|
<div class="omfetrab" :class="['s' + size, 'w' + width, 'h' + height, { asDrawer, asWindow }]" :style="{ maxHeight: maxHeight ? maxHeight + 'px' : undefined }">
|
||||||
<input ref="searchEl" :value="q" class="search" data-prevent-emoji-insert :class="{ filled: q != null && q != '' }" :placeholder="i18n.ts.search" type="search" @input="input()" @paste.stop="paste" @keyup.enter="done()">
|
<input ref="searchEl" :value="q" class="search" data-prevent-emoji-insert :class="{ filled: q != null && q != '' }" :placeholder="i18n.ts.search" type="search" @input="input()" @paste.stop="paste" @keydown.stop.prevent.enter="onEnter">
|
||||||
<div ref="emojisEl" class="emojis">
|
<div ref="emojisEl" class="emojis">
|
||||||
<section class="result">
|
<section class="result">
|
||||||
<div v-if="searchResultCustom.length > 0" class="body">
|
<div v-if="searchResultCustom.length > 0" class="body">
|
||||||
@ -327,6 +327,11 @@ function paste(event: ClipboardEvent): void {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function onEnter(ev: KeyboardEvent) {
|
||||||
|
if (ev.isComposing || ev.key === 'Process' || ev.keyCode === 229) return;
|
||||||
|
done();
|
||||||
|
}
|
||||||
|
|
||||||
function done(query?: string): boolean | void {
|
function done(query?: string): boolean | void {
|
||||||
if (query == null) query = q.value;
|
if (query == null) query = q.value;
|
||||||
if (query == null || typeof query !== 'string') return;
|
if (query == null || typeof query !== 'string') return;
|
||||||
|
@ -42,7 +42,7 @@ import { i18n } from '@/i18n';
|
|||||||
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
modelValue: string | number;
|
modelValue: string | number;
|
||||||
type?: 'text' | 'number' | 'password' | 'email' | 'url' | 'date' | 'time' | 'search';
|
type?: 'text' | 'number' | 'password' | 'email' | 'url' | 'date' | 'time' | 'search' | 'datetime-local';
|
||||||
required?: boolean;
|
required?: boolean;
|
||||||
readonly?: boolean;
|
readonly?: boolean;
|
||||||
disabled?: boolean;
|
disabled?: boolean;
|
||||||
|
@ -6,15 +6,14 @@
|
|||||||
<span>{{ $ts.clickToShow }}</span>
|
<span>{{ $ts.clickToShow }}</span>
|
||||||
</div>
|
</div>
|
||||||
<div v-else-if="media.type.startsWith('audio') && media.type !== 'audio/midi'" class="audio">
|
<div v-else-if="media.type.startsWith('audio') && media.type !== 'audio/midi'" class="audio">
|
||||||
<audio
|
<VuePlyr :options="{ volume: 0.5 }">
|
||||||
ref="audioEl"
|
<audio controls preload="metadata">
|
||||||
class="audio"
|
<source
|
||||||
:src="media.url"
|
:src="media.url"
|
||||||
:title="media.name"
|
:type="media.type"
|
||||||
controls
|
/>
|
||||||
preload="metadata"
|
</audio>
|
||||||
@volumechange="volumechange"
|
</VuePlyr>
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
<a
|
<a
|
||||||
v-else class="download"
|
v-else class="download"
|
||||||
@ -31,7 +30,9 @@
|
|||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import { onMounted } from 'vue';
|
import { onMounted } from 'vue';
|
||||||
import * as misskey from 'misskey-js';
|
import * as misskey from 'misskey-js';
|
||||||
|
import VuePlyr from 'vue-plyr';
|
||||||
import { ColdDeviceStorage } from '@/store';
|
import { ColdDeviceStorage } from '@/store';
|
||||||
|
import 'vue-plyr/dist/vue-plyr.css';
|
||||||
|
|
||||||
const props = withDefaults(defineProps<{
|
const props = withDefaults(defineProps<{
|
||||||
media: misskey.entities.DriveFile;
|
media: misskey.entities.DriveFile;
|
||||||
@ -55,7 +56,11 @@ onMounted(() => {
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
margin-top: 4px;
|
margin-top: 4px;
|
||||||
overflow: hidden;
|
overflow: clip;
|
||||||
|
|
||||||
|
--plyr-color-main: var(--accent);
|
||||||
|
--plyr-audio-controls-background: var(--bg);
|
||||||
|
--plyr-audio-controls-color: var(--accentLighten);
|
||||||
|
|
||||||
> .download,
|
> .download,
|
||||||
> .sensitive {
|
> .sensitive {
|
||||||
@ -93,10 +98,8 @@ onMounted(() => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
> .audio {
|
> .audio {
|
||||||
.audio {
|
border-radius: 8px;
|
||||||
display: block;
|
overflow: clip;
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
@ -1,22 +1,23 @@
|
|||||||
<template>
|
<template>
|
||||||
<div v-if="hide" class="qjewsnkg" @click="hide = false">
|
<div v-if="hide" :class="$style.hidden" @click="hide = false">
|
||||||
<ImgWithBlurhash class="bg" :hash="image.blurhash" :title="image.comment" :alt="image.comment"/>
|
<ImgWithBlurhash style="filter: brightness(0.5);" :hash="image.blurhash" :title="image.comment" :alt="image.comment"/>
|
||||||
<div class="text">
|
<div :class="$style.hiddenText">
|
||||||
<div class="wrapper">
|
<div :class="$style.hiddenTextWrapper">
|
||||||
<b style="display: block;"><i class="ti ti-alert-triangle"></i> {{ $ts.sensitive }}</b>
|
<b style="display: block;"><i class="ti ti-alert-triangle"></i> {{ $ts.sensitive }}</b>
|
||||||
<span style="display: block;">{{ $ts.clickToShow }}</span>
|
<span style="display: block;">{{ $ts.clickToShow }}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div v-else class="gqnyydlz">
|
<div v-else :class="$style.visible">
|
||||||
<a
|
<a
|
||||||
|
:class="$style.imageContainer"
|
||||||
:href="image.url"
|
:href="image.url"
|
||||||
:title="image.name"
|
:title="image.name"
|
||||||
>
|
>
|
||||||
<ImgWithBlurhash :hash="image.blurhash" :src="url" :alt="image.comment || image.name" :title="image.comment || image.name" :cover="false"/>
|
<ImgWithBlurhash :hash="image.blurhash" :src="url" :alt="image.comment || image.name" :title="image.comment || image.name" :cover="false"/>
|
||||||
<div v-if="image.type === 'image/gif'" class="gif">GIF</div>
|
<div v-if="image.type === 'image/gif'" :class="$style.gif">GIF</div>
|
||||||
</a>
|
</a>
|
||||||
<button v-tooltip="$ts.hide" class="_button hide" @click="hide = true"><i class="ti ti-eye-off"></i></button>
|
<button v-tooltip="$ts.hide" :class="$style.hide" class="_button" @click="hide = true"><i class="ti ti-eye-off"></i></button>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@ -49,82 +50,77 @@ watch(() => props.image, () => {
|
|||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" module>
|
||||||
.qjewsnkg {
|
.hidden {
|
||||||
position: relative;
|
position: relative;
|
||||||
|
|
||||||
> .bg {
|
|
||||||
filter: brightness(0.5);
|
|
||||||
}
|
|
||||||
|
|
||||||
> .text {
|
|
||||||
position: absolute;
|
|
||||||
left: 0;
|
|
||||||
top: 0;
|
|
||||||
width: 100%;
|
|
||||||
height: 100%;
|
|
||||||
z-index: 1;
|
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
align-items: center;
|
|
||||||
|
|
||||||
> .wrapper {
|
|
||||||
display: table-cell;
|
|
||||||
text-align: center;
|
|
||||||
font-size: 0.8em;
|
|
||||||
color: #fff;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.gqnyydlz {
|
.hiddenText {
|
||||||
|
position: absolute;
|
||||||
|
left: 0;
|
||||||
|
top: 0;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
z-index: 1;
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.hiddenTextWrapper {
|
||||||
|
display: table-cell;
|
||||||
|
text-align: center;
|
||||||
|
font-size: 0.8em;
|
||||||
|
color: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.visible {
|
||||||
position: relative;
|
position: relative;
|
||||||
//box-shadow: 0 0 0 1px var(--divider) inset;
|
//box-shadow: 0 0 0 1px var(--divider) inset;
|
||||||
background: var(--bg);
|
background: var(--bg);
|
||||||
|
--c: rgb(0 0 0 / 2%);
|
||||||
|
background-image: linear-gradient(45deg, var(--c) 16.67%, var(--bg) 16.67%, var(--bg) 50%, var(--c) 50%, var(--c) 66.67%, var(--bg) 66.67%, var(--bg) 100%);
|
||||||
|
background-size: 16px 16px;
|
||||||
|
}
|
||||||
|
|
||||||
> .hide {
|
.hide {
|
||||||
display: block;
|
display: block;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
border-radius: 6px;
|
border-radius: 6px;
|
||||||
background-color: var(--accentedBg);
|
background-color: var(--accentedBg);
|
||||||
-webkit-backdrop-filter: var(--blur, blur(15px));
|
-webkit-backdrop-filter: var(--blur, blur(15px));
|
||||||
backdrop-filter: var(--blur, blur(15px));
|
backdrop-filter: var(--blur, blur(15px));
|
||||||
color: var(--accent);
|
color: var(--accent);
|
||||||
font-size: 0.8em;
|
font-size: 0.8em;
|
||||||
padding: 6px 8px;
|
padding: 6px 8px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
top: 12px;
|
top: 12px;
|
||||||
right: 12px;
|
right: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
> i {
|
.imageContainer {
|
||||||
display: block;
|
display: block;
|
||||||
}
|
cursor: zoom-in;
|
||||||
}
|
overflow: hidden;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
background-position: center;
|
||||||
|
background-size: contain;
|
||||||
|
background-repeat: no-repeat;
|
||||||
|
}
|
||||||
|
|
||||||
> a {
|
.gif {
|
||||||
display: block;
|
background-color: var(--fg);
|
||||||
cursor: zoom-in;
|
border-radius: 6px;
|
||||||
overflow: hidden;
|
color: var(--accentLighten);
|
||||||
width: 100%;
|
display: inline-block;
|
||||||
height: 100%;
|
font-size: 14px;
|
||||||
background-position: center;
|
font-weight: bold;
|
||||||
background-size: contain;
|
left: 12px;
|
||||||
background-repeat: no-repeat;
|
opacity: .5;
|
||||||
|
padding: 0 6px;
|
||||||
> .gif {
|
text-align: center;
|
||||||
background-color: var(--fg);
|
top: 12px;
|
||||||
border-radius: 6px;
|
pointer-events: none;
|
||||||
color: var(--accentLighten);
|
|
||||||
display: inline-block;
|
|
||||||
font-size: 14px;
|
|
||||||
font-weight: bold;
|
|
||||||
left: 12px;
|
|
||||||
opacity: .5;
|
|
||||||
padding: 0 6px;
|
|
||||||
text-align: center;
|
|
||||||
top: 12px;
|
|
||||||
pointer-events: none;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="hoawjimk">
|
<div>
|
||||||
<XBanner v-for="media in mediaList.filter(media => !previewable(media))" :key="media.id" :media="media"/>
|
<XBanner v-for="media in mediaList.filter(media => !previewable(media))" :key="media.id" :media="media"/>
|
||||||
<div v-if="mediaList.filter(media => previewable(media)).length > 0" class="gird-container">
|
<div v-if="mediaList.filter(media => previewable(media)).length > 0" :class="$style.container">
|
||||||
<div ref="gallery" :data-count="mediaList.filter(media => previewable(media)).length">
|
<div ref="gallery" :class="[$style.medias, count <= 4 ? $style['n' + count] : $style.nMany]">
|
||||||
<template v-for="media in mediaList.filter(media => previewable(media))">
|
<template v-for="media in mediaList.filter(media => previewable(media))">
|
||||||
<XVideo v-if="media.type.startsWith('video')" :key="media.id" :video="media"/>
|
<XVideo v-if="media.type.startsWith('video')" :key="media.id" :class="$style.media" :video="media"/>
|
||||||
<XImage v-else-if="media.type.startsWith('image')" :key="media.id" class="image" :data-id="media.id" :image="media" :raw="raw"/>
|
<XImage v-else-if="media.type.startsWith('image')" :key="media.id" :class="$style.media" class="image" :data-id="media.id" :image="media" :raw="raw"/>
|
||||||
</template>
|
</template>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -32,6 +32,7 @@ const props = defineProps<{
|
|||||||
|
|
||||||
const gallery = ref(null);
|
const gallery = ref(null);
|
||||||
const pswpZIndex = os.claimZIndex('middle');
|
const pswpZIndex = os.claimZIndex('middle');
|
||||||
|
const count = $computed(() => props.mediaList.filter(media => previewable(media)).length);
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
const lightbox = new PhotoSwipeLightbox({
|
const lightbox = new PhotoSwipeLightbox({
|
||||||
@ -122,82 +123,64 @@ const previewable = (file: misskey.entities.DriveFile): boolean => {
|
|||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" module>
|
||||||
.hoawjimk {
|
.container {
|
||||||
> .gird-container {
|
position: relative;
|
||||||
position: relative;
|
width: 100%;
|
||||||
width: 100%;
|
margin-top: 4px;
|
||||||
margin-top: 4px;
|
}
|
||||||
|
|
||||||
&:before {
|
.medias {
|
||||||
content: '';
|
display: grid;
|
||||||
display: block;
|
grid-gap: 8px;
|
||||||
padding-top: 56.25% // 16:9;
|
|
||||||
|
// for webkit
|
||||||
|
height: 100%;
|
||||||
|
|
||||||
|
&.n1 {
|
||||||
|
aspect-ratio: 16/9;
|
||||||
|
grid-template-rows: 1fr;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.n2 {
|
||||||
|
aspect-ratio: 16/9;
|
||||||
|
grid-template-columns: 1fr 1fr;
|
||||||
|
grid-template-rows: 1fr;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.n3 {
|
||||||
|
aspect-ratio: 16/9;
|
||||||
|
grid-template-columns: 1fr 0.5fr;
|
||||||
|
grid-template-rows: 1fr 1fr;
|
||||||
|
|
||||||
|
> .media:nth-child(1) {
|
||||||
|
grid-row: 1 / 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
> div {
|
> .media:nth-child(3) {
|
||||||
position: absolute;
|
grid-column: 2 / 3;
|
||||||
top: 0;
|
grid-row: 2 / 3;
|
||||||
right: 0;
|
|
||||||
bottom: 0;
|
|
||||||
left: 0;
|
|
||||||
display: grid;
|
|
||||||
grid-gap: 8px;
|
|
||||||
|
|
||||||
> * {
|
|
||||||
overflow: hidden;
|
|
||||||
border-radius: 6px;
|
|
||||||
}
|
|
||||||
|
|
||||||
&[data-count="1"] {
|
|
||||||
grid-template-rows: 1fr;
|
|
||||||
}
|
|
||||||
|
|
||||||
&[data-count="2"] {
|
|
||||||
grid-template-columns: 1fr 1fr;
|
|
||||||
grid-template-rows: 1fr;
|
|
||||||
}
|
|
||||||
|
|
||||||
&[data-count="3"] {
|
|
||||||
grid-template-columns: 1fr 0.5fr;
|
|
||||||
grid-template-rows: 1fr 1fr;
|
|
||||||
|
|
||||||
> *:nth-child(1) {
|
|
||||||
grid-row: 1 / 3;
|
|
||||||
}
|
|
||||||
|
|
||||||
> *:nth-child(3) {
|
|
||||||
grid-column: 2 / 3;
|
|
||||||
grid-row: 2 / 3;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
&[data-count="4"] {
|
|
||||||
grid-template-columns: 1fr 1fr;
|
|
||||||
grid-template-rows: 1fr 1fr;
|
|
||||||
}
|
|
||||||
|
|
||||||
> *:nth-child(1) {
|
|
||||||
grid-column: 1 / 2;
|
|
||||||
grid-row: 1 / 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
> *:nth-child(2) {
|
|
||||||
grid-column: 2 / 3;
|
|
||||||
grid-row: 1 / 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
> *:nth-child(3) {
|
|
||||||
grid-column: 1 / 2;
|
|
||||||
grid-row: 2 / 3;
|
|
||||||
}
|
|
||||||
|
|
||||||
> *:nth-child(4) {
|
|
||||||
grid-column: 2 / 3;
|
|
||||||
grid-row: 2 / 3;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&.n4 {
|
||||||
|
aspect-ratio: 16/9;
|
||||||
|
grid-template-columns: 1fr 1fr;
|
||||||
|
grid-template-rows: 1fr 1fr;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.nMany {
|
||||||
|
grid-template-columns: 1fr 1fr;
|
||||||
|
|
||||||
|
> .media {
|
||||||
|
aspect-ratio: 16/9;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.media {
|
||||||
|
overflow: hidden; // clipにするとバグる
|
||||||
|
border-radius: 8px;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div v-else class="kkjnbbplepmiyuadieoenjgutgcmtsvu">
|
<div v-else class="kkjnbbplepmiyuadieoenjgutgcmtsvu">
|
||||||
<vue-plyr>
|
<VuePlyr :options="{ volume: 0.5 }">
|
||||||
<video
|
<video
|
||||||
controls
|
controls
|
||||||
:data-poster="video.thumbnailUrl"
|
:data-poster="video.thumbnailUrl"
|
||||||
@ -17,7 +17,7 @@
|
|||||||
:type="video.type"
|
:type="video.type"
|
||||||
/>
|
/>
|
||||||
</video>
|
</video>
|
||||||
</vue-plyr>
|
</VuePlyr>
|
||||||
<i class="ti ti-eye-off" @click="hide = true"></i>
|
<i class="ti ti-eye-off" @click="hide = true"></i>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
@ -48,7 +48,7 @@
|
|||||||
<div :class="$style.text">
|
<div :class="$style.text">
|
||||||
<span v-if="appearNote.isHidden" style="opacity: 0.5">({{ i18n.ts.private }})</span>
|
<span v-if="appearNote.isHidden" style="opacity: 0.5">({{ i18n.ts.private }})</span>
|
||||||
<MkA v-if="appearNote.replyId" :class="$style.replyIcon" :to="`/notes/${appearNote.replyId}`"><i class="ti ti-arrow-back-up"></i></MkA>
|
<MkA v-if="appearNote.replyId" :class="$style.replyIcon" :to="`/notes/${appearNote.replyId}`"><i class="ti ti-arrow-back-up"></i></MkA>
|
||||||
<Mfm v-if="appearNote.text" v-once :text="appearNote.text" :author="appearNote.user" :i="$i" :emoji-urls="appearNote.emojis"/>
|
<Mfm v-if="appearNote.text" :text="appearNote.text" :author="appearNote.user" :i="$i" :emoji-urls="appearNote.emojis"/>
|
||||||
<div v-if="translating || translation" :class="$style.translation">
|
<div v-if="translating || translation" :class="$style.translation">
|
||||||
<MkLoading v-if="translating" mini/>
|
<MkLoading v-if="translating" mini/>
|
||||||
<div v-else :class="$style.translated">
|
<div v-else :class="$style.translated">
|
||||||
|
@ -215,7 +215,7 @@ useTooltip(reactionRef, (showing) => {
|
|||||||
border-radius: 100%;
|
border-radius: 100%;
|
||||||
background: var(--panel);
|
background: var(--panel);
|
||||||
box-shadow: 0 0 0 3px var(--panel);
|
box-shadow: 0 0 0 3px var(--panel);
|
||||||
font-size: 12px;
|
font-size: 11px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
<span v-if="note.isHidden" style="opacity: 0.5">({{ i18n.ts.private }})</span>
|
<span v-if="note.isHidden" style="opacity: 0.5">({{ i18n.ts.private }})</span>
|
||||||
<span v-if="note.deletedAt" style="opacity: 0.5">({{ i18n.ts.deleted }})</span>
|
<span v-if="note.deletedAt" style="opacity: 0.5">({{ i18n.ts.deleted }})</span>
|
||||||
<MkA v-if="note.replyId" :class="$style.reply" :to="`/notes/${note.replyId}`"><i class="ti ti-arrow-back-up"></i></MkA>
|
<MkA v-if="note.replyId" :class="$style.reply" :to="`/notes/${note.replyId}`"><i class="ti ti-arrow-back-up"></i></MkA>
|
||||||
<Mfm v-if="note.text" v-once :text="note.text" :author="note.user" :i="$i" :emoji-urls="note.emojis"/>
|
<Mfm v-if="note.text" :text="note.text" :author="note.user" :i="$i" :emoji-urls="note.emojis"/>
|
||||||
<MkA v-if="note.renoteId" :class="$style.rp" :to="`/notes/${note.renoteId}`">RN: ...</MkA>
|
<MkA v-if="note.renoteId" :class="$style.rp" :to="`/notes/${note.renoteId}`">RN: ...</MkA>
|
||||||
</div>
|
</div>
|
||||||
<details v-if="note.files.length > 0">
|
<details v-if="note.files.length > 0">
|
||||||
|
@ -195,7 +195,7 @@ export default defineComponent({
|
|||||||
return h(MkSparkle, {}, genEl(token.children));
|
return h(MkSparkle, {}, genEl(token.children));
|
||||||
}
|
}
|
||||||
case 'rotate': {
|
case 'rotate': {
|
||||||
const degrees = parseFloat(token.props.args.deg) ?? '90';
|
const degrees = parseFloat(token.props.args.deg ?? '90');
|
||||||
style = `transform: rotate(${degrees}deg); transform-origin: center center;`;
|
style = `transform: rotate(${degrees}deg); transform-origin: center center;`;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -35,6 +35,9 @@ export const apiWithDialog = ((
|
|||||||
} else if (err.code.startsWith('TOO_MANY')) {
|
} else if (err.code.startsWith('TOO_MANY')) {
|
||||||
title = i18n.ts.youCannotCreateAnymore;
|
title = i18n.ts.youCannotCreateAnymore;
|
||||||
text = `${i18n.ts.error}: ${err.id}`;
|
text = `${i18n.ts.error}: ${err.id}`;
|
||||||
|
} else if (err.message.startsWith('Unexpected token')) {
|
||||||
|
title = i18n.ts.gotInvalidResponseError;
|
||||||
|
text = i18n.ts.gotInvalidResponseErrorDescription;
|
||||||
}
|
}
|
||||||
alert({
|
alert({
|
||||||
type: 'error',
|
type: 'error',
|
||||||
|
@ -73,7 +73,13 @@
|
|||||||
</FormSection>
|
</FormSection>
|
||||||
<FormSection>
|
<FormSection>
|
||||||
<template #label><Mfm text="$[jelly ❤]"/> {{ i18n.ts._aboutMisskey.patrons }}</template>
|
<template #label><Mfm text="$[jelly ❤]"/> {{ i18n.ts._aboutMisskey.patrons }}</template>
|
||||||
<div style="display: grid; grid-template-columns: repeat(auto-fill, minmax(180px, 1fr)); grid-gap: 12px;">
|
<div :class="$style.patronsWithIcon">
|
||||||
|
<div v-for="patron in patronsWithIcon" :class="$style.patronWithIcon">
|
||||||
|
<img :src="patron.icon" :class="$style.patronIcon">
|
||||||
|
<span :class="$style.patronName">{{ patron.name }}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div style="margin-top: 16px; display: grid; grid-template-columns: repeat(auto-fill, minmax(180px, 1fr)); grid-gap: 12px;">
|
||||||
<div v-for="patron in patrons" :key="patron">{{ patron }}</div>
|
<div v-for="patron in patrons" :key="patron">{{ patron }}</div>
|
||||||
</div>
|
</div>
|
||||||
<p>{{ i18n.ts._aboutMisskey.morePatrons }}</p>
|
<p>{{ i18n.ts._aboutMisskey.morePatrons }}</p>
|
||||||
@ -99,6 +105,14 @@ import { definePageMetadata } from '@/scripts/page-metadata';
|
|||||||
import { claimAchievement, claimedAchievements } from '@/scripts/achievements';
|
import { claimAchievement, claimedAchievements } from '@/scripts/achievements';
|
||||||
import { $i } from '@/account';
|
import { $i } from '@/account';
|
||||||
|
|
||||||
|
const patronsWithIcon = [{
|
||||||
|
name: 'カイヤン',
|
||||||
|
icon: 'https://misskey-hub.net/patrons/a2820716883e408cb87773e377ce7c8d.jpg',
|
||||||
|
}, {
|
||||||
|
name: 'だれかさん',
|
||||||
|
icon: 'https://misskey-hub.net/patrons/f7409b5e5a88477a9b9d740c408de125.jpg',
|
||||||
|
}];
|
||||||
|
|
||||||
const patrons = [
|
const patrons = [
|
||||||
'まっちゃとーにゅ',
|
'まっちゃとーにゅ',
|
||||||
'mametsuko',
|
'mametsuko',
|
||||||
@ -352,4 +366,27 @@ definePageMetadata({
|
|||||||
.contributorUsername {
|
.contributorUsername {
|
||||||
margin-left: 12px;
|
margin-left: 12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.patronsWithIcon {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
|
||||||
|
grid-gap: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.patronWithIcon {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
padding: 12px;
|
||||||
|
background: var(--buttonBg);
|
||||||
|
border-radius: 6px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.patronIcon {
|
||||||
|
width: 24px;
|
||||||
|
border-radius: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.patronName {
|
||||||
|
margin-left: 12px;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
<MkInput v-model="ad.ratio" type="number">
|
<MkInput v-model="ad.ratio" type="number">
|
||||||
<template #label>{{ i18n.ts.ratio }}</template>
|
<template #label>{{ i18n.ts.ratio }}</template>
|
||||||
</MkInput>
|
</MkInput>
|
||||||
<MkInput v-model="ad.expiresAt" type="date">
|
<MkInput v-model="ad.expiresAt" type="datetime-local">
|
||||||
<template #label>{{ i18n.ts.expiration }}</template>
|
<template #label>{{ i18n.ts.expiration }}</template>
|
||||||
</MkInput>
|
</MkInput>
|
||||||
</FormSplit>
|
</FormSplit>
|
||||||
@ -61,7 +61,12 @@ import { definePageMetadata } from '@/scripts/page-metadata';
|
|||||||
let ads: any[] = $ref([]);
|
let ads: any[] = $ref([]);
|
||||||
|
|
||||||
os.api('admin/ad/list').then(adsResponse => {
|
os.api('admin/ad/list').then(adsResponse => {
|
||||||
ads = adsResponse;
|
ads = adsResponse.map(r => {
|
||||||
|
return {
|
||||||
|
...r,
|
||||||
|
expiresAt: new Date(r.expiresAt).toISOString().slice(0, 16),
|
||||||
|
};
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
function add() {
|
function add() {
|
||||||
|
@ -77,6 +77,8 @@ export default defineComponent({
|
|||||||
accepted() {
|
accepted() {
|
||||||
this.state = 'accepted';
|
this.state = 'accepted';
|
||||||
if (this.session.app.callbackUrl) {
|
if (this.session.app.callbackUrl) {
|
||||||
|
const url = new URL(this.session.app.callbackUrl);
|
||||||
|
if (['javascript:', 'file:', 'data:', 'mailto:', 'tel:'].includes(url.protocol)) throw new Error('invalid url');
|
||||||
location.href = `${this.session.app.callbackUrl}?token=${this.session.token}`;
|
location.href = `${this.session.app.callbackUrl}?token=${this.session.token}`;
|
||||||
}
|
}
|
||||||
}, onLogin(res) {
|
}, onLogin(res) {
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<XPostForm v-if="$i" :channel="channel" class="post-form _panel _margin" fixed/>
|
<MkPostForm v-if="$i" :channel="channel" class="post-form _panel _margin" fixed/>
|
||||||
|
|
||||||
<XTimeline :key="channelId" class="_margin" src="channel" :channel="channelId" @before="before" @after="after"/>
|
<XTimeline :key="channelId" class="_margin" src="channel" :channel="channelId" @before="before" @after="after"/>
|
||||||
</div>
|
</div>
|
||||||
@ -34,7 +34,7 @@
|
|||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import { computed, inject, watch } from 'vue';
|
import { computed, inject, watch } from 'vue';
|
||||||
import MkContainer from '@/components/MkContainer.vue';
|
import MkContainer from '@/components/MkContainer.vue';
|
||||||
import XPostForm from '@/components/MkPostForm.vue';
|
import MkPostForm from '@/components/MkPostForm.vue';
|
||||||
import XTimeline from '@/components/MkTimeline.vue';
|
import XTimeline from '@/components/MkTimeline.vue';
|
||||||
import XChannelFollowButton from '@/components/MkChannelFollowButton.vue';
|
import XChannelFollowButton from '@/components/MkChannelFollowButton.vue';
|
||||||
import * as os from '@/os';
|
import * as os from '@/os';
|
||||||
|
@ -70,7 +70,7 @@ async function accept(): Promise<void> {
|
|||||||
state = 'accepted';
|
state = 'accepted';
|
||||||
if (props.callback) {
|
if (props.callback) {
|
||||||
const cbUrl = new URL(props.callback);
|
const cbUrl = new URL(props.callback);
|
||||||
if (!['http:', 'https:'].includes(cbUrl.protocol)) throw new Error('invalid url');
|
if (['javascript:', 'file:', 'data:', 'mailto:', 'tel:'].includes(cbUrl.protocol)) throw new Error('invalid url');
|
||||||
cbUrl.searchParams.set('session', props.session);
|
cbUrl.searchParams.set('session', props.session);
|
||||||
location.href = cbUrl.href;
|
location.href = cbUrl.href;
|
||||||
}
|
}
|
||||||
|
@ -91,7 +91,7 @@ function regenerateToken() {
|
|||||||
type: 'password',
|
type: 'password',
|
||||||
}).then(({ canceled, result: password }) => {
|
}).then(({ canceled, result: password }) => {
|
||||||
if (canceled) return;
|
if (canceled) return;
|
||||||
os.api('i/regenerate_token', {
|
os.api('i/regenerate-token', {
|
||||||
password: password,
|
password: password,
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -29,7 +29,7 @@ import { noteVisibilities } from 'misskey-js';
|
|||||||
import * as Acct from 'misskey-js/built/acct';
|
import * as Acct from 'misskey-js/built/acct';
|
||||||
import * as Misskey from 'misskey-js';
|
import * as Misskey from 'misskey-js';
|
||||||
import MkButton from '@/components/MkButton.vue';
|
import MkButton from '@/components/MkButton.vue';
|
||||||
import XPostForm from '@/components/MkPostForm.vue';
|
import MkPostForm from '@/components/MkPostForm.vue';
|
||||||
import * as os from '@/os';
|
import * as os from '@/os';
|
||||||
import { mainRouter } from '@/router';
|
import { mainRouter } from '@/router';
|
||||||
import { definePageMetadata } from '@/scripts/page-metadata';
|
import { definePageMetadata } from '@/scripts/page-metadata';
|
||||||
@ -69,14 +69,14 @@ async function init() {
|
|||||||
...(visibleAccts ? visibleAccts.split(',').map(Acct.parse) : []),
|
...(visibleAccts ? visibleAccts.split(',').map(Acct.parse) : []),
|
||||||
]
|
]
|
||||||
// TypeScriptの指示通りに変換する
|
// TypeScriptの指示通りに変換する
|
||||||
.map(q => 'username' in q ? { username: q.username, host: q.host === null ? undefined : q.host } : q)
|
.map(q => 'username' in q ? { username: q.username, host: q.host === null ? undefined : q.host } : q)
|
||||||
.map(q => os.api('users/show', q)
|
.map(q => os.api('users/show', q)
|
||||||
.then(user => {
|
.then(user => {
|
||||||
visibleUsers.push(user);
|
visibleUsers.push(user);
|
||||||
}, () => {
|
}, () => {
|
||||||
console.error(`Invalid user query: ${JSON.stringify(q)}`);
|
console.error(`Invalid user query: ${JSON.stringify(q)}`);
|
||||||
}),
|
}),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -120,13 +120,13 @@ async function init() {
|
|||||||
if (fileIds) {
|
if (fileIds) {
|
||||||
await Promise.all(
|
await Promise.all(
|
||||||
fileIds.split(',')
|
fileIds.split(',')
|
||||||
.map(fileId => os.api('drive/files/show', { fileId })
|
.map(fileId => os.api('drive/files/show', { fileId })
|
||||||
.then(file => {
|
.then(file => {
|
||||||
files.push(file);
|
files.push(file);
|
||||||
}, () => {
|
}, () => {
|
||||||
console.error(`Failed to fetch a file ${fileId}`);
|
console.error(`Failed to fetch a file ${fileId}`);
|
||||||
}),
|
}),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
//#endregion
|
//#endregion
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
<MkSpacer :content-max="800">
|
<MkSpacer :content-max="800">
|
||||||
<div ref="rootEl" v-hotkey.global="keymap">
|
<div ref="rootEl" v-hotkey.global="keymap">
|
||||||
<XTutorial v-if="$i && $store.reactiveState.tutorial.value != -1" class="_panel" style="margin-bottom: var(--margin);"/>
|
<XTutorial v-if="$i && $store.reactiveState.tutorial.value != -1" class="_panel" style="margin-bottom: var(--margin);"/>
|
||||||
<XPostForm v-if="$store.reactiveState.showFixedPostForm.value" :class="$style.postForm" class="post-form _panel" fixed style="margin-bottom: var(--margin);"/>
|
<MkPostForm v-if="$store.reactiveState.showFixedPostForm.value" :class="$style.postForm" class="post-form _panel" fixed style="margin-bottom: var(--margin);"/>
|
||||||
|
|
||||||
<div v-if="queue > 0" :class="$style.new"><button class="_buttonPrimary" @click="top()">{{ i18n.ts.newNoteRecived }}</button></div>
|
<div v-if="queue > 0" :class="$style.new"><button class="_buttonPrimary" @click="top()">{{ i18n.ts.newNoteRecived }}</button></div>
|
||||||
<div :class="$style.tl">
|
<div :class="$style.tl">
|
||||||
@ -24,7 +24,7 @@
|
|||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import { defineAsyncComponent, computed, watch } from 'vue';
|
import { defineAsyncComponent, computed, watch } from 'vue';
|
||||||
import XTimeline from '@/components/MkTimeline.vue';
|
import XTimeline from '@/components/MkTimeline.vue';
|
||||||
import XPostForm from '@/components/MkPostForm.vue';
|
import MkPostForm from '@/components/MkPostForm.vue';
|
||||||
import { scroll } from '@/scripts/scroll';
|
import { scroll } from '@/scripts/scroll';
|
||||||
import * as os from '@/os';
|
import * as os from '@/os';
|
||||||
import { defaultStore } from '@/store';
|
import { defaultStore } from '@/store';
|
||||||
|
@ -168,7 +168,7 @@ export const defaultStore = markRaw(new Storage('base', {
|
|||||||
},
|
},
|
||||||
disableShowingAnimatedImages: {
|
disableShowingAnimatedImages: {
|
||||||
where: 'device',
|
where: 'device',
|
||||||
default: false,
|
default: matchMedia('(prefers-reduced-motion)').matches,
|
||||||
},
|
},
|
||||||
emojiStyle: {
|
emojiStyle: {
|
||||||
where: 'device',
|
where: 'device',
|
||||||
|
@ -174,13 +174,11 @@ hr {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.ti {
|
.ti {
|
||||||
vertical-align: -40%;
|
vertical-align: -12%;
|
||||||
line-height: 1em;
|
line-height: 1em;
|
||||||
|
|
||||||
&:before {
|
&:before {
|
||||||
display: inline-block;
|
font-size: 128%;
|
||||||
font-size: 165%;
|
|
||||||
width: 0.74em;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -203,6 +201,13 @@ hr {
|
|||||||
-webkit-touch-callout: none;
|
-webkit-touch-callout: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
._nowrap {
|
||||||
|
white-space: pre !important;
|
||||||
|
word-wrap: normal !important; // https://codeday.me/jp/qa/20190424/690106.html
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
}
|
||||||
|
|
||||||
._ghost {
|
._ghost {
|
||||||
@extend ._noSelect;
|
@extend ._noSelect;
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
|
@ -146,6 +146,7 @@ const addColumn = async (ev) => {
|
|||||||
'tl',
|
'tl',
|
||||||
'antenna',
|
'antenna',
|
||||||
'list',
|
'list',
|
||||||
|
'channel',
|
||||||
'mentions',
|
'mentions',
|
||||||
'direct',
|
'direct',
|
||||||
];
|
];
|
||||||
|
71
packages/frontend/src/ui/deck/channel-column.vue
Normal file
71
packages/frontend/src/ui/deck/channel-column.vue
Normal file
@ -0,0 +1,71 @@
|
|||||||
|
<template>
|
||||||
|
<XColumn :menu="menu" :column="column" :is-stacked="isStacked" @parent-focus="$event => emit('parent-focus', $event)">
|
||||||
|
<template #header>
|
||||||
|
<i class="ti ti-device-tv"></i><span style="margin-left: 8px;">{{ column.name }}</span>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<template v-if="column.channelId">
|
||||||
|
<div style="padding: 8px; text-align: center;">
|
||||||
|
<MkButton primary gradate rounded inline @click="post"><i class="ti ti-pencil"></i></MkButton>
|
||||||
|
</div>
|
||||||
|
<XTimeline ref="timeline" src="channel" :channel="column.channelId" @after="() => emit('loaded')"/>
|
||||||
|
</template>
|
||||||
|
</XColumn>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script lang="ts" setup>
|
||||||
|
import { } from 'vue';
|
||||||
|
import XColumn from './column.vue';
|
||||||
|
import { updateColumn, Column } from './deck-store';
|
||||||
|
import XTimeline from '@/components/MkTimeline.vue';
|
||||||
|
import MkButton from '@/components/MkButton.vue';
|
||||||
|
import * as os from '@/os';
|
||||||
|
import { i18n } from '@/i18n';
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
column: Column;
|
||||||
|
isStacked: boolean;
|
||||||
|
}>();
|
||||||
|
|
||||||
|
const emit = defineEmits<{
|
||||||
|
(ev: 'loaded'): void;
|
||||||
|
(ev: 'parent-focus', direction: 'up' | 'down' | 'left' | 'right'): void;
|
||||||
|
}>();
|
||||||
|
|
||||||
|
let timeline = $shallowRef<InstanceType<typeof XTimeline>>();
|
||||||
|
|
||||||
|
if (props.column.channelId == null) {
|
||||||
|
setChannel();
|
||||||
|
}
|
||||||
|
|
||||||
|
async function setChannel() {
|
||||||
|
const channels = await os.api('channels/followed');
|
||||||
|
const { canceled, result: channel } = await os.select({
|
||||||
|
title: i18n.ts.selectChannel,
|
||||||
|
items: channels.map(x => ({
|
||||||
|
value: x, text: x.name,
|
||||||
|
})),
|
||||||
|
default: props.column.channelId,
|
||||||
|
});
|
||||||
|
if (canceled) return;
|
||||||
|
updateColumn(props.column.id, {
|
||||||
|
channelId: channel.id,
|
||||||
|
name: channel.name,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function post() {
|
||||||
|
os.post({
|
||||||
|
channel: {
|
||||||
|
id: props.column.channelId,
|
||||||
|
},
|
||||||
|
instant: true,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const menu = [{
|
||||||
|
icon: 'ti ti-pencil',
|
||||||
|
text: i18n.ts.selectChannel,
|
||||||
|
action: setChannel,
|
||||||
|
}];
|
||||||
|
</script>
|
@ -6,6 +6,7 @@
|
|||||||
<XNotificationsColumn v-else-if="column.type === 'notifications'" :column="column" :is-stacked="isStacked" @parent-focus="emit('parent-focus', $event)"/>
|
<XNotificationsColumn v-else-if="column.type === 'notifications'" :column="column" :is-stacked="isStacked" @parent-focus="emit('parent-focus', $event)"/>
|
||||||
<XTlColumn v-else-if="column.type === 'tl'" :column="column" :is-stacked="isStacked" @parent-focus="emit('parent-focus', $event)"/>
|
<XTlColumn v-else-if="column.type === 'tl'" :column="column" :is-stacked="isStacked" @parent-focus="emit('parent-focus', $event)"/>
|
||||||
<XListColumn v-else-if="column.type === 'list'" :column="column" :is-stacked="isStacked" @parent-focus="emit('parent-focus', $event)"/>
|
<XListColumn v-else-if="column.type === 'list'" :column="column" :is-stacked="isStacked" @parent-focus="emit('parent-focus', $event)"/>
|
||||||
|
<XChannelColumn v-else-if="column.type === 'channel'" :column="column" :is-stacked="isStacked" @parent-focus="emit('parent-focus', $event)"/>
|
||||||
<XAntennaColumn v-else-if="column.type === 'antenna'" :column="column" :is-stacked="isStacked" @parent-focus="emit('parent-focus', $event)"/>
|
<XAntennaColumn v-else-if="column.type === 'antenna'" :column="column" :is-stacked="isStacked" @parent-focus="emit('parent-focus', $event)"/>
|
||||||
<XMentionsColumn v-else-if="column.type === 'mentions'" :column="column" :is-stacked="isStacked" @parent-focus="emit('parent-focus', $event)"/>
|
<XMentionsColumn v-else-if="column.type === 'mentions'" :column="column" :is-stacked="isStacked" @parent-focus="emit('parent-focus', $event)"/>
|
||||||
<XDirectColumn v-else-if="column.type === 'direct'" :column="column" :is-stacked="isStacked" @parent-focus="emit('parent-focus', $event)"/>
|
<XDirectColumn v-else-if="column.type === 'direct'" :column="column" :is-stacked="isStacked" @parent-focus="emit('parent-focus', $event)"/>
|
||||||
@ -17,6 +18,7 @@ import XMainColumn from './main-column.vue';
|
|||||||
import XTlColumn from './tl-column.vue';
|
import XTlColumn from './tl-column.vue';
|
||||||
import XAntennaColumn from './antenna-column.vue';
|
import XAntennaColumn from './antenna-column.vue';
|
||||||
import XListColumn from './list-column.vue';
|
import XListColumn from './list-column.vue';
|
||||||
|
import XChannelColumn from './channel-column.vue';
|
||||||
import XNotificationsColumn from './notifications-column.vue';
|
import XNotificationsColumn from './notifications-column.vue';
|
||||||
import XWidgetsColumn from './widgets-column.vue';
|
import XWidgetsColumn from './widgets-column.vue';
|
||||||
import XMentionsColumn from './mentions-column.vue';
|
import XMentionsColumn from './mentions-column.vue';
|
||||||
|
@ -14,7 +14,7 @@ type ColumnWidget = {
|
|||||||
|
|
||||||
export type Column = {
|
export type Column = {
|
||||||
id: string;
|
id: string;
|
||||||
type: 'main' | 'widgets' | 'notifications' | 'tl' | 'antenna' | 'list' | 'mentions' | 'direct';
|
type: 'main' | 'widgets' | 'notifications' | 'tl' | 'antenna' | 'channel' | 'list' | 'mentions' | 'direct';
|
||||||
name: string | null;
|
name: string | null;
|
||||||
width: number;
|
width: number;
|
||||||
widgets?: ColumnWidget[];
|
widgets?: ColumnWidget[];
|
||||||
@ -22,6 +22,7 @@ export type Column = {
|
|||||||
flexible?: boolean;
|
flexible?: boolean;
|
||||||
antennaId?: string;
|
antennaId?: string;
|
||||||
listId?: string;
|
listId?: string;
|
||||||
|
channelId?: string;
|
||||||
includingTypes?: typeof notificationTypes[number][];
|
includingTypes?: typeof notificationTypes[number][];
|
||||||
tl?: 'home' | 'local' | 'social' | 'global';
|
tl?: 'home' | 'local' | 'social' | 'global';
|
||||||
};
|
};
|
||||||
|
@ -142,10 +142,10 @@ mainRouter.on('change', () => {
|
|||||||
document.documentElement.style.overflowY = 'scroll';
|
document.documentElement.style.overflowY = 'scroll';
|
||||||
|
|
||||||
if (window.innerWidth > 1024) {
|
if (window.innerWidth > 1024) {
|
||||||
const tempUI = miLocalStorage.getItem('ui_temp')
|
const tempUI = miLocalStorage.getItem('ui_temp');
|
||||||
if (tempUI) {
|
if (tempUI) {
|
||||||
miLocalStorage.setItem('ui', tempUI)
|
miLocalStorage.setItem('ui', tempUI);
|
||||||
miLocalStorage.removeItem('ui_temp')
|
miLocalStorage.removeItem('ui_temp');
|
||||||
location.reload();
|
location.reload();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
<template>
|
<template>
|
||||||
<XPostForm class="_panel mkw-postForm data-cy-mkw-postForm" :fixed="true" :autofocus="false"/>
|
<MkPostForm class="_panel mkw-post-form data-cy-mkw-postForm" :fixed="true" :autofocus="false"/>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import { } from 'vue';
|
import { } from 'vue';
|
||||||
import { GetFormResultType } from '@/scripts/form';
|
|
||||||
import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
|
import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
|
||||||
import XPostForm from '@/components/MkPostForm.vue';
|
import { GetFormResultType } from '@/scripts/form';
|
||||||
|
import MkPostForm from '@/components/MkPostForm.vue';
|
||||||
|
|
||||||
const name = 'postForm';
|
const name = 'postForm';
|
||||||
|
|
||||||
|
@ -12,8 +12,8 @@
|
|||||||
"misskey-js": "0.0.15"
|
"misskey-js": "0.0.15"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@typescript-eslint/parser": "5.50.0",
|
"@typescript-eslint/parser": "5.51.0",
|
||||||
"@typescript/lib-webworker": "npm:@types/serviceworker@0.0.61",
|
"@typescript/lib-webworker": "npm:@types/serviceworker@0.0.62",
|
||||||
"eslint": "8.33.0",
|
"eslint": "8.33.0",
|
||||||
"eslint-plugin-import": "2.27.5",
|
"eslint-plugin-import": "2.27.5",
|
||||||
"typescript": "4.9.5"
|
"typescript": "4.9.5"
|
||||||
|
1098
pnpm-lock.yaml
1098
pnpm-lock.yaml
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user