build(deps-dev): bump rubocop from 1.30.1 to 1.31.2

.devcontainer/Dockerfile

@@ -21,4 +21,4 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
 RUN gem install foreman
 
 # [Optional] Uncomment this line to install global node packages.
-RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g yarn" 2>&1
+RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g yarn tyarn" 2>&1

.devcontainer/devcontainer.json

@@ -20,7 +20,7 @@
   "forwardPorts": [3000, 4000],
 
   // Use 'postCreateCommand' to run commands after the container is created.
-  "postCreateCommand": "bundle install --path vendor/bundle && yarn install && ./bin/rails db:setup",
+  "postCreateCommand": "bundle config mirror.https://rubygems.org https://gems.ruby-china.com && bundle install --path vendor/bundle && yarn install && ./bin/rails db:setup",
 
   // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
   "remoteUser": "vscode"

.devcontainer/docker-compose.yml

@@ -24,7 +24,7 @@ services:
       DB_USER: postgres
       DB_PASS: postgres
       DB_PORT: '5432'
-      ES_ENABLED: 'true'
+      ES_ENABLED: 'false'
       ES_HOST: es
       ES_PORT: '9200'
     # Overrides default command so things don't shut down after the process ends.
@@ -55,22 +55,23 @@ services:
     networks:
       - internal_network
 
-  es:
-    image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2
-    restart: unless-stopped
-    environment:
-      ES_JAVA_OPTS: -Xms512m -Xmx512m
-      cluster.name: es-mastodon
-      discovery.type: single-node
-      bootstrap.memory_lock: 'true'
-    volumes:
-      - es-data:/usr/share/elasticsearch/data
-    networks:
-      - internal_network
-    ulimits:
-      memlock:
-        soft: -1
-        hard: -1
+  # es:
+  #   # image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2
+  #   image: mashirozx/elasticsearch-cnplugin:7.16.1
+  #   restart: unless-stopped
+  #   environment:
+  #     ES_JAVA_OPTS: -Xms512m -Xmx512m
+  #     cluster.name: es-mastodon
+  #     discovery.type: single-node
+  #     bootstrap.memory_lock: 'true'
+  #   volumes:
+  #     - es-data:/usr/share/elasticsearch/data
+  #   networks:
+  #     - internal_network
+  #   ulimits:
+  #     memlock:
+  #       soft: -1
+  #       hard: -1
 
 volumes:
   postgres-data:

.drone.yml

@@ -0,0 +1,107 @@
+---
+kind: pipeline
+name: arm64
+
+platform:
+  os: linux
+  arch: arm64
+
+steps:
+  - name: email notification on start
+    image: mashirozx/drone-email:latest-arm64
+    failure: ignore
+    settings:
+      host: 
+        from_secret: smtp_host
+      port:
+        from_secret: smtp_port
+      username:
+        from_secret: smtp_username
+      password:
+        from_secret: smtp_password
+      from.address:
+        from_secret: smtp_from_address
+      from.name:
+        from_secret: smtp_from_name
+      recipients:
+        from_secret: smtp_recipients
+      subject: >
+        {{repo.owner}}/{{repo.name}}:${DRONE_COMMIT_BRANCH} arm64 build #${DRONE_BUILD_NUMBER} start
+      body: >
+        ${DRONE_COMMIT_MESSAGE}<br /><br />
+        Git repo: {{repo.owner}}/{{repo.name}}<br />
+        Git branch: ${DRONE_COMMIT_BRANCH}<br />
+        Git hash: <a href="${DRONE_COMMIT_LINK}" target="_blank">${DRONE_COMMIT_SHA}</a><br />
+        Git author: ${DRONE_COMMIT_AUTHOR_NAME} (${DRONE_COMMIT_AUTHOR})<br />
+        <br />View CI detail: {{build.link}}
+        <br /><br />
+        Drone CI ${DRONE_SYSTEM_VERSION}
+    when:
+      branch:
+        - main
+      event:
+        - push
+        - tag
+
+  - name: build arm64 image
+    image: plugins/docker
+    settings:
+      repo:
+        from_secret: docker_repo
+      tags: 
+        - latest-arm64
+        - sha-${DRONE_COMMIT_SHA:0:8}-arm64
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+      dockerfile: Dockerfile.slim
+      squash: true
+    when:
+      branch:
+        - main
+      event:
+        - push
+
+  - name: email notification on complete
+    image: mashirozx/drone-email:latest-arm64
+    failure: ignore
+    settings:
+      host: 
+        from_secret: smtp_host
+      port:
+        from_secret: smtp_port
+      username:
+        from_secret: smtp_username
+      password:
+        from_secret: smtp_password
+      from.address:
+        from_secret: smtp_from_address
+      from.name:
+        from_secret: smtp_from_name
+      recipients:
+        from_secret: smtp_recipients
+      subject: >
+        {{#success build.status}}
+          {{repo.owner}}/{{repo.name}}:${DRONE_COMMIT_BRANCH} arm64 build #${DRONE_BUILD_NUMBER} succeeded
+        {{else}}
+          {{repo.owner}}/{{repo.name}}:${DRONE_COMMIT_BRANCH} arm64 build #${DRONE_BUILD_NUMBER} failed
+        {{/success}}
+      body: >
+        ${DRONE_COMMIT_MESSAGE}<br /><br />
+        Git repo: {{repo.owner}}/{{repo.name}}<br />
+        Git branch: ${DRONE_COMMIT_BRANCH}<br />
+        Git hash: <a href="${DRONE_COMMIT_LINK}" target="_blank">${DRONE_COMMIT_SHA}</a><br />
+        Git author: ${DRONE_COMMIT_AUTHOR_NAME} (${DRONE_COMMIT_AUTHOR})<br />
+        <br />View CI detail: {{build.link}}
+        <br /><br />
+        Drone CI ${DRONE_SYSTEM_VERSION}
+    when:
+      branch:
+        - main
+      event:
+        - push
+        - tag
+      status:
+        - success
+        - failure

.env.production.sample

@@ -75,3 +75,90 @@ S3_ALIAS_HOST=files.example.com
 # -----------------------
 IP_RETENTION_PERIOD=31556952
 SESSION_RETENTION_PERIOD=31556952
+
+##
+## Follow to the end of file is the configuration for mashirozx's fork
+##
+# Git display repo, please keep this to let more people reach this repo
+GITHUB_REPOSITORY=mashirozx/mastodon
+
+## Here are two kinds of Google translate free API
+# High performance translation server (https://github.com/mashirozx/google-translate-server)
+# NB: Google forbidden requests of this endpoint from some VPS IDCs
+TRANSLATION_SERVER_HOST=http://translate:30031
+
+# RSSHub based translate API (https://github.com/mashirozx/RSSHub)
+#TRANSLATION_SERVER_TYPE=rsshub
+#TRANSLATION_SERVER_HOST=http://rsshub.example.com
+
+# Markdown image proxy, if not set, will not display image preview in markdown mode
+IMAGE_PROXY_HOST=https://img-proxy.mashiro.top
+IMAGE_PROXY_PATH=https://img-proxy.mashiro.top
+
+# Max toot character limit
+MAX_TOOT_CHARS=500
+
+# Max media file size (megabytes)
+IMAGE_LIMIT=10
+VIDEO_LIMIT=40
+AVATAR_LIMIT=2
+HEADER_LIMIT=2
+# Emoji size (kilobytes)
+MAX_EMOJI_SIZE=51200
+MAX_REMOTE_EMOJI_SIZE=204800
+
+# Maximum custom emoji file sizes
+# If undefined or smaller than MAX_EMOJI_SIZE, the value
+# of MAX_EMOJI_SIZE will be used for MAX_REMOTE_EMOJI_SIZE
+# Units are in bytes
+MAX_EMOJI_SIZE=51200
+MAX_REMOTE_EMOJI_SIZE=204800
+
+# Allow insert remote media with url on toots
+# eg:
+# IMAGE: [https://example.com/example.png]
+# VIDEO: [https://example.com/example.mp4/mp3]
+ALLOW_REMOTE_MEDIA_TAG=true
+
+# Analytics services
+PLAUSIBLE_ANALYTICS_HOST=analytics.moezx.cc
+# PLAUSIBLE_ANALYTICS_SITE_DOMAIN=hello.2heng.xin
+MATOMO_ANALYTICS_HOST=analytics.2heng.xin
+MATOMO_ANALYTICS_SITE_ID=3
+
+# Third party OAuth providers
+# Force skip invite request when using an OAuth provider
+AUTO_REGISTRATION_WITH_AUTH_PROVIDERS=true
+
+# When auth providers were set, the about page layout should better to be reordered
+REORDER_ABOUT_PAGE=true
+
+# Callback url: https://littlefo.rest/auth/auth/github/callback
+# Scope: user.info
+GITHUB_OAUTH2_ENABLED=true
+GITHUB_OAUTH2_KEY=your_key
+GITHUB_OAUTH2_SECRET=your_secret
+
+# Callback url: https://littlefo.rest/auth/auth/gitlab/callback
+# Scope: read_user
+GITLAB_OAUTH2_ENABLED=true
+GITLAB_OAUTH2_KEY=your_key
+GITLAB_OAUTH2_SECRET=your_secret
+
+# Callback url: https://littlefo.rest/auth/auth/gitee/callback
+# Scope: user_info emails
+GITEE_OAUTH2_ENABLED=true
+GITEE_OAUTH2_KEY=your_key
+GITEE_OAUTH2_SECRET=your_secret
+
+# Azure Oauth 2 Authentication
+# https://docs.microsoft.com/en-us/azure/active-directory/develop/quickstart-register-app
+# Callback url: https://littlefo.rest/auth/auth/azure_oauth2/callback
+# Scope: email openid profile
+AZURE_OAUTH2_ENABLED=true
+# client id
+AZURE_OAUTH2_KEY=your_key
+# not the Secret ID but the value!
+AZURE_OAUTH2_SECRET=your_secret
+# optional tenant id if using a multi-tenant azure account: http://msdn.microsoft.com/en-us/library/azure/dn645542.aspx
+AZURE_OAUTH2_TENANT_ID=your_tenant_id

.github/workflows/build-image.yml

@@ -3,9 +3,9 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - 'main'
-    tags:
-      - '*'
+      - 'main-disable'
+#    tags:
+#      - '*'
   pull_request:
     paths:
       - .github/workflows/build-image.yml

.github/workflows/check-i18n.yml

@@ -2,9 +2,9 @@ name: Check i18n
 
 on:
   push:
-    branches: [main]
+    branches: [main-disable]
   pull_request:
-    branches: [main]
+    branches: [main-disable]
 
 env:
   RAILS_ENV: test

.github/workflows/docker-build-amd64.yml

@@ -0,0 +1,58 @@
+name: Build amd64 Image
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  docker-build:
+    runs-on: ubuntu-latest
+    if: ${{ !contains(github.event.commits.*.message, '[skip ci]') && !contains(github.event.commits.*.message, '[ci skip]') }}
+
+    steps:
+      - name: 🔍 Checkout code
+        uses: actions/checkout@v2
+
+      - name: 🦄 Set up Qemu for Docker
+        uses: docker/setup-qemu-action@v1
+
+      - name: 🏗️ Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: 🔑 Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: 🎃 Setup outputs
+        id: vars
+        run: |
+          echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
+
+      - name: 👻 Setup metadata
+        uses: docker/metadata-action@v3
+        id: meta
+        with:
+          images: mashirozx/mastodon
+          flavor: |
+            latest=auto
+          tags: |
+            type=edge,branch=main
+            type=match,pattern=v(.*),group=0
+            type=ref,event=pr
+
+      - name: ⚓ Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile.slim
+          pull: true
+          push: true
+          platforms: linux/amd64
+          cache-from: type=registry,ref=mashirozx/mastodon:latest
+          cache-to: type=inline
+          tags: |
+            mashirozx/mastodon:latest-amd64
+            mashirozx/mastodon:sha-${{steps.vars.outputs.sha_short}}-amd64

.github/workflows/docker-build-dev.yml

@@ -0,0 +1,44 @@
+name: Build Dev Image
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  docker-build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: 🔍 Checkout code
+        uses: actions/checkout@v2
+
+      - name: 🏗️ Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: 🔑 Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: 🎃 Set up outputs
+        id: vars
+        run: |
+          echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
+
+      - name: ⚓ Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: .devcontainer/Dockerfile
+          pull: true
+          push: true
+          build-args: |
+            VARIANT=3.0-bullseye
+            NODE_VERSION=14
+          cache-from: type=registry,ref=mashirozx/mastodon:dev
+          cache-to: type=inline
+          tags: |
+            mashirozx/mastodon:dev
+            mashirozx/mastodon:dev-${{steps.vars.outputs.sha_short}}