mastodon_command 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0d137a7b69f917c91d0adceb3f8b85674451b3150325a2af385c90ac65f7f88
-  data.tar.gz: d2ee552c7c866da5f0b8cb3210f6758f1f4d35002dbc954c1a0456a1842a135e
+  metadata.gz: 8aceb7bcdeb04a6e01f2c4e67e24b944bd064ea6849e26b6a080fcfff9be7a01
+  data.tar.gz: 90540b8a90c4c9b408a62a1974c34cf37e7517aad5fdf973032ff6381ae7c507
 SHA512:
-  metadata.gz: ec4f12f73bc0535f86f0810f3671ea31c90bea1a819bce3248ef8befd9b13e880c70f71352373b4e01033d76d04b6ed20bb03cc344869d9cc0092da9f462add1
-  data.tar.gz: 14857f581ed5fef4026167d5d0e54cea4a39e997dd729bb03a73f9c63bb6e448a99e4a6c1066d6364ae6222c1805d6f3979be8d1b7d36a91c35de7a590da4f44
+  metadata.gz: 2ad72f5a17f8b1e1ae0449bd8ef82cf98b910226ec090bdfba6f033f8f94ad9061cc874756021a756d63608c832811646de0554c6cafbcc23fc42e95715e35e5
+  data.tar.gz: f174e8e7d8b5f2f5be1f15ad01c6a26bef9f046f2740ab1fdaae395270e94b710ea16fbbcee847432a2c1a776e2ade9af4b465e70f785d34163c03427aa5fade

data/.travis.yml

@@ -1,5 +1,5 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.4.1
-before_install: gem install bundler -v 1.15.1
+  - 3.0.3
+before_install: gem install bundler -v 2.2.32

data/README.md

@@ -1,12 +1,12 @@
 # MastodonCommand
 - おみくじ機能や大阪弁機能などをつけることができます。
-- ローカルでマストドンのバージョン3.4.6にて動作を確認済み
+- ローカルでマストドンのバージョン3.5.0にて動作を確認済み
 （このプログラムを使って問題が起こっても保証はできないので予めご了承ください🙇‍♂️）
 
 ## Installation
 
 ```ruby
-gem 'mastodon_command'
+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: 'やで'

data/lib/mastodon_command/{convert.rb → 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

data/lib/mastodon_command/{convert_lang.rb → 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

data/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

data/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

data/lib/mastodon_command/version.rb

@@ -1,3 +1,3 @@
 module MastodonCommand
-  VERSION = "0.1.8"
+  VERSION = '0.1.10'.freeze
 end

data/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
-

data/mastodon_command.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.15"
+  spec.add_development_dependency "bundler", "~> 2.2.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mastodon_command
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - kenchiki
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-05 00:00:00.000000000 Z
+date: 2023-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -68,9 +68,9 @@ files:
 - bin/console
 - bin/setup
 - lib/mastodon_command.rb
-- lib/mastodon_command/convert.rb
-- lib/mastodon_command/convert_lang.rb
-- lib/mastodon_command/convert_random.rb
+- lib/mastodon_command/converter.rb
+- lib/mastodon_command/lang_converter.rb
+- lib/mastodon_command/random_converter.rb
 - lib/mastodon_command/statuses_controller_patch.rb
 - lib/mastodon_command/version.rb
 - mastodon_command.gemspec

data/lib/mastodon_command/convert_random.rb

@@ -1,8 +0,0 @@
-module MastodonCommand
-  class Random < MastodonCommand::Convert
-
-    def convert(input)
-      input + "\nあなたの運勢は「" + @replaces.sample + '」です'
-    end
-  end
-end