qqbot 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa9640a3b0d1829afb8e8a597d505583d918ca86
-  data.tar.gz: 9f598d3abf7f85314c655c308cc94b89254206f4
+  metadata.gz: f4747aff11d6401325e92d7f6c971d5840161d84
+  data.tar.gz: 4887f1da58515e0482d1ada0dba7d384371f58c1
 SHA512:
-  metadata.gz: 6256bf3d5c525b7d1f63aa98edf6c83ea5c46bb9417c74d287a428ff0ae88ab6a5a180748b08fcb8f57bac7e3dca77fff3acd16ca656f23579aa8d74d1b62740
-  data.tar.gz: a0bc8fb618dcb78e375ca05f31cb6bdd221dca51a625eaf29d3eb39b88c3d2420037ebf1f1be68767eda25eec84d56aaca70b85bb947ebb95cca44a95a5a566a
+  metadata.gz: 685e6cbfb49018deb77299a4bd93dce9eeaceb69bd194fe111b2b485cda0a4b78621f8190611a87736951c4a38833a028e709d2fee2585c03787dd66cb663efa
+  data.tar.gz: b4464f68b8aeca510a989034257cbe8f59f16903340ed593c5771796331b557880d4a4c8b111e388d366dd8d67a20204d2d02a5bfc135056ad0861ebe8dca73d

data/.gitignore

@@ -1,13 +1,15 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-
-lib/qqbot/qrcode.png
-
-qqbot-0.1.0.gem
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+
+lib/qqbot/qrcode.png
+
+qqbot-0.1.0.gem
+
+*.gem

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://ruby.taobao.org'
-
-# Specify your gem's dependencies in qqbot.gemspec
-gemspec
+source 'https://ruby.taobao.org'
+
+# Specify your gem's dependencies in qqbot.gemspec
+gemspec

data/README.md

@@ -1,40 +1,63 @@
-# QQBot
-
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/qqbot`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'qqbot'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install qqbot
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/ScienJus/qqbot. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
-
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+# QQBot
+
+基于 Smart QQ（Web QQ）的 QQ 机器人
+
+### 使用方法
+
+安装这个 Gem ：
+
+```
+gem install qqbot
+```
+
+`require 'qqbot'`并编写自己的业务逻辑，例如：
+
+```
+require 'qqbot'
+
+qqbot = QQBot.new
+
+qqbot.login
+
+qqbot.get_group_list.each { |group| puts group.name }
+
+qqbot.get_friend_list.each do |category|
+  puts category.name
+  category.friends.each do |friend|
+    puts "———— #{friend.nickname}"
+  end
+end
+```
+
+### Api 列表
+
+- [x] 登录
+- [x] 拉取消息
+- [x] 获取群列表
+- [x] 获取好友列表
+- [x] 获取讨论组列表
+- [ ] 发送私聊消息
+- [ ] 发送群消息
+- [ ] 发送临时消息
+- [ ] 好友详细信息
+- [ ] 群详细信息
+- [ ] 讨论组详细信息
+- [ ] 获取在线好友
+- [ ] 获取最近会话
+- [ ] 获取登录用户信息
+- [ ] 查询用户 QQ 号
+- [ ] 退出登录
+
+
+### 拓展功能列表
+
+- [x] 登录时保存二维码到本地
+- [x] 登录时通过网页查看二维码
+- [ ] 登录时发送二维码到指定邮箱
+- [ ] 登录时将二维码打印到控制台
+- [ ] 登录失效后邮件推送信息
+
+
+### 反馈
+
+有问题或是建议可以提 Issues ，或是发邮件联系我，我的邮箱：`i@scienjus.com`

data/lib/qqbot.rb

@@ -1,17 +1,23 @@
-require 'qqbot/version'
-require 'logger'
-
-module QQBot
-
-  LOGGER = Logger.new(STDOUT)
-
-  autoload :Auth, 'qqbot/auth'
-  autoload :Cookie, 'qqbot/cookie'
-  autoload :Client, 'qqbot/client'
-  autoload :Api, 'qqbot/api'
-  autoload :Bot, 'qqbot/bot'
-
-  def self.new
-    QQBot::Bot.new
-  end
-end
+require 'qqbot/version'
+require 'logger'
+
+module QQBot
+
+  LOGGER = Logger.new(STDOUT)
+
+  autoload :Auth, 'qqbot/auth'
+  autoload :Cookie, 'qqbot/cookie'
+  autoload :Client, 'qqbot/client'
+  autoload :Api, 'qqbot/api'
+  autoload :Bot, 'qqbot/bot'
+  autoload :Group, 'qqbot/model'
+  autoload :Friend, 'qqbot/model'
+  autoload :Category, 'qqbot/model'
+  autoload :Discuss, 'qqbot/model'
+  autoload :Message, 'qqbot/model'
+  autoload :Font, 'qqbot/model'
+
+  def self.new
+    QQBot::Bot.new
+  end
+end

data/lib/qqbot/api.rb

@@ -1,42 +1,149 @@
-require 'uri'
-require 'json'
-require "fileutils"
-
-module QQBot
-  class Api
-
-    def initialize(client, options = {})
-      @client = client
-      @options = options
-    end
-
-    def poll
-      uri = URI('http://d1.web2.qq.com/channel/poll2')
-
-      r = JSON.generate(
-        ptwebqq: @options[:ptwebqq],
-        clientid: 53999199,
-        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)
-      rescue [ExceptionType = Net::ReadTimeout]
-        return
-      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
-  end
-end
+require 'uri'
+require 'json'
+require 'fileutils'
+
+module QQBot
+  class Api
+
+    def initialize(client, options = {})
+      @client = client
+      @options = options
+    end
+
+    def self.hash(uin, ptwebqq)
+      n = Array.new(4, 0)
+
+      for i in (0...ptwebqq.size)
+        n[i % 4] ^= ptwebqq[i].ord
+      end
+
+      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
+
+      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,
+        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)
+      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
+    end
+
+    def hash
+      self.class.hash(@options[:uin], @options[:ptwebqq])
+    end
+
+    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
+    end
+
+    def get_discuss_list
+        uri = URI('http://s.web2.qq.com/api/get_discus_list')
+        uri.query =
+          URI.encode_www_form(
+            clientid: 53999199,
+            psessionid: @options[:psessionid],
+            vfwebqq: @options[:vfwebqq],
+            t: 0.1
+          )
+
+        code, body = @client.get(uri, 'http://d1.web2.qq.com/proxy.html?v=20151105001&callback=1&id=2')
+
+        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 hash
+      self.class.hash(@options[:uin], @options[:ptwebqq])
+    end
+  end
+end

data/lib/qqbot/auth.rb

@@ -1,180 +1,180 @@
-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", out: '/dev/null')
-        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服务进程'
-            system "kill -9 #{@pid}"
-          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
+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