matrix_qq 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c29f625d98e417ccbcb15f76dc231e1cdbbc7543
-  data.tar.gz: e42689a5edb2b7d5fa9244a595c40c8273d5e9cf
+  metadata.gz: a5b0224c44fe8e0830e5104fef1cdd402f2c258a
+  data.tar.gz: 4f8bb6c7e97bc23e1618949f0f8199381d04ea0d
 SHA512:
-  metadata.gz: 53eedc6eaf07ed958e3665c567e1cbcf44a4225011a718b74048e3168533d022e6014fdf5542d84b5a3db277a99615b1f1464b0ebd9f9d3975f9ae8819b6d5ef
-  data.tar.gz: 17a29886324a8071383bf8ffc15190c20e1a3e1927619b421d4ccd9f165ef6bef18055118c009e4c83878b304be82aeb728afb280bdce73774a2502661dd1284
+  metadata.gz: 583a69bcbc243bd8b5521aa0627298de9b4487185f87ff8a846ef3241d4aaf6220e6088148fac466aad5cb90a94a8745d09ff58ce00bd177333ed6d563920493
+  data.tar.gz: 34bbb59d6a0824b4dca1440897dd99751d7aabecfd80e35b4dbca906b494d4697e6aa7a908c30a612a8c4b82ebb882fd1697df3fc44dd0fc5bc92031a16749d9

data/CHANGELOG.yaml

@@ -1,6 +1,10 @@
 # Notice: Incompatible items start with `!`
 
 master:
+  Feature:
+    - hack
+  Change:
+    - user name by hack
 0.5.4:
   Feature:
     - agree friend add request

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

@@ -14,8 +14,7 @@ module MatrixQQ
           msg = @info['content']
           body = msg['body']
           type = msg['msgtype']
-          sender = user @info['sender']
-          sender, body = user_bot body if user_bot? body
+          sender = @info['sender_name']
           message = format_matrix_message(body, sender, type)
           MatrixQQ::QQ::SendGroup.text @matrix, @room, message
         end
@@ -38,29 +37,9 @@ module MatrixQQ
             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}"
+          else "#{room}#{name} send a #{type}"
           end
         end
-
-        def user(user)
-          @dbus.get("/profile/#{user}/displayname")['displayname']
-        end
-
-        def match_bot(message)
-          message.match(/^(\(.*?\))?\[(.*?)\]\s*/)
-        end
-
-        def user_bot?(message)
-          m = match_bot message
-          return true if m
-          false
-        end
-
-        def user_bot(message)
-          m = match_bot message
-          return unless m
-          [m[2], m.post_match]
-        end
       end # Matrix
 
       Forward.send_to['group'] << Group

data/lib/matrix_qq/matrix/hack.rb

@@ -0,0 +1,49 @@
+module MatrixQQ
+  class Matrix
+    module Hack
+      class << self
+        attr_accessor :list
+
+        Hack.list = []
+
+        def user(dbus, user)
+          dbus.get("/profile/#{user}/displayname")['displayname']
+        end
+
+        def match_bot(message)
+          message.match(/^(\(.*?\))?\[(.*?)\]\s*/)
+        end
+
+        def user_bot?(message)
+          m = match_bot message
+          return true if m
+          false
+        end
+
+        def user_bot(message)
+          m = match_bot message
+          return unless m
+          [m[2], m.post_match]
+        end
+      end
+
+      Hack.list << lambda do |dbus, info, i|
+        return unless info.is_a? Hash
+        return unless i == :join
+        info.each_value.map do |events|
+          events['timeline']['events'].map do |e|
+            body = e['content']['body']
+            next if body.nil?
+            sender = Hack.user dbus, e['sender']
+            sender, body = Hack.user_bot body if Hack.user_bot? body
+            e['sender_name'] = sender
+            e['content']['body'] = body
+            e
+          end
+          events
+        end
+        info
+      end
+    end
+  end
+end

data/lib/matrix_qq/matrix/log.rb

@@ -13,20 +13,14 @@ module MatrixQQ
           log_room room
           events['timeline']['events'].each do |event|
             next unless event['type'] == 'm.room.message'
-            log_message event['sender'], event['content']
+            log_message event['sender_name'], event['content']
           end
         end
       end
 
       def log_message(sender, content)
-        name = user sender
-        if content['msgtype'] == 'm.text'
-          message = content['body']
-          name, message = user_bot message if user_bot? message
-        else
-          message = content
-        end
-        puts "#{name}: #{message}"
+        message = content['msgtype'] == 'm.text' ? content['body'] : content
+        puts "#{sender}: #{message}"
       end
 
       def log_room(room)
@@ -36,26 +30,6 @@ module MatrixQQ
       def room(room)
         @dbus.get "/rooms/#{room}/state/m.room.name"
       end
-
-      def user(user)
-        @dbus.get("/profile/#{user}/displayname")['displayname']
-      end
-
-      def match_bot(message)
-        message.match(/^(\(.*?\))?\[(.*?)\]\s*/)
-      end
-
-      def user_bot?(message)
-        m = match_bot message
-        return true if m
-        false
-      end
-
-      def user_bot(message)
-        m = match_bot message
-        return unless m
-        [m[2], m.post_match]
-      end
     end # Log
 
     Matrix.join << Log

data/lib/matrix_qq/matrix/matrix.rb

@@ -30,7 +30,7 @@ module MatrixQQ
     def reg
       SIGN.each do |i|
         @dbus.obj.on_signal i.to_s do |json|
-          info = JSON.parse json
+          info = hack i, JSON.parse(json)
           Matrix.send(i).each do |func|
             MatrixQQ.log(func.name) do
               func.new(@dbus, @qq_dbus, info.dup).run
@@ -39,5 +39,10 @@ module MatrixQQ
         end
       end
     end
+
+    def hack(i, info)
+      Hack.list.each { |h| info = h.call(@dbus, info, i) }
+      info
+    end
   end
 end

data/lib/matrix_qq/matrix/require.rb

@@ -1,5 +1,6 @@
 require 'matrix_qq/matrix/dbus'
 require 'matrix_qq/matrix/matrix'
+require 'matrix_qq/matrix/hack'
 
 require 'matrix_qq/matrix/log'
 

data/lib/matrix_qq/qq/hack.rb

@@ -0,0 +1,12 @@
+module MatrixQQ
+  class QQ
+    module Hack
+      class << self
+        attr_accessor :list
+      end
+
+      Hack.list = []
+
+    end
+  end
+end

data/lib/matrix_qq/version.rb

@@ -1,3 +1,3 @@
 module MatrixQQ
-  VERSION = '0.5.4'.freeze
+  VERSION = '0.5.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: matrix_qq
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - 71e6fd52
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-15 00:00:00.000000000 Z
+date: 2017-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,6 +132,7 @@ files:
 - lib/matrix_qq/matrix/dbus.rb
 - lib/matrix_qq/matrix/forward/group.rb
 - lib/matrix_qq/matrix/forward/main.rb
+- lib/matrix_qq/matrix/hack.rb
 - lib/matrix_qq/matrix/log.rb
 - lib/matrix_qq/matrix/matrix.rb
 - lib/matrix_qq/matrix/require.rb
@@ -142,6 +143,7 @@ files:
 - 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/hack.rb
 - lib/matrix_qq/qq/log.rb
 - lib/matrix_qq/qq/qq.rb
 - lib/matrix_qq/qq/require.rb