matrix_qq 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7f1ca69b9545bf36b84bb8be5884c5ed343669b
-  data.tar.gz: 6759bda077e3d675238ca0602a0a885b7617d74e
+  metadata.gz: c29f625d98e417ccbcb15f76dc231e1cdbbc7543
+  data.tar.gz: e42689a5edb2b7d5fa9244a595c40c8273d5e9cf
 SHA512:
-  metadata.gz: c6ded8ebfece05ae18d2f26d84ff59ab6db178642bfbbd24917ec96d39b0b558dddc1b35612c90cd6c996ffeefcc1d695f4f69b3cf1fb7f70249ff3aad2e2167
-  data.tar.gz: 2369ef19762c5474749ef7c9366a72977024b3c3fbe0eb9454955a7b774b91f506d5c018339bb1cff8cedfd490fe0f9a85084e776ab61126ad74cf399cc4d1b2
+  metadata.gz: 53eedc6eaf07ed958e3665c567e1cbcf44a4225011a718b74048e3168533d022e6014fdf5542d84b5a3db277a99615b1f1464b0ebd9f9d3975f9ae8819b6d5ef
+  data.tar.gz: 17a29886324a8071383bf8ffc15190c20e1a3e1927619b421d4ccd9f165ef6bef18055118c009e4c83878b304be82aeb728afb280bdce73774a2502661dd1284

data/CHANGELOG.yaml

@@ -1,5 +1,13 @@
 # Notice: Incompatible items start with `!`
 
+master:
+0.5.4:
+  Feature:
+    - agree friend add request
+    - agree group invite request
+    - add log
+  Change:
+    - delete emoji code because cqhttp v3.0.1
 0.5.3:
   Fix:
     - example config

data/exe/matrix_qq

@@ -32,13 +32,23 @@ end)
 end
 load config
 
+LOG =
+  if ARGV.include? '-q'
+    open '/dev/null', 'w'
+  else
+    STDOUT
+  end
+
 session_bus = DBus::SessionBus.instance
 
 matrix = MatrixQQ::Matrix.new session_bus
+LOG.puts 'Matrix inited'
 qq = MatrixQQ::QQ.new session_bus
+LOG.puts 'QQ inited'
 matrix.qq_dbus = qq.dbus
 qq.matrix_dbus = matrix.dbus
 
 main = DBus::Main.new
 main << session_bus
+LOG.puts 'Started'
 main.run

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

@@ -3,35 +3,6 @@ module MatrixQQ
     class Forward
       # send to qq group
       class Group
-        Emoji = [
-          *(0x0080..0x02AF),
-          *(0x0300..0x03FF),
-          *(0x0600..0x06FF),
-          *(0x0C00..0x0C7F),
-          *(0x1DC0..0x1DFF),
-          *(0x1E00..0x1EFF),
-          *(0x2000..0x209F),
-          *(0x20D0..0x214F),
-          *(0x2190..0x23FF),
-          *(0x2460..0x25FF),
-          *(0x2600..0x27EF),
-          *(0x2900..0x29FF),
-          *(0x2B00..0x2BFF),
-          *(0x2C60..0x2C7F),
-          *(0x2E00..0x2E7F),
-          *(0x3000..0x303F),
-          *(0xA490..0xA4CF),
-          *(0xE000..0xF8FF),
-          *(0xFE00..0xFE0F),
-          *(0xFE30..0xFE4F),
-          *(0x1F000..0x1F02F),
-          *(0x1F0A0..0x1F0FF),
-          *(0x1F100..0x1F64F),
-          *(0x1F680..0x1F6FF),
-          *(0x1F910..0x1F96B),
-          *(0x1F980..0x1F9E0)
-        ].freeze
-
         def initialize(dbus, matrix, info, room)
           @dbus = dbus
           @info = info
@@ -46,19 +17,7 @@ module MatrixQQ
           sender = user @info['sender']
           sender, body = user_bot body if user_bot? body
           message = format_matrix_message(body, sender, type)
-          MatrixQQ::QQ::SendGroup.array @matrix, @room, emoji(message)
-        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
-                { type: 'emoji', data: { id: code.to_s } }
-              else
-                { type: 'text', data: { text: [code].pack('U') } }
-              end
-          end
+          MatrixQQ::QQ::SendGroup.text @matrix, @room, message
         end
 
         def format_matrix_message(msg, name, type = 'm.text')

data/lib/matrix_qq/qq/agree.rb

@@ -0,0 +1,30 @@
+module MatrixQQ
+  class QQ
+    class AgreeFriend
+      def initialize(dbus, _, info)
+        @dbus = dbus
+        @info = info
+      end
+
+      def run
+        return unless @info.is_a? Hash
+        @dbus.set_friend_add_request flag: @info['flag']
+      end
+    end # AgreeFriend
+
+    class AgreeGroup
+      def initialize(dbus, _, info)
+        @dbus = dbus
+        @info = info
+      end
+
+      def run
+        return unless @info.is_a? Hash
+        @dbus.set_group_add_request flag: @info['flag'], type: 'invite'
+      end
+    end # AgreeGroup
+
+    QQ.friend_request << AgreeFriend
+    QQ.invite_request << AgreeGroup
+  end
+end

data/lib/matrix_qq/qq/qq.rb

@@ -28,7 +28,6 @@ module MatrixQQ
       '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']} " },

data/lib/matrix_qq/qq/require.rb

@@ -2,6 +2,7 @@ require 'matrix_qq/qq/dbus'
 require 'matrix_qq/qq/qq'
 
 require 'matrix_qq/qq/log'
+require 'matrix_qq/qq/agree'
 
 require 'matrix_qq/qq/send'
 

data/lib/matrix_qq/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: matrix_qq
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - 71e6fd52
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-05 00:00:00.000000000 Z
+date: 2017-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,6 +136,7 @@ files:
 - lib/matrix_qq/matrix/matrix.rb
 - lib/matrix_qq/matrix/require.rb
 - lib/matrix_qq/matrix/send.rb
+- lib/matrix_qq/qq/agree.rb
 - lib/matrix_qq/qq/dbus.rb
 - lib/matrix_qq/qq/forward_friend/main.rb
 - lib/matrix_qq/qq/forward_friend/matrix.rb