matrix_qq 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a87444b9fff9f46cfe1d8dea2ffff5512ad4ee88
-  data.tar.gz: 6d5287af230d319461f80320ef0414e08375bbba
+  metadata.gz: 565d456e004a986b188f1ce4844883786e30d307
+  data.tar.gz: bc9c7c39c4c8be44beaf834fc713d2b6bbb8f0d8
 SHA512:
-  metadata.gz: 835685f46ee11bc834ca28f8ff3c73cec1d1aca9d39a794405f75ac5b2ab715683dfb1f5a8702d8484fb165f7db60a4edc737f2ae1fc0dcbb01d7513fceb6eaa
-  data.tar.gz: 9c4db86f440af128ba0d3ba03eecd9905eb84967eeb7144415c5b5dfcf9e36110dd97261d237c74ac86d109755e2f81c479116b768f110cd0bdfafe16927ea5d
+  metadata.gz: c84807ae0c75593ca4266d15fc18e5e25d5d6d7dd254ee1214bb9a02bfbc41490b4d605d8709402e668fc8e1233699330233502a59b61d69cc138581caf3a005
+  data.tar.gz: 460f1877875aa6d31f766fcc88a38100d065e42277620307932aafc1437934247eec1d3fe762fedd40dc0ed78a5318dd0663cecfcad475d10562bfdf610de605

data/CHANGELOG.yaml

@@ -1,7 +1,14 @@
 # Notice: Incompatible items start with `!`
 0.2.1:
-  Fix:
-    - Lock ignore list now
+  Feature:
+    - Matrix send message will add forword parm
+    - CQ code parse
+    - utils:
+      log
+  Change:
+    - Start/End with uuid
+    - One step json parse
+    - move log to utils
 0.2.0:
   Change:
     - ! config file add `.rb`

data/lib/matrix_qq/matrix/forward/main.rb

@@ -26,7 +26,7 @@ module MatrixQQ
       def each_event(events, tunnel)
         events.each do |event|
           next unless event['type'] == 'm.room.message'
-          next if exist @info['event_id']
+          next if exist event['content']['forword']
           tunnel[:to].each_pair do |to_room, type|
             call_module(event, to_room, type)
           end
@@ -41,10 +41,9 @@ module MatrixQQ
         end
       end
 
-      def exist(event_id)
-        MatrixQQ::Matrix::Send.ignore_lock.synchronize do
-          MatrixQQ::Matrix::Send.ignore.delete(event_id)
-        end
+      def exist(forword)
+        return false if forword.nil?
+        !forword
       end
     end # Forward
 

data/lib/matrix_qq/matrix/matrix.rb

@@ -30,21 +30,14 @@ module MatrixQQ
     def reg
       SIGN.each do |i|
         @dbus.obj.on_signal i.to_s do |json|
-          parse json
-          info = @info
+          info = JSON.parse json
           Matrix.send(i).each do |func|
-            puts "Start #{func.name}" if $VERBOSE
-            func.new(@dbus, @qq_dbus, info.dup).run
-            puts "End #{func.name}" if $VERBOSE
+            MatrixQQ.log(func.name) do
+              func.new(@dbus, @qq_dbus, info.dup).run
+            end
           end
         end
       end
     end
-
-    private
-
-    def parse(json)
-      @info = JSON.parse json
-    end
   end
 end

data/lib/matrix_qq/matrix/send.rb

@@ -1,19 +1,11 @@
 module MatrixQQ
   class Matrix
     module Send
-      class << self
-        attr_accessor :ignore, :ignore_lock
-      end
-      self.ignore = []
-      self.ignore_lock = Mutex.new
-
       def self.raw(dbus, room_id, event_type, body)
-        ignore_lock.synchronize do
-          txn_id = SecureRandom.hex(32)
-          puts "send #{body}" if $VERBOSE
-          res = dbus.put "/rooms/#{room_id}/send/#{event_type}/#{txn_id}", body
-          ignore << (res['event_id'])
-        end
+        txn_id = SecureRandom.hex(32)
+        puts "send #{body}" if $VERBOSE
+        uri = "/rooms/#{room_id}/send/#{event_type}/#{txn_id}"
+        dbus.put uri, body.merge(forword: false)
       end
 
       def self.text(dbus, room_id, message)

data/lib/matrix_qq/qq/forward_group/matrix.rb

@@ -18,14 +18,12 @@ module MatrixQQ
 
         def message(messages)
           messages.inject('') do |obj, msg|
-            obj +
-              case msg['type']
-              when 'text' then msg['data']['text']
-              when 'emoji' then [msg['data']['id'].to_i].pack 'U'
-              when 'face' then "[QQ 表情:#{msg['data']['id']}]"
-              when 'record' then '[语音]'
-              when 'image' then msg['data']['url']
-              end
+            obj + case msg['type']
+                  when 'at' then
+                    "@#{user msg['data']['qq'], @info['group_id']} "
+                  when 'image' then msg['data']['url']
+                  else QQ.cq_call msg
+                  end
           end
         end
 

data/lib/matrix_qq/qq/log.rb

@@ -17,14 +17,10 @@ module MatrixQQ
 
       def message(messages)
         messages.inject('') do |obj, msg|
-          obj +
-            case msg['type']
-            when 'text' then msg['data']['text']
-            when 'emoji' then [msg['data']['id'].to_i].pack 'U'
-            when 'face' then "[QQ 表情:#{msg['data']['id']}]"
-            when 'record' then '[语音]'
-            when 'image' then msg['data']['url']
-            end
+          obj + case msg['type']
+                when 'at' then "@#{user msg['data']['qq'], @info['group_id']} "
+                else QQ.cq_call msg
+                end
         end
       end
 

data/lib/matrix_qq/qq/qq.rb

@@ -23,6 +23,23 @@ module MatrixQQ
     end
     SIGN.each { |i| QQ.send (i.to_s + '='), [] }
 
+    CQ = {
+      'text'   => ->(msg) { msg['data']['text'] },
+      'face'   => ->(msg) { "[QQ 表情:#{msg['data']['id']}]" },
+      'bface'  => ->(msg) { "[QQ 原创表情:#{msg['data']['id']}]" },
+      'sface'  => ->(msg) { "[QQ 小表情:#{msg['data']['id']}]" },
+      'emoji'  => ->(msg) { [msg['data']['id'].to_i].pack 'U' },
+      'record' => ->(___) { '[语音]' },
+      'image'  => ->(msg) { msg['data']['url'] },
+      'at'     => ->(msg) { "@#{msg['data']['qq']} " },
+      'rps'    => ->(msg) { "[#{%w[石头 剪刀 布][msg['data']['type'] - 1]}]" },
+      'dice'   => ->(msg) { "[掷得 #{msg['data']['type']} 点]" },
+      'shake'  => ->(___) { '[窗口抖动]' },
+      'music'  => ->(msg) { "[音乐 #{msg['data'].to_json}]" },
+      'share'  => ->(msg) { "[分享 #{msg['data'].to_json}]" },
+      'anonymous' => ->(___) { '[匿名消息:]' }
+    }.freeze
+
     attr_reader :dbus, :info
     attr_accessor :matrix_dbus
 
@@ -34,21 +51,22 @@ module MatrixQQ
     def reg
       SIGN.each do |i|
         @dbus.obj.on_signal i.to_s do |json|
-          parse json
-          info = @info
+          info = JSON.parse json
           QQ.send(i).each do |func|
-            puts "Start #{func.name}" if $VERBOSE
-            func.new(@dbus, @matrix_dbus, info.dup).run
-            puts "End #{func.name}" if $VERBOSE
+            MatrixQQ.log(func.name) do
+              func.new(@dbus, @matrix_dbus, info.dup).run
+            end
           end
         end
       end
     end
 
-    private
-
-    def parse(json)
-      @info = JSON.parse json
+    def self.cq_call(msg)
+      m = QQ::CQ[msg['type']]
+      raise "Unknow type #{msg['type']}" if m.nil?
+      m = m.call(msg)
+      return '' if m.nil?
+      m
     end
   end
 end

data/lib/matrix_qq/utils.rb

@@ -0,0 +1,14 @@
+module MatrixQQ
+  class << self
+    def log(name, call = nil)
+      uuid = SecureRandom.uuid
+      puts "Start #{name} -- #{uuid}" if $VERBOSE
+      if call.nil?
+        yield
+      else
+        call.call
+      end
+      puts "End #{name} -- #{uuid}" if $VERBOSE
+    end
+  end
+end

data/lib/matrix_qq/version.rb

@@ -1,3 +1,3 @@
 module MatrixQQ
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.3.0'.freeze
 end

data/lib/matrix_qq.rb

@@ -1,6 +1,7 @@
 require 'dbus'
 require 'json'
 require 'securerandom'
+require 'concurrent'
 
 require 'matrix_qq/version'
 

data/matrix_qq.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'ruby-dbus', '~> 0.14.0'
   spec.add_dependency 'matrix_dbus', '~> 1.0'
   spec.add_dependency 'CQHTTP', '~> 2.2'
+  spec.add_dependency 'concurrent-ruby'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: matrix_qq
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - 71e6fd52
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-29 00:00:00.000000000 Z
+date: 2017-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - DAStudio.71e6fd52@gmail.com
@@ -129,6 +143,7 @@ files:
 - lib/matrix_qq/qq/qq.rb
 - lib/matrix_qq/qq/require.rb
 - lib/matrix_qq/qq/send.rb
+- lib/matrix_qq/utils.rb
 - lib/matrix_qq/version.rb
 - matrix_qq.gemspec
 homepage: https://github.com/71e6fd52/matrix_qq