qqbot 0.0.1 → 0.0.2

data/lib/qqbot/bot.rb

@@ -1,41 +1,172 @@
-module QQBot
-  class Bot
-    def initialize
-      @client = QQBot::Client.new
-      @auth = QQBot::Auth.new @client
-    end
-
-    def login
-      @auth.get_qrcode
-
-      url = ''
-
-      until url.start_with? 'http' do
-        sleep 5
-        url = @auth.verify_qrcode
-        @auth.get_qrcode if url == '-1'
-      end
-
-      @auth.get_ptwebqq url
-
-      @auth.get_vfwebqq
-
-      @auth.get_psessionid_and_uin
-
-      auth_options = @auth.options
-
-      @api = QQBot::Api.new(@client, auth_options)
-    end
-
-    def poll
-      return if @api.nil?
-
-      loop do
-        @api.poll
-        sleep 1
-      end
-    end
-
-  end
-
-end
+module QQBot
+  class Bot
+    def initialize
+      @client = QQBot::Client.new
+      @auth = QQBot::Auth.new @client
+    end
+
+    def login
+      @auth.get_qrcode
+
+      url = ''
+
+      until url.start_with? 'http' do
+        sleep 5
+        url = @auth.verify_qrcode
+        @auth.get_qrcode if url == '-1'
+      end
+
+      @auth.get_ptwebqq url
+
+      @auth.get_vfwebqq
+
+      @auth.get_psessionid_and_uin
+
+      auth_options = @auth.options
+
+      @api = QQBot::Api.new(@client, auth_options)
+    end
+
+    def poll &block
+      return if @api.nil?
+
+      loop do
+        json = @api.poll
+        unless json.nil?
+          json.each do |item|
+            message = QQBot::Message.new
+            value = item['value']
+            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
+            end
+            message.time = value['time']
+            message.content = value['content'][1]
+
+            font = QQBot::Font.new
+            font_json = value['content'][0][1]
+            font.color = font_json['color']
+            font.name = font_json['name']
+            font.size = font_json['size']
+            font.style = font_json['style']
+            message.font = font
+
+            block.call message
+          end
+        end
+        sleep 1
+      end
+    end
+
+    def get_group_list
+      json = @api.nil? ? nil : @api.get_group_list
+
+      unless json.nil?
+        group_map = {}
+
+        gnamelist = json['gnamelist']
+        gnamelist.each do |item|
+          group = QQBot::Group.new
+          group.name = item['name']
+          group.id = item['gid']
+          group.code = item['code']
+          group_map[group.id] = group
+        end
+
+        gmarklist = json['gmarklist']
+        gmarklist.each do |item|
+          group_map[item['uin']].markname = item['markname']
+        end
+
+        return 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
+
+        info = json['info']
+        info.each do |item|
+          friend_map[item['uin']].nickname = item['nick']
+        end
+
+        categories = json['categories']
+        has_default_category = false
+        categories.each 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
+          has_default_category ||= (category.id == 0)
+        end
+
+        unless has_default_category
+          category = QQBot::Category.new
+          category.name = '我的好友（默认）'
+          category.sort = 1
+          category.id = 0
+          category.friends = friend_map.values.select { |friend| friend.category_id == category.id }
+          category_list << category
+        end
+
+        return category_list
+      end
+    end
+
+    def get_discuss_list
+      json = @api.nil? ? nil : @api.get_discuss_list
+
+      unless json.nil?
+        discuss_list = []
+
+        dnamelist = json['dnamelist']
+        dnamelist.each do |item|
+          discuss = QQBot::Discuss.new
+          discuss.name = item['name']
+          discuss.id = item['did']
+          discuss_list << discuss
+        end
+
+        return discuss_list
+      end
+    end
+  end
+end

data/lib/qqbot/client.rb

@@ -1,67 +1,67 @@
-require 'net/http'
-require 'openssl'
-
-module QQBot
-  class Client
-
-    @@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
-    end
-
-    def initialize
-      @cookie = QQBot::Cookie.new
-    end
-
-    def get(uri, referer = '')
-      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.initialize_http_header(
-          'User-Agent' => @@user_agent,
-          'Cookie' => @cookie.to_s,
-          'Referer' => referer
-        )
-
-        res = http.request req
-
-        @cookie.put res.get_fields('set-cookie')
-
-        return res.code, res.body
-      end
-    end
-
-    def post(uri, referer = '', form_data = {})
-      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.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')
-
-        return res.code, res.body
-
-      end
-    end
-
-    def get_cookie key
-      @cookie[key]
-    end
-  end
-end
+require 'net/http'
+require 'openssl'
+
+module QQBot
+  class Client
+
+    @@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
+    end
+
+    def initialize
+      @cookie = QQBot::Cookie.new
+    end
+
+    def get(uri, referer = '')
+      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.initialize_http_header(
+          'User-Agent' => @@user_agent,
+          'Cookie' => @cookie.to_s,
+          'Referer' => referer
+        )
+
+        res = http.request req
+
+        @cookie.put res.get_fields('set-cookie')
+
+        return res.code, res.body
+      end
+    end
+
+    def post(uri, referer = '', form_data = {})
+      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.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')
+
+        return res.code, res.body
+
+      end
+    end
+
+    def get_cookie key
+      @cookie[key]
+    end
+  end
+end

data/lib/qqbot/cookie.rb

@@ -1,28 +1,28 @@
-module QQBot
-  class Cookie
-
-    def initialize
-      @cookies = {}
-    end
-
-    def put set_cookie_array
-      return if set_cookie_array == nil
-
-      set_cookie_array.each do |set_cookie|
-        set_cookie.split('; ').each do |cookie|
-          k, v = cookie.split('=')
-          @cookies[k] = v unless v == nil
-        end
-      end
-    end
-
-    def [] key
-      @cookies[key] || ''
-    end
-
-    def to_s
-      @cookies.map{ |k, v| "#{k}=#{v}" }.join('; ')
-    end
-
-  end
-end
+module QQBot
+  class Cookie
+
+    def initialize
+      @cookies = {}
+    end
+
+    def put set_cookie_array
+      return if set_cookie_array.nil?
+
+      set_cookie_array.each do |set_cookie|
+        set_cookie.split('; ').each do |cookie|
+          k, v = cookie.split('=')
+          @cookies[k] = v unless v.nil?
+        end
+      end
+    end
+
+    def [] key
+      @cookies[key] || ''
+    end
+
+    def to_s
+      @cookies.map{ |k, v| "#{k}=#{v}" }.join('; ')
+    end
+
+  end
+end

data/lib/qqbot/model.rb

@@ -0,0 +1,25 @@
+module QQBot
+  class Group
+    attr_accessor :name, :code, :id, :markname
+  end
+
+  class Friend
+    attr_accessor :nickname, :category_id, :id, :is_vip, :vip_level, :markname
+  end
+
+  class Category
+    attr_accessor :name, :sort, :id, :friends
+  end
+
+  class Discuss
+    attr_accessor :name, :id
+  end
+
+  class Message
+    attr_accessor :type, :from_id, :send_id, :time, :content, :font
+  end
+
+  class Font
+    attr_accessor :color, :name, :size, :style
+  end
+end

data/lib/qqbot/version.rb

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

data/qqbot.gemspec

@@ -1,33 +1,33 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'qqbot/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "qqbot"
-  spec.version       = QQBot::VERSION
-  spec.authors       = ["ScienJus"]
-  spec.email         = ["i@scienjus.com"]
-
-  spec.summary       = %q{a qq bot based on smart qq(web qq).}
-  spec.description   = %q{a qq bot based on smart qq api.?}
-  spec.homepage      = "https://github.com/ScienJus/qqbot"
-  spec.license       = "MIT"
-
-  # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
-  # delete this section to allow pushing this gem to any host.
-  if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = 'https://rubygems.org'
-  else
-    raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
-  end
-
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-end
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'qqbot/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "qqbot"
+  spec.version       = QQBot::VERSION
+  spec.authors       = ["ScienJus"]
+  spec.email         = ["i@scienjus.com"]
+
+  spec.summary       = %q{a qq bot based on smart qq(web qq).}
+  spec.description   = %q{a qq bot based on smart qq api.}
+  spec.homepage      = "https://github.com/ScienJus/qqbot"
+  spec.license       = "MIT"
+
+  # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
+  # delete this section to allow pushing this gem to any host.
+  if spec.respond_to?(:metadata)
+    spec.metadata['allowed_push_host'] = 'https://rubygems.org'
+  else
+    raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
+  end
+
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.11"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
+end