lita-talk 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 38b90ebfb227ce96dc0b0c89dac125a6cf00cf72
-  data.tar.gz: 84be5598b89b6341efefaafc42e1945a89f59442
+SHA256:
+  metadata.gz: 9136884bc2b6ed86bba33251a4f6efd971289944805071cbbfe3f8c9da6e6ab6
+  data.tar.gz: 60a5adef28a1056efe4790823712549d99274d394e368634d789b2f42df68a83
 SHA512:
-  metadata.gz: 1f903894538c30335b9e82557994acd2025e8484bfb8633c4a1f6e85c5620480e24cbf6ad99bb70ac71a7daa978c471c4e7ae931e4716dc5f5dddc77b147a215
-  data.tar.gz: 08a43863c82d660bf6d497a28504506a64c0e2afcc5c0eef1dfcbaab0d16aa094364082767c69b2ba74a21f8069fdc297d73dae12c332acb74d68d7cba1e337c
+  metadata.gz: c1b2b9b686aee1a3c93e4713da95de29bf79cfdbecbb8293a62320b4cd41fd0aff1a433753fd4362d98c1a0920ef6d8a784d244a18368993a4c51b0c413206c1
+  data.tar.gz: 05c381b60282bad8af320a945e827e3c1f016d9aa96f601056c09ab560f250c045f4058eb79de8e5675c805f145f39e98013c75714df22ef8aa57f47331baaf7

data/README.md

@@ -19,17 +19,19 @@ gem "lita-talk"
 Lita.configure do |config|
   ...
   # required
-  config.handlers.talk.docomo_api_key      = 'xxx'
-
-  # optional (https://dev.smt.docomo.ne.jp/?p=docs.api.page&api_name=dialogue&p_name=api_1#tag01)
-  #  20 : 関西弁キャラ
-  #  30 : 赤ちゃんキャラ
-  #  指定なし : デフォルトキャラ
-  config.handlers.talk.docomo_character_id = 20
-  # config.handlers.talk.docomo_character_id = [nil, 20, 30] # at random in array
+  config.handlers.talk.docomo_api_key = 'xxx'
 end
 ```
 
 ## Usage
 
-![ss 2015-04-15 at 16 24 51](https://cloud.githubusercontent.com/assets/1041857/7153973/25f15966-e38c-11e4-9c26-3aef61e4e7fa.png)
+```
+Lita > lita type
+default
+Lita > lita おはよう
+おはありりー
+Lita > lita type hakata
+ok
+Lita > lita おはよう
+おはようだの
+```

data/docker-compose.yml

@@ -0,0 +1,7 @@
+version: '3'
+
+services:
+  redis:
+    image: redis:latest
+    ports:
+      - "6379:6379"

data/lib/lita/handlers/talk.rb

@@ -1,38 +1,148 @@
-require 'docomoru'
+require 'faraday'
+require 'faraday_middleware'
 
 module Lita
   module Handlers
     class Talk < Handler
-      config :docomo_api_key,      type: String,  required: true
-      config :docomo_character_id, required: false
+      # @see: https://dev.smt.docomo.ne.jp/?p=docs.api.page&api_name=natural_dialogue&p_name=api_4#tag01
+      # @see: https://dev.smt.docomo.ne.jp/?p=docs.api.page&api_name=natural_dialogue&p_name=api_4_user_registration#tag01
+      API_ENDPOINT             = 'https://api.apigw.smt.docomo.ne.jp'.freeze
+      API_DIALOGUE_PATH        = '/naturalChatting/v1/dialogue'.freeze
+      API_REGISTRATION_PATH    = '/naturalChatting/v1/registration'.freeze
+
+      # @see: https://dev.smt.docomo.ne.jp/?p=docs.api.page&api_name=natural_dialogue&p_name=api_6#tag01
+      CHARACTER_TYPES          = %w[default ehime1 ehime2 ehime3 kansai hakata fukushima mie maiko ojo bushi gyaru burikko akachan]
+
+      config :docomo_api_key, type: String, required: true
+
+      route(
+        /^(.+)/,
+        :talk,
+        command: true,
+        help: {
+          'talk' => "Talk with you if given message didn't match any other handlers."
+        }
+      )
+
+      route(
+        /^type\s(.+)$/,
+        :update_character_type,
+        command: true,
+        help: {
+          'type (default|ehime1|ehime2|ehime3|kansai|hakata|fukushima|mie|maiko|ojo|bushi|gyaru|burikko|akachan)' => "Change type of bot"
+        }
+      )
+
+      route(
+        /^type$/,
+        :show_type,
+        command: true,
+        help: {
+          'type' => 'Show type of bot'
+        }
+      )
 
-      route(/^(.+)/, :talk, command: true, help: {
-        "talk" => "Talk with you if given message didn't match any other handlers."
-      })
       def talk(response)
-        @robot.handlers.map do |handler|
-          next nil if handler == self.class
-          next nil unless handler.respond_to?(:routes)
-          handler.routes
-        end.flatten.compact.each do |route|
-          next   if !route.command
-          return if response.matches.flatten[0].match(route.pattern)
+        return unless command_missing?(response)
+
+        response.reply create_dialogue(response)
+      end
+
+      def show_type(response)
+        response.reply character_type
+      end
+
+      def update_character_type(response)
+        type = response.matches.dig(0, 0)
+
+        if CHARACTER_TYPES.include?(type)
+          redis.set('character_type', type)
+          response.reply 'ok'
+        else
+          response.reply("Invalid type: #{type}.\nValid types: #{CHARACTER_TYPES.join(', ')}")
+        end
+      end
+
+      private
+
+      def character_type
+        redis.get('character_type') || 'default'
+      end
+
+      def client_data
+        type = character_type
+        return {} if type == 'default'
+
+        {
+          option: {
+            t: type
+          }
+        }
+      end
+
+      def create_dialogue(response)
+        context = fetch_context(response)
+
+        input_text = response.matches.dig(0, 0)
+
+        resp = faraday.post do |req|
+          req.url API_DIALOGUE_PATH
+          req.body = {
+            language: 'ja-JP',
+            appId:     context,
+            voiceText: input_text,
+            botId:     'Chatting',
+            clientData: client_data
+          }
         end
 
-        if response.matches.flatten[0].match(/ところで|それはそうと|そういえば|BTW/)
-          Lita.redis.del context_key(response)
+        resp.body.dig('systemText', 'expression')
+      end
+
+      def command_missing?(response)
+        all_handler_routes.each do |route|
+          next unless route.command
+          return false if response.matches.flatten[0].match(route.pattern)
         end
 
-        context = Lita.redis.get context_key(response)
-        api_response = client.create_dialogue(response.message.body, params(context))
-        Lita.redis.setex context_key(response), 600, api_response.body["context"]
-        response.reply api_response.body["utt"]
+        true
       end
 
-    private
+      def all_handler_routes
+        robot.handlers.map do |handler|
+          next nil unless handler.respond_to?(:routes)
+          next handler.routes.slice(1..-1) if handler == self.class
 
-      def client
-        @client ||= Docomoru::Client.new(api_key: config.docomo_api_key)
+          handler.routes
+        end.flatten.compact
+      end
+
+      def faraday
+        @faraday ||= Faraday.new(API_ENDPOINT) do |conn|
+          conn.request :json
+          conn.headers['Content-Type'] = 'application/json;charset=UTF-8'
+          conn.params['APIKEY'] = config.docomo_api_key
+          conn.response :json
+          conn.adapter Faraday.default_adapter
+        end
+      end
+
+      def fetch_context(response)
+        key = context_key(response)
+        context = redis.get(key)
+        return context if context
+
+        resp = faraday.post do |req|
+          req.url API_REGISTRATION_PATH
+          req.body = {
+            botId:   'Chatting',
+            appKind: 'bot'
+          }
+        end
+
+        context = resp.body['appId']
+        redis.set(key, context)
+        context
       end
 
       def context_key(response)
@@ -42,15 +152,6 @@ module Lita
           "lita-talk:#{response.message.source.room}"
         end
       end
-
-      def params(context)
-        {
-          context: context,
-          t:       Array(config.docomo_character_id).sample,
-        }.reject do |key, value|
-          value.nil?
-        end
-      end
     end
 
     Lita.register_handler(Talk)

data/lita-talk.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-talk"
-  spec.version       = "0.1.5"
+  spec.version       = "0.1.6"
   spec.authors       = ["fukayatsu"]
   spec.email         = ["fukayatsu@gmail.com"]
   spec.description   = "Talk with you if given message didn't match any other handlers."
@@ -15,7 +15,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "lita", "~> 4.3"
-  spec.add_runtime_dependency "docomoru", "~> 0.1.3 "
+  spec.add_runtime_dependency "faraday"
+  spec.add_runtime_dependency 'faraday_middleware'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "pry-byebug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-talk
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - fukayatsu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2018-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -25,19 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.3'
 - !ruby/object:Gem::Dependency
-  name: docomoru
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -120,6 +134,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- docker-compose.yml
 - lib/lita-talk.rb
 - lib/lita/handlers/talk.rb
 - lita-talk.gemspec
@@ -148,11 +163,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Talk with you if given message didn't match any other handlers.
 test_files:
 - spec/lita/handlers/talk_spec.rb
 - spec/spec_helper.rb
-has_rdoc: