mastodon_command 0.1.9 → 4.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e30efa3ddcfc5a17a306ffcd479011ce049c95e61dfdacb20b5889965184c4a1
-  data.tar.gz: 112a9291c179a70d191deec44cfdcfc629013d6b7add1df416a8628ab75a952a
+  metadata.gz: e1af1e330d3503e6cee6fa7eb39598b350467ab34be10324578e4578d72aa524
+  data.tar.gz: 84c727198d9b53ea9447b7e556e1f77550937fe900434ede12599b01b1e83623
 SHA512:
-  metadata.gz: 75f5185b959273a14f98229872525bc8e43b9b0eb0212f9f3894df3d08a817e3f2439f864d4c7697165fef8083088e8d62c4f60899ee7c8d6f393d70b01e861d
-  data.tar.gz: 640348e8cd8679fe75e302188e0add765b7dda209cb3c77d2f275352d3501048b4c12eba5ae98388827f882d47bff5eb57faaff469686f72913c59753f55a869
+  metadata.gz: bce92c9bebdc36e57ef3e8bcbf3e657e97404e3d42a91b4b11f9f2950188b25d041fed87fb436a442333e80af3593db56b89df0e7621cc02f16a454b944741ae
+  data.tar.gz: 84473e6b6be833308f2fa6e5867ae8b680a6f39e18f988c1f92e8c6f7bbfbb77eadee56cb7f6445b43fc59fed7187a817f802b5a6f1b653e7121da9234f01e4e

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.2.2
+before_install: gem install bundler -v 2.5.23

data/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: 'やで'

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,20 +2,30 @@ 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],
+        allowed_mentions: status_params[:allowed_mentions],
+        idempotency: request.headers['Idempotency-Key'],
+        with_rate_limit: true
+      )
+
       render json: @status, serializer: @status.is_a?(ScheduledStatus) ? REST::ScheduledStatusSerializer : REST::StatusSerializer
+    rescue PostStatusService::UnexpectedMentionsError => e
+      unexpected_accounts = ActiveModel::Serializer::CollectionSerializer.new(
+        e.accounts,
+        serializer: REST::AccountSerializer
+      )
+      render json: { error: e.message, unexpected_accounts: unexpected_accounts }, status: 422
     end
   end
 end

data/lib/mastodon_command/version.rb

@@ -1,3 +1,3 @@
 module MastodonCommand
-  VERSION = "0.1.9"
+  VERSION = '4.2.3'.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 "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "bundler", "~> 2"
+  spec.add_development_dependency "rake", "~> 13"
+  spec.add_development_dependency "rspec", "~> 3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mastodon_command
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 4.2.3
 platform: ruby
 authors:
 - kenchiki
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-05 00:00:00.000000000 Z
+date: 2025-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
 description: Mastodon Toot Command.
 email:
 - nagai-kj@nagai-galaxy.com
@@ -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
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Mastodon Toot Command.

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