skype_bot 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a03d772b5abd91c6c8d895f55d583fb08873314a
-  data.tar.gz: bb50576e96b07f8fbe53adb6cb591817edd6bf2e
+  metadata.gz: d3d9b5126b4cde9b2cdd812112532f7d99222389
+  data.tar.gz: fe10629998d37c84b413bd6c62d18ceec70fe8bb
 SHA512:
-  metadata.gz: 0a298a2b7b6b01cefa30270e585d021b9f15861126d13ad6fc60f5d9c69ffb54fde5a45d533e1c3a6598bf116b0a3a58c058e8375d52c34fea6b7646687cb71f
-  data.tar.gz: 8f5d756b0a6f7a0abca476dff820e01a269dc077ba21dd305968c323b0e5c82c59caf1e15be274c3e8afb330aa2f9c2c7cccb7e60aee8722901ada67c015ad27
+  metadata.gz: b02f3f75ca4ca16f8a60f81f2ae535d3675db7f4378c5eb735b5bc50c88d24879ebae2342636a22354d0bf9e972f5452c4b9e1a29a38c029ea82601a90b9ee9f
+  data.tar.gz: bbe441f731945e907798865c950de0242dd1e9887555d0b87a0cb021eec02f507b5984205af7486abba5927b689503aa07f7bedc3a020c5222b7c16385121953

data/lib/skype_bot/activity.rb

@@ -2,11 +2,11 @@ module SkypeBot
   module Activity
     extend self
 
-    CONVERSATION_URL = 'https://apis.skype.com/v2/conversations'
+    CONVERSATION_URL = 'https://skype.botframework.com/v3/conversations'
 
     def text_message(uid, content)
       token = Auth.get_token
-      body = { message: { content: content } }.to_json
+      body = payload(uid, content).to_json
       headers = { Authorization: "Bearer #{token}", 'Content-Type': 'application/json' }
       url = activity_url(uid)
 
@@ -18,5 +18,17 @@ module SkypeBot
     def activity_url(uid)
       "#{CONVERSATION_URL}/#{uid}/activities"
     end
+
+    def payload(uid, content)
+      {
+        type: 'message',
+        agent: 'botbuilder',
+        source: 'skype',
+        text: content,
+        from: { id: "#{Config.skype_number}:#{Config.app_id}" },
+        recipient: { id: uid },
+        channelData: {}
+      }
+    end
   end
 end

data/lib/skype_bot/config.rb

@@ -4,6 +4,7 @@ module SkypeBot
     mattr_accessor :bot_id
     mattr_accessor :app_id
     mattr_accessor :app_secret
+    mattr_accessor :skype_number
 
     mattr_accessor :scope
     @@scope = 'https://graph.microsoft.com/.default'

data/lib/skype_bot/parser.rb

@@ -3,21 +3,18 @@ module SkypeBot
     attr_accessor :payload
 
     def initialize(data)
-      @payload = data['_json']
+      @payload = data['skype']
     end
 
     def execute
-      payload.map do |event|
-        {
-          action: event['action'],
-          type: event['activity'].underscore,
-          from: event['from'],
-          display_name: event['fromDisplayName'],
-          to: event['to'],
-          time: Time.parse(event['time']),
-          content: event['content']
-        }
-      end
+      {
+        type: payload['type'].underscore,
+        from: payload['from']['id'],
+        display_name: payload['from']['name'],
+        to: payload['recipient']['id'],
+        time: Time.parse(payload['timestamp']),
+        content: payload['text']
+      }
     end
   end
 end

data/lib/skype_bot/version.rb

@@ -1,3 +1,3 @@
 module SkypeBot
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skype_bot
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - MQuy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-24 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler