Merge branch 'develop'

12.75.0
New Crowdin updates (#7320 )
2021-03-22 15:27:08 +09:00 · 2021-03-22 15:26:53 +09:00 · 2021-03-22 15:26:26 +09:00 · 2021-03-22 15:16:45 +09:00 · 2021-03-22 15:14:54 +09:00 · 2021-03-22 12:46:46 +09:00
468 changed files with 6832 additions and 2233 deletions
--- a/.autogen/check_pr.jq
+++ b/.autogen/check_pr.jq
@ -1,3 +0,0 @@
-.[]
-.head
-.label
--- a/.autogen/next_url.jq
+++ b/.autogen/next_url.jq
@ -1,2 +0,0 @@
-.links
-.next
--- a/.autogen/patreon.jq
+++ b/.autogen/patreon.jq
@ -1,39 +0,0 @@
-(
-  .data |
-  map(
-    select(
-      .relationships
-      .currently_entitled_tiers
-      .data[]
-    )
-  ) |
-  map(
-    .relationships
-    .user
-    .data
-    .id
-  )
-) as $data |
-.included |
-map(
-  select(
-    .id as $id |
-    $data |
-    contains(
-      [
-        $id
-      ]
-    )
-  )
-) |
-map(
-  .attributes |
-  [
-    .full_name,
-    .thumb_url,
-    .url
-  ] |
-  @tsv
-) |
-.[] |
-@text
--- a/.autogen/update_readme_patreon.sh
+++ b/.autogen/update_readme_patreon.sh
@ -1,87 +0,0 @@
-#!/usr/bin/env bash
-# __MISSKEY_BEARER_TOKEN=
-# __MISSKEY_CAMPAIGN_ID=
-# __MISSKEY_GITHUB_TOKEN=
-# __MISSKEY_HEAD=syuilo:patch-autogen
-# __MISSKEY_REPO=syuilo/misskey
-# __MISSKEY_BRANCH=develop
-test "$(curl -LSs -w '\n' -- "https://api.github.com/repos/$REPO/pulls?access_token=$__MISSKEY_GITHUB_TOKEN" | jq -r -f check_pr.jq | grep $__MISSKEY_HEAD)" && exit 1
-cd "$(dirname $0)/.." && \
-touch null.cache && \
-rm *.cache && \
-git checkout $__MISSKEY_BRANCH && \
-git pull origin $__MISSKEY_BRANCH && \
-git pull upstream $__MISSKEY_BRANCH && \
-git stash && \
-git rebase -f upstream/$__MISSKEY_BRANCH && \
-git branch patch-autogen && \
-git checkout patch-autogen && \
-git reset --hard HEAD || \
-exit 1
-touch patreon.md.cache && \
-rm patreon.md.cache && \
-echo '<!-- PATREON_START -->' > patreon.md.cache && \
-url="https://www.patreon.com/api/oauth2/v2/campaigns/$__MISSKEY_CAMPAIGN_ID/members?include=currently_entitled_tiers,user&fields%5Btier%5D=title&fields%5Buser%5D=full_name,thumb_url,url,hide_pledges"
-while :
- do
-  touch patreon.raw.cache && \
-  rm patreon.raw.cache && \
-  curl -LSs -w '\n' -H "Authorization: Bearer $__MISSKEY_BEARER_TOKEN" -- $url > patreon.raw.cache && \
-  touch patreon.cache && \
-  rm patreon.cache && \
-  cat patreon.raw.cache | \
-  jq -r -f patreon.jq >> patreon.cache && \
-  echo '<table><tr>' >> patreon.md.cache && \
-  cat patreon.cache | \
-  awk -F'\t' '{print $2,$1}' | \
-  sed -e 's/ /\\" alt=\\"/' | \
-  xargs -I% echo '<td><img src="%" width="100"></td>' >> patreon.md.cache && \
-  echo '</tr><tr>' >> patreon.md.cache && \
-  cat patreon.cache | \
-  awk -F'\t' '{print $3,$1}' | \
-  sed -e 's/ /\\">/' | \
-  xargs -I% echo '<td><a href="%</a></td>' >> patreon.md.cache && \
-  echo '</tr></table>' >> patreon.md.cache || \
-  exit 1
-  new_url="$(cat patreon.raw.cache | jq -r -f next_url.jq)"
-  test "$new_url" = 'null' && \
-  break || \
-  URL="$url"
-done
-ignore= && \
-echo -e "\n**Last updated:** $(date -uR | sed 's/\+0000/UTC/')\n<!-- PATREON_END -->" >> patreon.md.cache && \
-touch README.md && \
-touch .autogen/README.md && \
-rm .autogen/README.md && \
-mv README.md .autogen/README.md && \
-cat .autogen/README.md | while IFS= read line;
- do
-  if [[ -z "$ignore" ]]
-   then
-    if [[ "$line" = '<!-- PATREON_START -->' ]]
-     then
-      ignore='PATREON_INSIDE'
-     else
-      echo "$line" >> README.md
-    fi
-   else
-    if [[ "$LINE" = '<!-- PATREON_END -->' ]]
-     then
-      ignore=
-      cat patreon.md.cache >> README.md
-    fi
-  fi
-done
-cat patreon.md.cache
-touch null.cache && \
-rm *.cache && \
-diff .autogen/README.md README.md > diff.cache
-cat diff.cache && \
-test 4 -lt $(cat diff.cache | wc -l) && \
-git add README.md && \
-git commit -m 'Update README.md [AUTOGEN]' && \
-git push -f origin patch-autogen && \
-curl -LSs -w '\n' -X POST -d '{"title":"[AUTOMATED] Update README.md","body":"*This pull request was created by a tool.*","head":"'$__MISSKEY_HEAD'","base":"'$__MISSKEY_BRANCH'"}' -- "https://api.github.com/repos/$__MISSKEY_REPO/pulls?access_token=$__MISSKEY_GITHUB_TOKEN"
-git stash
-git checkout $__MISSKEY_BRANCH
-git branch -D patch-autogen
--- a/.eslintrc
+++ b/.eslintrc
@ -3,29 +3,11 @@
 		"parser": "@typescript-eslint/parser"
 	},
 	"extends": [
-		"eslint:recommended",
-		"plugin:vue/recommended"
+		"eslint:recommended"
 	],
 	"rules": {
-		"vue/require-v-for-key": 0,
-		"vue/max-attributes-per-line": 0,
-		"vue/html-indent": 0,
-		"vue/html-self-closing": 0,
-		"vue/no-unused-vars": 0,
-		"vue/attributes-order": 0,
-		"vue/require-prop-types": 0,
-		"vue/require-default-prop": 0,
-		"vue/html-closing-bracket-spacing": 0,
-		"vue/singleline-html-element-content-newline": 0,
-		"vue/no-v-html": 0,
 		"no-console": 0,
 		"no-unused-vars": 0,
 		"no-empty": 0
-	},
-	"globals": {
-		"ENV": true,
-		"VERSION": true,
-		"API": true,
-		"LANGS": true
 	}
 }
--- a/.node-version
+++ b/.node-version
@ -1 +1 @@
-v14.15.4
+v14.15.5
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -0,0 +1 @@
+see [releases](https://github.com/syuilo/misskey/releases)
--- a/14
+++ b/14
@ -1,4 +1,4 @@
-FROM node:14.15.4-alpine AS base
+FROM node:14.15.5-alpine3.13 AS base

 ENV NODE_ENV=production

@ -10,7 +10,6 @@ RUN apk add --no-cache \
    autoconf \
    automake \
    file \
-		git \
    g++ \
    gcc \
    libc-dev \
@ -18,8 +17,10 @@ RUN apk add --no-cache \
    make \
    nasm \
    pkgconfig \
-    python \
-    zlib-dev
+    python3 \
+    zlib-dev \
+    vips-dev \
+    vips

 COPY package.json yarn.lock ./
 RUN yarn install
@ -30,8 +31,9 @@ FROM base AS runner

 RUN apk add --no-cache \
    ffmpeg \
-    tini
-RUN npm i -g web-push
+    tini \
+    vips
+
 ENTRYPOINT ["/sbin/tini", "--"]

 COPY --from=builder /misskey/node_modules ./node_modules
--- a/src/client/assets/about-icon.png
+++ b/src/client/assets/about-icon.png
--- a/src/client/assets/fedi.jpg
+++ b/src/client/assets/fedi.jpg
--- a/src/client/assets/label-red.svg
+++ b/src/client/assets/label-red.svg
--- a/src/client/assets/label.svg
+++ b/src/client/assets/label.svg
--- a/src/client/assets/manifest.json
+++ b/src/client/assets/manifest.json
@ -7,12 +7,12 @@
 	"theme_color": "#86b300",
 	"icons": [
 		{
-			"src": "/assets/icons/192.png",
+			"src": "/static-assets/icons/192.png",
 			"sizes": "192x192",
 			"type": "image/png"
 		},
 		{
-			"src": "/assets/icons/512.png",
+			"src": "/static-assets/icons/512.png",
 			"sizes": "512x512",
 			"type": "image/png"
 		}
--- a/src/client/assets/misskey.svg
+++ b/src/client/assets/misskey.svg
--- a/src/client/assets/remove.png
+++ b/src/client/assets/remove.png
--- a/src/client/assets/room/furnitures/banknote/banknote.blend
+++ b/src/client/assets/room/furnitures/banknote/banknote.blend
--- a/src/client/assets/room/furnitures/banknote/banknote.glb
+++ b/src/client/assets/room/furnitures/banknote/banknote.glb
--- a/src/client/assets/room/furnitures/banknote/tex.png
+++ b/src/client/assets/room/furnitures/banknote/tex.png
--- a/src/client/assets/room/furnitures/bed/bed.blend
+++ b/src/client/assets/room/furnitures/bed/bed.blend
--- a/src/client/assets/room/furnitures/bed/bed.glb
+++ b/src/client/assets/room/furnitures/bed/bed.glb
--- a/src/client/assets/room/furnitures/bin/bin.blend
+++ b/src/client/assets/room/furnitures/bin/bin.blend
--- a/src/client/assets/room/furnitures/bin/bin.glb
+++ b/src/client/assets/room/furnitures/bin/bin.glb
--- a/src/client/assets/room/furnitures/book/book.blend
+++ b/src/client/assets/room/furnitures/book/book.blend
--- a/src/client/assets/room/furnitures/book/book.glb
+++ b/src/client/assets/room/furnitures/book/book.glb
--- a/src/client/assets/room/furnitures/book2/barcode.png
+++ b/src/client/assets/room/furnitures/book2/barcode.png
--- a/src/client/assets/room/furnitures/book2/book2.blend
+++ b/src/client/assets/room/furnitures/book2/book2.blend
--- a/src/client/assets/room/furnitures/book2/book2.glb
+++ b/src/client/assets/room/furnitures/book2/book2.glb
--- a/src/client/assets/room/furnitures/book2/texture.afdesign
+++ b/src/client/assets/room/furnitures/book2/texture.afdesign
--- a/src/client/assets/room/furnitures/book2/texture.png
+++ b/src/client/assets/room/furnitures/book2/texture.png
--- a/src/client/assets/room/furnitures/book2/uv.png
+++ b/src/client/assets/room/furnitures/book2/uv.png
--- a/src/client/assets/room/furnitures/cardboard-box/cardboard-box.blend
+++ b/src/client/assets/room/furnitures/cardboard-box/cardboard-box.blend
--- a/src/client/assets/room/furnitures/cardboard-box/cardboard-box.glb
+++ b/src/client/assets/room/furnitures/cardboard-box/cardboard-box.glb
--- a/src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.blend
+++ b/src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.blend
--- a/src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.glb
+++ b/src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.glb
--- a/src/client/assets/room/furnitures/cardboard-box2/texture.png
+++ b/src/client/assets/room/furnitures/cardboard-box2/texture.png
--- a/src/client/assets/room/furnitures/cardboard-box2/uv.png
+++ b/src/client/assets/room/furnitures/cardboard-box2/uv.png
--- a/src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.blend
+++ b/src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.blend
--- a/src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.glb
+++ b/src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.glb
--- a/src/client/assets/room/furnitures/cardboard-box3/texture.png
+++ b/src/client/assets/room/furnitures/cardboard-box3/texture.png
--- a/src/client/assets/room/furnitures/cardboard-box3/texture.xcf
+++ b/src/client/assets/room/furnitures/cardboard-box3/texture.xcf
--- a/src/client/assets/room/furnitures/cardboard-box3/uv.png
+++ b/src/client/assets/room/furnitures/cardboard-box3/uv.png
--- a/src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.blend
+++ b/src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.blend
--- a/src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.glb
+++ b/src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.glb
--- a/src/client/assets/room/furnitures/chair/chair.blend
+++ b/src/client/assets/room/furnitures/chair/chair.blend
--- a/src/client/assets/room/furnitures/chair/chair.glb
+++ b/src/client/assets/room/furnitures/chair/chair.glb
--- a/src/client/assets/room/furnitures/chair2/chair2.blend
+++ b/src/client/assets/room/furnitures/chair2/chair2.blend
--- a/src/client/assets/room/furnitures/chair2/chair2.glb
+++ b/src/client/assets/room/furnitures/chair2/chair2.glb
--- a/src/client/assets/room/furnitures/color-box/color-box.blend
+++ b/src/client/assets/room/furnitures/color-box/color-box.blend
--- a/src/client/assets/room/furnitures/color-box/color-box.glb
+++ b/src/client/assets/room/furnitures/color-box/color-box.glb
--- a/src/client/assets/room/furnitures/corkboard/corkboard.blend
+++ b/src/client/assets/room/furnitures/corkboard/corkboard.blend
--- a/src/client/assets/room/furnitures/corkboard/corkboard.glb
+++ b/src/client/assets/room/furnitures/corkboard/corkboard.glb
--- a/src/client/assets/room/furnitures/cube/cube.blend
+++ b/src/client/assets/room/furnitures/cube/cube.blend
--- a/src/client/assets/room/furnitures/cube/cube.glb
+++ b/src/client/assets/room/furnitures/cube/cube.glb
--- a/src/client/assets/room/furnitures/cup-noodle/cup-noodle.blend
+++ b/src/client/assets/room/furnitures/cup-noodle/cup-noodle.blend
--- a/src/client/assets/room/furnitures/cup-noodle/cup-noodle.glb
+++ b/src/client/assets/room/furnitures/cup-noodle/cup-noodle.glb
--- a/src/client/assets/room/furnitures/cup-noodle/noodle.png
+++ b/src/client/assets/room/furnitures/cup-noodle/noodle.png
--- a/src/client/assets/room/furnitures/desk/desk.blend
+++ b/src/client/assets/room/furnitures/desk/desk.blend
--- a/src/client/assets/room/furnitures/desk/desk.glb
+++ b/src/client/assets/room/furnitures/desk/desk.glb
--- a/src/client/assets/room/furnitures/doll-ai/doll-ai.blend
+++ b/src/client/assets/room/furnitures/doll-ai/doll-ai.blend
--- a/src/client/assets/room/furnitures/doll-ai/doll-ai.glb
+++ b/src/client/assets/room/furnitures/doll-ai/doll-ai.glb
--- a/src/client/assets/room/furnitures/doll-ai/doll_ai_tex.png
+++ b/src/client/assets/room/furnitures/doll-ai/doll_ai_tex.png
--- a/src/client/assets/room/furnitures/energy-drink/energy-drink.blend
+++ b/src/client/assets/room/furnitures/energy-drink/energy-drink.blend
--- a/src/client/assets/room/furnitures/energy-drink/energy-drink.glb
+++ b/src/client/assets/room/furnitures/energy-drink/energy-drink.glb
--- a/src/client/assets/room/furnitures/energy-drink/texture.afdesign
+++ b/src/client/assets/room/furnitures/energy-drink/texture.afdesign
--- a/src/client/assets/room/furnitures/energy-drink/texture.png
+++ b/src/client/assets/room/furnitures/energy-drink/texture.png
--- a/src/client/assets/room/furnitures/energy-drink/uv.png
+++ b/src/client/assets/room/furnitures/energy-drink/uv.png
--- a/src/client/assets/room/furnitures/eraser/cover.png
+++ b/src/client/assets/room/furnitures/eraser/cover.png
--- a/src/client/assets/room/furnitures/eraser/cover.psd
+++ b/src/client/assets/room/furnitures/eraser/cover.psd
--- a/src/client/assets/room/furnitures/eraser/eraser-uv.png
+++ b/src/client/assets/room/furnitures/eraser/eraser-uv.png
--- a/src/client/assets/room/furnitures/eraser/eraser.blend
+++ b/src/client/assets/room/furnitures/eraser/eraser.blend
--- a/src/client/assets/room/furnitures/eraser/eraser.glb
+++ b/src/client/assets/room/furnitures/eraser/eraser.glb
--- a/src/client/assets/room/furnitures/facial-tissue/facial-tissue-uv.png
+++ b/src/client/assets/room/furnitures/facial-tissue/facial-tissue-uv.png
--- a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.blend
+++ b/src/client/assets/room/furnitures/facial-tissue/facial-tissue.blend
--- a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.glb
+++ b/src/client/assets/room/furnitures/facial-tissue/facial-tissue.glb
--- a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.png
+++ b/src/client/assets/room/furnitures/facial-tissue/facial-tissue.png
--- a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.psd
+++ b/src/client/assets/room/furnitures/facial-tissue/facial-tissue.psd
--- a/src/client/assets/room/furnitures/fan/fan.blend
+++ b/src/client/assets/room/furnitures/fan/fan.blend
--- a/src/client/assets/room/furnitures/fan/fan.glb
+++ b/src/client/assets/room/furnitures/fan/fan.glb
--- a/src/client/assets/room/furnitures/holo-display/holo-display.blend
+++ b/src/client/assets/room/furnitures/holo-display/holo-display.blend
--- a/src/client/assets/room/furnitures/holo-display/holo-display.glb
+++ b/src/client/assets/room/furnitures/holo-display/holo-display.glb
--- a/src/client/assets/room/furnitures/holo-display/ray-uv.png
+++ b/src/client/assets/room/furnitures/holo-display/ray-uv.png
--- a/src/client/assets/room/furnitures/holo-display/ray.png
+++ b/src/client/assets/room/furnitures/holo-display/ray.png
--- a/src/client/assets/room/furnitures/keyboard/keyboard.blend
+++ b/src/client/assets/room/furnitures/keyboard/keyboard.blend
--- a/src/client/assets/room/furnitures/keyboard/keyboard.glb
+++ b/src/client/assets/room/furnitures/keyboard/keyboard.glb
--- a/src/client/assets/room/furnitures/low-table/low-table.blend
+++ b/src/client/assets/room/furnitures/low-table/low-table.blend
--- a/src/client/assets/room/furnitures/low-table/low-table.glb
+++ b/src/client/assets/room/furnitures/low-table/low-table.glb
--- a/src/client/assets/room/furnitures/mat/mat.blend
+++ b/src/client/assets/room/furnitures/mat/mat.blend
--- a/src/client/assets/room/furnitures/mat/mat.glb
+++ b/src/client/assets/room/furnitures/mat/mat.glb
--- a/src/client/assets/room/furnitures/milk/milk-uv.png
+++ b/src/client/assets/room/furnitures/milk/milk-uv.png
--- a/src/client/assets/room/furnitures/milk/milk.blend
+++ b/src/client/assets/room/furnitures/milk/milk.blend
--- a/src/client/assets/room/furnitures/milk/milk.glb
+++ b/src/client/assets/room/furnitures/milk/milk.glb
--- a/src/client/assets/room/furnitures/milk/milk.png
+++ b/src/client/assets/room/furnitures/milk/milk.png
--- a/src/client/assets/room/furnitures/milk/milk.psd
+++ b/src/client/assets/room/furnitures/milk/milk.psd
--- a/src/client/assets/room/furnitures/monitor/monitor.blend
+++ b/src/client/assets/room/furnitures/monitor/monitor.blend
--- a/src/client/assets/room/furnitures/monitor/monitor.glb
+++ b/src/client/assets/room/furnitures/monitor/monitor.glb
--- a/src/client/assets/room/furnitures/monitor/monitor.psd
+++ b/src/client/assets/room/furnitures/monitor/monitor.psd
--- a/src/client/assets/room/furnitures/monitor/screen-uv.png
+++ b/src/client/assets/room/furnitures/monitor/screen-uv.png
--- a/src/client/assets/room/furnitures/monitor/screen.jpg
+++ b/src/client/assets/room/furnitures/monitor/screen.jpg
--- a/src/client/assets/room/furnitures/moon/moon.blend
+++ b/src/client/assets/room/furnitures/moon/moon.blend
--- a/src/client/assets/room/furnitures/moon/moon.glb
+++ b/src/client/assets/room/furnitures/moon/moon.glb
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`see [releases](https://github.com/syuilo/misskey/releases)`