Art/bump 2024.7.0

.github/workflows/check_copyright_year.yml

@@ -3,8 +3,8 @@ name: Check copyright year
 on:
   push:
     branches:
-      - master
-      - develop
+      - art/main
+      - art/dev
 
 jobs:
   check_copyright_year:

.github/workflows/docker-develop.yml

@@ -3,7 +3,7 @@ name: Publish Docker image (develop)
 on:
   push:
     branches:
-      - develop
+      - art/dev
   workflow_dispatch:
 
 env:

.github/workflows/docker.yml

@@ -44,8 +44,10 @@ jobs:
       - name: Log in to Docker Hub
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Build and Push to Docker Hub
         id: build
         uses: docker/build-push-action@v6

.github/workflows/dockle.yml

@@ -4,8 +4,8 @@ name: Dockle
 on:
   push:
     branches:
-      - master
-      - develop
+      - art/main
+      - art/dev
   pull_request:
 
 jobs:

.github/workflows/lint.yml

@@ -3,15 +3,8 @@ name: Lint
 on:
   push:
     branches:
-      - master
-      - develop
-    paths:
-      - packages/backend/**
-      - packages/frontend/**
-      - packages/sw/**
-      - packages/misskey-js/**
-      - packages/shared/eslint.config.js
-      - .github/workflows/lint.yml
+      - art/main
+      - art/dev
   pull_request:
     paths:
       - packages/backend/**

.github/workflows/test-backend.yml

@@ -3,13 +3,8 @@ name: Test (backend)
 on:
   push:
     branches:
-      - master
-      - develop
-    paths:
-      - packages/backend/**
-      # for permissions
-      - packages/misskey-js/**
-      - .github/workflows/test-backend.yml
+      - art/main
+      - art/dev
   pull_request:
     paths:
       - packages/backend/**

.github/workflows/test-frontend.yml

@@ -3,15 +3,8 @@ name: Test (frontend)
 on:
   push:
     branches:
-      - master
-      - develop
-    paths:
-      - packages/frontend/**
-      # for permissions
-      - packages/misskey-js/**
-      # for e2e
-      - packages/backend/**
-      - .github/workflows/test-frontend.yml
+      - art/main
+      - art/dev
   pull_request:
     paths:
       - packages/frontend/**

.github/workflows/test-misskey-js.yml

@@ -5,12 +5,9 @@ name: Test (misskey.js)
 
 on:
   push:
-    branches: [ develop ]
-    paths:
-      - packages/misskey-js/**
-      - .github/workflows/test-misskey-js.yml
+    branches: [ art/dev ]
   pull_request:
-    branches: [ develop ]
+    branches: [ art/dev ]
     paths:
       - packages/misskey-js/**
       - .github/workflows/test-misskey-js.yml

.github/workflows/test-production.yml

@@ -3,8 +3,8 @@ name: Test (production install and build)
 on:
   push:
     branches:
-      - master
-      - develop
+      - art/main
+      - art/dev
   pull_request:
 
 env:

README.md

@@ -1,3 +1,8 @@
+<div align="center">
+	<img src="https://github.com/Misskey-art/misskey/assets/56180684/852c4783-eb4d-413d-b0ce-b184e9525ec8" alt="Misskey art logo" height=200/>
+	<h2>Fork of Misskey by Misskey.art</h2>
+</div>
+
 <div align="center">
 <a href="https://misskey-hub.net">
 	<img src="./assets/title_float.svg" alt="Misskey logo" style="border-radius:50%" width="300"/>

locales/cs-CZ.yml

@@ -1367,9 +1367,9 @@ _achievements:
       title: "Štastný nový rok!"
       description: "Přihlašte se v den nového roku"
       flavor: "Na další skvělý rok v této instanci"
-    _cookieClicked:
+    _puddingClicked:
       title: "Hra, ve které klikáte na sušenky"
-      description: "Klikněte na soubor cookie"
+      description: "Klikněte na soubor pudidng"
       flavor: "Počkejte, jste na správné webové stránce?"
     _brainDiver:
       title: "Brain Diver"

locales/de-DE.yml

@@ -1506,7 +1506,7 @@ _achievements:
       title: "Frohes Neujahr"
       description: "Logge dich am Neujahrstag ein"
       flavor: "Auf ein weiteres tolles Jahr in dieser Instanz"
-    _cookieClicked:
+    _puddingClicked:
       title: "Ein Spiel, in dem du auf einen Keks klickst"
       description: "Den Keks geklickt"
       flavor: "Bist du hier richtig?"

locales/en-US.yml

@@ -437,6 +437,7 @@ exploreUsersCount: "There are {count} users"
 exploreFediverse: "Explore the Fediverse"
 popularTags: "Popular tags"
 userList: "Lists"
+toServiceArt: "Link to Service"
 about: "About"
 aboutMisskey: "About Misskey"
 administrator: "Administrator"
@@ -1645,9 +1646,9 @@ _achievements:
       title: "Happy New Year!"
       description: "Logged in on the first day of the year"
       flavor: "To another great year on this instance"
-    _cookieClicked:
-      title: "A game in which you click cookies"
-      description: "Clicked the cookie"
+    _puddingClicked:
+      title: "A game in which you click puddings"
+      description: "Clicked the pudding"
       flavor: "Wait, are you on the correct website?"
     _brainDiver:
       title: "Brain Diver"
@@ -1840,6 +1841,8 @@ _aboutMisskey:
   source: "Source code"
   original: "Original"
   thisIsModifiedVersion: "{name} uses a modified version of the original Misskey."
+  originalSource: "Original source code"
+  ioSource: "Misskey.io's source code"
   translation: "Translate Misskey"
   donate: "Donate to Misskey"
   morePatrons: "We also appreciate the support of many other helpers not listed here. Thank you! 🥰"
@@ -2264,6 +2267,7 @@ _instanceCharts:
 _timelines:
   home: "Home"
   local: "Local"
+  media: "Media"
   social: "Social"
   global: "Global"
 _play:

locales/es-ES.yml

@@ -1608,7 +1608,7 @@ _achievements:
       title: "¡Feliz Año Nuevo!"
       description: "En linea en año nuevo"
       flavor: "¡Gracias por tu apoyo a la instancia durante todo este año!"
-    _cookieClicked:
+    _puddingClicked:
       title: "Un juego para picarle a una galleta"
       description: "Picaste una galleta"
       flavor: "¿Está mal este juego?"

locales/fr-FR.yml

@@ -1467,7 +1467,7 @@ _achievements:
       description: "Vous vous êtes connecté à la date de votre anniversaire"
     _loggedInOnNewYearsDay:
       title: "Bonne année !"
-    _cookieClicked:
+    _puddingClicked:
       flavor: "Attendez une minute, vous êtes sur le mauvais site web ?"
     _brainDiver:
       flavor: "Misskey-Misskey La-Tu-Ma"

locales/id-ID.yml

@@ -1625,7 +1625,7 @@ _achievements:
       title: "Selamat Tahun Baru!"
       description: "Login di hari pertama tahun baru"
       flavor: "Untuk tahun baru yang berkah bagi instansi ini"
-    _cookieClicked:
+    _puddingClicked:
       title: "Permainan dimana kamu mengeklik kue"
       description: "Mengeklik kue"
       flavor: "Tunggu, apakah kamu sedang berada di website yang benar?"

locales/index.d.ts

@@ -1764,6 +1764,10 @@ export interface Locale extends ILocale {
      * リスト
      */
     "userList": string;
+    /**
+     * Serviceへのリンク
+     */
+    "toServiceArt": string;
     /**
      * 情報
      */
@@ -4208,6 +4212,11 @@ export interface Locale extends ILocale {
      * 連合なしにする
      */
     "disableFederationOk": string;
+    /**
+     * R18など、NSFWに相当する内容を投稿する場合は、注釈に投稿の内容に関する簡単な説明を記述してください。
+     * 詳しくはルールをご覧ください。https://service.misskey.art
+     */
+    "contentWarningCheckRule": string;
     /**
      * 現在このサーバーは招待制です。招待コードをお持ちの方のみ登録できます。
      */
@@ -6414,13 +6423,13 @@ export interface Locale extends ILocale {
                  */
                 "flavor": string;
             };
-            "_cookieClicked": {
+            "_puddingClicked": {
                 /**
-                 * クッキーをクリックするゲーム
+                 * プリンをクリックするゲーム
                  */
                 "title": string;
                 /**
-                 * クッキーをクリックした
+                 * プリンをクリックした
                  */
                 "description": string;
                 /**
@@ -7139,6 +7148,14 @@ export interface Locale extends ILocale {
          * ソースコード
          */
         "source": string;
+        /**
+         * 本家のソースコード
+         */
+        "originalSource": string;
+        /**
+         * Misskey.ioのソースコード
+         */
+        "ioSource": string;
         /**
          * オリジナル
          */
@@ -8781,6 +8798,10 @@ export interface Locale extends ILocale {
          * ローカル
          */
         "local": string;
+        /**
+         * メディア
+         */
+        "media": string;
         /**
          * ソーシャル
          */

locales/it-IT.yml

@@ -1632,9 +1632,9 @@ _achievements:
       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:
+    _puddingClicked:
       title: "Clicca il biscotto"
-      description: "Hai giocato a cliccare il cookie"
+      description: "Hai giocato a cliccare il pudding"
       flavor: "È il sito giusto?"
     _brainDiver:
       title: "Brain Diver"

locales/ja-JP.yml

@@ -437,6 +437,7 @@ exploreUsersCount: "{count}のユーザーがいます"
 exploreFediverse: "Fediverseを探索"
 popularTags: "人気のタグ"
 userList: "リスト"
+toServiceArt: "Serviceへのリンク"
 about: "情報"
 aboutMisskey: "Misskeyについて"
 administrator: "管理者"
@@ -1048,6 +1049,7 @@ letsLookAtTimeline: "タイムラインを見てみる"
 disableFederationConfirm: "連合なしにしますか？"
 disableFederationConfirmWarn: "連合なしにしても投稿は非公開になりません。ほとんどの場合、連合なしにする必要はありません。"
 disableFederationOk: "連合なしにする"
+contentWarningCheckRule: "R18など、NSFWに相当する内容を投稿する場合は、注釈に投稿の内容に関する簡単な説明を記述してください。\n詳しくはルールをご覧ください。https://service.misskey.art"
 invitationRequiredToRegister: "現在このサーバーは招待制です。招待コードをお持ちの方のみ登録できます。"
 emailNotSupported: "このサーバーではメール配信はサポートされていません"
 postToTheChannel: "チャンネルに投稿"
@@ -1655,9 +1657,9 @@ _achievements:
       title: "あけましておめでとうございます"
       description: "元日にログインした"
       flavor: "今年も弊サーバーをよろしくお願いします"
-    _cookieClicked:
-      title: "クッキーをクリックするゲーム"
-      description: "クッキーをクリックした"
+    _puddingClicked:
+      title: "プリンをクリックするゲーム"
+      description: "プリンをクリックした"
       flavor: "ソフト間違ってない？"
     _brainDiver:
       title: "Brain Diver"
@@ -1862,6 +1864,8 @@ _aboutMisskey:
   contributors: "コントリビューター"
   allContributors: "全てのコントリビューター"
   source: "ソースコード"
+  originalSource: "本家のソースコード"
+  ioSource: "Misskey.ioのソースコード"
   original: "オリジナル"
   thisIsModifiedVersion: "{name}はオリジナルのMisskeyを改変したバージョンを使用しています。"
   translation: "Misskeyを翻訳"
@@ -2317,6 +2321,7 @@ _instanceCharts:
 _timelines:
   home: "ホーム"
   local: "ローカル"
+  media: "メディア"
   social: "ソーシャル"
   global: "グローバル"
 

locales/ja-KS.yml

@@ -1614,9 +1614,9 @@ _achievements:
       title: "あけましておめでとうございます！"
       description: "元旦にログインした"
       flavor: "今年も弊サーバーをよろしゅう頼みますわ"
-    _cookieClicked:
-      title: "クッキー叩くやつ"
-      description: "クッキー叩いてもうた"
+    _puddingClicked:
+      title: "プリン叩くやつ"
+      description: "プリン叩いてもうた"
       flavor: "兄ちゃんソフト間違っとんで"
     _brainDiver:
       title: "Brain Diver"

locales/ko-KR.yml

@@ -1631,7 +1631,7 @@ _achievements:
       title: "새해 복 많이 받으세요"
       description: "새해 첫 날에 로그인했습니다"
       flavor: "올해에도 저희 서버에 관심을 가져 주셔서 감사합니다"
-    _cookieClicked:
+    _puddingClicked:
       title: "쿠키를 클릭하는 게임"
       description: "쿠키를 클릭했습니다"
       flavor: "소프트웨어 착각하지 않으셨나요?"

locales/no-NO.yml

@@ -534,7 +534,7 @@ _achievements:
     _loggedInOnNewYearsDay:
       title: "Godt nytt år"
       description: "Du logget inn på årets første dag"
-    _cookieClicked:
+    _puddingClicked:
       description: "Du klikket på kjeksen"
       flavor: "Er du på riktig nettsted?"
     _brainDiver:

locales/ru-RU.yml

@@ -1351,7 +1351,7 @@ _achievements:
       title: "С Новым годом!"
       description: "Вход на сайт в первый день года"
       flavor: "Желаем отличного года на нашем сайте!"
-    _cookieClicked:
+    _puddingClicked:
       title: "Игра, в которой вы щёлкаете по печенькам"
       description: "Нажато печенье"
       flavor: "Стоп, вы вообще на том сайте-то?"

locales/th-TH.yml

@@ -1645,7 +1645,7 @@ _achievements:
       title: "สวัสดีปีใหม่!"
       description: "เข้าสู่ระบบในวันแรกของปี"
       flavor: "อีกปีที่ยอดเยี่ยมในโอกาสนี้เลย"
-    _cookieClicked:
+    _puddingClicked:
       title: "เกมที่คุณคลิกที่คุกกี้"
       description: "คลิกคุกกี้"
       flavor: "ใช่หรอ? แน่ใจว่าซอฟต์แวร์ทำงานถูกต้องนะ?"

locales/uk-UA.yml

@@ -1132,7 +1132,7 @@ _achievements:
     _loggedInOnNewYearsDay:
       title: "З Новим роком!"
       description: "Увійшли в перший день року"
-    _cookieClicked:
+    _puddingClicked:
       flavor: "Чекайте, це вірний сайт?"
     _brainDiver:
       title: "Brain Diver"