今までの変更差分の適用

.github/workflows/lint-ruby.yml

@@ -1,27 +1,29 @@
 name: Ruby Linting
 on:
-  push:
-    branches-ignore:
-      - 'dependabot/**'
-      - 'renovate/**'
-    paths:
-      - 'Gemfile*'
-      - '.rubocop*.yml'
-      - '.ruby-version'
-      - 'config/brakeman.ignore'
-      - '**/*.rb'
-      - '**/*.rake'
-      - '.github/workflows/lint-ruby.yml'
-
-  pull_request:
-    paths:
-      - 'Gemfile*'
-      - '.rubocop*.yml'
-      - '.ruby-version'
-      - 'config/brakeman.ignore'
-      - '**/*.rb'
-      - '**/*.rake'
-      - '.github/workflows/lint-ruby.yml'
+  # 自動実行は行わない
+  workflow_dispatch:
+  # push:
+  #   branches-ignore:
+  #     - 'dependabot/**'
+  #     - 'renovate/**'
+  #   paths:
+  #     - 'Gemfile*'
+  #     - '.rubocop*.yml'
+  #     - '.ruby-version'
+  #     - 'config/brakeman.ignore'
+  #     - '**/*.rb'
+  #     - '**/*.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:

Gemfile

@@ -205,3 +205,6 @@ gem 'rubyzip', '~> 2.3'
 gem 'hcaptcha', '~> 7.1'
 
 gem 'mail', '~> 2.8'
+
+#DKIM
+gem 'dkim', '~> 1.1'

Gemfile.lock

@@ -235,6 +235,7 @@ GEM
     diff-lcs (1.5.0)
     discard (1.2.1)
       activerecord (>= 4.2, < 8)
+    dkim (1.1.0)
     docile (1.4.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
@@ -841,6 +842,7 @@ DEPENDENCIES
   devise-two-factor (~> 4.1)
   devise_pam_authenticatable2 (~> 9.2)
   discard (~> 1.2)
+  dkim (~> 1.1)
   doorkeeper (~> 5.6)
   dotenv-rails (~> 2.8)
   ed25519 (~> 1.3)

README.md

@@ -1,3 +1,13 @@
+ますとどんちほー用
+
+https://mstdn.kemono-friends.info
+
+エラーページの マストドンのフレンズは [桜木李杏](https://mstdn.kemono-friends.info/@cynthia_koko)さんに描いて頂きました。
+
+初期アバターは [とろねこ](https://mstdn.kemono-friends.info/@Atelier_toro)さんに描いて頂きました。
+
+![Mastodon](https://i.imgur.com/NhZc40l.png)
+
 <h1><picture>
   <source media="(prefers-color-scheme: dark)" srcset="./lib/assets/wordmark.dark.png?raw=true">
   <source media="(prefers-color-scheme: light)" srcset="./lib/assets/wordmark.light.png?raw=true">

app/controllers/api/v1/search_controller.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+class Api::V1::SearchController < Api::BaseController
+  include Authorization
+
+  RESULTS_LIMIT = 30
+
+  before_action -> { authorize_if_got_token! :read, :'read:search' }
+  before_action -> { doorkeeper_authorize! :read, :'read:search' }
+  before_action :require_user!
+
+  respond_to :json
+
+  def index
+    @search = Search.new(search_results)
+    render json: @search, serializer: REST::SearchSerializer
+  end
+
+  private
+
+  def search_results
+    SearchService.new.call(
+      params[:q],
+      current_account,
+      limit_param(RESULTS_LIMIT),
+      search_params.merge(resolve: truthy_param?(:resolve))
+    )
+  end
+
+  def search_params
+    params.permit(:type, :offset, :min_id, :max_id, :account_id)
+  end
+end

app/controllers/api/v2/media_controller.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+class Api::V2::MediaController < Api::V1::MediaController
+end
+__END__
+
 class Api::V2::MediaController < Api::V1::MediaController
   def create
     @media_attachment = current_account.media_attachments.create!({ delay_processing: true }.merge(media_attachment_params))

app/javascript/mastodon/features/compose/components/compose_form.jsx

@@ -100,7 +100,7 @@ class ComposeForm extends ImmutablePureComponent {
     const fulltext = this.getFulltextForCharacterCounting();
     const isOnlyWhitespace = fulltext.length !== 0 && fulltext.trim().length === 0;
 
-    return !(isSubmitting || isUploading || isChangingUpload || length(fulltext) > 500 || (isOnlyWhitespace && !anyMedia));
+    return !(isSubmitting || isUploading || isChangingUpload || length(fulltext) > 2048 || (isOnlyWhitespace && !anyMedia));
   };
 
   handleSubmit = (e) => {
@@ -121,6 +121,24 @@ class ComposeForm extends ImmutablePureComponent {
     }
   };
 
+  handleZWCopy = () => {
+    const textarea = document.createElement('textarea');
+
+    textarea.textContent    = "​";
+    textarea.style.position = 'fixed';
+
+    document.body.appendChild(textarea);
+
+    try {
+      textarea.select();
+      document.execCommand('copy');
+    } catch (e) {
+
+    } finally {
+      document.body.removeChild(textarea);
+    }
+  };
+
   onSuggestionsClearRequested = () => {
     this.props.onClearSuggestions();
   };
@@ -297,7 +315,7 @@ class ComposeForm extends ImmutablePureComponent {
             </div>
 
             <div className='character-counter__wrapper'>
-              <CharacterCounter max={500} text={this.getFulltextForCharacterCounting()} />
+              <CharacterCounter max={2048} text={this.getFulltextForCharacterCounting()} />
             </div>
           </div>
         </div>
@@ -312,6 +330,9 @@ class ComposeForm extends ImmutablePureComponent {
             />
           </div>
         </div>
+        <div className='compose-form__publish'>
+          <div className='compose-form__publish-button-wrapper'><Button text='ゼロ幅' onClick={this.handleZWCopy} block /></div>
+        </div>
       </form>
     );
   }

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

@@ -36,6 +36,7 @@ const messages = defineMessages({
   blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' },
   domain_blocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Blocked domains' },
   mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' },
+  library: { id: 'navigation_bar.library', defaultMessage: 'Library (Wiki)' },
   pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned posts' },
   lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' },
   discover: { id: 'navigation_bar.discover', defaultMessage: 'Discover' },