Merge branch 'develop'

.github/workflows/docker-develop.yml

@@ -16,16 +16,16 @@ jobs:
         uses: actions/checkout@v3.3.0
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v4
         with:
           images: misskey/misskey
       - name: Log in to Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Build and Push to Docker Hub
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           context: .
           push: true

.github/workflows/docker.yml

@@ -15,7 +15,7 @@ jobs:
         uses: actions/checkout@v3.3.0
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v4
         with:
           images: misskey/misskey
           tags: |
@@ -26,12 +26,12 @@ jobs:
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
       - name: Log in to Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Build and Push to Docker Hub
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           context: .
           push: true

CHANGELOG.md

@@ -9,6 +9,23 @@
 You should also include the user name that made the change.
 -->
 
+## 13.1.0 (2023/01/21)
+
+### Improvements
+- 実績機能
+- Playのプリセットを追加
+- Playのscriptの文字数制限を緩和
+- AiScript GUIの強化
+- リアクション一覧詳細ダイアログを表示できるように
+- 存在しないカスタム絵文字をテキストで表示するように
+- Alt text in image viewer
+- ジョブキューのプロセスとWebサーバーのプロセスを分離
+
+### Bugfixes
+- playを削除する手段がなかったのを修正
+- The … button on notes does nothing when not logged in
+- twitterと連携するときに autwh is not a function になるのを修正
+
 ## 13.0.0 (2023/01/16)
 
 ### TL;DR
@@ -32,13 +49,16 @@ You should also include the user name that made the change.
 - Elasticsearchのサポートが削除されました
 	- 代わりに今後任意の検索プロバイダを設定できる仕組みを構想しています。その仕組みを使えば今まで通りElasticsearchも利用できます
 - Yarnからpnpmに移行されました
+  corepackの有効化を推奨します: `sudo corepack enable`
 - インスタンスブロックはサブドメインにも適用されるようになります
 - ロールの導入に伴い、いくつかの機能がロールと統合されました
 	- モデレーターはロールに統合されました。今までのモデレーター情報は失われるため、予めモデレーター一覧を記録しておき、アップデート後にモデレーターロールを作りアサインし直してください。
 	- サイレンスはロールに統合されました。今までのユーザーは恩赦されるため、予めサイレンス一覧を記録しておくのをおすすめします。
 	- ユーザーごとのドライブ容量設定はロールに統合されました。
-	- インスタンスデフォルトのドライブ容量設定はロールに統合されました。アップデート後、ベースロールのドライブ容量を編集してください。
+	- インスタンスデフォルトのドライブ容量設定はロールに統合されました。アップデート後、ベースロールもしくはコンディショナルロールでドライブ容量を編集してください。
 	- LTL/GTLの解放状態はロールに統合されました。
+- Dockerの実行をrootで行わないようにしました。Dockerかつオブジェクトストレージを使用していない場合は`chown -hR 991.991 ./files`を実行してください。  
+  https://github.com/misskey-dev/misskey/pull/9560
 
 #### For users
 - ノートのウォッチ機能が削除されました

Dockerfile

@@ -6,6 +6,8 @@ RUN apt-get update \
 	&& apt-get install -y --no-install-recommends \
 	build-essential
 
+RUN corepack enable
+
 WORKDIR /misskey
 
 COPY ["pnpm-lock.yaml", "pnpm-workspace.yaml", "package.json", "./"]
@@ -14,7 +16,6 @@ COPY ["packages/backend/package.json", "./packages/backend/"]
 COPY ["packages/frontend/package.json", "./packages/frontend/"]
 COPY ["packages/sw/package.json", "./packages/sw/"]
 
-RUN npm i -g pnpm
 RUN pnpm i --frozen-lockfile
 
 COPY . ./
@@ -34,10 +35,10 @@ RUN apt-get update \
 	ffmpeg tini \
 	&& apt-get -y clean \
 	&& rm -rf /var/lib/apt/lists/* \
+	&& corepack enable \
 	&& groupadd -g "${GID}" misskey \
 	&& useradd -l -u "${UID}" -g "${GID}" -m -d /misskey misskey
 
-RUN npm i -g pnpm
 USER misskey
 WORKDIR /misskey
 

docker-compose.yml

@@ -24,7 +24,7 @@ services:
 
   redis:
     restart: always
-    image: redis:4.0-alpine
+    image: redis:7-alpine
     networks:
       - internal_network
     volumes:
@@ -36,7 +36,7 @@ services:
 
   db:
     restart: always
-    image: postgres:12.2-alpine
+    image: postgres:15-alpine
     networks:
       - internal_network
     env_file:

locales/ar-SA.yml

@@ -108,6 +108,7 @@ clickToShow: "اضغط للعرض"
 sensitive: "محتوى حساس"
 add: "إضافة"
 reaction: "التفاعلات"
+reactions: "التفاعلات"
 reactionSetting: "التفاعلات المراد عرضها في منتقي التفاعلات."
 reactionSettingDescription2: "اسحب لترتيب ، انقر للحذف ، استخدم \"+\" للإضافة."
 rememberNoteVisibility: "تذكر إعدادت مدى رؤية الملاحظات"

locales/bn-BD.yml

@@ -107,6 +107,7 @@ clickToShow: "দেখার জন্য ক্লিক করুন"
 sensitive: "সংবেদনশীল বিষয়বস্তু"
 add: "যুক্ত করুন"
 reaction: "প্রতিক্রিয়া"
+reactions: "প্রতিক্রিয়া"
 reactionSetting: "রিঅ্যাকশন পিকারে যেসকল প্রতিক্রিয়া দেখানো হবে"
 reactionSettingDescription2: "পুনরায় সাজাতে টেনে আনুন, মুছতে ক্লিক করুন, যোগ করতে + টিপুন।"
 rememberNoteVisibility: "নোটের দৃশ্যমান্যতার সেটিংস মনে রাখুন"

locales/ca-ES.yml

@@ -108,6 +108,7 @@ clickToShow: "Fes clic per mostrar"
 sensitive: "NSFW"
 add: "Afegir"
 reaction: "Reaccions"
+reactions: "Reaccions"
 reactionSetting: "Reaccions a mostrar al selector de reaccions"
 reactionSettingDescription2: "Arrossega per reordenar, fes clic per suprimir, prem \"+\" per afegir."
 rememberNoteVisibility: "Recorda la configuració de visibilitat de les notes"

locales/cs-CZ.yml

@@ -105,6 +105,7 @@ clickToShow: "Klikněte pro zobrazení"
 sensitive: "NSFW"
 add: "Přidat"
 reaction: "Reakce"
+reactions: "Reakce"
 reactionSettingDescription2: "Přetažením změníte pořadí, kliknutím smažete, zmáčkněte \"+\" k přidání"
 rememberNoteVisibility: "Zapamatovat nastavení zobrazení poznámky"
 attachCancel: "Odstranit přílohu"

locales/de-DE.yml

@@ -110,6 +110,7 @@ clickToShow: "Zum Anzeigen anklicken"
 sensitive: "NSFW"
 add: "Hinzufügen"
 reaction: "Reaktionen"
+reactions: "Reaktionen"
 reactionSetting: "In der Reaktionsauswahl anzuzeigende Reaktionen"
 reactionSettingDescription2: "Ziehe um Anzuordnen, klicke um zu löschen, drücke „+“ um hinzuzufügen"
 rememberNoteVisibility: "Notizsichtbarkeit merken"
@@ -931,10 +932,12 @@ undefined: "Undefiniert"
 assign: "Zuweisen"
 unassign: "Entfernen"
 color: "Farbe"
-manageCustomEmojis: "Benutzerdefinierte Emojis verwalten"
+manageCustomEmojis: "Kann benutzerdefinierte Emojis verwalten"
 youCannotCreateAnymore: "Du hast das Erstellungslimit erreicht."
 cannotPerformTemporary: "Vorübergehend nicht verfügbar"
 cannotPerformTemporaryDescription: "Diese Aktion ist wegen des Überschreitenes des Ausführungslimits temporär nicht verfügbar. Bitte versuche es nach einiger Zeit erneut."
+preset: "Vorlage"
+selectFromPresets: "Aus Vorlagen wählen"
 _role:
   new: "Rolle erstellen"
   edit: "Rolle bearbeiten"
@@ -943,7 +946,7 @@ _role:
   permission: "Rollenberechtigungen"
   descriptionOfPermission: "<b>Moderatoren</b> können grundlegende Verwaltungsaufgaben erledigen.\n<b>Administratoren</b> können alle Einstellungen der Instanz verwalten."
   assignTarget: "Zuweisungsart"
-  descriptionOfAssignTarget: "<b>Manuell</b> bedeutet, dass die Liste der Benutzer einer Rolle manuell verwaltet wird.\n<b>Konditionell</b> bedeutet, dass die Liste der Benutzer einer Rolle durch eine Bedingung automatisch verwaltet wird."
+  descriptionOfAssignTarget: "<b>Manuell</b> bedeutet, dass die Liste der Benutzer einer Rolle manuell verwaltet wird.\n<b>Konditional</b> bedeutet, dass die Liste der Benutzer einer Rolle durch eine Bedingung automatisch verwaltet wird."
   manual: "Manuell"
   conditional: "Konditional"
   condition: "Bedingung"
@@ -966,7 +969,7 @@ _role:
     gtlAvailable: "Kann auf die globale Chronik zugreifen"
     ltlAvailable: "Kann auf die lokale Chronik zugreifen"
     canPublicNote: "Kann öffentliche Notizen erstellen"
-    canInvite: "Einladungscodes für diese Instanz erstellen"
+    canInvite: "Kann Einladungscodes für diese Instanz erstellen"
     canManageCustomEmojis: "Benutzerdefinierte Emojis verwalten"
     driveCapacity: "Drive-Kapazität"
     pinMax: "Maximale Anzahl an angehefteten Notizen"
@@ -979,6 +982,7 @@ _role:
     userEachUserListsMax: "Maximale Anzahl an Benutzerlisten"
     rateLimitFactor: "Versuchsanzahl"
     descriptionOfRateLimitFactor: "Je niedriger desto weniger restriktiv, je höher destro restriktiver."
+    canHideAds: "Kann Werbung ausblenden"
   _condition:
     isLocal: "Lokaler Benutzer"
     isRemote: "Benutzer fremder Instanz"
@@ -1023,7 +1027,7 @@ _accountDelete:
 _ad:
   back: "Zurück"
   reduceFrequencyOfThisAd: "Diese Werbung weniger anzeigen"
-  hide: "Nie anzeigen"
+  hide: "Ausblenden"
 _forgotPassword:
   enterEmail: "Gib die Email-Adresse ein, mit der du dich registriert hast. An diese wird ein Link gesendet, mit dem du dein Passwort zurücksetzen kannst."
   ifNoEmail: "Solltest du bei der Registrierung keine Email-Adresse angegeben haben, wende dich bitte an den Administrator."

locales/el-GR.yml

@@ -103,6 +103,7 @@ you: "Εσύ"
 clickToShow: "Κάντε κλικ για εμφάνιση"
 add: "Προσθέστε"
 reaction: "Αντιδράσεις"
+reactions: "Αντιδράσεις"
 reactionSetting: "Αντιδράσεις για εμφάνιση στην επιλογή αντίδρασης"
 reactionSettingDescription2: "Σύρετε για να αλλάξετε τη σειρά, κάντε κλικ για να διαγράψετε, πατήστε \"+\" για να προσθέσετε."
 rememberNoteVisibility: "Θυμήσου τις ρυθμίσεις ορατότητας σημειώματος"

locales/en-US.yml

@@ -110,6 +110,7 @@ clickToShow: "Click to show"
 sensitive: "NSFW"
 add: "Add"
 reaction: "Reactions"
+reactions: "Reactions"
 reactionSetting: "Reactions to show in the reaction picker"
 reactionSettingDescription2: "Drag to reorder, click to delete, press \"+\" to add."
 rememberNoteVisibility: "Remember note visibility settings"
@@ -935,8 +936,41 @@ manageCustomEmojis: "Manage Custom Emojis"
 youCannotCreateAnymore: "You've hit the creation limit."
 cannotPerformTemporary: "Temporarily unavailable"
 cannotPerformTemporaryDescription: "This action cannot be performed temporarily due to exceeding the execution limit. Please wait for a while and then try again."
-preset: "Presets"
+preset: "Preset"
 selectFromPresets: "Choose from presets"
+_achievements:
+  _types:
+    _reactWithoutRead:
+      title: "Did you really read that?"
+      description: "React on a note that's over 100 characters long within 3 seconds of it being posted"
+    _clickedClickHere:
+      title: "Click here"
+      description: "You've clicked here"
+    _justPlainLucky:
+      title: "Just Plain Lucky"
+      description: "Has a chance to be obtained with a probability of 0.01% every 10 seconds"
+    _setNameToSyuilo:
+      title: "God Complex"
+      description: "Set your name to \"syuilo\""
+    _passedSinceAccountCreated1:
+      title: "One Year Anniversary"
+      description: "One year has passed since your account was created"
+    _passedSinceAccountCreated2:
+      title: "Two Year Anniversary"
+      description: "Two years have passed since your account was created"
+    _passedSinceAccountCreated3:
+      title: "Three Year Anniversary"
+      description: "Three years have passed since your account was created"
+    _loggedInOnBirthday:
+      title: "Happy Birthday"
+      description: "Logged in on your birthday"
+    _cookieClicked:
+      title: "A game in which you click cookies"
+      description: "Clicked the cookie"
+    _brainDiver:
+      title: "Brain Diver"
+      description: "Post the link to Brain Diver"
+      flavor: "Misskey-Misskey La-Tu-Ma"
 _role:
   new: "New role"
   edit: "Edit role"
@@ -954,22 +988,22 @@ _role:
   descriptionOfIsPublic: "Anyone will be able to view a list of users assigned to this role. In addition, this role will be displayed in the profiles of assigned users."
   options: "Role options"
   policies: "Policies"
-  baseRole: "Base role"
-  useBaseValue: "Use base role value"
+  baseRole: "Role template"
+  useBaseValue: "Use role template value"
   chooseRoleToAssign: "Select the role to assign"
-  canEditMembersByModerator: "Allow moderators to edit the list members of this role"
+  canEditMembersByModerator: "Allow moderators to edit the list of members for this role"
   descriptionOfCanEditMembersByModerator: "When turned on, moderators as well as administrators will be able to assign and unassign users to this role. When turned off, only administrators will be able to assign users."
   priority: "Priority"
   _priority:
     low: "Low"
     middle: "Medium"
     high: "High"
   _options:
-    gtlAvailable: "Viewing the global timeline"
-    ltlAvailable: "Viewing the local timeline"
+    gtlAvailable: "Can view the global timeline"
+    ltlAvailable: "Can view the local timeline"
     canPublicNote: "Can send public notes"
-    canInvite: "Create instance invite codes"
-    canManageCustomEmojis: "Manage Custom Emojis"
+    canInvite: "Can create instance invite codes"
+    canManageCustomEmojis: "Can manage custom emojis"
     driveCapacity: "Drive capacity"
     pinMax: "Maximum number of pinned notes"
     antennaMax: "Maximum number of antennas"
@@ -981,7 +1015,7 @@ _role:
     userEachUserListsMax: "Maximum number of users within a user list"
     rateLimitFactor: "Rate limit"
     descriptionOfRateLimitFactor: "Lower rate limits are less restrictive, higher ones more restrictive. "
-    canHideAds: "Remove ads"
+    canHideAds: "Can hide ads"
   _condition:
     isLocal: "Local user"
     isRemote: "Remote user"
@@ -1026,7 +1060,7 @@ _accountDelete:
 _ad:
   back: "Back"
   reduceFrequencyOfThisAd: "Show this ad less"
-  hide: "Never show"
+  hide: "Hide"
 _forgotPassword:
   enterEmail: "Enter the email address you used to register. A link with which you can reset your password will then be sent to it."
   ifNoEmail: "If you did not use an email during registration, please contact the instance administrator instead."
@@ -1586,6 +1620,7 @@ _notification:
   pollEnded: "Poll results have become available"
   unreadAntennaNote: "Antenna {name}"
   emptyPushNotificationMessage: "Push notifications have been updated"
+  achievementEarned: "Achievement unlocked"
   _types:
     all: "All"
     follow: "New followers"

locales/es-ES.yml

@@ -110,6 +110,7 @@ clickToShow: "Click para ver"
 sensitive: "Marcado como sensible"
 add: "Agregar"
 reaction: "Reacción"
+reactions: "Reacción"
 reactionSetting: "Reacciones para mostrar en el menú de reacciones"
 reactionSettingDescription2: "Arrastre para reordenar, click para borrar, apriete la tecla + para añadir."
 rememberNoteVisibility: "Recordar visibilidad"

locales/fr-FR.yml

@@ -110,6 +110,7 @@ clickToShow: "Cliquer pour afficher"
 sensitive: "Contenu sensible"
 add: "Ajouter"
 reaction: "Réactions"
+reactions: "Réactions"
 reactionSetting: "Réactions à afficher dans le sélecteur de réactions"
 reactionSettingDescription2: "Déplacer pour réorganiser, cliquer pour effacer, utiliser « + » pour ajouter."
 rememberNoteVisibility: "Activer l'option \" se souvenir de la visibilité des notes \" vous permet de réutiliser automatiquement la visibilité utilisée lors de la publication de votre note précédente."