wechat-bot2 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d129e298145340b212f0f23de82dbf6c571580d29984553c68e77339fa8ce4d
-  data.tar.gz: 15d8e87b1bebc29ff8b8727f64dbe62b3dad74d5b61bd2920050e7d9b320b50e
+  metadata.gz: 653832898538ffcb6e9d48f9415fbd3ee1da167e4e5d43a4d97ad8da3649e37e
+  data.tar.gz: '08a1a65f53a4aa5c479d85fd29605c4c358dbebbae48c00055124818564ce480'
 SHA512:
-  metadata.gz: 2fb047ab3e2829968a859c16e38ba8ad5cb51f74d21f6395903ecc94a363727dd4b11d4e54bf8e408db75ba3112a6a3b921f6f0ffc1ec431df2b0c91ed59e0f8
-  data.tar.gz: 5de0e2c9a843309fc2ecf67aeff30ad71377193d5b0e72c2160a740b9470c25a8d78fd141d5adc6c6c4f702bc156b6ea0af8cd8cfc475421196bd8d0c9d47442
+  metadata.gz: 97487df4a67f2591420baa1e5aea86f60f89dd7f27f1c6162bd57225204085be3b21f88a78ab2369807b89f62b2c0ba19e0ea77b1e62843a664ecb8ddeb2192d
+  data.tar.gz: '07833b7ba0df389c343929405bb6bfbaa97f23e248bfc2b81c0f3b5cdd5d3787e850167452da9045b9735079884b4f464cb609e5b2540e542b4b5275c9c87775'

data/Rakefile

@@ -8,6 +8,8 @@ RSpec::Core::RakeTask.new(:spec)
 require 'rubocop/rake_task'
 RuboCop::RakeTask.new
 
+require 'irb'
+
 task :default => [:rubocop, :spec]
 
 desc 'Run a sample wechat bot'
@@ -39,3 +41,19 @@ task :bot do
 
   bot.start
 end
+
+desc 'Enable irb with var `bot` & `client`'
+task :irb do
+  bot = WeChat::Bot.new do
+    logger = self.logger
+    on :message do |m|
+      logger.info "Message Raw: #{m.raw}"
+    end
+  end
+
+  client = bot.client
+  client.login
+  client.contacts
+
+  binding.irb # since ruby-2.4
+end

data/lib/wechat/bot/client.rb

@@ -1,6 +1,8 @@
 require "rqrcode"
 require "logger"
 require "uri"
+require "digest"
+require "json"
 
 module WeChat::Bot
   # 微信 API 类
@@ -141,7 +143,7 @@ module WeChat::Bot
     #
     # @return [Array]
     def login_status(uuid)
-      timestamp = timestamp
+      timestamp = timestamp()
       params = {
         "loginicon" => "true",
         "uuid" => uuid,
@@ -195,7 +197,7 @@ module WeChat::Bot
     #
     # 掉线后 300 秒可以重新使用此 api 登录获取的联系人和群ID保持不变
     def login_loading
-      url = "#{store(:index_url)}/webwxinit?r=#{timestamp}"
+      url = api_url('webwxinit', r: timestamp)
       r = @session.post(url, json: params_base_request)
       data = r.parse(:json)
 
@@ -215,7 +217,7 @@ module WeChat::Bot
     #
     # 需要解密参数 Code 的值的作用，目前都用的是 3
     def update_notice_status
-      url = "#{store(:index_url)}/webwxstatusnotify?lang=zh_CN&pass_ticket=#{store(:pass_ticket)}"
+      url = api_url('webwxstatusnotify', lang: 'zh_CN', pass_ticket: store(:pass_ticket))
       params = params_base_request.merge({
         "Code"  => 3,
         "FromUserName" => @bot.profile.username,
@@ -267,12 +269,11 @@ module WeChat::Bot
     # 根据 {#sync_check} 接口返回有数据时需要调用该接口
     # @return [void]
     def sync_messages
-      query = {
+      url = api_url('webwxsync', {
         "sid" => store(:sid),
         "skey" => store(:skey),
         "pass_ticket" => store(:pass_ticket)
-      }
-      url = "#{store(:index_url)}/webwxsync?#{URI.encode_www_form(query)}"
+      })
       params = params_base_request.merge({
         "SyncKey" => store(:sync_key),
         "rr" => "-#{timestamp}"
@@ -313,12 +314,11 @@ module WeChat::Bot
     #
     # @return [Hash] 联系人列表
     def contacts
-      query = {
+      url = api_url('webwxgetcontact', {
         "r" => timestamp,
         "pass_ticket" => store(:pass_ticket),
         "skey" => store(:skey)
-      }
-      url = "#{store(:index_url)}/webwxgetcontact?#{URI.encode_www_form(query)}"
+      })
 
       r = @session.post(url, json: {})
       data = r.parse(:json)
@@ -326,6 +326,8 @@ module WeChat::Bot
       @bot.contact_list.batch_sync(data["MemberList"])
     end
 
+    alias_method :_send, :send
+
     # 消息发送
     #
     # @param [Symbol] type 消息类型，未知类型默认走 :text
@@ -339,6 +341,8 @@ module WeChat::Bot
       case type
       when :emoticon
         send_emoticon(username, content)
+      when :image
+        send_image(username, content: content)
       else
         send_text(username, content)
       end
@@ -350,7 +354,7 @@ module WeChat::Bot
     # @param [String] text 消息内容
     # @return [Hash<Object,Object>] 发送结果状态
     def send_text(username, text)
-      url = "#{store(:index_url)}/webwxsendmsg"
+      url = api_url('webwxsendmsg')
       params = params_base_request.merge({
         "Scene" => 0,
         "Msg" => {
@@ -367,34 +371,96 @@ module WeChat::Bot
       r.parse(:json)
     end
 
+    # FIXME: 上传图片出问题，未能解决
+    def upload_image(username, file)
+      url = "#{store(:file_url)}/webwxuploadmedia?f=json"
+      
+      filename = File.basename(file.path)
+      content_type = {'png'=>'image/png', 'jpg'=>'image/jpeg', 'jpeg'=>'image/jpeg'}[filename.split('.').last.downcase] || 'application/octet-stream'
+      md5 = Digest::MD5.file(file.path).hexdigest
+
+      headers = {
+        'Host' => 'file.wx.qq.com',
+        'User-Agent' => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:42.0) Gecko/20100101 Firefox/42.0',
+        'Accept' => '*/*',
+        'Accept-Language' => 'zh-CN,zh;q=0.9,en-US;q=0.8,en;q=0.7',
+        'Accept-Encoding' => 'gzip, deflate, br',
+        'Referer' => 'https://wx.qq.com/',
+        'Origin' => 'https://wx.qq.com',
+        'Connection' => 'Keep-Alive'
+      }
+
+      @media_cnt = 1 + (@media_cnt || -1)
+
+      params = {
+        'id' => "WU_FILE_#{@media_cnt}",
+        'name' => filename,
+        'type' => content_type,
+        'lastModifiedDate' => 'Tue Sep 09 2014 17:47:23 GMT+0800 (CST)',
+        'size' => file.size,
+        'mediatype' => 'pic', # pic/video/doc
+        'uploadmediarequest' => JSON.generate(
+          params_base_request.merge({
+            'UploadType' => 2,
+            'ClientMediaId' => timestamp,
+            'TotalLen' => file.size,
+            'StartPos' => 0,
+            'DataLen' => file.size,
+            'MediaType' => 4,
+            'FromUserName' => @bot.profile.username,
+            'ToUserName' => username,
+            'FileMd5' => md5
+            })
+          ),
+        'webwx_data_ticket' => @session.cookie_of('webwx_data_ticket'),
+        'pass_ticket' => store(:pass_ticket),
+        'filename' => ::HTTP::FormData::File.new(file, content_type: content_type)
+        }
+
+      r = @session.post(url, form: params, headers: headers)
+
+      # @bot.logger.info "Response: #{r.inspect}"
+
+      r.parse(:json)
+    end
+
     # 发送图片
     #
     # @param [String] username 目标 UserName
     # @param [String, File] 图片名或图片文件
     # @param [Hash] 非文本消息的参数（可选）
     # @return [Boolean] 发送结果状态
-    # def send_image(username, image, media_id = nil)
-    #   if media_id.nil?
-    #     media_id = upload_file(image)
-    #   end
-
-    #   url = "#{store(:index_url)}/webwxsendmsgimg?fun=async&f=json"
-
-    #   params = params_base_request.merge({
-    #     "Scene" => 0,
-    #     "Msg" => {
-    #       "Type" => type,
-    #       "FromUserName" => @bot.profile.username,
-    #       "ToUserName" => username,
-    #       "MediaId" => mediaId,
-    #       "LocalID" => timestamp,
-    #       "ClientMsgId" => timestamp,
-    #     },
-    #   })
-
-    #   r = @session.post(url, json: params)
-    #   r.parse(:json)
-    # end
+    def send_image(username, **opts)
+      # if media_id.nil?
+      #   media_id = upload_file(image)
+      # end
+      if opts[:media_id]
+        conf = {"MediaId" => opts[:media_id], "Content" => ""}
+      elsif opts[:image]
+        media_id = upload_image(username, opts[:image])
+        conf = {"MediaId" => media_id, "Content" => ""}
+      elsif opts[:content]
+        conf = {"MediaId" => "", "Content" => opts[:content]}
+      else
+        raise RuntimeException, "发送图片参数错误，须提供media_id或content"
+      end
+
+      url = "#{store(:index_url)}/webwxsendmsgimg?fun=async&f=json"
+
+      params = params_base_request.merge({
+        "Scene" => 0,
+        "Msg" => {
+          "Type" => 3,
+          "FromUserName" => @bot.profile.username,
+          "ToUserName" => username,
+          "LocalID" => timestamp,
+          "ClientMsgId" => timestamp,
+        }.merge(conf)
+      })
+
+      r = @session.post(url, json: params)
+      r.parse(:json)
+    end
 
     # 发送表情
     #
@@ -405,12 +471,11 @@ module WeChat::Bot
     #
     # @return [Hash<Object,Object>] 发送结果状态
     def send_emoticon(username, emoticon_id)
-      query = {
+      url = api_url('webwxsendemoticon', {
         'fun' => 'sys',
         'pass_ticket' => store(:pass_ticket),
         'lang' => 'zh_CN'
-      }
-      url = "#{store(:index_url)}/webwxsendemoticon?#{URI.encode_www_form(query)}"
+      })
       params = params_base_request.merge({
         "Scene" => 0,
         "Msg" => {
@@ -435,7 +500,7 @@ module WeChat::Bot
     # @param [String] message_id
     # @return [TempFile]
     def download_image(message_id)
-      url = "#{store(:index_url)}/webwxgetmsgimg"
+      url = api_url('webwxgetmsgimg')
       params = {
         "msgid" => message_id,
         "skey" => store(:skey)
@@ -460,7 +525,7 @@ module WeChat::Bot
     # @param [Array<String>] users
     # @return [Hash<Object, Object>]
     def create_group(*users)
-      url = "#{store(:index_url)}/webwxcreatechatroom?r=#{timestamp}"
+      url = api_url('webwxcreatechatroom', r: timestamp, pass_ticket: store(:pass_ticket))
       params = params_base_request.merge({
         "Topic" => "",
         "MemberCount" => users.size,
@@ -471,11 +536,66 @@ module WeChat::Bot
       r.parse(:json)
     end
 
+    ##### 
+    # 以下接口都参考：https://github.com/littlecodersh/ItChat/blob/master/itchat/components/contact.py
+
+    # 更新群组
+    def update_group(username, fun, update_key, update_value)
+      url = api_url('webwxupdatechatroom', {fun: fun, pass_ticket: store(:pass_ticket)})
+      params = params_base_request.merge({
+        "ChatRoomName" => username,
+        update_key => update_value
+        })
+      r = @session.post(url, json: params)
+      r.parse(:json)
+    end
+
+    # 修改群组名称
+    def set_group_name(username, name)
+      update_group(username, 'modtopic', 'NewTopic', name)
+    end
+
+    # 删除群组成员
+    def delete_group_member(username, *users)
+      update_group(username, 'delmember', 'DelMemberList', users.join(","))
+    end
+
+    # 群组邀请
+    def invite_group_member(username, *users)
+      update_group(username, 'invitemember', 'InviteMemberList', users.join(","))
+    end
+
+    # 群组添加
+    def add_group_member(username, *users)
+      update_group(username, 'addmember', 'AddMemberList', users.join(","))
+    end
+
+    # 添加好友
+    #
+    # @param [Integer] status: 2-添加 3-接受
+    def add_friend(username, status = 2, verify_content='')
+      url = api_url('webwxverifyuser', {r: timestamp, pass_ticket: store(:pass_ticket)})
+      params = params_base_request.merge({
+        "Opcode" => status, # 3
+        "VerifyUserListSize" => 1,
+        "VerifyUserList" => [{
+          "Value" => username,
+          "VerifyUserTicket" => ''}],
+        "VerifyContent" => verify_content,
+        "SceneListCount" => 1,
+        "SceneList" => [33],
+        "skey" => store(:skey)
+      })
+      r = @session.post(url, json: params)
+      r.parse(:json)
+    end
+    ##### 
+
     # 登出
     #
     # @return [void]
     def logout
-      url = "#{store(:index_url)}/webwxlogout"
+      url = api_url('webwxlogout')
       params = {
         "redirect" => 1,
         "type"  => 1,
@@ -504,6 +624,10 @@ module WeChat::Bot
 
     private
 
+    def api_url(path, query = {})
+      "#{store(:index_url)}/#{path}#{query.empty? ? '' : '?'+URI.encode_www_form(query)}"
+    end
+
     # 保存和获取存储数据
     #
     # @return [Object] 获取数据返回该变量对应的值类型

data/lib/wechat/bot/contact.rb

@@ -128,6 +128,8 @@ module WeChat::Bot
       "#<#{self.class}:#{object_id.to_s(16)} username='#{username}' nickname='#{nickname}' kind='#{kind}' members=#{members.size}>"
     end
 
+    alias :inspect :to_s
+
     private
 
     # 更新或新写入变量值

data/lib/wechat/bot/contact_list.rb

@@ -1,3 +1,5 @@
+require "wechat/bot/contact"
+
 module WeChat::Bot
   # 微信联系人列表
   class ContactList < CachedList
@@ -35,6 +37,21 @@ module WeChat::Bot
       end
     end
 
+    Contact::Kind.constants.each do |const|
+      val = Contact::Kind.const_get(const)
+
+      # 查找用户分类: find_user/group/mp/special
+      define_method "find_#{val}", ->(pattern = nil) do
+        @mutex.synchronize do
+          return @cache.values.select do |contact| 
+            contact.kind == val && (
+              pattern.nil? || (pattern.is_a?(Regexp) && pattern.match?(contact.nickname.scrub)) || contact.nickname == pattern
+            )
+          end
+        end
+      end
+    end
+
     # 查找用户
     #
     # @param [Hash] args 接受两个参数:

data/lib/wechat/bot/core.rb

@@ -68,7 +68,7 @@ module WeChat::Bot
     # @param [Array<Object>] args
     # @yieldparam [Array<String>]
     # @return [Handler]
-    def on(event, regexp = //, *args, &block)
+    def on(event, regexp = %r{}, *args, &block)
       event = event.to_s.to_sym
 
       pattern = case regexp

data/lib/wechat/bot/http/session.rb

@@ -54,6 +54,13 @@ module WeChat::Bot
         response
       end
 
+      def cookie_of(name)
+        cookies.cookies.each do |cookie|
+          return cookie.value if name == cookie.name
+        end
+        nil
+      end
+
       private
 
       # 组装 request 基础请求参数

data/lib/wechat/bot/message.rb

@@ -104,17 +104,17 @@ module WeChat::Bot
 
       if match = group_message(message)
         message = match[1]
-        @from_user = @from.find_member(username: match[0])
+        @from_user = @from.find_member(username: match[0]) unless @from.nil?
         @at_message_names = match[2]
       else
         @from_user = @from
       end
 
       @message = message
-      
-      parse_emoticon if @kind == Message::Kind::Emoticon
 
       case @kind
+      when Message::Kind::Emoticon
+        parse_emoticon
       when Message::Kind::ShareCard
         @meta_data = MessageData::ShareCard.parse(@message)
       end
@@ -158,11 +158,6 @@ module WeChat::Bot
       end
     end
 
-    # 私聊或者群聊被@
-    def talked_to?
-      (source == Contact::Kind::User) || at_members.any?{|member| !!member && (member.username == @raw['ToUserName']) }
-    end
-
     private
 
     # 解析消息来源

data/lib/wechat/bot/version.rb

@@ -1,5 +1,5 @@
 module WeChat
   module Bot
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wechat-bot2
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - icyleaf
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-02 00:00:00.000000000 Z
+date: 2018-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler