Merge pull request #8 from Misskey-art/art/dev

Release v13.13.2-art_1.0

.github/workflows/check_copyright_year.yml

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

.github/workflows/docker-develop.yml

@@ -3,12 +3,18 @@ name: Publish Docker image (develop)
 on:
   push:
     branches:
-      - develop
+      - art/dev
   workflow_dispatch:
 
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
 jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub
+    permissions:
+      packages: write
     runs-on: ubuntu-latest
     if: github.repository == 'misskey-dev/misskey'
     steps:
@@ -23,12 +29,14 @@ jobs:
         id: meta
         uses: docker/metadata-action@v4
         with:
-          images: misskey/misskey
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-      - name: Log in to Docker Hub
+      - name: Log in to the Container registry
         uses: docker/login-action@v2
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
+          registry: ${{ env.REGISTRY }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+  
       - name: Build and Push to Docker Hub
         uses: docker/build-push-action@v4
         with:

.github/workflows/docker.yml

@@ -5,9 +5,15 @@ on:
     types: [published]
   workflow_dispatch:
 
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+    
 jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub
+    permissions:
+      packages: write
     runs-on: ubuntu-latest
 
     steps:
@@ -22,7 +28,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@v4
         with:
-          images: misskey/misskey
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
             type=edge
             type=ref,event=pr
@@ -30,11 +36,13 @@ jobs:
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
-      - name: Log in to Docker Hub
+      - name: Log in to the Container registry
         uses: docker/login-action@v2
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
+          registry: ${{ env.REGISTRY }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Build and Push to Docker Hub
         uses: docker/build-push-action@v4
         with:

.github/workflows/dockle.yml

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

.github/workflows/lint.yml

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

.github/workflows/reviewer_lottery.yml

@@ -1,13 +0,0 @@
-name: "Reviewer lottery"
-on:
-  pull_request_target:
-    types: [opened, ready_for_review, reopened]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-    - uses: uesteibar/reviewer-lottery@v2
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/storybook.yml

@@ -5,7 +5,7 @@ on:
     branches:
       - master
       - develop
-  pull_request_target:
+  # pull_request_target:
 
 jobs:
   build:

.github/workflows/test-backend.yml

@@ -3,8 +3,8 @@ name: Test (backend)
 on:
   push:
     branches:
-      - master
+      - art/main
-      - develop
+      - art/dev
   pull_request:
 
 jobs:

.github/workflows/test-frontend.yml

@@ -3,8 +3,8 @@ name: Test (frontend)
 on:
   push:
     branches:
-      - master
+      - art/main
-      - develop
+      - art/dev
   pull_request:
 
 jobs:

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

@@ -5,9 +5,9 @@ name: Test (misskey.js)
 
 on:
   push:
-    branches: [ develop ]
+    branches: [ art/dev ]
   pull_request:
-    branches: [ develop ]
+    branches: [ art/dev ]
 
 jobs:
   test:

.github/workflows/test-production.yml

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

locales/index.d.ts

@@ -988,6 +988,7 @@ export interface Locale {
     "disableFederationConfirm": string;
     "disableFederationConfirmWarn": string;
     "disableFederationOk": string;
+    "contentWarningCheckRule": string;
     "invitationRequiredToRegister": string;
     "emailNotSupported": string;
     "postToTheChannel": string;

locales/ja-JP.yml

@@ -985,6 +985,7 @@ letsLookAtTimeline: "タイムラインを見てみる"
 disableFederationConfirm: "連合なしにしますか？"
 disableFederationConfirmWarn: "連合なしにしても投稿は非公開になりません。ほとんどの場合、連合なしにする必要はありません。"
 disableFederationOk: "連合なしにする"
+contentWarningCheckRule: "R18に相当する内容を投稿する場合は、注釈に投稿の内容に関する簡単な説明を記述してください。\n詳しくはルールをご覧ください。https://service.misskey.art"
 invitationRequiredToRegister: "現在このサーバーは招待制です。招待コードをお持ちの方のみ登録できます。"
 emailNotSupported: "このサーバーではメール配信はサポートされていません"
 postToTheChannel: "チャンネルに投稿"

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "13.13.2",
+	"version": "13.13.2-art_1.0",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

packages/backend/src/server/web/manifest.json

@@ -7,13 +7,13 @@
 	"theme_color": "#86b300",
 	"icons": [
 		{
-			"src": "/static-assets/icons/192.png",
+			"src": "/static-assets/icons/192art.png",
 			"sizes": "192x192",
 			"type": "image/png",
 			"purpose": "maskable"
 		},
 		{
-			"src": "/static-assets/icons/512.png",
+			"src": "/static-assets/icons/512art.png",
 			"sizes": "512x512",
 			"type": "image/png",
 			"purpose": "maskable"

packages/frontend/src/components/MkPostForm.vue

@@ -59,6 +59,7 @@
 			<button class="_buttonPrimary" style="padding: 4px; border-radius: 8px;" @click="addVisibleUser"><i class="ti ti-plus ti-fw"></i></button>
 		</div>
 	</div>
+	<MkInfo v-if="useCw" warn :class="$style.contentWarningCheckRule">{{ i18n.ts.contentWarningCheckRule }}</MkInfo>
 	<MkInfo v-if="hasNotSpecifiedMentions" warn :class="$style.hasNotSpecifiedMentions">{{ i18n.ts.notSpecifiedMentionWarning }} - <button class="_textButton" @click="addMissingMention()">{{ i18n.ts.add }}</button></MkInfo>
 	<input v-show="useCw" ref="cwInputEl" v-model="cw" :class="$style.cw" :placeholder="i18n.ts.annotation" @keydown="onKeydown">
 	<div :class="[$style.textOuter, { [$style.withCw]: useCw }]">
@@ -1046,6 +1047,10 @@ defineExpose({
 	background: var(--X4);
 }
 
+.contentWarningCheckRule {
+	margin: 0 20px 16px 20px;
+}
+
 .hasNotSpecifiedMentions {
 	margin: 0 20px 16px 20px;
 }