Compare commits

..

39 Commits

Author SHA1 Message Date
syuilo
a5df2b0293 Merge branch 'develop' 2023-01-23 20:13:46 +09:00
syuilo
e6eae558d3 13.2.0 2023-01-23 20:13:38 +09:00
syuilo
083fa53d9c update deps 2023-01-23 20:13:18 +09:00
syuilo
7b73dd2d62 enhance(server): onlyServer / onlyQueue オプションを復活 2023-01-23 20:07:48 +09:00
syuilo
7028b7331b 他人の実績閲覧時は獲得条件を表示しないように 2023-01-23 16:40:31 +09:00
syuilo
eefebab530 アニメーション減らすオプション有効時はリアクションのアニメーションを無効に 2023-01-23 16:36:47 +09:00
syuilo
683ddbef3e update contributors 2023-01-23 16:33:47 +09:00
syuilo
bd23522c76 enhance(client): カスタム絵文字一覧のパフォーマンスを改善 2023-01-23 16:19:13 +09:00
nexryai
c1dfbe2623 Hide the value of the object storage secret key input form in the control panel (#9706) 2023-01-23 16:08:09 +09:00
syuilo
ed9facbb33 fix(client): Aiscript: button is not defined
Fix #9704
2023-01-23 12:53:44 +09:00
syuilo
70df8c77fa Merge branch 'develop' 2023-01-22 21:30:06 +09:00
syuilo
2c52655b17 13.1.8 2023-01-22 21:29:57 +09:00
syuilo
6c4c071ae9 New Crowdin updates (#9692)
* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Ukrainian)
2023-01-22 21:28:34 +09:00
tamaina
b19dba80f4 Fix #9691 2023-01-22 12:25:55 +00:00
syuilo
09f4b9e546 Merge branch 'develop' 2023-01-22 21:01:52 +09:00
syuilo
2e6d8c792b 13.1.7 2023-01-22 21:01:42 +09:00
syuilo
e6338a555d mfmにscaleを追加
Resolve #9609
2023-01-22 20:58:52 +09:00
syuilo
313a489ba0 New Crowdin updates (#9689)
* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Ukrainian)
2023-01-22 20:46:43 +09:00
syuilo
b906ff3fed add an achievement 2023-01-22 20:30:56 +09:00
syuilo
ede96eca28 🎨 2023-01-22 20:25:10 +09:00
syuilo
42f3d9188b add a secret achievement 2023-01-22 20:22:38 +09:00
syuilo
a35e0e9261 Merge branch 'develop' 2023-01-22 17:30:12 +09:00
syuilo
80a400a67c 13.1.6 2023-01-22 17:30:04 +09:00
syuilo
7a6534f30b カスタム絵文字のURLが空文字列になる場合があるのを修正 2023-01-22 17:29:31 +09:00
syuilo
68a523ec6d Merge branch 'develop' 2023-01-22 17:19:13 +09:00
syuilo
97d6c1ee86 13.1.5 2023-01-22 17:19:03 +09:00
syuilo
19c93151ce tweak boot.js 2023-01-22 17:18:48 +09:00
syuilo
039a2af3ab tweak boot.js 2023-01-22 17:18:39 +09:00
syuilo
945129c371 Merge branch 'develop' 2023-01-22 17:11:00 +09:00
syuilo
da32be3ef3 13.1.4 2023-01-22 17:10:49 +09:00
syuilo
468ec36830 New Crowdin updates (#9685)
* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Chinese Traditional)
2023-01-22 17:09:26 +09:00
syuilo
492fb9a115 Update CHANGELOG.md 2023-01-22 17:06:18 +09:00
syuilo
bd8b624bae tweak bootstrap of client 2023-01-22 17:04:51 +09:00
syuilo
9dacf11702 fix(client): ローカリゼーション更新時にリロードが繰り返されることがあるのを修正 2023-01-22 16:52:15 +09:00
syuilo
26ae2dfc0f add achievement 2023-01-22 08:00:42 +09:00
syuilo
a7f43d5312 Merge branch 'develop' 2023-01-22 07:05:13 +09:00
syuilo
7fdf298bd4 13.1.3 2023-01-22 07:04:58 +09:00
syuilo
7d7167df6d New Crowdin updates (#9680)
* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Russian)
2023-01-22 07:04:30 +09:00
syuilo
aa339be2ab fix(client): リアクションのカスタム絵文字が表示されないことがあるのを修正
Fix #9683
2023-01-22 07:04:20 +09:00
36 changed files with 860 additions and 202 deletions

View File

@@ -9,6 +9,36 @@
You should also include the user name that made the change.
-->
## 13.2.0 (2021/01/23)
### Improvements
- onlyServer / onlyQueue オプションを復活
- 他人の実績閲覧時は獲得条件を表示しないように
- アニメーション減らすオプション有効時はリアクションのアニメーションを無効に
- カスタム絵文字一覧のパフォーマンスを改善
### Bugfixes
- Aiscript: button is not defined
## 13.1.7 (2023/01/22)
### Improvements
- 新たな実績を追加
- MFMにscaleタグを追加
## 13.1.4 (2023/01/22)
### Improvements
- 新たな実績を追加
### Bugfixes
- Client: ローカリゼーション更新時にリロードが繰り返されることがあるのを修正
## 13.1.3 (2023/01/22)
### Bugfixes
- Client: リアクションのカスタム絵文字の表示の問題を修正
## 13.1.2 (2023/01/22)
### Bugfixes
@@ -60,6 +90,7 @@ You should also include the user name that made the change.
- Node.js 18.x or later is required
- PostgreSQL 15.x is required
- Misskey not using 15 specific features at 13.0.0, but may do so in the future.
- Docker環境でPostgreSQLのアップデートを行う際のガイドはこちら: https://github.com/misskey-dev/misskey/pull/9641#issue-1536336620
- Elasticsearchのサポートが削除されました
- 代わりに今後任意の検索プロバイダを設定できる仕組みを構想しています。その仕組みを使えば今まで通りElasticsearchも利用できます
- Yarnからpnpmに移行されました

View File

@@ -1048,6 +1048,9 @@ _achievements:
_noteFavorited1:
title: "Sternengucker"
description: "Eine Notiz als Favorit markiert"
_myNoteFavorited1:
title: "Sternensucher"
description: "Ein anderer Benutzer hat eine deiner Notizen als Favoriten markiert"
_profileFilled:
title: "Perfekte Vorbereitung"
description: "Fülle dein Profil aus"

View File

@@ -1048,6 +1048,9 @@ _achievements:
_noteFavorited1:
title: "Stargazer"
description: "Favorite your first note"
_myNoteFavorited1:
title: "Seeking Stars"
description: "Have somebody else favorite one of your notes"
_profileFilled:
title: "Well-prepared"
description: "Set up your profile"

View File

@@ -1,7 +1,7 @@
---
_lang_: "Italiano"
headlineMisskey: "Rete collegata tramite note"
introMisskey: "Eccoci! Misskey è un servizio di microblogging decentralizzato, libero e aperto. \n📡 Puoi pubblicare «Note» per condividere ciò che sta succedendo o per dire a tutti qualcosa su di te. \n👍 Puoi reagire inviando emoji rapidi alle «Note» provenienti da altri profili nel Fediverso.\n🚀 Esplora un nuovo mondo insieme a noi!"
introMisskey: "Eccoci! Misskey è un servizio di microblogging decentralizzato, libero e aperto. \n\n📡 Puoi pubblicare «Note» per condividere ciò che sta succedendo o per dire a tutti qualcosa su di te. \n\n👍 Puoi reagire inviando emoji rapidi alle «Note» provenienti da altri profili nel Fediverso.\n\n🚀 Esplora un nuovo mondo insieme a noi!"
poweredByMisskeyDescription: "{name} è uno dei servizi (chiamati istanze) che utilizzano la piattaforma open source <b>Misskey</b>."
monthAndDay: "{day}/{month}"
search: "Cerca"
@@ -95,7 +95,7 @@ follow: "Segui"
followRequest: "Richiesta di follow"
followRequests: "Richieste di follow"
unfollow: "Smetti di seguire"
followRequestPending: "La richiesta di follow deve essere approvata"
followRequestPending: "Richiesta in approvazione"
enterEmoji: "Inserisci emoji"
renote: "Rinota"
unrenote: "Annulla rinota"
@@ -938,6 +938,237 @@ cannotPerformTemporary: "Indisponibilità temporanea"
cannotPerformTemporaryDescription: "L'attività non può essere svolta, poiché si è raggiunto il limite di esecuzioni possibili. Per favore, riprova più tardi."
preset: "Preimpostato"
selectFromPresets: "Seleziona preimpostato"
achievements: "Obiettivi raggiunti"
_achievements:
earnedAt: "Data di conseguimento"
_types:
_notes1:
title: "Hai iniziato a usare Misskey"
description: "Hai pubblicato la prima Nota"
flavor: "Goditi la vita su Misskey!"
_notes10:
title: "Alcune Note"
description: "Hai inserito 10 Note"
_notes100:
title: "Un po' di Note"
description: "Hai inserito 100 Note"
_notes500:
title: "Un bel po' di Note"
description: "Hai inserito 500 Note"
_notes1000:
title: "Una montagna di Note"
description: "Hai inserito 1.000 Note"
_notes5000:
title: "Un sovraccarico di Note!"
description: "Hai inserito 5.000 Note"
_notes10000:
title: "SuperNote!"
description: "Hai inserito 10.000 Note"
_notes20000:
title: "Voglio più... Note!"
description: "Hai inserito 20.000 Note"
_notes30000:
title: "Note, Note, Note!"
description: "Hai inserito 30.000 Note"
_notes40000:
title: "Una fabbrica di Note"
description: "Hai inserito 40.000 Note"
_notes50000:
title: "Un pianeta di Note"
description: "Hai inserito 50.000 Note"
_notes60000:
title: "Un quasar di Note"
description: "Hai inserito 60.000 Note"
_notes70000:
title: "Un buco nero supermassiccio di Note"
description: "Hai inserito 70.000 Note"
_notes80000:
title: "Una galassia di Note"
description: "Hai inserito 80.000 Note"
_notes90000:
title: "Un universo di Note!"
description: "Hai inserito 90.000 Note"
_notes100000:
title: "ALL YOUR NOTE ARE BELONG TO US"
description: "Hai inserito 100.000 Note"
flavor: "Hai molto da scrivere?"
_login3:
title: "Principiante I"
description: "Accedi per un totale di 3 giorni"
flavor: "Da oggi, chiamatemi Misskist"
_login7:
title: "Principiante II"
description: "Accedi per un totale di 7 giorni"
flavor: "Ti sembra di avere la situazione sotto controllo?"
_login15:
title: "Principiante III"
description: "Accedi per un totale di 15 giorni"
_login30:
title: "Misskist I"
description: "Accedi per un totale di 30 giorni"
_login60:
title: "Misskeist II"
description: "Accedi per un totale di 60 giorni"
_login100:
title: "Misskeist III"
description: "Accedi per un totale di 100 giorni"
flavor: "Violent Misskeist"
_login200:
title: "Regolare I"
description: "Accedi per un totale di 200 giorni"
_login300:
title: "Regolare II"
description: "Accedi per un totale di 300 giorni"
_login400:
title: "Regolare III"
description: "Accedi per un totale di 400 giorni"
_login500:
title: "Professionista I"
description: "Accedi per un totale di 500 giorni"
flavor: "Amici cari, mi piacciono le Note"
_login600:
title: "Professionista II"
description: "Accedi per un totale di 600 giorni"
_login700:
title: "Professionista III"
description: "Accedi per un totale di 700 giorni"
_login800:
title: "Maestro di Note I"
description: "Accedi per un totale di 800 giorni"
_login900:
title: "Maestro di Note II"
description: "Accedi per un totale di 900 giorni"
_login1000:
title: "Maestro di Note III"
description: "Accedi per un totale di 1.000 giorni"
flavor: "Grazie per aver usato Misskey!"
_noteClipped1:
title: "Devo clippare!"
description: "Ho raccolto in Clip la prima Nota"
_noteFavorited1:
title: "Guarda le stelle"
description: "Aggiungi una Nota ai preferiti per la prima volta"
_myNoteFavorited1:
title: "Fornitura stelline"
description: "Qualcuno ha preferito una delle tue Note"
_profileFilled:
title: "Perfettamente"
description: "Imposta il tuo profilo"
_markedAsCat:
title: "Io sono un gatto"
description: "Aggiungi le orecchie da gatto al tuo profilo"
flavor: "Ti chiamerò..."
_following1:
title: "Hai seguito il tuo primo profilo"
description: "Il tuo primo profilo Follower"
_following10:
title: "Segui, segui!"
description: "Hai seguito 10 profili"
_following50:
title: "Tanti amici"
description: "Hai seguito 50 profili"
_following100:
title: "Cento amici"
description: "Hai seguito 100 profili"
_following300:
title: "Sovraccarico di amici"
description: "Hai seguito 300 profili"
_followers1:
title: "Primo Follower"
description: "Hai ottenuto un Follower"
_followers10:
title: "Follow me!"
description: "Hai ottenuto 10 Follower"
_followers50:
title: "Follower a frotte"
description: "Hai ottenuto 50 Follower"
_followers100:
title: "Popolare"
description: "Hai ottenuto 100 Follower"
_followers300:
title: "Mettetevi in fila"
description: "Hai ottenuto 300 Follower"
_followers500:
title: "Trasmettitore"
description: "Hai ottenuto 500 Follower"
_followers1000:
title: "Influenzer"
description: "Hai superato i 1.000 Follower"
_collectAchievements30:
title: "Collezionista di successi"
description: "Hai raggiunto 30 obiettivi"
_viewAchievements3min:
title: "Mi piacciono i risultati"
description: "Guarda la tua collezione di obiettivi per almeno 3 minuti"
_iLoveMisskey:
title: "I LOVE Misskey"
description: "Pubblica «I ♥ #Misskey»"
flavor: "Grazie per aver utilizzato Misskey! Dal team di sviluppo"
_client30min:
title: "Piccola pausa"
description: "Hai passato più di 30 minuti di fila su Misskey"
_noteDeletedWithin1min:
title: "Ooops!"
description: "Hai eliminato una nota entro un minuto dalla sua pubblicazione"
_postedAtLateNight:
title: "Biassanot!"
description: "Hai pubblicato una nota in tarda notte"
flavor: "Andiamo a dormire presto"
_postedAt0min0sec:
title: "Mezzanotte"
description: "Hai pubblicato una Nota a mezzanotte in punto"
flavor: "tic, tac, tic, tac! Gong!"
_selfQuote:
title: "Autoreferenziale"
description: "Hai citato una delle tue Note"
_htl20npm:
title: "Timeline scorrevole"
description: "La tua Timeline personale ha superato la velocità di 20 Note orarie (Note al minuto)"
_outputHelloWorldOnScratchpad:
title: "Hello, world!"
description: "Hai scritto «Hello world» nel blocco appunti"
_open3windows:
title: "Finestrato"
description: "Hai aperto almeno 3 finestre contemporaneamente"
_driveFolderCircularReference:
title: "Riferimento circolare"
description: "Hai provato a nidificare in modo ricorsivo le cartelle del Drive"
_reactWithoutRead:
title: "Hai letto bene?"
description: "Hai reagito ad una Nota più lunga di 100 caratteri entro 3 secondi dalla sua pubblicazione"
_clickedClickHere:
title: "Clicca qui"
description: "Hai cliccato qui"
_justPlainLucky:
title: "Proprio fortunato"
description: "Ottenuto con una probabilità dello 0,01% ogni 10 secondi"
_setNameToSyuilo:
title: "Complesso divino"
description: "Hai impostati il tuo nome in «syuilo»"
_passedSinceAccountCreated1:
title: "Primo Anniversario"
description: "È passato un anno da quando hai creato il profilo"
_passedSinceAccountCreated2:
title: "Secondo Anniversario"
description: "Sono passati due anni da quando hai creato il profilo"
_passedSinceAccountCreated3:
title: "Terzo Anniversario"
description: "Sono passati tre anni da quando hai creato il profilo"
_loggedInOnBirthday:
title: "Buon compleanno!"
description: "Hai effettuato l'accesso il giorno del tuo compleanno"
_loggedInOnNewYearsDay:
title: "Buon anno nuovo!"
description: "Hai usato effettuato l'accesso il giorno di capodanno"
flavor: "Anche quest'anno, grazie per il tuo continuo supporto a questa istanza"
_cookieClicked:
title: "Clicca il biscotto"
description: "Hai giocato a cliccare il cookie"
flavor: "Hai autorizzato i cookie?"
_brainDiver:
title: "Brain Diver"
description: "Pubblica un link a Brain Diver"
flavor: "Sulle note di Brain Diver"
_role:
new: "Nuovo ruolo"
edit: "Modifica ruolo"
@@ -1293,7 +1524,7 @@ _tutorial:
step3_1: "Hai finito di impostare il tuo profilo?"
step3_2: "Ora puoi pubblicare una «Nota». Proviamo subito! Premi il bottone con l'icona «penna» per iniziare a scrivere in una finestra di dialogo. "
step3_3: "Scritto il testo della nota, puoi pubblicarla premendo il pulsante nella parte superiore destra della finestra di dialogo."
step3_4: "Non ti viene niente in mente? Perché non scrivi semplicemente \"Ho appena cominciato a usare Misskey\"?"
step3_4: "Non ti viene niente in mente? Perché non scrivi semplicemente \"Ho appena iniziato a usare Misskey\"?"
step4_1: "Hai pubblicato qualcosa?"
step4_2: "Se puoi visualizzare la tua nota sulla timeline, ce l'hai fatta!"
step5_1: "Adesso, cerca di seguire altre persone per vivacizzare la tua timeline. "
@@ -1587,6 +1818,7 @@ _notification:
pollEnded: "Risultati del sondaggio."
unreadAntennaNote: "Antenna {name}"
emptyPushNotificationMessage: "Le notifiche push sono state aggiornate."
achievementEarned: "Obiettivo raggiunto"
_types:
all: "Tutto"
follow: "Novità follower"

View File

@@ -1049,6 +1049,9 @@ _achievements:
_noteFavorited1:
title: "星をみるひと"
description: "初めてノートをお気に入りに登録した"
_myNoteFavorited1:
title: "星が欲しい"
description: "自分のノートが他の人からお気に入りに登録された"
_profileFilled:
title: "準備万端"
description: "プロフィール設定を行った"
@@ -1102,6 +1105,9 @@ _achievements:
title: "I Love Misskey"
description: "\"I ❤ #Misskey\"を投稿した"
flavor: "Misskeyを使ってくださりありがとうございます by 開発チーム"
_foundTreasure:
title: "宝探し"
description: "隠されたお宝を発見した"
_client30min:
title: "ひとやすみ"
description: "クライアントを起動してから30分以上経過した"
@@ -1122,6 +1128,9 @@ _achievements:
_htl20npm:
title: "流れるTL"
description: "ホームタイムラインの流速が20npmを越す"
_viewInstanceChart:
title: "アナリスト"
description: "インスタンスのチャートを表示した"
_outputHelloWorldOnScratchpad:
title: "Hello, world!"
description: "スクラッチパッドで hello world を出力した"

View File

@@ -1048,6 +1048,9 @@ _achievements:
_noteFavorited1:
title: "별을 바라보는 자"
description: "처음으로 노트를 즐겨찾기했습니다"
_myNoteFavorited1:
title: "I wanna Star"
description: "다른 사람이 당신의 노트를 즐겨찾기했습니다"
_profileFilled:
title: "준비 완료"
description: "프로필 설정을 완료했습니다"

View File

@@ -891,20 +891,53 @@ cannotUploadBecauseNoFreeSpace: "Файл не может быть загруж
beta: "Бета"
enableAutoSensitive: "Автоматическое определение NSFW"
enableAutoSensitiveDescription: "Если доступно, используйте машинное обучение для автоматической установки флага NSFW на носителе. Даже если эта функция отключена, она может быть установлена ​​автоматически в зависимости от инстанта."
navbar: "Панель навигации"
shuffle: "Перемешать"
account: "Учётные записи"
move: "Переместить"
pushNotification: "Push-уведомления"
subscribePushNotification: "Включить push-уведомления"
unsubscribePushNotification: "Выключить push-уведомления"
pushNotificationAlreadySubscribed: "Push-уведомления уже включены"
pushNotificationNotSupported: "Push-уведмления не поддерживаются инстансом или браузером"
sendPushNotificationReadMessage: "Удалять push-уведомления когда сообщение или прочитано"
sendPushNotificationReadMessageCaption: "На мгновение появится уведомление \"{emptyPushNotificationMessage}\". Расход заряда батареи может увеличиться "
windowMaximize: "Развернуть"
windowRestore: "Восстановить"
caption: "Подпись (Automatic Translation)"
loggedInAsBot: "Вы под аккаунтом бота!"
tools: "Инструменты"
cannotLoad: "Не удалось загрузить"
numberOfProfileView: "Количество профилей для просмотра"
like: "Нравится!"
unlike: "Отменить «нравится»"
numberOfLikes: "Количество лайков"
show: "Отображение"
neverShow: "Больше не показывать"
remindMeLater: "Напомнить позже"
didYouLikeMisskey: "Вам нравится Misskey?"
pleaseDonate: "Сайт {host} работает на Misskey. Это бесплатное программное обеспечение, и ваши пожертвования очень бы помогли продолжать его разработку!"
roles: "Роли"
role: "Роль"
normalUser: "Обычный пользователь"
undefined: "неопределён"
assign: "Назначить"
unassign: "Отменить назначение"
color: "Цвет"
manageCustomEmojis: "Управлять пользовательскими эмодзи"
youCannotCreateAnymore: "Вы достигли лимита создания."
cannotPerformTemporary: "Временно недоступен"
cannotPerformTemporaryDescription: "Это действие временно невозможно выполнить из-за превышения лимита выполнения."
preset: "Шаблоны"
selectFromPresets: "Выбрать из шаблонов"
achievements: "Достижения"
_achievements:
earnedAt: "Разблокировано в"
_types:
_notes1:
title: "Первые шаги в Misskey"
description: "Опубликована первая заметка"
flavor: "Приятных дней с Misskey!"
_notes10:
title: "Несколько заметок"
description: "Опубликовано 10 заметок"
@@ -950,9 +983,11 @@ _achievements:
_notes100000:
title: "ALL YOUR NOTE ARE BELONG TO US"
description: "Опубликовано 100000 заметок"
flavor: "Вам правда нужно столько писать?"
_login3:
title: "Новичок "
description: "3 дня на сайте"
flavor: "С сегодняшнего дня зовите меня просто мискиец"
_login7:
title: "Новичок Ⅱ"
description: "Неделя на сайте"
@@ -969,6 +1004,7 @@ _achievements:
_login100:
title: "Мискиец Ⅲ"
description: "100 дней на сайте"
flavor: "Жестокий Misskist "
_login200:
title: "Завсегдатай "
description: "200 дней на сайте"
@@ -981,6 +1017,7 @@ _achievements:
_login500:
title: "Ветеран "
description: "500 дней на сайте"
flavor: "Господа, я люблю заметки"
_login600:
title: "Ветеран Ⅱ"
description: "600 дней на сайте"
@@ -996,32 +1033,59 @@ _achievements:
_login1000:
title: "Повелитель заметок Ⅲ"
description: "1000 дней на сайте"
flavor: "Спасибо, что пользуетесь Misskey!"
_noteClipped1:
title: "Нельзя не сохранить"
description: "Первая заметка в подборке"
_noteFavorited1:
title: "Смотрящий на звёзды"
description: "Первое добавление в избранное"
_myNoteFavorited1:
title: "В поиске звёзд"
description: "Кому-то понравилась ваша заметка"
_profileFilled:
title: "Приготовления закончены"
description: "Заполнен профиль"
_markedAsCat:
title: "Ваш покорный слуга кот"
description: "Включена опция «Аккаунт кота»"
flavor: "Позвольте представиться: я — кот, просто кот, у меня еще нет имени."
_following1:
title: "Я не один"
description: "Сделана первая подписка"
_following10:
title: "Не останавливайся… Не останавливайся…"
description: "Количество подписок достигло 10"
_following50:
title: "Много друзей"
description: "Количество подписок достигло 50"
_following100:
title: "Сотня друзей"
description: "Количество подписок достигло 100"
_following300:
title: "Друзья в избытке"
description: "Количество подписок достигло 300"
_followers1:
title: "Первый подписчик"
description: "Появился 1 подписчик"
_followers10:
title: "Следуй за мной!"
description: "Количество подписчиков достигло 10"
_followers50:
title: "Один за другим"
description: "Подписчиков больше 50"
description: "Количество подписчиков достигло 50"
_followers100:
title: "Всеобщий любимец"
description: "Подписчиков больше 100"
description: "Количество подписчиков достигло 100"
_followers300:
title: "В очередь!"
description: "Подписчиков больше 300"
description: "Количество подписчиков достигло 300"
_followers500:
title: "Радиостанция"
description: "Подписчиков больше 300"
description: "Количество подписчиков достигло 500"
_followers1000:
title: "Авторитет"
description: "Подписчиков больше 1000"
description: "Количество подписчиков достигло 1000"
_collectAchievements30:
title: "Достигатор"
description: "Получено 30 достижений"
@@ -1031,6 +1095,7 @@ _achievements:
_iLoveMisskey:
title: "Я люблю Misskey"
description: "Написана заметка «I ❤ #Misskey»"
flavor: "Спасибо за поддержку Misskey! Ваша команда разработчиков"
_client30min:
title: "Перерыв на обед"
description: "Прошло 30 минут с момента запуска клиента"
@@ -1040,6 +1105,7 @@ _achievements:
_postedAtLateNight:
title: "Житель ночи"
description: "Заметка опубликована в глухую ночь"
flavor: "Вроде бы пора спать"
_postedAt0min0sec:
title: "Говорящие часы"
description: "Заметка опубликована ровно в 0 минут 0 секунд"
@@ -1057,6 +1123,7 @@ _achievements:
title: "Многооконный"
description: "Открыто одновременно 3 окна"
_driveFolderCircularReference:
title: "Циклическая ссылка"
description: "Попытка создать на «диске» рекурсивно вложенную папку"
_reactWithoutRead:
title: "Не читай @ отвечай!"
@@ -1085,6 +1152,7 @@ _achievements:
_loggedInOnNewYearsDay:
title: "С Новым годом!"
description: "Вход на сайт в первый день года"
flavor: "Желаем отличного года на нашем сайте!"
_cookieClicked:
title: "Игра, в которой вы щёлкаете по печенькам"
description: "Нажато печенье"
@@ -1094,11 +1162,34 @@ _achievements:
description: "Опубликована ссылка на песню «Brain Diver»"
flavor: "Мисски-Мисски Ла-Ту-Ма"
_role:
new: "Новая роль"
edit: "Изменить роль"
name: "Название роли"
description: "Описание роли"
permission: "Ролевые полномочия"
descriptionOfPermission: "<b>Модераторы</b> могут изменять базовые операции для модераторов.\n<b>Администраторы</b> могут изменять полностью настройки инстанса."
assignTarget: "Метод присвоения"
descriptionOfAssignTarget: "<b>Вручную</b> чтобы указать кому выдавать роль, а кому нет.\n<b>По условию<b> чтобы автоматически выдавать и удалять роль при условиях."
manual: "Вручную"
conditional: "По условию"
condition: "Условия"
isConditionalRole: "Эта роль выдаётся по условию."
isPublic: "Общедоступная роль"
descriptionOfIsPublic: "Список тех, кому назначена эта роль будет доступен всем. Кроме того эта роль будет отмечена у каждого в профиле."
options: "Настройки ролей"
policies: "Политики"
baseRole: "Шаблон роли"
useBaseValue: "Использовать значение из шаблона"
chooseRoleToAssign: "Выберите роль, которую хотите выдать"
canEditMembersByModerator: "Могут назначать модераторы"
descriptionOfCanEditMembersByModerator: "Если включено, на эту роль могут назначать пользователей как администраторы, так и модераторы. Если выключено, назначать могут только администраторы."
priority: "Приоритет"
_priority:
low: "Низкий"
middle: "Средне"
high: "Высокий"
_options:
canManageCustomEmojis: "Управлять пользовательскими эмодзи"
_sensitiveMediaDetection:
description: "Машинное обучение может быть использовано для автоматического обнаружения чувствительных медиа для модерации. Нагрузка на сервер увеличивается незначительно."
setSensitiveFlagAutomatically: "Установить флаг NSFW"
@@ -1145,6 +1236,11 @@ _plugin:
install: "Установка расширений"
installWarn: "Пожалуйста, не устанавливайте расширения, которым не доверяете."
manage: "Управление расширениями"
_preferencesBackups:
saveConfirm: "Сохранить бэкап как {name}?"
deleteConfirm: "Удалить резервную копию {name}?"
renameConfirm: "Переименовать резервную копию с \"{old}\" на \"{new}\"?"
noBackups: "Резервной копии не существует. Вы можете создать резервную копию в настройках на этом инстансе с помощью \"Создать новую резервную копию\"."
_registry:
scope: "Область"
key: "Ключ"
@@ -1641,6 +1737,7 @@ _notification:
youReceivedFollowRequest: "У вас новый запрос на подписку."
yourFollowRequestAccepted: "Ваш запрос на подписку одобрен."
youWereInvitedToGroup: "Вы приглашены в группу."
achievementEarned: "Получено достижение"
_types:
all: "Все"
follow: "Подписки"

View File

@@ -899,6 +899,45 @@ unlike: "Не вподобати"
numberOfLikes: "Вподобання"
show: "Відображення"
color: "Колір"
achievements: "Досягнення"
_achievements:
_types:
_notes1:
title: "налаштовую свій msky"
description: "Перша нотатка"
flavor: "Приємного часу з Misskey!"
_notes10:
title: "Декілька нотаток"
description: "10 нотаток відправлено"
_notes100:
description: "100 нотаток відправлено"
_notes500:
description: "500 нотаток відправлено"
_notes1000:
description: "1 000 нотаток відправлено"
_notes5000:
description: "5 000 нотаток відправлено"
_notes10000:
description: "10 000 нотаток відправлено"
_notes20000:
description: "20 000 нотаток відправлено"
_notes30000:
description: "30 000 нотаток відправлено"
_notes40000:
description: "40 000 нотаток відправлено"
_notes50000:
description: "50 000 нотаток відправлено"
_notes60000:
description: "60 000 нотаток відправлено"
_notes70000:
description: "70 000 нотаток відправлено"
_notes80000:
description: "80 000 нотаток відправлено"
_notes90000:
description: "90 000 нотаток відправлено"
_notes100000:
title: "ALL YOUR NOTE ARE BELONG TO US"
description: "100 000 нотаток відправлено"
_role:
priority: "Пріоритет"
_priority:

View File

@@ -956,7 +956,7 @@ _achievements:
title: "满是帖子"
description: "发布了500篇帖子"
_notes1000:
title: "帖成山"
title: "帖成山"
description: "发布了1,000篇帖子"
_notes5000:
title: "帖如泉涌"
@@ -992,22 +992,53 @@ _achievements:
title: "ALL YOUR NOTE ARE BELONG TO US"
description: "发布了100,000篇帖子"
flavor: "真的有那么多可以写的东西吗?"
_login3:
title: "初学者 I"
description: "连续登录3天"
_login7:
description: "连续登录7天"
_login15:
description: "连续登录15天"
_login30:
description: "连续登录30天"
_login60:
description: "连续登录60天"
_login1000:
flavor: "感谢您使用Misskey"
_noteFavorited1:
title: "观星者"
_markedAsCat:
title: "我是猫"
description: "将账户设定为一只猫"
_following10:
title: "关注,跟随"
_following50:
title: "我的朋友很多"
_following300:
description: "关注数超过300"
_followers100:
title: "胜友如云"
_collectAchievements30:
description: "获得超过30个成就"
_viewAchievements3min:
description: "盯着成就看三分钟"
_iLoveMisskey:
title: "I Love Misskey"
description: "发布\"I ❤ #Misskey\"帖子"
flavor: "感谢您使用 Misskey by 开发团队"
_noteDeletedWithin1min:
description: "发帖后一分钟内就将其删除"
_postedAtLateNight:
title: "夜行者"
description: "深夜发布帖子"
_outputHelloWorldOnScratchpad:
title: "Hello, world!"
_passedSinceAccountCreated1:
description: "账户创建时间超过1年"
_passedSinceAccountCreated2:
description: "账户创建时间超过2年"
_passedSinceAccountCreated3:
description: "账户创建时间超过3年"
_loggedInOnBirthday:
title: "生日快乐"
description: "在生日当天登录"

View File

@@ -1042,18 +1042,64 @@ _achievements:
title: "貼文大師ⅠⅠⅠ"
description: "總登入天數為1,000天"
flavor: "感謝您使用Misskey"
_noteClipped1:
title: "忍不住要收進摘錄裡"
description: "第一次將貼文收進摘錄"
_noteFavorited1:
title: "觀星者"
description: "第一次將貼文收藏至我的最愛"
_myNoteFavorited1:
title: "想要星星"
description: "自己的貼文被他人收藏至「我的最愛」了"
_profileFilled:
title: "有備而來"
description: "設定了個人檔案"
_markedAsCat:
title: "我是貓"
description: "已將帳戶設定為貓"
flavor: "還沒有名字。"
_following1:
title: "首次追隨"
description: "首次追隨了"
_following10:
title: "跟著跟著"
description: "跟隨超過10人了"
_following50:
title: "朋友很多"
description: "跟隨超過50人了"
_following100:
title: "100位朋友"
description: "跟隨超過100人了"
_following300:
title: "朋友過多"
description: "跟隨超過300人了"
_followers1:
title: "第一個追隨者"
description: "第一次被追隨"
_followers10:
title: "Follow me!"
description: "跟隨者超過10人了"
_followers50:
title: "成群結隊"
description: "跟隨者超過50人了"
_followers100:
title: "紅人"
description: "跟隨者超過100人了"
_followers300:
title: "請排成一排"
description: "跟隨者超過300人了"
_followers500:
title: "基站"
description: "超過500名追隨者"
description: "超過500名追隨者"
_followers1000:
title: "影響者"
description: "超過1000名追隨者"
description: "超過1000名追隨者"
_collectAchievements30:
title: "成就收藏家"
description: "獲得30個以上的成就"
_viewAchievements3min:
title: "喜愛成就"
description: "看成就列表要花3分鐘以上"
description: "看成就列表要花3分鐘以上"
_iLoveMisskey:
title: "I Love Misskey"
description: "發布「I ❤ #Misskey」"
@@ -1071,6 +1117,7 @@ _achievements:
_postedAt0min0sec:
title: "報時"
description: "在0分0秒發佈貼文"
flavor: "啵.啵.啵.嗶ー"
_selfQuote:
title: "自我引用"
description: "引用了自己的貼文"
@@ -1082,7 +1129,7 @@ _achievements:
description: "在暫存記憶體輸出了 hello world"
_open3windows:
title: "多重視窗"
description: "開啟3個以上的視窗"
description: "開啟3個以上的視窗"
_driveFolderCircularReference:
title: "循環引用"
description: "試圖遞迴套入雲端硬碟資料夾"
@@ -1098,6 +1145,30 @@ _achievements:
_setNameToSyuilo:
title: "神的情結"
description: "將名稱設定為 syuilo"
_passedSinceAccountCreated1:
title: "一周年"
description: "自建立帳戶開始過了1年"
_passedSinceAccountCreated2:
title: "二周年"
description: "自建立帳戶開始過了2年"
_passedSinceAccountCreated3:
title: "三周年"
description: "自建立帳戶開始過了3年"
_loggedInOnBirthday:
title: "生日快樂"
description: "在生日當天登入了"
_loggedInOnNewYearsDay:
title: "新年快樂"
description: "在元旦當天登入了"
flavor: "今年也請對敝實例多多指教"
_cookieClicked:
title: "點擊餅乾的遊戲"
description: "點擊了餅乾"
flavor: "是不是軟體有問題?"
_brainDiver:
title: "Brain Driver"
description: "發佈了Brain Driver的連結"
flavor: "Misskey-Misskey La-Tu-Ma"
_role:
new: "建立角色"
edit: "編輯角色"
@@ -1747,6 +1818,7 @@ _notification:
pollEnded: "問卷調查已產生結果"
unreadAntennaNote: "天線 {name}"
emptyPushNotificationMessage: "推送通知已更新"
achievementEarned: "獲得成就"
_types:
all: "全部 "
follow: "追隨中"

View File

@@ -1,6 +1,6 @@
{
"name": "misskey",
"version": "13.1.2",
"version": "13.2.0",
"codename": "nasubi",
"repository": {
"type": "git",

View File

@@ -23,9 +23,9 @@
"@tensorflow/tfjs-node": "4.1.0"
},
"dependencies": {
"@bull-board/api": "^4.10.2",
"@bull-board/fastify": "^4.10.2",
"@bull-board/ui": "^4.10.2",
"@bull-board/api": "^4.11.0",
"@bull-board/fastify": "^4.11.0",
"@bull-board/ui": "^4.11.0",
"@discordapp/twemoji": "14.0.2",
"@fastify/accepts": "4.1.0",
"@fastify/cookie": "^8.3.0",
@@ -120,7 +120,7 @@
"typeorm": "0.3.11",
"typescript": "4.9.4",
"ulid": "2.3.0",
"undici": "^5.15.1",
"undici": "^5.16.0",
"unzipper": "0.10.11",
"uuid": "9.0.0",
"vary": "1.1.2",

View File

@@ -0,0 +1,35 @@
import { NestFactory } from '@nestjs/core';
import { ChartManagementService } from '@/core/chart/ChartManagementService.js';
import { QueueProcessorService } from '@/queue/QueueProcessorService.js';
import { NestLogger } from '@/NestLogger.js';
import { QueueProcessorModule } from '@/queue/QueueProcessorModule.js';
import { JanitorService } from '@/daemons/JanitorService.js';
import { QueueStatsService } from '@/daemons/QueueStatsService.js';
import { ServerStatsService } from '@/daemons/ServerStatsService.js';
import { ServerService } from '@/server/ServerService.js';
import { MainModule } from '@/MainModule.js';
export async function server() {
const app = await NestFactory.createApplicationContext(MainModule, {
logger: new NestLogger(),
});
app.enableShutdownHooks();
const serverService = app.get(ServerService);
serverService.launch();
app.get(ChartManagementService).start();
app.get(JanitorService).start();
app.get(QueueStatsService).start();
app.get(ServerStatsService).start();
}
export async function jobQueue() {
const jobQueue = await NestFactory.createApplicationContext(QueueProcessorModule, {
logger: new NestLogger(),
});
jobQueue.enableShutdownHooks();
jobQueue.get(QueueProcessorService).start();
jobQueue.get(ChartManagementService).start();
}

View File

@@ -6,21 +6,12 @@ import cluster from 'node:cluster';
import chalk from 'chalk';
import chalkTemplate from 'chalk-template';
import semver from 'semver';
import { NestFactory } from '@nestjs/core';
import Logger from '@/logger.js';
import { loadConfig } from '@/config.js';
import type { Config } from '@/config.js';
import { lessThan } from '@/misc/prelude/array.js';
import { showMachineInfo } from '@/misc/show-machine-info.js';
import { DaemonModule } from '@/daemons/DaemonModule.js';
import { JanitorService } from '@/daemons/JanitorService.js';
import { QueueStatsService } from '@/daemons/QueueStatsService.js';
import { ServerStatsService } from '@/daemons/ServerStatsService.js';
import { NestLogger } from '@/NestLogger.js';
import { ChartManagementService } from '@/core/chart/ChartManagementService.js';
import { ServerService } from '@/server/ServerService.js';
import { MainModule } from '@/MainModule.js';
import { envOption } from '../env.js';
import { envOption } from '@/env.js';
import { jobQueue, server } from './common.js';
const _filename = fileURLToPath(import.meta.url);
const _dirname = dirname(_filename);
@@ -73,14 +64,13 @@ export async function masterMain() {
process.exit(1);
}
const app = await NestFactory.createApplicationContext(MainModule, {
logger: new NestLogger(),
});
app.enableShutdownHooks();
// start server
const serverService = app.get(ServerService);
serverService.launch();
if (envOption.onlyServer) {
await server();
} else if (envOption.onlyQueue) {
await jobQueue();
} else {
await server();
}
bootLogger.succ('Misskey initialized');
@@ -89,11 +79,6 @@ export async function masterMain() {
}
bootLogger.succ(`Now listening on port ${config.port} on ${config.url}`, null, true);
app.get(ChartManagementService).start();
app.get(JanitorService).start();
app.get(QueueStatsService).start();
app.get(ServerStatsService).start();
}
function showEnvironment(): void {

View File

@@ -1,23 +1,18 @@
import cluster from 'node:cluster';
import { NestFactory } from '@nestjs/core';
import { ChartManagementService } from '@/core/chart/ChartManagementService.js';
import { QueueProcessorService } from '@/queue/QueueProcessorService.js';
import { NestLogger } from '@/NestLogger.js';
import { QueueProcessorModule } from '@/queue/QueueProcessorModule.js';
import { envOption } from '@/env.js';
import { jobQueue, server } from './common.js';
/**
* Init worker process
*/
export async function workerMain() {
const jobQueue = await NestFactory.createApplicationContext(QueueProcessorModule, {
logger: new NestLogger(),
});
jobQueue.enableShutdownHooks();
// start job queue
jobQueue.get(QueueProcessorService).start();
jobQueue.get(ChartManagementService).start();
if (envOption.onlyServer) {
await server();
} else if (envOption.onlyQueue) {
await jobQueue();
} else {
await jobQueue();
}
if (cluster.isWorker) {
// Send a 'ready' message to parent process

View File

@@ -44,6 +44,7 @@ const ACHIEVEMENT_TYPES = [
'loggedInOnNewYearsDay',
'noteClipped1',
'noteFavorited1',
'myNoteFavorited1',
'profileFilled',
'markedAsCat',
'following1',
@@ -61,12 +62,14 @@ const ACHIEVEMENT_TYPES = [
'collectAchievements30',
'viewAchievements3min',
'iLoveMisskey',
'foundTreasure',
'client30min',
'noteDeletedWithin1min',
'postedAtLateNight',
'postedAt0min0sec',
'selfQuote',
'htl20npm',
'viewInstanceChart',
'outputHelloWorldOnScratchpad',
'open3windows',
'driveFolderCircularReference',
@@ -94,7 +97,7 @@ export class AchievementService {
@bindThis
public async create(
userId: User['id'],
type: string,
type: typeof ACHIEVEMENT_TYPES[number],
): Promise<void> {
if (!ACHIEVEMENT_TYPES.includes(type)) return;

View File

@@ -32,8 +32,8 @@ export class EmojiEntityService {
name: emoji.name,
category: emoji.category,
host: opts.omitHost ? undefined : emoji.host,
// ?? emoji.originalUrl してるのは後方互換性のため
url: opts.withUrl ? (emoji.publicUrl ?? emoji.originalUrl) : undefined,
// || emoji.originalUrl してるのは後方互換性のためpublicUrlはstringなので??はだめ)
url: opts.withUrl ? (emoji.publicUrl || emoji.originalUrl) : undefined,
};
}

View File

@@ -6,6 +6,7 @@ import { Endpoint } from '@/server/api/endpoint-base.js';
import { GetterService } from '@/server/api/GetterService.js';
import { DI } from '@/di-symbols.js';
import { ApiError } from '../../../error.js';
import { AchievementService } from '@/core/AchievementService.js';
export const meta = {
tags: ['notes', 'favorites'],
@@ -51,6 +52,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
private idService: IdService,
private getterService: GetterService,
private achievementService: AchievementService,
) {
super(meta, paramDef, async (ps, me) => {
// Get favoritee
@@ -76,6 +78,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
noteId: note.id,
userId: me.id,
});
if (note.userHost == null) {
this.achievementService.create(note.userId, 'myNoteFavorited1');
}
});
}
}

View File

@@ -22,18 +22,13 @@
renderError('SOMETHING_HAPPENED_IN_PROMISE', e);
};
const v = localStorage.getItem('v') || VERSION;
let forceError = localStorage.getItem('forceError');
if (forceError != null) {
renderError('FORCED_ERROR', 'This error is forced by having forceError in local storage.')
}
//#region Detect language & fetch translations
const localeVersion = localStorage.getItem('localeVersion');
const localeOutdated = (localeVersion == null || localeVersion !== v);
if (!localStorage.hasOwnProperty('locale') || localeOutdated) {
if (!localStorage.hasOwnProperty('locale')) {
const supportedLangs = LANGS;
let lang = localStorage.getItem('lang');
if (lang == null || !supportedLangs.includes(lang)) {
@@ -47,13 +42,31 @@
}
}
const res = await window.fetch(`/assets/locales/${lang}.${v}.json`);
if (res.status === 200) {
const metaRes = await window.fetch('/api/meta', {
method: 'POST',
body: JSON.stringify({}),
credentials: 'omit',
cache: 'no-cache',
headers: {
'Content-Type': 'application/json',
},
});
if (metaRes.status !== 200) {
renderError('META_FETCH');
return;
}
const meta = await metaRes.json();
const v = meta.version;
if (v == null) {
renderError('META_FETCH_V');
return;
}
const localRes = await window.fetch(`/assets/locales/${lang}.${v}.json`);
if (localRes.status === 200) {
localStorage.setItem('lang', lang);
localStorage.setItem('locale', await res.text());
localStorage.setItem('locale', await localRes.text());
localStorage.setItem('localeVersion', v);
} else {
await checkUpdate();
renderError('LOCALE_FETCH');
return;
}
@@ -64,7 +77,6 @@
function importAppScript() {
import(`/vite/${CLIENT_ENTRY}`)
.catch(async e => {
await checkUpdate();
console.error(e);
renderError('APP_IMPORT', e);
});
@@ -291,48 +303,4 @@
}
`)
}
// eslint-disable-next-line no-inner-declarations
async function checkUpdate() {
try {
const res = await window.fetch('/api/meta', {
method: 'POST',
cache: 'no-cache',
body: '{}',
headers: {
'Content-Type': 'application/json',
},
});
const meta = await res.json();
if (meta.version == null) {
throw new Error('failed to fetch instance metadata');
}
if (meta.version != v) {
localStorage.setItem('v', meta.version);
refresh();
}
} catch (e) {
console.error(e);
renderError('UPDATE_CHECK', e);
throw e;
}
}
// eslint-disable-next-line no-inner-declarations
function refresh() {
// Clear cache (service worker)
try {
navigator.serviceWorker.controller.postMessage('clear');
navigator.serviceWorker.getRegistrations().then(registrations => {
registrations.forEach(registration => registration.unregister());
});
} catch (e) {
console.error(e);
}
location.reload();
}
})();

View File

@@ -16,8 +16,8 @@
<time v-tooltip="new Date(achievement.unlockedAt).toLocaleString()">{{ new Date(achievement.unlockedAt).getFullYear() }}/{{ new Date(achievement.unlockedAt).getMonth() + 1 }}/{{ new Date(achievement.unlockedAt).getDate() }}</time>
</span>
</div>
<div :class="$style.description">{{ i18n.ts._achievements._types['_' + achievement.name].description }}</div>
<div v-if="i18n.ts._achievements._types['_' + achievement.name].flavor" :class="$style.flavor">{{ i18n.ts._achievements._types['_' + achievement.name].flavor }}</div>
<div :class="$style.description">{{ withDescription ? i18n.ts._achievements._types['_' + achievement.name].description : '???' }}</div>
<div v-if="i18n.ts._achievements._types['_' + achievement.name].flavor && withDescription" :class="$style.flavor">{{ i18n.ts._achievements._types['_' + achievement.name].flavor }}</div>
</div>
</div>
<template v-if="withLocked">
@@ -49,8 +49,10 @@ import { ACHIEVEMENT_TYPES, ACHIEVEMENT_BADGES, claimAchievement } from '@/scrip
const props = withDefaults(defineProps<{
user: misskey.entities.User;
withLocked: boolean;
withDescription: boolean;
}>(), {
withLocked: true,
withDescription: true,
});
let achievements = $ref();

View File

@@ -21,6 +21,7 @@ import { useTooltip } from '@/scripts/use-tooltip';
import { $i } from '@/account';
import MkReactionEffect from '@/components/MkReactionEffect.vue';
import { claimAchievement } from '@/scripts/achievements';
import { defaultStore } from '@/store';
const props = defineProps<{
reaction: string;
@@ -61,6 +62,7 @@ const toggleReaction = () => {
const anime = () => {
if (document.hidden) return;
if (!defaultStore.state.animation) return;
const rect = buttonEl.value.getBoundingClientRect();
const x = rect.left + 16;

View File

@@ -31,11 +31,11 @@ const useOsNativeEmojis = computed(() => defaultStore.state.emojiStyle === 'nati
const url = computed(() => {
if (char.value) {
return char2path(char.value);
} else if (props.host == null) {
} else if (props.host == null && !customEmojiName.includes('@')) {
const found = customEmojis.find(x => x.name === customEmojiName);
return found ? found.url : null;
} else {
const rawUrl = `/emoji/${customEmojiName}@${props.host}.webp`;
const rawUrl = props.host ? `/emoji/${customEmojiName}@${props.host}.webp` : `/emoji/${customEmojiName}.webp`;
return defaultStore.state.disableShowingAnimatedImages
? getStaticImageUrl(rawUrl)
: rawUrl;

View File

@@ -200,6 +200,12 @@ export default defineComponent({
style = `transform: translateX(${x}em) translateY(${y}em);`;
break;
}
case 'scale': {
const x = Math.min(parseInt(token.props.args.x ?? '1'), 5);
const y = Math.min(parseInt(token.props.args.y ?? '1'), 5);
style = `transform: scale(${x}, ${y});`;
break;
}
case 'fg': {
let color = token.props.args.color;
if (!/^[0-9a-f]{3,6}$/i.test(color)) color = 'f00';

View File

@@ -10,8 +10,12 @@ export const apiUrl = url + '/api';
export const wsUrl = url.replace('http://', 'ws://').replace('https://', 'wss://') + '/streaming';
export const lang = miLocalStorage.getItem('lang');
export const langs = _LANGS_;
export const locale = JSON.parse(miLocalStorage.getItem('locale'));
export let locale = JSON.parse(miLocalStorage.getItem('locale'));
export const version = _VERSION_;
export const instanceName = siteName === 'Misskey' ? host : siteName;
export const ui = miLocalStorage.getItem('ui');
export const debug = miLocalStorage.getItem('debug') === 'true';
export function updateLocale(newLocale) {
locale = newLocale;
}

View File

@@ -3,3 +3,7 @@ import { locale } from '@/config';
import { I18n } from '@/scripts/i18n';
export const i18n = markRaw(new I18n(locale));
export function updateI18n(newLocale) {
i18n.ts = newLocale;
}

View File

@@ -25,10 +25,10 @@ import JSON5 from 'json5';
import widgets from '@/widgets';
import directives from '@/directives';
import components from '@/components';
import { version, ui, lang, host } from '@/config';
import { version, ui, lang, host, updateLocale } from '@/config';
import { applyTheme } from '@/scripts/theme';
import { isDeviceDarkmode } from '@/scripts/is-device-darkmode';
import { i18n } from '@/i18n';
import { i18n, updateI18n } from '@/i18n';
import { confirm, alert, post, popup, toast } from '@/os';
import { stream } from '@/stream';
import * as sound from '@/scripts/sound';
@@ -87,9 +87,12 @@ import { fetchCustomEmojis } from './custom-emojis';
if (localeOutdated) {
const res = await window.fetch(`/assets/locales/${lang}.${version}.json`);
if (res.status === 200) {
miLocalStorage.setItem('locale', await res.text());
const newLocale = await res.text();
const parsedNewLocale = JSON.parse(newLocale);
miLocalStorage.setItem('locale', newLocale);
miLocalStorage.setItem('localeVersion', version);
location.reload();
updateLocale(parsedNewLocale);
updateI18n(parsedNewLocale);
}
}
//#endregion

View File

@@ -4,11 +4,14 @@
<div style="overflow: clip;">
<MkSpacer :content-max="600" :margin-min="20">
<div class="_gaps_m znqjceqz">
<div ref="containerEl" v-panel class="about" :class="{ playing: easterEggEngine != null }">
<img src="/client-assets/about-icon.png" alt="" class="icon" draggable="false" @load="iconLoaded" @click="gravity"/>
<div class="misskey">Misskey</div>
<div class="version">v{{ version }}</div>
<span v-for="emoji in easterEggEmojis" :key="emoji.id" class="emoji" :data-physics-x="emoji.left" :data-physics-y="emoji.top" :class="{ _physics_circle_: !emoji.emoji.startsWith(':') }"><MkEmoji class="emoji" :emoji="emoji.emoji" :is-reaction="false" :normal="true" :no-style="true"/></span>
<div v-panel class="about">
<div ref="containerEl" class="container" :class="{ playing: easterEggEngine != null }">
<img src="/client-assets/about-icon.png" alt="" class="icon" draggable="false" @load="iconLoaded" @click="gravity"/>
<div class="misskey">Misskey</div>
<div class="version">v{{ version }}</div>
<span v-for="emoji in easterEggEmojis" :key="emoji.id" class="emoji" :data-physics-x="emoji.left" :data-physics-y="emoji.top" :class="{ _physics_circle_: !emoji.emoji.startsWith(':') }"><MkEmoji class="emoji" :emoji="emoji.emoji" :is-reaction="false" :normal="true" :no-style="true"/></span>
</div>
<button v-if="thereIsTreasure" class="_button treasure" @click="getTreasure"><img src="/fluent-emoji/1f3c6.png" class="treasureImg"></button>
</div>
<div style="text-align: center;">
{{ i18n.ts._aboutMisskey.about }}<br><a href="https://misskey-hub.net/docs/misskey.html" target="_blank" class="_link">{{ i18n.ts.learnMore }}</a>
@@ -37,11 +40,31 @@
</FormSection>
<FormSection>
<template #label>{{ i18n.ts._aboutMisskey.contributors }}</template>
<div class="_formLinksGrid">
<FormLink to="https://github.com/syuilo" external>@syuilo</FormLink>
<FormLink to="https://github.com/tamaina" external>@tamaina</FormLink>
<FormLink to="https://github.com/acid-chicken" external>@acid-chicken</FormLink>
<FormLink to="https://github.com/rinsuki" external>@rinsuki</FormLink>
<div :class="$style.contributors">
<a href="https://github.com/syuilo" target="_blank" :class="$style.contributor">
<img src="https://avatars.githubusercontent.com/u/4439005?v=4" :class="$style.contributorAvatar">
<span :class="$style.contributorUsername">@syuilo</span>
</a>
<a href="https://github.com/tamaina" target="_blank" :class="$style.contributor">
<img src="https://avatars.githubusercontent.com/u/7973572?v=4" :class="$style.contributorAvatar">
<span :class="$style.contributorUsername">@tamaina</span>
</a>
<a href="https://github.com/acid-chicken" target="_blank" :class="$style.contributor">
<img src="https://avatars.githubusercontent.com/u/20679825?v=4" :class="$style.contributorAvatar">
<span :class="$style.contributorUsername">@acid-chicken</span>
</a>
<a href="https://github.com/rinsuki" target="_blank" :class="$style.contributor">
<img src="https://avatars.githubusercontent.com/u/6533808?v=4" :class="$style.contributorAvatar">
<span :class="$style.contributorUsername">@rinsuki</span>
</a>
<a href="https://github.com/mei23" target="_blank" :class="$style.contributor">
<img src="https://avatars.githubusercontent.com/u/30769358?v=4" :class="$style.contributorAvatar">
<span :class="$style.contributorUsername">@mei23</span>
</a>
<a href="https://github.com/robflop" target="_blank" :class="$style.contributor">
<img src="https://avatars.githubusercontent.com/u/8159402?v=4" :class="$style.contributorAvatar">
<span :class="$style.contributorUsername">@robflop</span>
</a>
</div>
<template #caption><MkLink url="https://github.com/misskey-dev/misskey/graphs/contributors">{{ i18n.ts._aboutMisskey.allContributors }}</MkLink></template>
</FormSection>
@@ -70,6 +93,8 @@ import { i18n } from '@/i18n';
import { defaultStore } from '@/store';
import * as os from '@/os';
import { definePageMetadata } from '@/scripts/page-metadata';
import { claimAchievement, claimedAchievements } from '@/scripts/achievements';
import { $i } from '@/account';
const patrons = [
'まっちゃとーにゅ',
@@ -152,6 +177,8 @@ const patrons = [
'pixeldesu',
];
let thereIsTreasure = $ref($i && !claimedAchievements.includes('foundTreasure'));
let easterEggReady = false;
let easterEggEmojis = $ref([]);
let easterEggEngine = $ref(null);
@@ -187,6 +214,11 @@ function iLoveMisskey() {
});
}
function getTreasure() {
thereIsTreasure = false;
claimAchievement('foundTreasure');
}
onBeforeUnmount(() => {
if (easterEggEngine) {
easterEggEngine.stop();
@@ -207,54 +239,114 @@ definePageMetadata({
.znqjceqz {
> .about {
position: relative;
text-align: center;
padding: 16px;
border-radius: var(--radius);
&.playing {
&, * {
user-select: none;
}
* {
will-change: transform;
}
> .emoji {
visibility: visible;
}
}
> .icon {
display: block;
width: 80px;
margin: 0 auto;
border-radius: 16px;
}
> .misskey {
margin: 0.75em auto 0 auto;
width: max-content;
}
> .version {
margin: 0 auto;
width: max-content;
opacity: 0.5;
}
> .emoji {
> .treasure {
position: absolute;
top: 0;
top: 60px;
left: 0;
visibility: hidden;
right: 0;
margin: 0 auto;
width: min-content;
> .treasureImg {
width: 25px;
vertical-align: bottom;
}
}
> .container {
position: relative;
text-align: center;
padding: 16px;
&.playing {
&, * {
user-select: none;
}
* {
will-change: transform;
}
> .emoji {
visibility: visible;
}
}
> .icon {
display: block;
width: 80px;
margin: 0 auto;
border-radius: 16px;
position: relative;
z-index: 1;
}
> .misskey {
margin: 0.75em auto 0 auto;
width: max-content;
position: relative;
z-index: 1;
}
> .version {
margin: 0 auto;
width: max-content;
opacity: 0.5;
position: relative;
z-index: 1;
}
> .emoji {
pointer-events: none;
font-size: 24px;
width: 24px;
position: absolute;
z-index: 1;
top: 0;
left: 0;
visibility: hidden;
> .emoji {
pointer-events: none;
font-size: 24px;
width: 24px;
}
}
}
}
}
</style>
<style lang="scss" module>
.contributors {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
grid-gap: 12px;
}
.contributor {
display: flex;
align-items: center;
padding: 12px;
background: var(--buttonBg);
border-radius: 6px;
&:hover {
text-decoration: none;
background: var(--buttonHoverBg);
}
&.active {
color: var(--accent);
background: var(--buttonHoverBg);
}
}
.contributorAvatar {
width: 30px;
border-radius: 100%;
}
.contributorUsername {
margin-left: 12px;
}
</style>

View File

@@ -86,7 +86,7 @@
</template>
<script lang="ts" setup>
import { ref, computed } from 'vue';
import { ref, computed, watch } from 'vue';
import XEmojis from './about.emojis.vue';
import XFederation from './about.federation.vue';
import { version, instanceName, host } from '@/config';
@@ -100,6 +100,7 @@ import * as os from '@/os';
import number from '@/filters/number';
import { i18n } from '@/i18n';
import { definePageMetadata } from '@/scripts/page-metadata';
import { claimAchievement } from '@/scripts/achievements';
const props = withDefaults(defineProps<{
initialTab?: string;
@@ -110,6 +111,12 @@ const props = withDefaults(defineProps<{
let stats = $ref(null);
let tab = $ref(props.initialTab);
watch($$(tab), () => {
if (tab === 'charts') {
claimAchievement('viewInstanceChart');
}
});
const initStats = () => os.api('stats', {
}).then((res) => {
stats = res;

View File

@@ -38,7 +38,7 @@
<template #label>Access key</template>
</MkInput>
<MkInput v-model="objectStorageSecretKey">
<MkInput v-model="objectStorageSecretKey" type="password">
<template #prefix><i class="ti ti-key"></i></template>
<template #label>Secret key</template>
</MkInput>

View File

@@ -1,6 +1,6 @@
<template>
<button class="zuvgdzyu _button" @click="menu">
<img :src="`/emoji/${emoji.name}.webp`" class="img" loading="lazy"/>
<img :src="emoji.url" class="img" loading="lazy"/>
<div class="body">
<div class="name _monospace">{{ emoji.name }}</div>
<div class="info">{{ emoji.aliases.join(' ') }}</div>
@@ -15,7 +15,12 @@ import copyToClipboard from '@/scripts/copy-to-clipboard';
import { i18n } from '@/i18n';
const props = defineProps<{
emoji: Record<string, unknown>; // TODO
emoji: {
name: string;
aliases: string[];
category: string;
url: string;
};
}>();
function menu(ev) {

View File

@@ -1,6 +1,6 @@
<template>
<MkSpacer :content-max="1200">
<MkAchievements :user="user" :with-locked="false"/>
<MkAchievements :user="user" :with-locked="false" :with-description="$i != null && (props.user.id === $i.id)"/>
</MkSpacer>
</template>

View File

@@ -40,6 +40,7 @@ export const ACHIEVEMENT_TYPES = [
'loggedInOnNewYearsDay',
'noteClipped1',
'noteFavorited1',
'myNoteFavorited1',
'profileFilled',
'markedAsCat',
'following1',
@@ -57,12 +58,14 @@ export const ACHIEVEMENT_TYPES = [
'collectAchievements30',
'viewAchievements3min',
'iLoveMisskey',
'foundTreasure',
'client30min',
'noteDeletedWithin1min',
'postedAtLateNight',
'postedAt0min0sec',
'selfQuote',
'htl20npm',
'viewInstanceChart',
'outputHelloWorldOnScratchpad',
'open3windows',
'driveFolderCircularReference',
@@ -240,6 +243,11 @@ export const ACHIEVEMENT_BADGES = {
bg: null,
frame: 'bronze',
},
'myNoteFavorited1': {
img: '/fluent-emoji/1f320.png',
bg: null,
frame: 'silver',
},
'profileFilled': {
img: '/fluent-emoji/1f44c.png',
bg: 'linear-gradient(0deg, rgb(187 183 59), rgb(255 143 77))',
@@ -325,6 +333,11 @@ export const ACHIEVEMENT_BADGES = {
bg: 'linear-gradient(0deg, rgb(255 77 77), rgb(247 155 214))',
frame: 'silver',
},
'foundTreasure': {
img: '/fluent-emoji/1f3c6.png',
bg: 'linear-gradient(0deg, rgb(197 69 192), rgb(2 112 155))',
frame: 'gold',
},
'client30min': {
img: '/fluent-emoji/1f552.png',
bg: 'linear-gradient(0deg, rgb(220 223 225), rgb(172 192 207))',
@@ -355,6 +368,11 @@ export const ACHIEVEMENT_BADGES = {
bg: 'linear-gradient(0deg, rgb(220 223 225), rgb(172 192 207))',
frame: 'bronze',
},
'viewInstanceChart': {
img: '/fluent-emoji/1f4ca.png',
bg: 'linear-gradient(0deg, rgb(58 231 198), rgb(37 194 255))',
frame: 'bronze',
},
'outputHelloWorldOnScratchpad': {
img: '/fluent-emoji/1f530.png',
bg: 'linear-gradient(0deg, rgb(58 231 198), rgb(37 194 255))',
@@ -431,11 +449,12 @@ export const ACHIEVEMENT_BADGES = {
frame: 'bronze' | 'silver' | 'gold' | 'platinum';
}>;
export const claimedAchievements = ($i && $i.achievements) ? $i.achievements.map(x => x.name) : [];
export const claimedAchievements: typeof ACHIEVEMENT_TYPES[number][] = ($i && $i.achievements) ? $i.achievements.map(x => x.name) : [];
const claimingQueue = new Set<string>();
export async function claimAchievement(type: typeof ACHIEVEMENT_TYPES[number]) {
if ($i == null) return;
if (claimedAchievements.includes(type)) return;
claimingQueue.add(type);
claimedAchievements.push(type);

View File

@@ -303,7 +303,7 @@ function getButtonOptions(def: values.Value | undefined, call: (fn: values.VFn,
if (primary) utils.assertBoolean(primary);
const rounded = def.value.get('rounded');
if (rounded) utils.assertBoolean(rounded);
const disabled = button.value.get('disabled');
const disabled = def.value.get('disabled');
if (disabled) utils.assertBoolean(disabled);
return {

View File

@@ -1 +1 @@
export const MFM_TAGS = ['tada', 'jelly', 'twitch', 'shake', 'spin', 'jump', 'bounce', 'flip', 'x2', 'x3', 'x4', 'position', 'fg', 'bg', 'font', 'blur', 'rainbow', 'sparkle', 'rotate'];
export const MFM_TAGS = ['tada', 'jelly', 'twitch', 'shake', 'spin', 'jump', 'bounce', 'flip', 'x2', 'x3', 'x4', 'scale', 'position', 'fg', 'bg', 'font', 'blur', 'rainbow', 'sparkle', 'rotate'];

View File

@@ -54,6 +54,8 @@ export default defineConfig(({ command, mode }) => {
'@/': __dirname + '/src/',
'/client-assets/': __dirname + '/assets/',
'/static-assets/': __dirname + '/../backend/assets/',
'/fluent-emojis/': __dirname + '/../../fluent-emojis/dist/',
'/fluent-emoji/': __dirname + '/../../fluent-emojis/dist/',
},
},

42
pnpm-lock.yaml generated
View File

@@ -48,9 +48,9 @@ importers:
packages/backend:
specifiers:
'@bull-board/api': ^4.10.2
'@bull-board/fastify': ^4.10.2
'@bull-board/ui': ^4.10.2
'@bull-board/api': ^4.11.0
'@bull-board/fastify': ^4.11.0
'@bull-board/ui': ^4.11.0
'@discordapp/twemoji': 14.0.2
'@fastify/accepts': 4.1.0
'@fastify/cookie': ^8.3.0
@@ -202,7 +202,7 @@ importers:
typeorm: 0.3.11
typescript: 4.9.4
ulid: 2.3.0
undici: ^5.15.1
undici: ^5.16.0
unzipper: 0.10.11
uuid: 9.0.0
vary: 1.1.2
@@ -211,9 +211,9 @@ importers:
ws: 8.12.0
xev: 3.0.2
dependencies:
'@bull-board/api': 4.10.2
'@bull-board/fastify': 4.10.2
'@bull-board/ui': 4.10.2
'@bull-board/api': 4.11.0
'@bull-board/fastify': 4.11.0
'@bull-board/ui': 4.11.0
'@discordapp/twemoji': 14.0.2
'@fastify/accepts': 4.1.0
'@fastify/cookie': 8.3.0
@@ -308,7 +308,7 @@ importers:
typeorm: 0.3.11_ioredis@4.28.5+pg@8.8.0
typescript: 4.9.4
ulid: 2.3.0
undici: 5.15.1
undici: 5.16.0
unzipper: 0.10.11
uuid: 9.0.0
vary: 1.1.2
@@ -915,17 +915,17 @@ packages:
resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
dev: true
/@bull-board/api/4.10.2:
resolution: {integrity: sha512-lRHo0A7hsz71aOx1ZN0SmLLWfSuvKdL6EZ4imlgo5SuXGozybvlRc5KPIJU2/E1w5meoUGi+nFezBwp1gT/SMw==}
/@bull-board/api/4.11.0:
resolution: {integrity: sha512-qFnG63s3BkaslsNnXYagEUcdeK9SijZTJ+I4vMU+OiZt9VlKh01X1KjNlqjF9guvWcjk+Rg8UOMm0fWwM6PK6g==}
dependencies:
redis-info: 3.1.0
dev: false
/@bull-board/fastify/4.10.2:
resolution: {integrity: sha512-yp/TlfyfMBgR6vibyCUBOTKn2BFlBSLxkJxzlvIcMDs2Vl3PMXMs4YoCr2o3m+dXxSNzpTfomxAc5XQfJdp0VQ==}
/@bull-board/fastify/4.11.0:
resolution: {integrity: sha512-G4sAFVx5kGT5T/F2gL91RjZ2+YrMHNrLWoVo/QfHMcZe3RoOP4PpbOLgLC/O67KYn3JK6t8ysGyyP035OSJ2HA==}
dependencies:
'@bull-board/api': 4.10.2
'@bull-board/ui': 4.10.2
'@bull-board/api': 4.11.0
'@bull-board/ui': 4.11.0
'@fastify/static': 6.6.1
'@fastify/view': 7.4.0
ejs: 3.1.8
@@ -933,10 +933,10 @@ packages:
- supports-color
dev: false
/@bull-board/ui/4.10.2:
resolution: {integrity: sha512-vaHGojG5D3xjnaed3nwOaLy4Y06RgDJdYRaFR5E06SjZ0vOvjVYGD6s4cykK512Aw/ElFhKDPwzhf8BvpwAtDQ==}
/@bull-board/ui/4.11.0:
resolution: {integrity: sha512-/Yb7x/3tWxysA2jRDQ89xEPnscvfGQdf4MmDRzWH5lDkVmL8b1HvZAQxLrHcxwB6y16oorQTf/1KbRZl0rJDHg==}
dependencies:
'@bull-board/api': 4.10.2
'@bull-board/api': 4.11.0
dev: false
/@chainsafe/is-ip/2.0.1:
@@ -1077,7 +1077,7 @@ packages:
dependencies:
ky: 0.30.0
ky-universal: 0.10.1_ky@0.30.0
undici: 5.15.1
undici: 5.16.0
transitivePeerDependencies:
- web-streams-polyfill
dev: false
@@ -1402,7 +1402,7 @@ packages:
fastify-plugin: 4.5.0
pump: 3.0.0
tiny-lru: 10.0.1
undici: 5.15.1
undici: 5.16.0
dev: false
/@fastify/send/1.0.0:
@@ -13541,8 +13541,8 @@ packages:
undertaker-registry: 1.0.1
dev: false
/undici/5.15.1:
resolution: {integrity: sha512-XLk8g0WAngdvFqTI+VKfBtM4YWXgdxkf1WezC771Es0Dd+Pm1KmNx8t93WTC+Hh9tnghmVxkclU1HN+j+CvIUA==}
/undici/5.16.0:
resolution: {integrity: sha512-KWBOXNv6VX+oJQhchXieUznEmnJMqgXMbs0xxH2t8q/FUAWSJvOSr/rMaZKnX5RIVq7JDn0JbP4BOnKG2SGXLQ==}
engines: {node: '>=12.18'}
dependencies:
busboy: 1.6.0