wechat-bot2 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45b229da1d868e19135b5c098047080fa8c4c5021e59a0fe01fb39472c70df17
-  data.tar.gz: 427a0a11dafe69a2a4a6fc739da898713a57ca799590f7bcd85259dc38ed3f38
+  metadata.gz: 2d129e298145340b212f0f23de82dbf6c571580d29984553c68e77339fa8ce4d
+  data.tar.gz: 15d8e87b1bebc29ff8b8727f64dbe62b3dad74d5b61bd2920050e7d9b320b50e
 SHA512:
-  metadata.gz: ce306583f3407ff60a1a04912b47a48b4a6de2c7c4d4a662894221092d4d027ac87fcbf70c3fa3d7ae4a4eba1f7138003b7f3975e0416295051fcf22fd91f33a
-  data.tar.gz: 4dc39e55e76176775666753b7b39a61829ec55b6854eb47d05335b5afc8d6a383b44649bf2f2bc5247f12d2ced0693db78386990e953aa961db42d34d63aaea5
+  metadata.gz: 2fb047ab3e2829968a859c16e38ba8ad5cb51f74d21f6395903ecc94a363727dd4b11d4e54bf8e408db75ba3112a6a3b921f6f0ffc1ec431df2b0c91ed59e0f8
+  data.tar.gz: 5de0e2c9a843309fc2ecf67aeff30ad71377193d5b0e72c2160a740b9470c25a8d78fd141d5adc6c6c4f702bc156b6ea0af8cd8cfc475421196bd8d0c9d47442

data/lib/wechat/bot/contact.rb

@@ -90,6 +90,14 @@ module WeChat::Bot
       attr(:members)
     end
 
+    def find_member(args)
+      if args[:username]
+        members.find{|contact| args[:username] == contact.username }
+      elsif args[:nickname]
+        members.find{|contact| args[:nickname] == contact.nickname }
+      end
+    end
+
     # 联系人解析
     #
     # @param [Hash<Object, Object>] raw
@@ -117,7 +125,7 @@ module WeChat::Bot
     end
 
     def to_s
-      "#<#{self.class}:#{object_id.to_s(16)} username='#{username}' nickname='#{nickname}' kind='#{kind}'>"
+      "#<#{self.class}:#{object_id.to_s(16)} username='#{username}' nickname='#{nickname}' kind='#{kind}' members=#{members.size}>"
     end
 
     private

data/lib/wechat/bot/message.rb

@@ -21,7 +21,7 @@ module WeChat::Bot
     end
 
     GROUP_MESSAGE_REGEX = /^(@\w+):<br\/>(.*)$/
-    AT_MESSAGE_REGEX = /@([^\s]+) (.*)/
+    AT_MESSAGE_REGEX = /@([^\s]+?) /
 
     # 原始消息
     # @return [Hash<Object, Object>]
@@ -50,6 +50,8 @@ module WeChat::Bot
     # 用户或者群组
     # @return [Contact]
     attr_reader :from
+    # 群组消息时为消息用户，其余为from
+    attr_reader :from_user
 
     # 消息正文
     # @return [String]
@@ -94,16 +96,22 @@ module WeChat::Bot
       parse_source
       parse_kind
 
+      # TODO: 来自于特殊账户无法获取联系人信息，需要单独处理
+      @from = @bot.contact_list.find(username: @raw["FromUserName"])
+
       message = @raw["Content"].convert_emoji
       message = CGI.unescape_html(message) if @kinde != Message::Kind::Text
+
       if match = group_message(message)
-        # from_username = match[0]
         message = match[1]
+        @from_user = @from.find_member(username: match[0])
+        @at_message_names = match[2]
+      else
+        @from_user = @from
       end
 
       @message = message
-      # TODO: 来自于特殊账户无法获取联系人信息，需要单独处理
-      @from = @bot.contact_list.find(username: @raw["FromUserName"])
+      
       parse_emoticon if @kind == Message::Kind::Emoticon
 
       case @kind
@@ -139,9 +147,24 @@ module WeChat::Bot
     end
 
     def at_message?
-      @at_mesage == true
+      !( @at_message_names.nil? || @at_message_names.empty? )
     end
 
+    def at_members
+      if at_message?
+        @at_message_names.map{|nickname| from.find_member(nickname: nickname) }
+      else
+        []
+      end
+    end
+
+    # 私聊或者群聊被@
+    def talked_to?
+      (source == Contact::Kind::User) || at_members.any?{|member| !!member && (member.username == @raw['ToUserName']) }
+    end
+
+    private
+
     # 解析消息来源
     #
     # 特殊账户/群聊/公众号/用户
@@ -218,11 +241,7 @@ module WeChat::Bot
       @events << @kind
       @events << @source
 
-      @at_mesage = false
-      if @source == :group && @raw["Content"] =~ /@([^\s]+)\s+(.*)/
-        @events << :at_message
-        @at_mesage = true
-      end
+      @events << :at_message if at_message?
     end
 
     # 解析表情
@@ -259,10 +278,10 @@ module WeChat::Bot
     #   - 1 message
     def group_message(message)
       if match = GROUP_MESSAGE_REGEX.match(message)
-        return [match[1], at_message(match[2])]
+        at_message(match[2]).unshift(match[1])
+      else
+        false
       end
-
-      false
     end
 
     # 尝试解析群聊中的 @ 消息
@@ -273,11 +292,11 @@ module WeChat::Bot
     # @param [String] message 原始消息
     # @return [String] 文本消息，如果不是 @ 消息返回原始消息
     def at_message(message)
-      if match = AT_MESSAGE_REGEX.match(message)
-        return match[2].strip
-      end
-
-      message
+      at_names = []
+      [
+        message.gsub(AT_MESSAGE_REGEX){ at_names << $1; "" },
+        at_names
+      ]
     end
   end
 end

data/lib/wechat/bot/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wechat-bot2
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - icyleaf