Merge pull request #1 from kenchiki/development

3.5.0に対応
kenchiki · Jul 12, 2023 · c72aeaf · c72aeaf
2 parents bee56b7 + 06c1016
commit c72aeaf
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 50 deletions.
diff --git a/README.md b/README.md
@@ -1,12 +1,12 @@
 # MastodonCommand
 - おみくじ機能や大阪弁機能などをつけることができます。
-- ローカルでマストドンのバージョン3.4.6にて動作を確認済み
+- ローカルでマストドンのバージョン3.5.0にて動作を確認済み
 （このプログラムを使って問題が起こっても保証はできないので予めご了承ください🙇‍♂️）
 
 ## Installation
 
 ```ruby
-gem 'mastodon_command', '0.1.9'
+gem 'mastodon_command', '0.1.10'
 ```
 
 ## Usage
@@ -21,11 +21,11 @@ Rails.application.configure do
   config.after_initialize do
     MastodonCommand.setup do |status|
       # おみくじ機能
-      fortune = MastodonCommand::Random.new('[ 　\n]?#(おみくじ|占い|運勢)[ 　\n]?', %w(大吉 中吉 小吉 吉 半吉 凶 大凶))
+      fortune = MastodonCommand::RandomConverter.new('[ 　\n]?#(おみくじ|占い|運勢)[ 　\n]?', %w(大吉 中吉 小吉 吉 半吉 凶 大凶))
       status = fortune.convert(status) if fortune.match(status)
 
       # 大阪弁機能
-      osaka = MastodonCommand::Lang.new('[ 　\n]?#(大阪弁)[ 　\n]?', [
+      osaka = MastodonCommand::LangConverter.new('[ 　\n]?#(大阪弁)[ 　\n]?', [
         {
           pattern: 'です',
           replace: 'やで'

diff --git a/lib/mastodon_command.rb b/lib/mastodon_command.rb
@@ -1,25 +1,14 @@
-require "mastodon_command/version"
-require "mastodon_command/convert"
-require "mastodon_command/convert_random"
-require "mastodon_command/convert_lang"
-require "mastodon_command/statuses_controller_patch"
+require 'mastodon_command/version'
+require 'mastodon_command/converter'
+require 'mastodon_command/random_converter'
+require 'mastodon_command/lang_converter'
+require 'mastodon_command/statuses_controller_patch'
 
 module MastodonCommand
   def self.setup(&proc)
-    # create function for Monkey patch
-    extend self
-    (
-    class << self;
-      self
-    end).module_eval do
-      define_method 'convert_toot', &proc
-      # define_method 'b' do
-      #   p 'b'
-      # end
-    end
+    define_singleton_method(:convert_toot, &proc)
 
     # Monkey patch
     Api::V1::StatusesController.prepend(MastodonCommand::StatusesControllerPatch)
   end
 end
-
diff --git a/lib/mastodon_command/convert_random.rb b/lib/mastodon_command/convert_random.rb
diff --git a/lib/mastodon_command/convert.rb → lib/mastodon_command/converter.rb b/lib/mastodon_command/convert.rb → lib/mastodon_command/converter.rb
@@ -1,7 +1,6 @@
 module MastodonCommand
-  class Convert
-    attr_accessor :pattern
-    attr_accessor :replaces
+  class Converter
+    attr_accessor :pattern, :replaces
 
     def initialize(pattern, replaces)
       @pattern = pattern

diff --git a/lib/mastodon_command/convert_lang.rb → lib/mastodon_command/lang_converter.rb b/lib/mastodon_command/convert_lang.rb → lib/mastodon_command/lang_converter.rb
@@ -1,10 +1,9 @@
 module MastodonCommand
-  class Lang < MastodonCommand::Convert
-
+  class LangConverter < MastodonCommand::Converter
     def convert(input)
-      @replaces.each {|replace|
+      @replaces.each do |replace|
         input = input.gsub(/#{replace[:pattern]}/, replace[:replace])
-      }
+      end
       input
     end
   end

diff --git a/lib/mastodon_command/random_converter.rb b/lib/mastodon_command/random_converter.rb
@@ -0,0 +1,7 @@
+module MastodonCommand
+  class RandomConverter < MastodonCommand::Converter
+    def convert(input)
+      "#{input}\nあなたの運勢は「#{@replaces.sample}」です"
+    end
+  end
+end
diff --git a/lib/mastodon_command/statuses_controller_patch.rb b/lib/mastodon_command/statuses_controller_patch.rb
@@ -2,19 +2,22 @@ module MastodonCommand
   module StatusesControllerPatch
     def create
       status = MastodonCommand.convert_toot(status_params[:status])
-      @status = PostStatusService.new.call(current_user.account,
-                                           text: status,
-                                           thread: @thread,
-                                           media_ids: status_params[:media_ids],
-                                           sensitive: status_params[:sensitive],
-                                           spoiler_text: status_params[:spoiler_text],
-                                           visibility: status_params[:visibility],
-                                           scheduled_at: status_params[:scheduled_at],
-                                           application: doorkeeper_token.application,
-                                           poll: status_params[:poll],
-                                           idempotency: request.headers['Idempotency-Key'],
-                                           with_rate_limit: true)
-
+      @status = PostStatusService.new.call(
+        current_user.account,
+        text: status,
+        thread: @thread,
+        media_ids: status_params[:media_ids],
+        sensitive: status_params[:sensitive],
+        spoiler_text: status_params[:spoiler_text],
+        visibility: status_params[:visibility],
+        language: status_params[:language],
+        scheduled_at: status_params[:scheduled_at],
+        application: doorkeeper_token.application,
+        poll: status_params[:poll],
+        idempotency: request.headers['Idempotency-Key'],
+        with_rate_limit: true
+      )
+
       render json: @status, serializer: @status.is_a?(ScheduledStatus) ? REST::ScheduledStatusSerializer : REST::StatusSerializer
     end
   end

diff --git a/lib/mastodon_command/version.rb b/lib/mastodon_command/version.rb
@@ -1,3 +1,3 @@
 module MastodonCommand
-  VERSION = "0.1.9"
+  VERSION = '0.1.10'.freeze
 end