matrix_qq 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7486c179e93ec5ece200ddafc628d1b3cf91390d
-  data.tar.gz: f4c8221bb89a500fe2884f0a540917907d75204a
+  metadata.gz: b10cb473c23ae57054f29f317828d51d3e0cc3a0
+  data.tar.gz: 84d52dfe120fd743b2bd54e12699ba07a478c97e
 SHA512:
-  metadata.gz: 6993e4a6baefc9b8d5323f266bc2c5db18c6bcf135b76a873547ca5acf93c204e9bcae760470e351bac33d74c4dd808a604b415f52c70d89b7aa0ed9ed3fedeb
-  data.tar.gz: 1f7750b15ea76ce2f068e18db8087957b0c23a9c98090df7c65326d8144bfb9701802aad69e7df64954e008f862fe6e1fe673855a254771bc8716f73c2e3e742
+  metadata.gz: 364aae41c69bc800fff31dfe978b3fffaae1d4343b6a0370d4d494a50b1dcd85d428891dce95bd6fe7eb8af3e33fd6293d9c2d541c1a024e2f4a877f29820744
+  data.tar.gz: cad73b838a627235490481f37284c8cfa4440b8a1d640119576f9cbbd2073453e6987871698f9f9ca1a7941fc971db10321815eaa279020eb07d6fb93afff93a

data/CHANGELOG.yaml

@@ -1,8 +1,16 @@
 # Notice: Incompatible items start with `!`
 
-0.3.3:
+0.4.0:
   Feature:
     - msgtype rich
+    - matrix forword support all
+    - all matrix can formord to group
+    - group forword support all
+    - all group can formord to matrix
+    - utils:
+      - intercept?
+  Change:
+    - merge text if haven't emoji
 0.3.2:
   Feature:
     - Emoji support
@@ -14,7 +22,7 @@
     - Matrix send message will add forword parm
     - CQ code parse
     - utils:
-      log
+      - log
   Change:
     - Start/End with uuid
     - One step json parse

data/exe/matrix_qq

@@ -18,8 +18,13 @@ unless File.size? config
       # },
       # '10000' => {
       #   type: 'friend',
+      #   intercept: false,
       #   to: { '!abcdef:matrix.org' => 'matrix' }
       # }
+      # 'friend' => {
+      #   type: 'all',
+      #   to: { '#friend:matrix.org' => 'matrix' }
+      # }
     }
   }
 end)

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

@@ -50,6 +50,7 @@ module MatrixQQ
         end
 
         def emoji(msg)
+          return { type: 'text', data: { text: msg } } if (msg & Emoji).empty?
           msg.each_codepoint.inject([]) do |obj, code|
             obj <<
               if Emoji.include? code
@@ -61,23 +62,24 @@ module MatrixQQ
         end
 
         def format_matrix_message(msg, name, type = 'm.text')
-          return "#{name} 发送了一条消息" if msg =~ /^-msg /
+          room = "{#{@info['send_room']}} " if @info['print_room']
+          return "#{room}#{name} 发送了一条消息" if msg =~ /^-msg /
           return '有人发送了一条消息' if msg =~ /^-all /
           return if msg =~ /^- /
 
           info = type.match(/^m\./).post_match
           info ||= 'text'
-          message msg, name, info
+          message msg, name, info, room
         end
 
-        def message(msg, name, type)
+        def message(msg, name, type, room = '')
           case type
           when 'text'
             m = msg.match(/^-name /)
-            m ? m.post_match : "[#{name}] #{msg}"
-          when 'notice' then "[#{name}] notice #{msg}"
-          when 'emote' then "#{name} #{msg}"
-          else "#{name} send a #{info}"
+            m ? m.post_match : "#{room}[#{name}] #{msg}"
+          when 'notice' then "#{room}[#{name}] notice #{msg}"
+          when 'emote' then "#{room}#{name} #{msg}"
+          else "#{room}#{name} send a #{info}"
           end
         end
 

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

@@ -16,17 +16,35 @@ module MatrixQQ
       def run
         return unless @info.is_a? Hash
         @info.each_pair do |room, value|
-          tunnel = Config[:tunnel][room]
-          next if tunnel.nil?
-          next unless tunnel[:type] == 'matrix'
-          each_event value['timeline']['events'], tunnel
+          all = run_exact room, value
+          run_all room, value if all
         end
       end
 
-      def each_event(events, tunnel)
+      def run_exact(room, value)
+        tunnel = Config[:tunnel][room]
+        return false if tunnel.nil?
+        return false unless tunnel[:type] == 'matrix'
+        each_event value['timeline']['events'], tunnel
+        MatrixQQ.intercept? tunnel
+      end
+
+      def run_all(room, value)
+        tunnel = Config[:tunnel]['matrix']
+        return if tunnel.nil?
+        return unless tunnel[:type] == 'all'
+        each_event \
+          value['timeline']['events'],
+          tunnel,
+          print_room: true,
+          send_room: room
+      end
+
+      def each_event(events, tunnel, hackin = {})
         events.each do |event|
           next unless event['type'] == 'm.room.message'
           next if exist event['content']['forword']
+          event.merge!(hackin)
           tunnel[:to].each_pair do |to_room, type|
             call_module(event, to_room, type)
           end

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

@@ -15,18 +15,34 @@ module MatrixQQ
 
       def run
         return unless @info.is_a? Hash
+        all = run_exact room, value
+        run_all room, value if all
+      end
+
+      def run_exact
         tunnel = Config[:tunnel][@info['group_id'].to_s]
+        return false if tunnel.nil?
+        return false unless tunnel[:type] == 'group'
+        tunnel[:to].each_pair do |room, type|
+          call_module room, type
+        end
+        MatrixQQ.intercept? tunnel
+      end
+
+      def run_all
+        tunnel = Config[:tunnel]['group']
         return if tunnel.nil?
-        return unless tunnel[:type] == 'group'
+        return unless tunnel[:type] == 'all'
         tunnel[:to].each_pair do |room, type|
-          call_module(room, type)
+          call_module room, type, print_room: true
         end
       end
 
-      def call_module(room, type)
+      def call_module(room, type, hackin = {})
+        info = @info.merge hackin
         ForwardGroup.send_to[type.to_s].each do |func|
           puts "Start #{func.name}" if $VERBOSE
-          func.new(@dbus, @matrix, @info, room).run
+          func.new(@dbus, @matrix, info, room).run
           puts "End #{func.name}" if $VERBOSE
         end
       end

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

@@ -1,7 +1,6 @@
 module MatrixQQ
   class QQ
     class ForwardGroup
-      # send to matrix
       class Matrix
         def initialize(dbus, matrix, info, room)
           @dbus = dbus
@@ -13,15 +12,17 @@ module MatrixQQ
         def run
           msg = message @info['message']
           sender = user @info['user_id'], @info['group_id']
-          MatrixQQ::Matrix::Send.text @matrix, @room, "[#{sender}] #{msg}"
+          room = "{#{@info['group_id']}}" if @info['print_room']
+          MatrixQQ::Matrix::Send.text \
+            @matrix, @room,
+            "#{room}[#{sender}] #{msg}"
         end
 
         def message(messages)
           messages.inject('') do |obj, msg|
             obj + case msg['type']
-                  when 'at' then
+                  when 'at'
                     "@#{user msg['data']['qq'], @info['group_id']} "
-                  when 'image' then msg['data']['url']
                   else QQ.cq_call msg
                   end
           end
@@ -36,6 +37,23 @@ module MatrixQQ
           name = info['card']
           name == '' ? info['nickname'] : name
         end
+
+        def matrix_send_image(uri)
+          mxc = @matrix.upload_file uri
+          w, h = FastImage.size uri
+          open(uri) do |f|
+            gen_image_json(f.content_type, uri, mxc, w, h, f.size)
+          end
+        end
+
+        def gen_image_json(type, uri, w, h, size)
+          {
+            body: type,
+            msgtype: 'm.image',
+            url: uri,
+            info: { w: w, h: h, mimetype: type, size: size }
+          }.to_json
+        end
       end # Matrix
 
       ForwardGroup.send_to['matrix'] << Matrix

data/lib/matrix_qq/utils.rb

@@ -1,5 +1,12 @@
 module MatrixQQ
   class << self
+    def intercept?(tunnel)
+      i = tunnel[:intercept]
+      return true if i.nil?
+      return true if i
+      false
+    end
+
     def log(name, call = nil)
       uuid = SecureRandom.uuid
       puts "Start #{name} -- #{uuid}" if $VERBOSE

data/lib/matrix_qq/version.rb

@@ -1,3 +1,3 @@
 module MatrixQQ
-  VERSION = '0.3.3'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/lib/matrix_qq.rb

@@ -2,6 +2,7 @@ require 'dbus'
 require 'json'
 require 'securerandom'
 require 'concurrent'
+require 'open-uri'
 
 require 'matrix_qq/version'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: matrix_qq
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - 71e6fd52
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-02 00:00:00.000000000 Z
+date: 2017-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler