diff --git a/.github/workflows/check_copyright_year.yml b/.github/workflows/check_copyright_year.yml
index 8daea44a83..ecb487ace3 100644
--- a/.github/workflows/check_copyright_year.yml
+++ b/.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:
diff --git a/.github/workflows/docker-develop.yml b/.github/workflows/docker-develop.yml
index 09a2c33e0c..56b2f0a11c 100644
--- a/.github/workflows/docker-develop.yml
+++ b/.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
- - name: Log in to Docker Hub
+ images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+ - name: Log in to the Container registry
uses: docker/login-action@v2
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
uses: docker/build-push-action@v4
with:
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index a465d92eaf..046006bdf6 100644
--- a/.github/workflows/docker.yml
+++ b/.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 }}
- password: ${{ secrets.DOCKER_PASSWORD }}
+ registry: ${{ env.REGISTRY }}
+ username: ${{ github.actor }}
+ password: ${{ secrets.GITHUB_TOKEN }}
+
- name: Build and Push to Docker Hub
uses: docker/build-push-action@v4
with:
diff --git a/.github/workflows/dockle.yml b/.github/workflows/dockle.yml
index 9b79ee54f0..b31ff5ad7c 100644
--- a/.github/workflows/dockle.yml
+++ b/.github/workflows/dockle.yml
@@ -4,8 +4,8 @@ name: Dockle
on:
push:
branches:
- - master
- - develop
+ - art/main
+ - art/dev
pull_request:
jobs:
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 0f3702f958..ca34626e78 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -3,8 +3,8 @@ name: Lint
on:
push:
branches:
- - master
- - develop
+ - art/main
+ - art/dev
pull_request:
jobs:
diff --git a/.github/workflows/reviewer_lottery.yml b/.github/workflows/reviewer_lottery.yml
deleted file mode 100644
index 33228d7465..0000000000
--- a/.github/workflows/reviewer_lottery.yml
+++ /dev/null
@@ -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 }}
diff --git a/.github/workflows/storybook.yml b/.github/workflows/storybook.yml
index 6cb1b34997..07d8cfa696 100644
--- a/.github/workflows/storybook.yml
+++ b/.github/workflows/storybook.yml
@@ -5,7 +5,7 @@ on:
branches:
- master
- develop
- pull_request_target:
+ # pull_request_target:
jobs:
build:
diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index d7be15bd4f..4f9f76ec87 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -3,8 +3,8 @@ name: Test (backend)
on:
push:
branches:
- - master
- - develop
+ - art/main
+ - art/dev
pull_request:
jobs:
diff --git a/.github/workflows/test-frontend.yml b/.github/workflows/test-frontend.yml
index 4ea4ba4628..3fc487b48a 100644
--- a/.github/workflows/test-frontend.yml
+++ b/.github/workflows/test-frontend.yml
@@ -3,8 +3,8 @@ name: Test (frontend)
on:
push:
branches:
- - master
- - develop
+ - art/main
+ - art/dev
pull_request:
jobs:
diff --git a/.github/workflows/test-misskey-js.yml b/.github/workflows/test-misskey-js.yml
index b15e704c7f..c7fd97b69c 100644
--- a/.github/workflows/test-misskey-js.yml
+++ b/.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:
diff --git a/.github/workflows/test-production.yml b/.github/workflows/test-production.yml
index 5243a83777..28e5c4fc29 100644
--- a/.github/workflows/test-production.yml
+++ b/.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:
diff --git a/locales/index.d.ts b/locales/index.d.ts
index eed29f408c..6ebb3d2abb 100644
--- a/locales/index.d.ts
+++ b/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;
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 8004e53575..1262805559 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -985,6 +985,7 @@ letsLookAtTimeline: "タイムラインを見てみる"
disableFederationConfirm: "連合なしにしますか?"
disableFederationConfirmWarn: "連合なしにしても投稿は非公開になりません。ほとんどの場合、連合なしにする必要はありません。"
disableFederationOk: "連合なしにする"
+contentWarningCheckRule: "R18に相当する内容を投稿する場合は、注釈に投稿の内容に関する簡単な説明を記述してください。\n詳しくはルールをご覧ください。https://service.misskey.art"
invitationRequiredToRegister: "現在このサーバーは招待制です。招待コードをお持ちの方のみ登録できます。"
emailNotSupported: "このサーバーではメール配信はサポートされていません"
postToTheChannel: "チャンネルに投稿"
diff --git a/package.json b/package.json
index dd0c1d57e7..3de1b9da22 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "misskey",
- "version": "13.13.2",
+ "version": "13.13.2-art_1.0",
"codename": "nasubi",
"repository": {
"type": "git",
diff --git a/packages/backend/assets/favicon.ico b/packages/backend/assets/favicon.ico
index 9be1ff6295..b813b8cc28 100644
Binary files a/packages/backend/assets/favicon.ico and b/packages/backend/assets/favicon.ico differ
diff --git a/packages/backend/assets/favicon.png b/packages/backend/assets/favicon.png
index b4eb18a5cb..110e0e0707 100644
Binary files a/packages/backend/assets/favicon.png and b/packages/backend/assets/favicon.png differ
diff --git a/packages/backend/assets/icons/192.png b/packages/backend/assets/icons/192.png
deleted file mode 100644
index 15fd1e3731..0000000000
Binary files a/packages/backend/assets/icons/192.png and /dev/null differ
diff --git a/packages/backend/assets/icons/192art.png b/packages/backend/assets/icons/192art.png
new file mode 100644
index 0000000000..ab5c4f51bd
Binary files /dev/null and b/packages/backend/assets/icons/192art.png differ
diff --git a/packages/backend/assets/icons/512.png b/packages/backend/assets/icons/512.png
deleted file mode 100644
index f2169ec9b0..0000000000
Binary files a/packages/backend/assets/icons/512.png and /dev/null differ
diff --git a/packages/backend/assets/icons/512art.png b/packages/backend/assets/icons/512art.png
new file mode 100644
index 0000000000..9ddc462b9f
Binary files /dev/null and b/packages/backend/assets/icons/512art.png differ
diff --git a/packages/backend/assets/icons/mi-art.png b/packages/backend/assets/icons/mi-art.png
new file mode 100644
index 0000000000..9ddc462b9f
Binary files /dev/null and b/packages/backend/assets/icons/mi-art.png differ
diff --git a/packages/backend/assets/splash.png b/packages/backend/assets/splash.png
index 3430e6efe7..4d84283787 100644
Binary files a/packages/backend/assets/splash.png and b/packages/backend/assets/splash.png differ
diff --git a/packages/backend/src/server/web/manifest.json b/packages/backend/src/server/web/manifest.json
index 41171d62a1..c57fbfe5b6 100644
--- a/packages/backend/src/server/web/manifest.json
+++ b/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"
diff --git a/packages/frontend/assets/cookie.png b/packages/frontend/assets/cookie.png
index 4a7f040613..ce87628e8b 100644
Binary files a/packages/frontend/assets/cookie.png and b/packages/frontend/assets/cookie.png differ
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index 5c65569683..6b49ef82e1 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -59,6 +59,7 @@
+