Merge pull request #1790 from TeamBlackCrystal/next

feat: next

.github/workflows/e2e.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [14.x, 16.x, 17.x, 18.x]
+        node-version: [14.x, 16.x, 18.x]
         python-version: [3.9]
 
     services:
@@ -59,6 +59,7 @@ jobs:
       working-directory: ./e2e
 
     - name: Upload E2E ScreenShots
+      if: always()
       uses: actions/upload-artifact@v2
       with:
         name: ScreenShots-${{ matrix.node-version }}

.github/workflows/hub-docker-push.yml

@@ -0,0 +1,52 @@
+name: Publish DockerHub image
+
+on:
+#  release:
+#    types: [published]
+  workflow_dispatch:
+    inputs:
+      buildVersion:
+        description: 'input build version. ex: 11.37.1-rei0784-5.99.0'
+        required: true
+        default: ''
+      buildId:
+        description: 'input build id. ex: 1'
+        required: true
+        default: ''
+      confirm:
+        description: 'If run flow, input "run".'
+        required: true
+        default: ''
+
+jobs:
+  push_to_registry:
+    if: github.event.inputs.confirm == 'run'
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v2
+      - name: Setup QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: sousuke0422/misskey
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Build and Push to Docker Hub
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+#          tags: ${{ steps.meta.outputs.tags }}
+          tags: sousuke0422/misskey:latest,sousuke0422/misskey:11,sousuke0422/misskey:${{ github.event.inputs.buildVersion }}-${{ github.event.inputs.buildId }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/nodejs.yml

@@ -9,20 +9,20 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x, 16.x, 17.x, 18.x]
+        node-version: [14.x, 16.x, 18.x]
 
     services:
       postgres:
-        image: postgres:10-alpine
+        image: postgres:11.2-alpine
         ports:
           - 54311:5432
         env:
           POSTGRES_DB: test-misskey
           POSTGRES_HOST_AUTH_METHOD: trust
       redis:
-        image: redis:alpine
+        image: redis:4.0-alpine
         ports:
-          - 6379:6379
+          - 56311:6379
 
     steps:
     - uses: actions/checkout@v2
@@ -34,6 +34,7 @@ jobs:
         node-version: ${{ matrix.node-version }}
         cache: 'yarn'
     - run: node devtools/diag-environment.js
+    - run: sudo apt-get install -y ffmpeg
     - run: yarn install
     - run: yarn build
     - run: cp test/test.yml .config

CHANGELOG.md

@@ -15,6 +15,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- 依存関係が更新されました。脆弱性が修正されている場合があります。
+  - CVE-2022-29256 (sharp)
+	- CVE-2022-33987 (got)
+
+### Added
+
+- ~~Twemojiをインスタンスで配信~~
+  - オプション化し、使用するcdnを変更
+- 引越し先をユーザーページに表示するように
+- 投稿ページのURLで埋め込みプレイヤーを提供するように
+
+## Changed
+
+- emojilistを更新
+- クエリの最適化
+- dockerでnode@18を使用します
+
 ## [11.37.1-rei0784-5.21.1] 2022-07-28
 
 ### Fixed
@@ -26,6 +45,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - 依存関係が更新されました。脆弱性が修正されている場合があります。
+- antenna, clip, listのパフォーマンス悪いのを修正
+  - *ayuskeyではantenna, clipのapiのみを提供しています。*
 
 ## Changed
 

Dockerfile

@@ -1,7 +1,5 @@
 FROM node:18.6.0-alpine3.15 AS base
 
-ENV NODE_ENV=production
-
 WORKDIR /misskey
 
 FROM base AS builder
@@ -21,9 +19,12 @@ RUN apk add --no-cache \
     zlib-dev \
 		git
 
-COPY package.json yarn.lock ./
-RUN yarn install
 COPY . ./
+
+RUN yarn install
+
+ENV NODE_ENV=production
+
 RUN yarn build
 
 FROM base AS runner

README.md

@@ -34,12 +34,24 @@ Fediverseの世界に漂うため、Misskeyをはじめとした他のソーシ
 * [TenCha](https://github.com/coke12103/TenCha)
   * isLadyをサポート
 
-## ライブラリ
+## ライブラリ（Ayuskey動作保証）
 
+* [MiPA(Mi.py互換)](https://github.com/yupix/mipa)
+  * bot向けフレームワーク
+  * misskey(v12)対応
+* [MiPAC](https://github.com/yupix/mipac)
+  * [MiPA](https://github.com/yupix/mipa)の内部APIです。
+  * MisskeyのAPI Wrapperであり、オブジェクト的にAPIを操作することができます
+  * misskey(v12)対応
 * ~~[Mi.py](https://github.com/yupix/Mi.py)~~
-  * **開発終了**
+  * **開発終了の為非推奨**
   * bot向けフレームワーク
-  * ayuskey動作保証、misskey(v12)対応
+  * misskey(v12)対応
+  * 今後新たにBOTを作成する場合は [MiPA](https://github.com/yupix/mipa) をご利用ください
+
+## ライブラリ（Ayuskey動作未保障）
+
+* [Misskey.py](https://github.com/YuzuRyo61/Misskey.py)
 
 <details>
 <summary>内部</summary>

chart/Chart.yaml

@@ -0,0 +1,3 @@
+apiVersion: v2
+name: ayuskey
+version: 0.0.0

chart/files/default.yml

@@ -0,0 +1,173 @@
+#━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+# Misskey configuration
+#━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+#      ┌─────┐
+#───┘ URL      └─────────────────────────────────────────────────────
+
+# Final accessible URL seen by a user.
+url: https://example.tld/
+
+# ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
+# URL SETTINGS AFTER THAT!
+
+#      ┌───────────────┐
+#───┘ Port settings                └───────────────────────────────────────────
+
+#                 +----- https://example.tld/ ------------+
+#   +------+      |+-------------+      +----------------+|
+#   | User | ---> || Proxy (443) | ---> | Misskey (3000) ||
+#   +------+      |+-------------+      +----------------+|
+#                 +---------------------------------------+
+#
+#   You need to setup reverse proxy. (eg. nginx)
+#   You do not define 'https' section.
+
+# Listen port
+port: 3000
+
+#      ┌──────────────────────────┐
+#───┘ PostgreSQL configuration                           └────────────────────────────────
+
+db:
+  #host: /var/run/postgresql #unixsocket
+  host: localhost
+  port: 5432
+
+  # Database name
+  db: misskey
+
+  # Auth
+  user: example-misskey-user
+  pass: example-misskey-pass
+
+  # Whether disable Caching queries
+  #disableCache: true
+
+  # Extra Connection options
+  #extra:
+  #  ssl: true
+
+  # Use PGroonga
+  #pgroonga: false
+
+#      ┌─────────────────────┐
+#───┘ Redis configuration                      └─────────────────────────────────────
+
+redis:
+  #path: /var/run/redis/redis-server.sock #unixsocket
+  host: localhost
+  port: 6379
+  #pass: example-pass
+  #prefix: example-prefix
+  #db: 1
+
+#      ┌─────────────────────────────┐
+#───┘ Elasticsearch configuration                              └─────────────────────────────
+
+#elasticsearch:
+#  host: localhost
+#  port: 9200
+#  ssl: false
+#  user: 
+#  pass: 
+
+#      ┌─────────────────────┐
+#───┘ Sonic configuration                      └─────────────────────────────────────
+
+#sonic:
+#  host: localhost
+#  port: 1491
+#  pass: example-pass
+
+
+#      ┌───────────────┐
+#───┘ ID generation                └───────────────────────────────────────────
+
+# You can select the ID generation method.
+# You don't usually need to change this setting, but you can
+# change it according to your preferences.
+
+# Available methods:
+# aid ... Short, Millisecond accuracy. Not recommended.
+# meid ... Similar to ObjectID, Millisecond accuracy
+# ulid ... Millisecond accuracy
+# objectid ... This is left for backward compatibility
+
+# Use meid or ulid
+
+# ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
+# ID SETTINGS AFTER THAT!
+
+id: 'meid'
+
+#      ┌─────────────────────┐
+#───┘ Instance configuration                   └─────────────────────────────────────
+
+# Disable Federation: (default: false)
+#disableFederation: true
+
+# Disable URL Preview (default: false)
+# disableUrlPreview: true
+
+# If enabled:
+#  The first account created is automatically marked as Admin.
+autoAdmin: true
+
+# Number of worker processes
+#clusterLimit: 1
+
+# Job concurrency per worker
+# deliverJobConcurrency: 128
+# inboxJobConcurrency: 16
+
+# Job rate limiter
+# deliverJobPerSec: 128
+# inboxJobPerSec: 16
+
+# Job attempts
+# deliverJobMaxAttempts: 12
+# inboxJobMaxAttempts: 8
+
+# Syslog option
+#syslog:
+#  host: localhost
+#  port: 514
+
+# Media Proxy
+#mediaProxy: https://example.com/proxy
+
+# Sign to ActivityPub GET request (default: true)
+#signToActivityPubGet: true
+
+# Upload or download file size limits (bytes)
+#maxFileSize: 262144000
+
+#      ┌─────────────────────┐
+#───┘ Network configuration                    └─────────────────────────────────────
+
+# IP address family used for outgoing request (ipv4, ipv6 or dual)
+#outgoingAddressFamily: ipv4
+
+# Proxy for HTTP/HTTPS
+#proxy: http://127.0.0.1:3128
+
+#proxyBypassHosts: [
+#  'example.com',
+#  '192.0.2.8'
+#]
+
+#allowedPrivateNetworks: [
+#  '127.0.0.1/32'
+#]
+
+# Proxy for SMTP/SMTPS
+#proxySmtp: http://127.0.0.1:3128   # use HTTP/1.1 CONNECT
+#proxySmtp: socks4://127.0.0.1:1080 # use SOCKS4
+#proxySmtp: socks5://127.0.0.1:1080 # use SOCKS5
+
+#      ┌─────────────────────┐
+#───┘ Other configuration                      └─────────────────────────────────────
+
+# url-preview "Access-Control-Allow-Origin: *" (default: false) (for External FE)
+#urlPreviewCors: true

chart/templates/ConfigMap.yml

@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "ayuskey.fullname" . }}-config-file
+data:
+  default.yml: |-
+{{ .Files.Get "files/default.yml"|indent 4 }}