[yufushiro] stable-4.3 から m.yufushiro.dev の差分

.github/workflows/build-push-pr.yml

@@ -12,9 +12,8 @@ jobs:
     runs-on: ubuntu-latest
     # This is only allowed to run if:
     # - the PR branch is in the `mastodon/mastodon` repository
-    # - the PR is not a draft
     # - the PR has the "build-image" label
-    if: ${{ github.event.pull_request.head.repo.full_name == github.repository && !github.event.pull_request.draft && contains(github.event.pull_request.labels.*.name, 'build-image') }}
+    if: ${{ github.event.pull_request.head.repo.full_name == github.repository && contains(github.event.pull_request.labels.*.name, 'build-image') }}
     steps:
       # Repository needs to be cloned so `git rev-parse` below works
       - name: Clone repository
@@ -32,10 +31,10 @@ jobs:
     uses: ./.github/workflows/build-container-image.yml
     with:
       file_to_build: Dockerfile
-      platforms: linux/amd64,linux/arm64
+      platforms: linux/amd64
       use_native_arm64_builder: true
       push_to_images: |
-        ghcr.io/mastodon/mastodon
+        ghcr.io/yufushiro/mastodon
       version_metadata: ${{ needs.compute-suffix.outputs.metadata }}
       flavor: |
         latest=auto
@@ -49,10 +48,10 @@ jobs:
     uses: ./.github/workflows/build-container-image.yml
     with:
       file_to_build: streaming/Dockerfile
-      platforms: linux/amd64,linux/arm64
+      platforms: linux/amd64
       use_native_arm64_builder: true
       push_to_images: |
-        ghcr.io/mastodon/mastodon-streaming
+        ghcr.io/yufushiro/mastodon-streaming
       version_metadata: ${{ needs.compute-suffix.outputs.metadata }}
       flavor: |
         latest=auto

.github/workflows/check-i18n.yml

@@ -2,13 +2,7 @@ name: Check i18n
 
 on:
   push:
-    branches:
-      - 'main'
-      - 'stable-*'
-  pull_request:
-    branches:
-      - 'main'
-      - 'stable-*'
+    branches: [yufushiro]
 
 env:
   RAILS_ENV: test

.github/workflows/codeql.yml

@@ -3,15 +3,7 @@ name: 'CodeQL'
 on:
   merge_group:
   push:
-    branches:
-      - 'main'
-      - 'stable-*'
-  pull_request:
-    branches:
-      - 'main'
-      - 'stable-*'
-  schedule:
-    - cron: '22 6 * * 1'
+    branches: ['yufushiro']
 
 jobs:
   analyze:

.github/workflows/lint-css.yml

@@ -16,18 +16,6 @@ on:
       - '.github/workflows/lint-css.yml'
       - '.github/stylelint-matcher.json'
 
-  pull_request:
-    paths:
-      - 'package.json'
-      - 'yarn.lock'
-      - '.nvmrc'
-      - '.prettier*'
-      - 'stylelint.config.js'
-      - '**/*.css'
-      - '**/*.scss'
-      - '.github/workflows/lint-css.yml'
-      - '.github/stylelint-matcher.json'
-
 jobs:
   lint:
     runs-on: ubuntu-latest

.github/workflows/lint-js.yml

@@ -18,20 +18,6 @@ on:
       - '**/*.tsx'
       - '.github/workflows/lint-js.yml'
 
-  pull_request:
-    paths:
-      - 'package.json'
-      - 'yarn.lock'
-      - 'tsconfig.json'
-      - '.nvmrc'
-      - '.prettier*'
-      - '.eslint*'
-      - '**/*.js'
-      - '**/*.jsx'
-      - '**/*.ts'
-      - '**/*.tsx'
-      - '.github/workflows/lint-js.yml'
-
 jobs:
   lint:
     runs-on: ubuntu-latest

.github/workflows/lint-ruby.yml

@@ -14,16 +14,6 @@ on:
       - '**/*.rake'
       - '.github/workflows/lint-ruby.yml'
 
-  pull_request:
-    paths:
-      - 'Gemfile*'
-      - '.rubocop*.yml'
-      - '.ruby-version'
-      - 'config/brakeman.ignore'
-      - '**/*.rb'
-      - '**/*.rake'
-      - '.github/workflows/lint-ruby.yml'
-
 jobs:
   lint:
     runs-on: ubuntu-latest

.github/workflows/test-ruby.yml

@@ -3,10 +3,7 @@ name: Ruby Testing
 on:
   merge_group:
   push:
-    branches:
-      - 'main'
-      - 'stable-*'
-  pull_request:
+    branches: [yufushiro]
 
 env:
   BUNDLE_CLEAN: true
@@ -124,8 +121,6 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version:
-          - '3.1'
-          - '3.2'
           - '.ruby-version'
     steps:
       - uses: actions/checkout@v4
@@ -226,8 +221,6 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version:
-          - '3.1'
-          - '3.2'
           - '.ruby-version'
     steps:
       - uses: actions/checkout@v4
@@ -305,8 +298,6 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version:
-          - '3.1'
-          - '3.2'
           - '.ruby-version'
 
     steps:
@@ -422,8 +413,6 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version:
-          - '3.1'
-          - '3.2'
           - '.ruby-version'
         search-image:
           - docker.elastic.co/elasticsearch/elasticsearch:7.17.13

app/javascript/mastodon/features/account_timeline/index.jsx

@@ -51,7 +51,7 @@ const mapStateToProps = (state, { params: { acct, id, tagged }, withReplies = fa
     remoteUrl: state.getIn(['accounts', accountId, 'url']),
     isAccount: !!state.getIn(['accounts', accountId]),
     statusIds: state.getIn(['timelines', `account:${path}`, 'items'], emptyList),
-    featuredStatusIds: withReplies ? ImmutableList() : state.getIn(['timelines', `account:${accountId}:pinned${tagged ? `:${tagged}` : ''}`, 'items'], emptyList),
+    featuredStatusIds: withReplies ? ImmutableList() : state.getIn(['timelines', `account:${accountId}:pinned${tagged ? `:${tagged}` : ''}`, 'items'], emptyList).take(3),
     isLoading: state.getIn(['timelines', `account:${path}`, 'isLoading']),
     hasMore: state.getIn(['timelines', `account:${path}`, 'hasMore']),
     suspended: state.getIn(['accounts', accountId, 'suspended'], false),

app/javascript/mastodon/features/status/components/card.jsx

@@ -137,7 +137,7 @@ export default class Card extends PureComponent {
     const provider    = card.get('provider_name').length === 0 ? decodeIDNA(getHostname(card.get('url'))) : card.get('provider_name');
     const interactive = card.get('type') === 'video';
     const language    = card.get('language') || '';
-    const largeImage  = (card.get('image')?.length > 0 && card.get('width') > card.get('height')) || interactive;
+    const largeImage  = false;
     const showAuthor  = !!card.getIn(['authors', 0, 'accountId']);
 
     const description = (

app/lib/activitypub/activity/delete.rb

@@ -12,9 +12,13 @@ def perform
   private
 
   def delete_person
-    with_redis_lock("delete_in_progress:#{@account.id}", autorelease: 2.hours, raise_on_failure: false) do
-      DeleteAccountService.new.call(@account, reserve_username: false, skip_activitypub: true)
-    end
+    # Workaround for some implementations (such as Misskey) that send Delete activity for non-permanent account suspension.
+    @account.silence!
+    AccountModerationNote.create!(
+      account: Account.local.find_by!(username: 'yufushiro'),
+      target_account: @account,
+      content: 'Delete activity has been received.'
+    )
   end
 
   def delete_note

app/lib/activitypub/activity/undo.rb

@@ -13,6 +13,8 @@ def perform
       undo_like
     when 'Block'
       undo_block
+    when 'Delete'
+      undo_delete
     when nil
       handle_reference
     end
@@ -125,6 +127,19 @@ def undo_block
     end
   end
 
+  def undo_delete
+    target_account = account_from_uri(target_uri)
+
+    return if target_account.nil?
+
+    target_account.unsilence!
+    AccountModerationNote.create!(
+      account: Account.local.find_by!(username: 'yufushiro'),
+      target_account: target_account,
+      content: 'Undo Delete activity has been received.'
+    )
+  end
+
   def target_uri
     @target_uri ||= value_or_id(@object['object'])
   end

app/models/concerns/account/avatar.rb

@@ -4,7 +4,7 @@ module Account::Avatar
   extend ActiveSupport::Concern
 
   IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif', 'image/webp'].freeze
-  LIMIT = 2.megabytes
+  LIMIT = 4.megabytes
 
   AVATAR_DIMENSIONS = [400, 400].freeze
   AVATAR_GEOMETRY = [AVATAR_DIMENSIONS.first, AVATAR_DIMENSIONS.last].join('x')

app/models/custom_emoji.rb

@@ -24,23 +24,32 @@
 class CustomEmoji < ApplicationRecord
   include Attachmentable
 
-  LIMIT = 256.kilobytes
+  LIMIT = 1.megabyte
   MINIMUM_SHORTCODE_SIZE = 2
 
   SHORTCODE_RE_FRAGMENT = '[a-zA-Z0-9_]{2,}'
 
-  SCAN_RE = /(?<=[^[:alnum:]:]|\n|^)
+  SCAN_RE = /(?<=[^a-zA-Z0-9]|\n|^)
     :(#{SHORTCODE_RE_FRAGMENT}):
-    (?=[^[:alnum:]:]|$)/x
+    (?=[^a-zA-Z0-9]|$)/x
   SHORTCODE_ONLY_RE = /\A#{SHORTCODE_RE_FRAGMENT}\z/
 
-  IMAGE_MIME_TYPES = %w(image/png image/gif image/webp).freeze
+  IMAGE_MIME_TYPES = %w(image/jpeg image/png image/gif image/webp).freeze
 
   belongs_to :category, class_name: 'CustomEmojiCategory', optional: true
 
   has_one :local_counterpart, -> { where(domain: nil) }, class_name: 'CustomEmoji', primary_key: :shortcode, foreign_key: :shortcode, inverse_of: false, dependent: nil
 
-  has_attached_file :image, styles: { static: { format: 'png', convert_options: '-coalesce +profile "!icc,*" +set date:modify +set date:create +set date:timestamp', file_geometry_parser: FastGeometryParser } }, validate_media_type: false, processors: [:lazy_thumbnail]
+  has_attached_file :image,
+                    styles: {
+                      static: {
+                        format: 'png',
+                        convert_options: '-coalesce +profile "!icc,*" +set date:modify +set date:create +set date:timestamp',
+                        file_geometry_parser: FastGeometryParser,
+                      },
+                    },
+                    validate_media_type: false,
+                    processors: [:lazy_thumbnail]
 
   normalizes :domain, with: ->(domain) { domain.downcase }
 

app/serializers/node_info/serializer.rb

@@ -41,6 +41,7 @@ def metadata
     {
       nodeName: Setting.site_title,
       nodeDescription: Setting.site_short_description,
+      themeColor: '#99ddff',
     }
   end
 

app/views/statuses/_og_image.html.haml

@@ -1,14 +1,18 @@
 - if activity.is_a?(Status) && (activity.non_sensitive_with_media? || (activity.with_media? && Setting.preview_sensitive_media))
   - player_card = false
-  - activity.ordered_media_attachments.each do |media|
+  - activity.ordered_media_attachments.each_with_index do |media, index|
     - if media.image?
       = opengraph 'og:image', full_asset_url(media.file.url(:original))
       = opengraph 'og:image:type', media.file_content_type
+      - if index.zero?
+        = opengraph 'twitter:image', full_asset_url(media.file.url(:original))
       - unless media.file.meta.nil?
         = opengraph 'og:image:width', media.file.meta.dig('original', 'width')
         = opengraph 'og:image:height', media.file.meta.dig('original', 'height')
       - if media.description.present?
         = opengraph 'og:image:alt', media.description
+        - if index.zero?
+          = opengraph 'twitter:image:alt', media.description
     - elsif media.video? || media.gifv?
       - player_card = true
       = opengraph 'og:image', full_asset_url(media.file.url(:small))

config/sidekiq.yml

@@ -12,19 +12,19 @@
   :listened_queues_only: true
   :schedule:
     scheduled_statuses_scheduler:
-      every: '5m'
+      interval: '12h'
       class: Scheduler::ScheduledStatusesScheduler
       queue: scheduler
     trends_refresh_scheduler:
-      every: '5m'
+      interval: '12h'
       class: Scheduler::Trends::RefreshScheduler
       queue: scheduler
     trends_review_notifications_scheduler:
-      every: '6h'
+      interval: '12h'
       class: Scheduler::Trends::ReviewNotificationsScheduler
       queue: scheduler
     indexing_scheduler:
-      interval: 1 minute
+      interval: '12h'
       class: Scheduler::IndexingScheduler
       queue: scheduler
     vacuum_scheduler:
@@ -48,19 +48,19 @@
       class: Scheduler::PgheroScheduler
       queue: scheduler
     instance_refresh_scheduler:
-      cron: '0 * * * *'
+      interval: '12h'
       class: Scheduler::InstanceRefreshScheduler
       queue: scheduler
     accounts_statuses_cleanup_scheduler:
-      interval: 1 minute
+      interval: '12h'
       class: Scheduler::AccountsStatusesCleanupScheduler
       queue: scheduler
     suspended_user_cleanup_scheduler:
-      interval: 1 minute
+      interval: '12h'
       class: Scheduler::SuspendedUserCleanupScheduler
       queue: scheduler
     software_update_check_scheduler:
-      interval: 30 minutes
+      interval: '12h'
       class: Scheduler::SoftwareUpdateCheckScheduler
       queue: scheduler
     auto_close_registrations_scheduler:

lib/mastodon/version.rb

@@ -25,7 +25,7 @@ def prerelease
     end
 
     def build_metadata
-      ENV.fetch('MASTODON_VERSION_METADATA', nil)
+      'yufushiro'
     end
 
     def to_a
@@ -50,7 +50,7 @@ def api_versions
     end
 
     def repository
-      ENV.fetch('GITHUB_REPOSITORY', 'mastodon/mastodon')
+      ENV.fetch('GITHUB_REPOSITORY', 'yufushiro/mastodon')
     end
 
     def source_base_url
@@ -63,11 +63,8 @@ def source_tag
     end
 
     def source_url
-      if source_tag
-        "#{source_base_url}/tree/#{source_tag}"
-      else
-        source_base_url
-      end
+      # Pull Request #1 の URL を返す
+      "#{source_base_url}/pull/1"
     end
 
     def user_agent