qqbot 0.0.2 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4747aff11d6401325e92d7f6c971d5840161d84
-  data.tar.gz: 4887f1da58515e0482d1ada0dba7d384371f58c1
+  metadata.gz: 2323213c6970fbad5d18f7eb6d16c265a332ffb3
+  data.tar.gz: 85fb56e409dc95b7623522bee66b931c25258dae
 SHA512:
-  metadata.gz: 685e6cbfb49018deb77299a4bd93dce9eeaceb69bd194fe111b2b485cda0a4b78621f8190611a87736951c4a38833a028e709d2fee2585c03787dd66cb663efa
-  data.tar.gz: b4464f68b8aeca510a989034257cbe8f59f16903340ed593c5771796331b557880d4a4c8b111e388d366dd8d67a20204d2d02a5bfc135056ad0861ebe8dca73d
+  metadata.gz: 263e39aadc3568d61200cab91a59e8a942c2ab9c3e286857ae19a91b45cd3015f5cc60cdd89a01eb7b5312a7615b1a812b39cd7d6809317c402cf3bcb3d9ff88
+  data.tar.gz: c156c8f2523c2f63e9471db1176f5db688ae001039e6ac30d7c35e468284831962c9462c5a2842149daec0f0de18a17b138319231b51bd27953cf5a0c67e7e35

data/README.md

@@ -17,11 +17,11 @@ require 'qqbot'
 
 qqbot = QQBot.new
 
-qqbot.login
+# 在这里需要扫描二维码登录
 
 qqbot.get_group_list.each { |group| puts group.name }
 
-qqbot.get_friend_list.each do |category|
+qqbot.get_friend_list_with_category.each do |category|
   puts category.name
   category.friends.each do |friend|
     puts "———— #{friend.nickname}"
@@ -36,16 +36,17 @@ end
 - [x] 获取群列表
 - [x] 获取好友列表
 - [x] 获取讨论组列表
-- [ ] 发送私聊消息
-- [ ] 发送群消息
-- [ ] 发送临时消息
+- [x] 发送私聊消息
+- [x] 发送群消息
+- [x] 发送讨论组消息
+- [x] 发送临时消息
 - [ ] 好友详细信息
-- [ ] 群详细信息
-- [ ] 讨论组详细信息
-- [ ] 获取在线好友
-- [ ] 获取最近会话
-- [ ] 获取登录用户信息
-- [ ] 查询用户 QQ 号
+- [x] 群详细信息
+- [x] 讨论组详细信息
+- [x] 获取在线好友
+- [x] 获取最近会话
+- [x] 获取登录用户信息
+- [x] 查询用户 QQ 号
 - [ ] 退出登录
 
 

data/lib/qqbot/api.rb

@@ -1,95 +1,131 @@
 require 'uri'
-require 'json'
-require 'fileutils'
 
 module QQBot
   class Api
 
-    def initialize(client, options = {})
-      @client = client
+    def initialize
+      @client = QQBot::Client.new
+      @msg_id = 1_000_000
+    end
+
+    def auth_options=(options = {})
       @options = options
     end
 
-    def self.hash(uin, ptwebqq)
-      n = Array.new(4, 0)
+    def get_qrcode
+      uri = URI('https://ssl.ptlogin2.qq.com/ptqrshow');
+      uri.query =
+        URI.encode_www_form(
+          appid: 501004106,
+          e: 0,
+          l: :M,
+          s: 5,
+          d: 72,
+          v: 4,
+          t: 0.1,
+        )
+      @client.get(uri)
+    end
 
-      for i in (0...ptwebqq.size)
-        n[i % 4] ^= ptwebqq[i].ord
-      end
+    def verify_qrcode
+      uri = URI('https://ssl.ptlogin2.qq.com/ptqrlogin');
+      uri.query =
+        URI.encode_www_form(
+          webqq_type: 10,
+          remember_uin: 1,
+          login2qq: 1,
+          aid: 501004106,
+          u1: 'http://Fw.qq.com/proxy.html?login2qq=1&webqq_type=10',
+          ptredirect: 0,
+          ptlang: 2052,
+          daid: 164,
+          from_ui: 1,
+          pttype: 1,
+          dumy: '',
+          fp: 'loginerroralert',
+          action: '0-0-157510',
+          mibao_css: 'm_webqq',
+          t: 1,
+          g: 1,
+          js_type: 0,
+          js_ver: 10143,
+          login_sig: '',
+          pt_randsalt: 0,
+        )
+      @client.get(uri)
+    end
 
-      u = ['EC', 'OK']
+    def get_ptwebqq(url)
+      uri = URI(url);
+      code, body = @client.get(uri, 'http://s.web2.qq.com/proxy.html?v=20130916001&callback=1&id=1')
+      return code, @client.get_cookie('ptwebqq')
+    end
+
+    def get_vfwebqq(ptwebqq)
+      uri = URI('http://s.web2.qq.com/api/getvfwebqq');
+      uri.query =
+        URI.encode_www_form(
+          ptwebqq: ptwebqq,
+          clientid: QQBot::CLIENT_ID,
+          psessionid: '',
+          t: 0.1,
+        )
+      @client.get(uri, 'http://s.web2.qq.com/proxy.html?v=20130916001&callback=1&id=1')
+    end
+
+    def get_psessionid_and_uin(ptwebqq)
+      uri = URI('http://d1.web2.qq.com/channel/login2');
+      r = JSON.generate(
+        ptwebqq: ptwebqq,
+        clientid: QQBot::CLIENT_ID,
+        psessionid: '',
+        status: 'online'
+      )
+      @client.post(uri, 'http://d1.web2.qq.com/proxy.html?v=20151105001&callback=1&id=2', r: r)
+    end
 
+    def self.hash(uin, ptwebqq)
+      n = Array.new(4, 0)
+      ptwebqq.chars.each_index { |i| n[i % 4] ^= ptwebqq[i].ord }
+      u = ['EC', 'OK']
       v = Array.new(4)
       v[0] = uin >> 24 & 255 ^ u[0][0].ord;
       v[1] = uin >> 16 & 255 ^ u[0][1].ord;
       v[2] = uin >> 8 & 255 ^ u[1][0].ord;
       v[3] = uin & 255 ^ u[1][1].ord;
-
       u = Array.new(8)
-      for i in (0...8)
-        u[i] = i.odd? ? v[i >> 1] : n[i >> 1]
-      end
-
+      (0...8).each { |i| u[i] = i.odd? ? v[i >> 1] : n[i >> 1] }
       n = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F']
-
       v = ''
-
       u.each do |i|
         v << n[(i >> 4) & 15]
         v << n[i & 15]
       end
-
       v
     end
 
     def poll
       uri = URI('http://d1.web2.qq.com/channel/poll2')
-
       r = JSON.generate(
         ptwebqq: @options[:ptwebqq],
-        clientid: 53999199,
+        clientid: QQBot::CLIENT_ID,
         psessionid: @options[:psessionid],
         key: ''
       )
-
       begin
-        code, body = @client.post(uri, 'http://d1.web2.qq.com/proxy.html?v=20151105001&callback=1&id=2', r: r)
+        @client.post(uri, 'http://d1.web2.qq.com/proxy.html?v=20151105001&callback=1&id=2', r: r)
       rescue
         retry
       end
-
-      if code == '200'
-        json = JSON.parse body
-        if json['retcode'] == 0
-          return json['result']
-        else
-          QQBot::LOGGER.info "获取消息失败 返回码 #{json['retcode']}"
-        end
-      else
-        QQBot::LOGGER.info "请求失败，返回码#{code}"
-      end
     end
 
     def get_group_list
         uri = URI('http://s.web2.qq.com/api/get_group_name_list_mask2')
-
         r = JSON.generate(
           vfwebqq: @options[:vfwebqq],
           hash: hash
         )
-
-        code, body = @client.post(uri, 'http://d1.web2.qq.com/proxy.html?v=20151105001&callback=1&id=2', r: r)
-
-        if code == '200'
-          json = JSON.parse body
-          if json['retcode'] == 0
-            return json['result']
-          else
-            QQBot::LOGGER.info "获取群列表失败 返回码 #{json['retcode']}"
-          end
-        else
-          QQBot::LOGGER.info "请求失败，返回码#{code}"
-        end
+        @client.post(uri, 'http://d1.web2.qq.com/proxy.html?v=20151105001&callback=1&id=2', r: r)
     end
 
     def hash
@@ -98,52 +134,168 @@ module QQBot
 
     def get_friend_list
         uri = URI('http://s.web2.qq.com/api/get_user_friends2')
-
         r = JSON.generate(
           vfwebqq: @options[:vfwebqq],
           hash: hash
         )
-
-        code, body = @client.post(uri, 'http://s.web2.qq.com/proxy.html?v=20130916001&callback=1&id=1', r: r)
-
-        if code == '200'
-          json = JSON.parse body
-          if json['retcode'] == 0
-            return json['result']
-          else
-            QQBot::LOGGER.info "获取好友列表失败 返回码 #{json['retcode']}"
-          end
-        else
-          QQBot::LOGGER.info "请求失败，返回码#{code}"
-        end
+        @client.post(uri, 'http://s.web2.qq.com/proxy.html?v=20130916001&callback=1&id=1', r: r)
     end
 
     def get_discuss_list
         uri = URI('http://s.web2.qq.com/api/get_discus_list')
         uri.query =
           URI.encode_www_form(
-            clientid: 53999199,
+            clientid: QQBot::CLIENT_ID,
             psessionid: @options[:psessionid],
             vfwebqq: @options[:vfwebqq],
             t: 0.1
           )
+        @client.get(uri, 'http://d1.web2.qq.com/proxy.html?v=20151105001&callback=1&id=2')
+    end
+
+    def send_to_friend(friend_id, content)
+      uri = URI('http://d1.web2.qq.com/channel/send_buddy_msg2')
+      r = JSON.generate(
+        to: friend_id,
+        content: self.class.build_message(content),
+        face: 522,
+        clientid: QQBot::CLIENT_ID,
+        msg_id: msg_id,
+        psessionid: @options[:psessionid]
+      )
+      @client.post(uri, 'http://d1.web2.qq.com/proxy.html?v=20151105001&callback=1&id=2', r: r)
+    end
+
+    def send_to_group(group_id, content)
+      uri = URI('http://d1.web2.qq.com/channel/send_qun_msg2')
+      r = JSON.generate(
+        group_uin: group_id,
+        content: self.class.build_message(content),
+        face: 522,
+        clientid: QQBot::CLIENT_ID,
+        msg_id: msg_id,
+        psessionid: @options[:psessionid]
+      )
+      @client.post(uri, 'http://d1.web2.qq.com/proxy.html?v=20151105001&callback=1&id=2', r: r)
+    end
+
+    def send_to_discuss(discuss_id, content)
+      uri = URI('http://d1.web2.qq.com/channel/send_discu_msg2')
+      r = JSON.generate(
+        did: discuss_id,
+        content: self.class.build_message(content),
+        face: 522,
+        clientid: QQBot::CLIENT_ID,
+        msg_id: msg_id,
+        psessionid: @options[:psessionid]
+      )
+      @client.post(uri, 'http://d1.web2.qq.com/proxy.html?v=20151105001&callback=1&id=2', r: r)
+    end
+
+    def send_to_sess(sess_id, content)
+      uri = URI('http://d1.web2.qq.com/channel/send_sess_msg2')
+      r = JSON.generate(
+        to: sess_id,
+        content: self.class.build_message(content),
+        face: 522,
+        clientid: QQBot::CLIENT_ID,
+        msg_id: msg_id,
+        psessionid: @options[:psessionid]
+      )
+      @client.post(uri, 'http://d1.web2.qq.com/proxy.html?v=20151105001&callback=1&id=2', r: r)
+    end
+
+    def get_account_info
+      uri = URI('http://s.web2.qq.com/api/get_self_info2')
+      uri.query =
+        URI.encode_www_form(
+          t: 0.1
+        )
+
+      @client.get(uri, 'http://s.web2.qq.com/proxy.html?v=20130916001&callback=1&id=1')
+    end
+
+    def get_recent_list
+      uri = URI('http://d1.web2.qq.com/channel/get_recent_list2')
+      r = JSON.generate(
+        vfwebqq: @options[:vfwebqq],
+        clientid: QQBot::CLIENT_ID,
+        psessionid: ''
+      )
+      @client.post(uri, 'http://d1.web2.qq.com/proxy.html?v=20151105001&callback=1&id=2', r: r)
+    end
+
+    def get_qq_by_id(id)
+      uri = URI('http://s.web2.qq.com/api/get_friend_uin2')
+      uri.query =
+        URI.encode_www_form(
+          tuin: id,
+          type: 1,
+          vfwebqq: @options[:vfwebqq],
+          t: 0.1
+        )
+      @client.get(uri, 'http://s.web2.qq.com/proxy.html?v=20130916001&callback=1&id=1')
+    end
+
+    def get_online_friends
+      uri = URI('http://d1.web2.qq.com/channel/get_online_buddies2')
+      uri.query =
+        URI.encode_www_form(
+          vfwebqq: @options[:vfwebqq],
+          clientid: QQBot::CLIENT_ID,
+          psessionid: @options[:psessionid],
+          t: 0.1
+        )
+      @client.get(uri, 'http://d1.web2.qq.com/proxy.html?v=20151105001&callback=1&id=2')
+    end
 
-        code, body = @client.get(uri, 'http://d1.web2.qq.com/proxy.html?v=20151105001&callback=1&id=2')
+    def get_group_info(group_code)
+      uri = URI('http://s.web2.qq.com/api/get_group_info_ext2')
+      uri.query =
+        URI.encode_www_form(
+          gcode: group_code,
+          vfwebqq: @options[:vfwebqq],
+          t: 0.1
+        )
+      @client.get(uri, 'http://s.web2.qq.com/proxy.html?v=20130916001&callback=1&id=1')
+    end
 
-        if code == '200'
-          json = JSON.parse body
-          if json['retcode'] == 0
-            return json['result']
-          else
-            QQBot::LOGGER.info "获取群列表失败 返回码 #{json['retcode']}"
-          end
-        else
-          QQBot::LOGGER.info "请求失败，返回码#{code}"
-        end
+    def get_discuss_info(discuss_id)
+      uri = URI('http://d1.web2.qq.com/channel/get_discu_info')
+      uri.query =
+        URI.encode_www_form(
+          did: discuss_id,
+          vfwebqq: @options[:vfwebqq],
+          clientid: QQBot::CLIENT_ID,
+          psessionid: @options[:psessionid],
+          t: 0.1
+        )
+      @client.get(uri, 'http://d1.web2.qq.com/proxy.html?v=20151105001&callback=1&id=2')
     end
 
     def hash
       self.class.hash(@options[:uin], @options[:ptwebqq])
     end
+
+    def msg_id
+      @msg_id += 1
+    end
+
+    def self.build_message(content)
+      JSON.generate(
+        [
+            content,
+            [
+                'font',
+                {
+                    name: '宋体',
+                    size: 10,
+                    style: [0, 0, 0],
+                    color: '000000'
+                }
+            ]
+        ]
+      )
+    end
   end
 end

data/lib/qqbot/bot.rb

@@ -1,56 +1,166 @@
+require 'json'
+
 module QQBot
   class Bot
     def initialize
-      @client = QQBot::Client.new
-      @auth = QQBot::Auth.new @client
+      @api = QQBot::Api.new
+      @api.auth_options = login
     end
 
-    def login
-      @auth.get_qrcode
+    def self.check_response_json(code, body)
+      if code == '200'
+        json = JSON.parse body
+        if json['retcode'] == 0
+          return json['result']
+        else
+          QQBot::LOGGER.info "请求失败， JSON返回码 #{json['retcode']}"
+        end
+      else
+        QQBot::LOGGER.info "请求失败，HTTP返回码#{code} retcode"
+      end
+    end
+
+    def self.check_send_msg_response(code, body)
+      if code == '200'
+        json = JSON.parse body
+        if json['errCode'] == 0
+          QQBot::LOGGER.info '发送成功'
+          return true
+        else
+          QQBot::LOGGER.info "发送失败 返回码 #{json['retcode']}"
+        end
+      else
+        QQBot::LOGGER.info "请求失败，返回码 #{code}"
+      end
+    end
+
+    def get_qrcode
+      code, body = @api.get_qrcode
+
+      if code == '200'
+        file_name = File.expand_path('qrcode.png', File.dirname(__FILE__));
+
+        File.open(file_name, 'wb') do |file|
+          file.write body
+          file.close
+        end
+
+        QQBot::LOGGER.info "二维码已经保存在#{file_name}中"
+
+        unless @pid
+          QQBot::LOGGER.info '开启web服务进程'
+          @pid = spawn("ruby -run -e httpd #{file_name} -p 9090")
+        end
 
+        QQBot::LOGGER.info '也可以通过访问 http://localhost:9090 查看二维码'
+        return true
+      else
+        QQBot::LOGGER.info "请求失败，返回码#{code}"
+      end
+    end
+
+    def verify_qrcode
       url = ''
 
       until url.start_with? 'http' do
         sleep 5
-        url = @auth.verify_qrcode
-        @auth.get_qrcode if url == '-1'
+        code, body = @api.verify_qrcode
+
+        if code == '200'
+          result = body.force_encoding("UTF-8")
+          if result.include? '二维码已失效'
+            QQBot::LOGGER.info '二维码已失效，准备重新获取'
+            return unless get_qrcode
+          elsif result.include? 'http'
+            QQBot::LOGGER.info '认证成功'
+            return URI.extract(result).first
+          end
+        else
+          QQBot::LOGGER.info "请求失败，返回码#{code}"
+          return
+        end
       end
+    end
 
-      @auth.get_ptwebqq url
+    def close_qrcode_server
+      if @pid
+        QQBot::LOGGER.info '关闭web服务进程'
+        Process.kill('KILL', @pid)
+        @pid = nil
+      end
+    end
 
-      @auth.get_vfwebqq
+    def get_ptwebqq(url)
+      code, ptwebqq = @api.get_ptwebqq url
 
-      @auth.get_psessionid_and_uin
+      if code == '302'
+        ptwebqq
+      else
+        QQBot::LOGGER.info "请求失败，返回码#{code}"
+      end
+    end
 
-      auth_options = @auth.options
+    def get_vfwebqq(ptwebqq)
+      code, body = @api.get_vfwebqq(ptwebqq)
 
-      @api = QQBot::Api.new(@client, auth_options)
+      result = self.class.check_response_json(code, body)
+      result['vfwebqq'] if result
     end
 
-    def poll &block
-      return if @api.nil?
+    def get_psessionid_and_uin(ptwebqq)
+      code, body = @api.get_psessionid_and_uin ptwebqq
 
+      result = self.class.check_response_json(code, body)
+      if result
+        return result['psessionid'], result['uin']
+      end
+    end
+
+    def login
+      QQBot::LOGGER.info '开始获取二维码'
+      raise QQBot::Error::LoginFailed unless get_qrcode
+
+      QQBot::LOGGER.info '等待扫描二维码'
+      url = verify_qrcode
+      raise QQBot::Error::LoginFailed unless url
+
+      close_qrcode_server
+
+      QQBot::LOGGER.info '开始获取ptwebqq'
+      ptwebqq = get_ptwebqq url
+      raise QQBot::Error::LoginFailed unless ptwebqq
+
+      QQBot::LOGGER.info '开始获取vfwebqq'
+      vfwebqq = get_vfwebqq ptwebqq
+      raise QQBot::Error::LoginFailed unless vfwebqq
+
+      QQBot::LOGGER.info '开始获取psessionid和uin'
+      psessionid, uin = get_psessionid_and_uin ptwebqq
+      raise QQBot::Error::LoginFailed unless uin && psessionid
+
+      {
+        ptwebqq: ptwebqq,
+        vfwebqq: vfwebqq,
+        psessionid: psessionid,
+        uin: uin
+      }
+    end
+
+    def poll
       loop do
-        json = @api.poll
-        unless json.nil?
-          json.each do |item|
+        code, body = @api.poll
+        result = self.class.check_response_json(code, body)
+
+        if result
+          result.each do |item|
             message = QQBot::Message.new
             value = item['value']
+            message.type, message.from_id, message.send_id =
             case item['poll_type']
-            when 'message' then
-              message.type = 0
-              message.from_id = value['from_uin']
-              message.send_id = value['from_uin']
-            when 'group_message' then
-              message.type = 1
-              message.from_id = value['from_uin']
-              message.send_id = value['send_uin']
-            when 'discu_message' then
-              message.type = 2
-              message.from_id = value['from_uin']
-              message.send_id = value['send_uin']
-            else
-              message.type = 3
+            when 'message' then [0, value['from_uin'], value['from_uin']]
+            when 'group_message' then [1, value['from_uin'], value['send_uin']]
+            when 'discu_message' then [2, value['from_uin'], value['send_uin']]
+            else 3
             end
             message.time = value['time']
             message.content = value['content'][1]
@@ -63,7 +173,7 @@ module QQBot
             font.style = font_json['style']
             message.font = font
 
-            block.call message
+            yield if block_given?
           end
         end
         sleep 1
@@ -71,12 +181,13 @@ module QQBot
     end
 
     def get_group_list
-      json = @api.nil? ? nil : @api.get_group_list
+      code, body = @api.get_group_list
+      result = self.class.check_response_json(code, body)
 
-      unless json.nil?
+      if result
         group_map = {}
 
-        gnamelist = json['gnamelist']
+        gnamelist = result['gnamelist']
         gnamelist.each do |item|
           group = QQBot::Group.new
           group.name = item['name']
@@ -85,57 +196,32 @@ module QQBot
           group_map[group.id] = group
         end
 
-        gmarklist = json['gmarklist']
+        gmarklist = result['gmarklist']
         gmarklist.each do |item|
           group_map[item['uin']].markname = item['markname']
         end
 
-        return group_map.values
+        group_map.values
       end
     end
 
-    def get_friend_list
-      json = @api.nil? ? nil : @api.get_friend_list
-
-      unless json.nil?
-        friend_map = {}
-        category_list = []
-
-        friends = json['friends']
-        friends.each do |item|
-          friend = QQBot::Friend.new
-          friend.id = item['uin']
-          friend.category_id = item['categories']
-          friend_map[friend.id] = friend
-        end
-
-        marknames = json['marknames']
-        marknames.each do |item|
-          friend_map[item['uin']].markname = item['markname']
-        end
-
-        vipinfo = json['vipinfo']
-        vipinfo.each do |item|
-          friend = friend_map[item['u']]
-          friend.is_vip = item['is_vip']
-          friend.vip_level = item['vip_level']
-        end
+    def get_friend_list_with_category
+      code, body = @api.get_friend_list
+      result = self.class.check_response_json(code, body)
 
-        info = json['info']
-        info.each do |item|
-          friend_map[item['uin']].nickname = item['nick']
-        end
+      if result
+        friend_list = self.class.build_friend_list result
 
-        categories = json['categories']
+        categories = result['categories']
         has_default_category = false
-        categories.each do |item|
+        category_list = categories.collect do |item|
           category = QQBot::Category.new
           category.name = item['name']
           category.sort = item['sort']
           category.id = item['index']
-          category.friends = friend_map.values.select { |friend| friend.category_id == category.id }
-          category_list << category
+          category.friends = friend_list.select { |friend| friend.category_id == category.id }
           has_default_category ||= (category.id == 0)
+          category
         end
 
         unless has_default_category
@@ -143,29 +229,243 @@ module QQBot
           category.name = '我的好友（默认）'
           category.sort = 1
           category.id = 0
-          category.friends = friend_map.values.select { |friend| friend.category_id == category.id }
+          category.friends = friend_list.select { |friend| friend.category_id == category.id }
           category_list << category
         end
 
-        return category_list
+        category_list
       end
     end
 
-    def get_discuss_list
-      json = @api.nil? ? nil : @api.get_discuss_list
+    def get_friend_list
+      code, body = @api.get_friend_list
+      result = self.class.check_response_json(code, body)
 
-      unless json.nil?
-        discuss_list = []
+      if result
+        self.class.build_friend_list(result)
+      end
+    end
+
+    def self.build_friend_list(json)
+      friend_map = {}
+
+      friends = json['friends']
+      friends.each do |item|
+        friend = QQBot::Friend.new
+        friend.id = item['uin']
+        friend.category_id = item['categories']
+        friend_map[friend.id] = friend
+      end
 
-        dnamelist = json['dnamelist']
-        dnamelist.each do |item|
+      marknames = json['marknames']
+      marknames.each do |item|
+        friend_map[item['uin']].markname = item['markname']
+      end
+
+      vipinfo = json['vipinfo']
+      vipinfo.each do |item|
+        friend = friend_map[item['u']]
+        friend.is_vip = item['is_vip']
+        friend.vip_level = item['vip_level']
+      end
+
+      info = json['info']
+      info.each do |item|
+        friend_map[item['uin']].nickname = item['nick']
+      end
+
+      friend_map.values
+    end
+
+    def get_discuss_list
+      code, body = @api.get_discuss_list
+      result = self.class.check_response_json(code, body)
+
+      if result
+        dnamelist = result['dnamelist']
+        dnamelist.collect do |item|
           discuss = QQBot::Discuss.new
           discuss.name = item['name']
           discuss.id = item['did']
-          discuss_list << discuss
+          discuss
+        end
+      end
+    end
+
+    def send_to_friend(friend_id, content)
+      code, body = @api.send_to_friend(friend_id, content)
+      self.class.check_send_msg_response(code, body)
+    end
+
+    def send_to_group(group_id, content)
+      code, body = @api.send_to_group(group_id, content)
+      self.class.check_send_msg_response(code, body)
+    end
+
+    def send_to_discuss(discuss_id, content)
+      code, body = @api.send_to_discuss(discuss_id, content)
+      self.class.check_send_msg_response(code, body)
+    end
+
+    def send_to_sess(sess_id, content)
+      code, body = @api.send_to_sess(sess_id, content)
+      self.class.check_send_msg_response(code, body)
+    end
+
+    def get_account_info
+      code, body = @api.get_account_info
+      result = self.class.check_response_json(code, body)
+
+      if result
+        # TODO
+        account_info = QQBot::AccountInfo.new
+        account_info.phone = result['phone']
+        account_info.occupation = result['occupation']
+        account_info.college = result['college']
+        account_info.id = result['uin']
+        account_info.blood = result['blood']
+        account_info.slogan = result['lnick']
+        account_info.homepage = result['homepage']
+        account_info.vip_info = result['vip_info']
+        account_info.city = result['city']
+        account_info.country = result['country']
+        account_info.province = result['province']
+        account_info.personal = result['personal']
+        account_info.shengxiao = result['shengxiao']
+        account_info.nickname = result['nick']
+        account_info.email = result['email']
+        account_info.account = result['account']
+        account_info.gender = result['gender']
+        account_info.mobile = result['mobile']
+        birthday = QQBot::Birthday.new
+        birthday.year = result['birthday']['year']
+        birthday.month = result['birthday']['month']
+        birthday.day = result['birthday']['day']
+        account_info.birthday = birthday
+
+        account_info
+      end
+    end
+
+    def get_recent_list
+      code, body = @api.get_recent_list
+      result = self.class.check_response_json(code, body)
+
+      if result
+        result.collect do |item|
+          recent = QQBot::Recent.new
+          recent.id = item['uin']
+          recent.type = item['type']
+          recent
+        end
+      end
+    end
+
+    def get_qq_by_id(id)
+      code, body = @api.get_qq_by_id(id)
+      result = self.class.check_response_json(code, body)
+
+      if result
+        result['account']
+      end
+    end
+
+    def get_online_friends
+      code, body = @api.get_online_friends
+      result = self.class.check_response_json(code, body)
+
+      if result
+        result.collect do |item|
+          online = QQBot::Online.new
+          online.id = item['uin']
+          online.client_type = item['client_type']
+          online
+        end
+      end
+    end
+
+    def get_group_info(group_code)
+      code, body = @api.get_group_info(group_code)
+      result = self.class.check_response_json(code, body)
+
+      if result
+        group_info = QQBot::GroupInfo.new
+        ginfo = result['ginfo']
+        group_info.id = ginfo['gid']
+        group_info.create_time = ginfo['createtime']
+        group_info.memo = ginfo['memo']
+        group_info.name = ginfo['name']
+        group_info.owner_id = ginfo['owner']
+        group_info.markname = ginfo['markname']
+
+        member_map = {}
+
+        minfo = result['minfo']
+        minfo.each do |item|
+          member = QQBot::GroupMember.new
+          member.id = item['uin']
+          member.nickname = item['nick']
+          member.gender = item['gender']
+          member.country = item['country']
+          member.city = item['city']
+          member_map[member.id] = member
+        end
+
+        cards = result['cards']
+        cards.each do |item|
+          member_map[item['muin']].markname = item['card']
+        end
+
+        vipinfo = result['vipinfo']
+        vipinfo.each do |item|
+          member = member_map[item['u']]
+          member.is_vip = item['is_vip']
+          member.vip_level = item['vip_level']
+        end
+
+        stats = result['stats']
+        stats.each do |item|
+          member = member_map[item['uin']]
+          member.client_type = item['client_type']
+          member.status = item['stat']
         end
 
-        return discuss_list
+        group_info.members = member_map.values
+
+        group_info
+      end
+    end
+
+    def get_discuss_info(discuss_id)
+      code, body = @api.get_discuss_info(discuss_id)
+      result = self.class.check_response_json(code, body)
+
+      if result
+        discuss_info = QQBot::DiscussInfo.new
+        info = result['info']
+        discuss_info.id = info['did']
+        discuss_info.name = info['discu_name']
+
+        member_map = {}
+
+        mem_info = result['mem_info']
+        mem_info.each do |item|
+          member = QQBot::DiscussMember.new
+          member.id = item['uin']
+          member.nickname = item['nick']
+          member_map[member.id] = member
+        end
+
+        mem_status = result['mem_status']
+        mem_status.each do |item|
+          member = member_map[item['uin']]
+          member.client_type = item['client_type']
+          member.status = item['status']
+        end
+
+        discuss_info.members = member_map.values
+
+        discuss_info
       end
     end
   end

data/lib/qqbot/client.rb

@@ -6,8 +6,8 @@ module QQBot
 
     @@user_agent = 'Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36';
 
-    def self.origin uri
-      uri.scheme + '://' + uri.host
+    def self.origin(uri)
+      "#{uri.scheme}://#{uri.host}"
     end
 
     def initialize
@@ -15,52 +15,45 @@ module QQBot
     end
 
     def get(uri, referer = '')
+      QQBot::LOGGER.debug { "get #{uri.to_s}" }
+
       Net::HTTP.start(uri.host, uri.port,
         use_ssl: uri.scheme == 'https',
         verify_mode: OpenSSL::SSL::VERIFY_NONE) do |http|
-
-        req = Net::HTTP::Get.new uri
-
+        req = Net::HTTP::Get.new(uri)
         req.initialize_http_header(
           'User-Agent' => @@user_agent,
           'Cookie' => @cookie.to_s,
           'Referer' => referer
         )
-
-        res = http.request req
-
-        @cookie.put res.get_fields('set-cookie')
-
+        res = http.request(req)
+        @cookie.put(res.get_fields('set-cookie'))
+        QQBot::LOGGER.debug { "code: #{res.code}, body: #{res.body}" }
         return res.code, res.body
       end
     end
 
     def post(uri, referer = '', form_data = {})
+      QQBot::LOGGER.debug { "post uri: #{uri.to_s} data: #{form_data.to_s}" }
       Net::HTTP.start(uri.host, uri.port,
         use_ssl: uri.scheme == 'https',
         verify_mode: OpenSSL::SSL::VERIFY_NONE) do |http|
-
-        req = Net::HTTP::Post.new uri
-
+        req = Net::HTTP::Post.new(uri)
         req.set_form_data(form_data)
-
         req.initialize_http_header(
           'User-Agent' => @@user_agent,
           'Cookie' => @cookie.to_s,
           'Referer' => referer,
           'Origin' => self.class.origin(uri)
         )
-
-        res = http.request req
-
-        @cookie.put res.get_fields('set-cookie')
-
+        res = http.request(req)
+        @cookie.put(res.get_fields('set-cookie'))
+        QQBot::LOGGER.debug { "response code: #{res.code}, body: #{res.body}" }
         return res.code, res.body
-
       end
     end
 
-    def get_cookie key
+    def get_cookie(key)
       @cookie[key]
     end
   end

data/lib/qqbot/error.rb

@@ -0,0 +1,4 @@
+module QQBot
+  class Error < StandardError; end
+  class Error::LoginFailed < Error; end
+end

data/lib/qqbot/model.rb

@@ -22,4 +22,36 @@ module QQBot
   class Font
     attr_accessor :color, :name, :size, :style
   end
+
+  class AccountInfo
+    attr_accessor :phone, :occupation, :college, :id, :blood, :slogan, :homepage, :vip_info, :city, :country, :province, :personal, :shengxiao, :nickname, :email, :account, :gender, :mobile, :birthday
+  end
+
+  class Birthday
+    attr_accessor :year, :month, :day
+  end
+
+  class Recent
+    attr_accessor :id, :type
+  end
+
+  class Online
+    attr_accessor :id, :client_type
+  end
+
+  class GroupMember
+    attr_accessor :id, :nickname, :gender, :country, :city, :markname, :is_vip, :vip_level, :client_type, :status
+  end
+
+  class GroupInfo
+    attr_accessor :id, :create_time, :memo, :name, :owner_id, :markname, :members
+  end
+
+  class DiscussInfo
+    attr_accessor :id, :name, :members
+  end
+
+  class DiscussMember
+    attr_accessor :id, :nickname, :client_type, :status
+  end
 end

data/lib/qqbot/version.rb

@@ -1,3 +1,3 @@
 module QQBot
-  VERSION = "0.0.2"
+  VERSION = "0.1.1"
 end

data/lib/qqbot.rb

@@ -1,11 +1,25 @@
-require 'qqbot/version'
 require 'logger'
+require 'qqbot/version'
 
 module QQBot
 
-  LOGGER = Logger.new(STDOUT)
+  class Logger < Logger
+
+    def info(*args)
+      super || false if info?
+    end
+
+    def debug(*args)
+      super || false if debug?
+    end
+  end
+
+  LOGGER = QQBot::Logger.new(STDOUT)
+  LOGGER.datetime_format = '%Y-%m-%d %H:%M:%S'
+  LOGGER.level = Logger::INFO
+
+  CLIENT_ID = 53999199
 
-  autoload :Auth, 'qqbot/auth'
   autoload :Cookie, 'qqbot/cookie'
   autoload :Client, 'qqbot/client'
   autoload :Api, 'qqbot/api'
@@ -16,6 +30,15 @@ module QQBot
   autoload :Discuss, 'qqbot/model'
   autoload :Message, 'qqbot/model'
   autoload :Font, 'qqbot/model'
+  autoload :AccountInfo, 'qqbot/model'
+  autoload :Birthday, 'qqbot/model'
+  autoload :Recent, 'qqbot/model'
+  autoload :Online, 'qqbot/model'
+  autoload :GroupInfo, 'qqbot/model'
+  autoload :GroupMember, 'qqbot/model'
+  autoload :DiscussInfo, 'qqbot/model'
+  autoload :DiscussMember, 'qqbot/model'
+  autoload :Error, 'qqbot/error'
 
   def self.new
     QQBot::Bot.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qqbot
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.1
 platform: ruby
 authors:
 - ScienJus
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-29 00:00:00.000000000 Z
+date: 2015-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,10 +71,10 @@ files:
 - bin/setup
 - lib/qqbot.rb
 - lib/qqbot/api.rb
-- lib/qqbot/auth.rb
 - lib/qqbot/bot.rb
 - lib/qqbot/client.rb
 - lib/qqbot/cookie.rb
+- lib/qqbot/error.rb
 - lib/qqbot/model.rb
 - lib/qqbot/version.rb
 - qqbot.gemspec

data/lib/qqbot/auth.rb

@@ -1,180 +0,0 @@
-require 'uri'
-require 'json'
-require 'fileutils'
-
-module QQBot
-  class Auth
-
-    def initialize client
-      @client = client
-    end
-
-    def get_qrcode
-      QQBot::LOGGER.info '开始获取二维码'
-
-      uri = URI('https://ssl.ptlogin2.qq.com/ptqrshow');
-
-      uri.query =
-        URI.encode_www_form(
-          appid: 501004106,
-          e: 0,
-          l: :M,
-          s: 5,
-          d: 72,
-          v: 4,
-          t: 0.1,
-        )
-
-      code, body = @client.get uri
-
-      if code == '200'
-        file_name = File.expand_path('qrcode.png', File.dirname(__FILE__));
-
-        File.open(file_name, 'wb') do |file|
-          file.write body
-          file.close
-        end
-
-        QQBot::LOGGER.info "二维码已经保存在#{file_name}中"
-
-        if @pid.nil?
-          QQBot::LOGGER.info '开启web服务进程'
-          @pid = spawn("ruby -run -e httpd #{file_name} -p 9090")
-        end
-
-        QQBot::LOGGER.info '也可以通过访问 http://localhost:9090 查看二维码'
-      else
-        QQBot::LOGGER.info "请求失败，返回码#{code}"
-      end
-    end
-
-    def verify_qrcode
-      QQBot::LOGGER.info '等待扫描二维码'
-
-      uri = URI('https://ssl.ptlogin2.qq.com/ptqrlogin');
-      uri.query =
-        URI.encode_www_form(
-          webqq_type: 10,
-          remember_uin: 1,
-          login2qq: 1,
-          aid: 501004106,
-          u1: 'http://Fw.qq.com/proxy.html?login2qq=1&webqq_type=10',
-          ptredirect: 0,
-          ptlang: 2052,
-          daid: 164,
-          from_ui: 1,
-          pttype: 1,
-          dumy: '',
-          fp: 'loginerroralert',
-          action: '0-0-157510',
-          mibao_css: 'm_webqq',
-          t: 1,
-          g: 1,
-          js_type: 0,
-          js_ver: 10143,
-          login_sig: '',
-          pt_randsalt: 0,
-        )
-
-      code, body = @client.get uri
-
-      if code == '200'
-        result = body.force_encoding("UTF-8")
-        if result.include? '二维码已失效'
-          QQBot::LOGGER.info '二维码已失效，请重新获取'
-          return '-1'
-        elsif result.include? 'http'
-          QQBot::LOGGER.info '认证成功'
-          unless @pid.nil?
-            QQBot::LOGGER.info '关闭web服务进程'
-            Process.kill('KILL', @pid)
-            @pid = nil
-          end
-          return URI.extract(result)[0]
-        else
-          return '0'
-        end
-      else
-        QQBot::LOGGER.info "请求失败，返回码#{code}"
-        return '0'
-      end
-    end
-
-    def get_ptwebqq url
-      QQBot::LOGGER.info '开始获取ptwebqq'
-
-      uri = URI(url);
-
-      code, body = @client.get(uri, 'http://s.web2.qq.com/proxy.html?v=20130916001&callback=1&id=1')
-
-      if code == '302'
-        @ptwebqq = @client.get_cookie 'ptwebqq'
-      else
-        QQBot::LOGGER.info "请求失败，返回码#{code}"
-      end
-    end
-
-    def get_vfwebqq
-      QQBot::LOGGER.info '开始获取vfwebqq'
-
-      uri = URI('http://s.web2.qq.com/api/getvfwebqq');
-
-      uri.query =
-        URI.encode_www_form(
-          ptwebqq: @ptwebqq,
-          clientid: 53999199,
-          psessionid: '',
-          t: 0.1,
-        )
-
-      code, body = @client.get(uri, 'http://s.web2.qq.com/proxy.html?v=20130916001&callback=1&id=1')
-
-      if code == '200'
-        json = JSON.parse body
-        if json['retcode'] == 0
-          @vfwebqq = json['result']['vfwebqq']
-        else
-          QQBot::LOGGER.info "获取vfwebqq失败 返回码 #{json['retcode']}"
-        end
-      else
-        QQBot::LOGGER.info "请求失败，返回码#{code}"
-      end
-    end
-
-    def get_psessionid_and_uin
-      QQBot::LOGGER.info '开始获取psessionid和uin'
-
-      uri = URI('http://d1.web2.qq.com/channel/login2');
-
-      r = JSON.generate(
-        ptwebqq: @ptwebqq,
-        clientid: 53999199,
-        psessionid: '',
-        status: 'online'
-      )
-
-      code, body = @client.post(uri, 'http://d1.web2.qq.com/proxy.html?v=20151105001&callback=1&id=2', r: r)
-
-      if code == '200'
-        json = JSON.parse body
-        if json['retcode'] == 0
-          @uin = json['result']['uin']
-          @psessionid = json['result']['psessionid']
-        else
-          QQBot::LOGGER.info "获取vfwebqq失败 返回码 #{json['retcode']}"
-        end
-      else
-        QQBot::LOGGER.info "请求失败，返回码#{code}"
-      end
-    end
-
-    def options
-      {
-        ptwebqq: @ptwebqq,
-        vfwebqq: @vfwebqq,
-        psessionid: @psessionid,
-        uin: @uin
-      }
-    end
-  end
-end