Merge pull request #360 from pooza/2_1_14

2.1.14

config/application.yaml

@@ -1,5 +1,5 @@
 package:
-  version: 2.1.13
+  version: 2.1.14
   url: https://github.com/pooza/mulukhiya-toot-proxy
   authors:
     - Tatsuya Koishi

lib/mulukhiya_toot_proxy/server.rb

@@ -14,9 +14,7 @@ def before_post
     end
 
     post '/api/v1/statuses' do
-      tags = params['status'].scan(
-        Regexp.new(@config['/mastodon/hashtag/pattern'], Regexp::IGNORECASE),
-      )
+      tags = params['status'].scan(tag_pattern).map(&:first)
       results = []
       Handler.all do |handler|
         Timeout.timeout(handler.timeout) do
@@ -71,5 +69,11 @@ def before_post
       @logger.error(e.to_h)
       return @renderer.to_s
     end
+
+    private
+
+    def tag_pattern
+      return Regexp.new(@config['/mastodon/hashtag/pattern'], Regexp::IGNORECASE)
+    end
   end
 end

test/server.rb

@@ -1,4 +1,5 @@
 require 'rack/test'
+require 'json'
 
 module MulukhiyaTootProxy
   class ServerTest < Test::Unit::TestCase
@@ -45,6 +46,17 @@ def test_toot
       assert_equal(last_response.status, 422)
     end
 
+    def test_toot_response
+      return unless @config['/handlers'].include?('itunes_url_nowplaying')
+      header 'Authorization', "Bearer #{@config['/test/token']}"
+      header 'Content-Type', 'application/json'
+      post '/api/v1/statuses', {'status' => '#nowplaying https://itunes.apple.com/jp/album//1447931442?i=1447931444&uo=4 #日本語のタグ', 'visibility' => 'private'}.to_json
+      assert(last_response.ok?)
+      tags = JSON.parse(last_response.body)['tags']
+      assert_equal(tags[0]['name'], 'nowplaying')
+      assert_equal(tags[1]['name'], '日本語のタグ')
+    end
+
     def test_hook_toot
       account = Mastodon.lookup_token_owner(@config['/test/token'])
       assert(account.is_a?(Hash))