Merge branch 'develop'

This reverts commit 1dbce5e3e2.

.autogen/check_pr.jq

@@ -1,3 +0,0 @@
-.[]
-.head
-.label

.autogen/next_url.jq

@@ -1,2 +0,0 @@
-.links
-.next

.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

.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

.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
 	}
 }

.github/ISSUE_TEMPLATE/01_bug-report.md

@@ -7,6 +7,11 @@ assignees: ''
 
 ---
 
+<!--
+Thanks for reporting!
+First, in order to avoid duplicate Issues, please search to see if the problem you found has already been reported.
+-->
+
 ## 💡 Summary
 
 <!-- Tell us what the bug is -->

.github/workflows/docker.yml

@@ -1,18 +0,0 @@
-name: Docker build
-on:
-  push:
-    branches:
-      - master
-      - develop
-  pull_request:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Pull previous build result (for cache)
-      run: docker pull misskey/misskey:latest
-    - name: Build docker container
-      run: docker build --cache-from misskey/misskey:latest -t misskey/misskey .

.mocharc.json

@@ -1,6 +1,6 @@
 {
 	"extension": ["ts","js","cjs","mjs"],
-	"require": "ts-node/register",
+	"require": ["ts-node/register", "tsconfig-paths/register"],
 	"slow": 1000,
 	"timeout": 30000,
 	"exit": true

.node-version

@@ -1 +1 @@
-v14.15.1
+v14.15.5

CHANGELOG.md

@@ -0,0 +1 @@
+see [releases](https://github.com/misskey-dev/misskey/releases)

CONTRIBUTING.md

@@ -8,7 +8,7 @@
   - 温度感高めで見てほしいものは責付いてください。
 
 ## Issues
-Feature suggestions and bug reports are filed in https://github.com/syuilo/misskey/issues .
+Feature suggestions and bug reports are filed in https://github.com/misskey-dev/misskey/issues .
 
 * Please search existing issues to avoid duplication. If your issue is already filed, please add your reaction or comment to the existing one.
 * If you have multiple independent issues, please submit them separately.
@@ -240,36 +240,6 @@ SQLでは配列のインデックスは**1始まり**。
 MongoDBの時とは違い、findOneでレコードを取得する時に対象レコードが存在しない場合 **`undefined`** が返ってくるので注意。
 MongoDBは`null`で返してきてたので、その感覚で`if (x === null)`とか書くとバグる。代わりに`if (x == null)`と書いてください
 
-### 簡素な`undefined`チェック
-データベースからレコードを取得するときに、プログラムの流れ的に(ほぼ)絶対`undefined`にはならない場合でも、`undefined`チェックしないとTypeScriptに怒られます。
-でもいちいち複数行を費やして、発生するはずのない`undefined`をチェックするのも面倒なので、`ensure`というユーティリティ関数を用意しています。
-例えば、
-``` ts
-const user = await Users.findOne(userId);
-// この時点で user の型は User | undefined
-if (user == null) {
-	throw 'missing user';
-}
-// この時点で user の型は User
-```
-という処理を`ensure`を使うと
-``` ts
-const user = await Users.findOne(userId).then(ensure);
-// この時点で user の型は User
-```
-という風に書けます。
-もちろん`ensure`内部でエラーを握りつぶすようなことはしておらず、万が一`undefined`だった場合はPromiseがRejectされ後続の処理は実行されません。
-``` ts
-const user = await Users.findOne(userId).then(ensure);
-// 万が一 Users.findOne の結果が undefined だったら、ensure でエラーが発生するので
-// この行に到達することは無い
-// なので、.then(ensure) は
-// if (user == null) {
-//	throw 'missing user';
-// }
-// の糖衣構文のような扱いです
-```
-
 ### Migration作成方法
 ```
 npx ts-node ./node_modules/typeorm/cli.js migration:generate -n 変更の名前

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:14.15.1-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

README.md

@@ -1,78 +1,67 @@
-<a href="https://xn--931a.moe/"><img src="https://github.com/syuilo/misskey/blob/develop/assets/ai-orig.png?raw=true" align="right" height="320px"/></a>
+[![Misskey](/assets/about/banner.svg)](https://join.misskey.page/)
 
-[![Misskey](/assets/title.png)](https://join.misskey.page/)
-================================================================
+<h1 align="center">Misskey</h1>
 
-[![CircleCI](https://img.shields.io/circleci/project/github/syuilo/misskey.svg?style=for-the-badge&logo=circleci)](https://circleci.com/gh/syuilo/misskey)
-[![Dependencies](https://img.shields.io/david/syuilo/misskey.svg?style=for-the-badge&logo=npm)](https://david-dm.org/syuilo/misskey)
+<div align="center">
+
+[![CircleCI](https://img.shields.io/circleci/project/github/misskey-dev/misskey.svg?style=for-the-badge&logo=circleci)](https://circleci.com/gh/misskey-dev/misskey)
+[![Dependencies](https://img.shields.io/david/misskey-dev/misskey.svg?style=for-the-badge&logo=npm)](https://david-dm.org/misskey-dev/misskey)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=for-the-badge&logo=github)](http://makeapullrequest.com)
 [![Awesome Humane Tech](https://raw.githubusercontent.com/humanetech-community/awesome-humane-tech/main/humane-tech-badge.svg?sanitize=true)](https://github.com/humanetech-community/awesome-humane-tech)
 
 **A forever evolving, interplanetary microblogging platform.**
 
-<p align="justify">
 <a href="https://join.misskey.page/">Misskey</a> is a decentralized microblogging platform born on Earth.
 Since it exists within the Fediverse (a universe where various social media platforms are organized),
 it is mutually linked with other social media platforms.
 Why don't you take a short break from the hustle and bustle of the city, and dive into a new Internet? <a href="https://join.misskey.page/">Find an instance!</a>
-</p>
 
 <a href="https://www.patreon.com/syuilo"><img src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" alt="Become a Patron!" width="160" /></a>
 
+</div>
+
+---
+
+Do you have a question? Or are you experiencing trouble?
+Visit [our forum](https://forum.misskey.io/)!
+
+---
+
 ![](https://ja.mstdn.wiki/images/e/ed/Deck.jpg)
 
 :sparkles: Features
 ----------------------------------------------------------------
+<a href="https://xn--931a.moe/"><img src="https://github.com/misskey-dev/misskey/blob/develop/assets/ai-orig.png?raw=true" align="right" height="320px"/></a>
 
-<img src="/assets/about/post.png" align="left" height="200px"/>
-
-<h3 align="left">Posting</h3>
-<p align="justify">
+<h3>Posting</h3>
+<p>
 Post your ideas, discussion topics, fun moments, or anything else you want to share! Misskey supports text, emoji, pictures, videos, and polls!
 </p>
 
 ---
 
-<img src="/assets/about/reaction.png" align="right" height="200px"/>
-
-<h3 align="right">Reactions</h3>
-<p align="justify">
+<h3 >Reactions</h3>
+<p>
 Reactions are the simplest way to respond to others' posts. Simply pick a reaction emote from the list! Reactions on Misskey are much more expressive than other social media services which only allow “liking”.
 </p>
 
 ---
 
-<img src="/assets/about/ui.png" align="left" height="200px"/>
-
-<h3 align="left">Interface</h3>
-<p align="justify">
+<h3>Interface</h3>
+<p>
 Customize the UI to your own tastes! No UI will work for everyone, so Misskey is completely customizable. Make Misskey *yours* by editing the style, adjusting timeline layouts, and placing widgets.
 </p>
 
 ---
 
-<img src="/assets/about/drive.png" align="right" width="300px"/>
-
-<h3 align="right">Misskey Drive</h3>
-<p align="justify">
+<h3>Misskey Drive</h3>
+<p>
 Organize and store your files! Want to post a picture you have already uploaded? Wish you could organize your files into folders? Misskey Drive is a solution!
 </p>
 
 ---
 
-...and more! Experience Misskey with your own eyes at [misskey.io](https://misskey.io/) or join one of the [other instances](https://joinmisskey.github.io/) that are available.
-
-Screen shots
-----------------------------------------------------------------
-### Profile page
-<img src="/assets/ss/user.jpg" width="500px"/>
-
-### Explore users
-<img src="/assets/ss/explore.jpg" width="500px"/>
-
-:new: What's new
-----------------------------------------------------------------
-Please see the [Release notes](./CHANGELOG.md).
+...and more!
 
 :package: Create your own instance
 ----------------------------------------------------------------
@@ -106,6 +95,10 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 	</tr>
 </table>
 
+---
+
+To receive updates of this repo, follow [@repo@misskey.io](https://misskey.io/@repo) on fediverse.
+
 :heart: Backers
 ----------------------------------------------------------------
 <!-- PATREON_START -->