CQHTTP 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff7ce3959ce81bec0e5cb087fd9dd4c36cd6a429
-  data.tar.gz: 64c650dab1a39f0d7151449f0a24d189aebc232e
+  metadata.gz: db0b0a77276f93d3b81abb0fad47c050c7fe4d5c
+  data.tar.gz: 22e17482ba89fcaba487c81a16b3d40153e7112b
 SHA512:
-  metadata.gz: 5a39b9aa330a92840ca83ccf0c9450ff9b0d077934ad1862a32137ec06ea87d49a401cf43eb35c13e6e1f53ad88f598ca26af2021e9b2fa620b44b10a6671e8c
-  data.tar.gz: 047b48e7f38bfe5204bb4a3439aad10007775ce1c6e9226dc5af8709b63f6ff719039a3fc5a19ba2fe383102bcfc1f95cbd4377374ac9700e46de4bb7922352d
+  metadata.gz: 184000c2b7eb45220139af5bb2a64a5e90412ad67cbc3ef8a144ebda343fb7953982a753063e5a9f8b1302e0b27028d70d0f9e63aa4179cf953b79ee45483dba
+  data.tar.gz: 96a9840f5d89175f6def2ebfb302435f1f68584837b3b2e901a2cd6d8bab7a5ed3ec2ea87e004192fe8a7f85921ec8a8280a7dae0a9f03c612d047bfd8116d9a

data/exe/cqhttp-dbus

@@ -16,7 +16,19 @@ class CQHTTP2DBus < DBus::Object
     end
 
     dbus_signal :message, 'message_type:s, json:s'
+    %i[private group get_group_list].each do |i|
+      dbus_signal i, 'json:s'
+    end
     dbus_signal :event, 'event:s, json:s'
+    %i[
+      group_upload
+      group_admin
+      group_decrease
+      group_increase
+      friend_add
+    ].each do
+      dbus_signal i, 'json:s'
+    end
     dbus_signal :friend_request, 'json:s'
     dbus_signal :join_request, 'json:s'
     dbus_signal :invite_request, 'json:s'
@@ -25,27 +37,65 @@ class CQHTTP2DBus < DBus::Object
   end
 end
 
-def cqhttp2dbus(c, obj)
-  j = c.json
-  obj.all j.to_json
-  case j['post_type']
-  when 'message' then obj.message j['message_type'], j.to_json
-  when 'event' then obj.event j['event'], j.to_json
-  when 'request'
-    case j['request_type']
-    when 'friend' then obj.friend_request j.to_json
+# case signal
+class Case
+  def initialize(info, obj)
+    @info = info
+    @obj = obj
+    @json = gen_json
+  end
+
+  def gen_json
+    JSON.pretty_generate @info
+  end
+
+  def send_json(name)
+    @obj.send name, @json
+  end
+
+  def unknow
+    @obj.send_json :unknow
+  end
+
+  def run
+    send_json :all
+    case @info['post_type']
+    when 'message' then message
+    when 'event' then event
+    when 'request' then request
+    else unknow
+    end
+  end
+
+  def message
+    @obj.message @info['message_type'], @json
+    send_json @info['message_type']
+  end
+
+  def event
+    @obj.event @info['event'], @json
+    send_json @info['event']
+  end
+
+  def request
+    case @info['request_type']
+    when 'friend' then send_json :friend_request
     when 'group'
       case j['sub_type']
-      when 'add' then obj.join_request j.to_json
-      when 'invite' then obj.invite_request j.to_json
-      else obj.unknow j.to_json
+      when 'add' then send_json :join_request
+      when 'invite' then send_json :invite_request
+      else unknow
       end
-    else obj.unknow j.to_json
+    else unknow
     end
-  else obj.unknow j.to_json
   end
 end
 
+def cqhttp2dbus(c, obj)
+  j = c.json
+  Case.new(j, obj).run
+end
+
 bus = DBus::SessionBus.instance
 service = bus.request_service 'org.dastudio.qq'
 obj = CQHTTP2DBus.new '/org/dastudio/qq'

data/lib/CQHTTP/version.rb

@@ -1,3 +1,3 @@
 module CQHTTP
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: CQHTTP
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - 71e6fd52