matrix_qq 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b10cb473c23ae57054f29f317828d51d3e0cc3a0
-  data.tar.gz: 84d52dfe120fd743b2bd54e12699ba07a478c97e
+  metadata.gz: 1e8e2d63bc458ef9fe56fe6e75b0e933a8b3c337
+  data.tar.gz: af4d419663e04cad318b19fe834388d6a70d730d
 SHA512:
-  metadata.gz: 364aae41c69bc800fff31dfe978b3fffaae1d4343b6a0370d4d494a50b1dcd85d428891dce95bd6fe7eb8af3e33fd6293d9c2d541c1a024e2f4a877f29820744
-  data.tar.gz: cad73b838a627235490481f37284c8cfa4440b8a1d640119576f9cbbd2073453e6987871698f9f9ca1a7941fc971db10321815eaa279020eb07d6fb93afff93a
+  metadata.gz: b884e630c813d6f0f25fe884ea45dd76eb83a606b152dd1958069ec901095fbcff1f60fd714f9e52d5ed31d61dbc9f220c7ccb5ba0a86e7f1e73fed2dbc248b0
+  data.tar.gz: a5e2f6acc60bd3dd0d49abc1e87edf6015aee9c9b87be77ad6f82d2b6379acb964604b7ca32f3654d9af170ce164e847b65dcc11b0b855158d670bef181eede7

data/CHANGELOG.yaml

@@ -1,5 +1,15 @@
 # Notice: Incompatible items start with `!`
 
+0.5.0:
+  Feature:
+    - friend to matrix
+  Fix:
+    - friend forword
+    - group forword
+    - intercept logic
+    - name
+    - Friend call Group mudule
+    - wrong speel
 0.4.0:
   Feature:
     - msgtype rich

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

@@ -0,0 +1,52 @@
+module MatrixQQ
+  class QQ
+    class ForwardFriend
+      class << self
+        attr_accessor :send_to
+      end
+      self.send_to = Hash.new { |h, k| h[k] = [] }
+
+      def initialize(dbus, matrix, info)
+        @dbus = dbus
+        @info = info
+        @matrix = matrix
+      end
+
+      def run
+        return unless @info.is_a? Hash
+        return if run_exact
+        run_all
+      end
+
+      def run_exact
+        tunnel = Config[:tunnel][@info['user_id'].to_s]
+        return false if tunnel.nil?
+        return false unless tunnel[:type] == 'friend'
+        tunnel[:to].each_pair do |room, type|
+          call_module room, type
+        end
+        MatrixQQ.intercept? tunnel
+      end
+
+      def run_all
+        tunnel = Config[:tunnel]['friend']
+        return if tunnel.nil?
+        return unless tunnel[:type] == 'all'
+        tunnel[:to].each_pair do |room, type|
+          call_module room, type, print_sender: true
+        end
+      end
+
+      def call_module(room, type, hackin = {})
+        info = @info.merge hackin
+        ForwardFriend.send_to[type.to_s].each do |func|
+          puts "Start #{func.name}" if $VERBOSE
+          func.new(@dbus, @matrix, info, room).run
+          puts "End #{func.name}" if $VERBOSE
+        end
+      end
+    end # ForwardFriend
+
+    QQ.private << ForwardFriend
+  end
+end

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

@@ -0,0 +1,34 @@
+module MatrixQQ
+  class QQ
+    class ForwardFriend
+      class Matrix
+        def initialize(dbus, matrix, info, room)
+          @dbus = dbus
+          @info = info
+          @matrix = matrix
+          @room = room
+        end
+
+        def run
+          msg = message @info['message']
+          sender = "[#{user @info['user_id']}] " if @info['print_sender']
+          MatrixQQ::Matrix::Send.text \
+            @matrix, @room,
+            "#{sender}#{msg}"
+        end
+
+        def message(messages)
+          messages.inject('') do |obj, msg|
+            obj + QQ.cq_call(msg)
+          end
+        end
+
+        def user(user)
+          @dbus.get_stranger_info(user_id: user)['nickname']
+        end
+      end # Matrix
+
+      ForwardFriend.send_to['matrix'] << Matrix
+    end # ForwardFriend
+  end # QQ
+end

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

@@ -1,6 +1,5 @@
 module MatrixQQ
   class QQ
-    # send group massage to other
     class ForwardGroup
       class << self
         attr_accessor :send_to
@@ -15,8 +14,8 @@ module MatrixQQ
 
       def run
         return unless @info.is_a? Hash
-        all = run_exact room, value
-        run_all room, value if all
+        return if run_exact
+        run_all
       end
 
       def run_exact
@@ -46,7 +45,7 @@ module MatrixQQ
           puts "End #{func.name}" if $VERBOSE
         end
       end
-    end # Forward
+    end # ForwardGroup
 
     QQ.group << ForwardGroup
   end

data/lib/matrix_qq/qq/require.rb

@@ -7,3 +7,6 @@ require 'matrix_qq/qq/send'
 
 require 'matrix_qq/qq/forward_group/main'
 require 'matrix_qq/qq/forward_group/matrix'
+
+require 'matrix_qq/qq/forward_friend/main'
+require 'matrix_qq/qq/forward_friend/matrix'

data/lib/matrix_qq/utils.rb

@@ -2,7 +2,7 @@ module MatrixQQ
   class << self
     def intercept?(tunnel)
       i = tunnel[:intercept]
-      return true if i.nil?
+      return false if i.nil?
       return true if i
       false
     end

data/lib/matrix_qq/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: matrix_qq
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - 71e6fd52
@@ -137,6 +137,8 @@ files:
 - lib/matrix_qq/matrix/require.rb
 - lib/matrix_qq/matrix/send.rb
 - lib/matrix_qq/qq/dbus.rb
+- lib/matrix_qq/qq/forward_friend/main.rb
+- lib/matrix_qq/qq/forward_friend/matrix.rb
 - lib/matrix_qq/qq/forward_group/main.rb
 - lib/matrix_qq/qq/forward_group/matrix.rb
 - lib/matrix_qq/qq/log.rb