ruby-cqhttp 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c58389ac3f0bf71861c81ff860e50c4b3b36dad8c6d46f8542888ae556922288
-  data.tar.gz: af00c0a7322aefd90866849ecf28061b0c8fe9aaf9078bce7669f5a1face3a02
+  metadata.gz: 87e4e75d7c60595d1c8b7819e463ef23f400300735a747e6176e12ea6e7d3591
+  data.tar.gz: 88a63f60407888c0ba0a258ccbca71253e84492268bfd87dc193e319554c40dd
 SHA512:
-  metadata.gz: 99cace3bf8ec77f910d22376c4ccf74784d4bb7538a06519fbd2db69acbaac0bf00daf917cd27a99ad96bc703712a1ee72150d047671eb4d95b5e24acb281f78
-  data.tar.gz: 2c11c6eed136f57900e796740900b1dd022c18433291b4ef08dcdd7e2512e653847a2a5f7d57dbbdba64399ef70736099d1b732be0522a55326e8b968bc02d4f
+  metadata.gz: 9ad14175baf0305ba55f86f33446772336939fa89f3163b274906100c8d520bb9e8a51174b6e92793e4d4dc375df092bf35fa4ad27f6e9dd28f18da06c9f3249
+  data.tar.gz: 31f469412b075c00bb95f6ec3acb1190a20647391fba290cb06f8449669eddb570612de507a689fe1c5993f7695c8d12af5ff3771265543387ca8e5f0a5e1b8d

data/lib/Bot/Api.rb

@@ -4,18 +4,61 @@ module CQHttp
 
     @apiUrl = 'http://127.0.0.1:5700'
     class << self
+      def setGroupName(group_id, group_name, url=@apiUrl)
+        ret = { group_id: group_id.to_i, group_name: group_name }.to_json
+        data = JSON.parse(Utils.httpPost("#{url}/set_group_name", ret))
+        if data['status'] == 'ok'
+          Utils.log Time.new, '√', '设置群头像成功'
+        else
+          Utils.log Time.new, '×', '设置群头像失败'
+        end
+      end
+
+      def getImage(file, url=@apiUrl)   # UNFINSHED
+        ret = { file: file }.to_json
+        data = JSON.parse(Utils.httpPost("#{url}/get_image", ret))
+        if data['status'] == 'ok'
+          Utils.log Time.new, '√', '下载图片成功'
+          return data['data']
+        else
+          Utils.log Time.new, '×', '下载图片失败'
+        end
+      end
+
+      def get_msg(message_id, url=@apiUrl)   # UNFINSHED
+        ret = { message_id: message_id }.to_json
+        data = JSON.parse(Utils.httpPost("#{url}/get_msg", ret))
+        if data['status'] == 'ok'
+          Utils.log Time.new, '√', '消息获取成功'
+          return data['data']
+        else
+          Utils.log Time.new, '×', '消息获取失败'
+        end
+        
+      end
+
       def sendPrivateMessage(msg, user_id, url=@apiUrl)
         ret = { user_id: user_id, message: msg }.to_json
-        message_id = JSON.parse(Utils.httpPost("#{url}/send_private_msg", ret))['data']['message_id']
-        Utils.log Time.new, '↑', "发送至私聊 #{user_id} 的消息: #{msg} (#{message_id})"
-        message_id
+        data = JSON.parse(Utils.httpPost("#{url}/send_private_msg", ret))
+        if data['status'] == 'ok'
+          message_id = data['data']['message_id']
+          Utils.log Time.new, '↑', "发送至私聊 #{user_id} 的消息: #{msg} (#{message_id})"
+          return message_id
+        else
+          Utils.log Time.new, '×', '发送消息失败'
+        end
       end
 
       def sendGroupMessage(msg, group_id, url=@apiUrl)
         ret = { group_id: group_id, message: msg }.to_json
-        message_id = JSON.parse(Utils.httpPost("#{url}/send_group_msg", ret))['data']['message_id']
-        Utils.log Time.new, '↑', "发送至群 #{group_id} 的消息: #{msg} (#{message_id})"
-        message_id
+        data = JSON.parse(Utils.httpPost("#{url}/send_group_msg", ret))
+        if data['status'] == 'ok'
+          message_id = data['data']['group_id']
+          Utils.log Time.new, '↑', "发送至群 #{user_id} 的消息: #{msg} (#{message_id})"
+          return message_id
+        else
+          Utils.log Time.new, '×', '发送消息失败'
+        end
       end
 
       def acceptFriendRequest(flag, url=@apiUrl)
@@ -24,7 +67,7 @@ module CQHttp
         if data['status'] == 'ok'
           Utils.log Time.new, '√', '已通过好友请求'
         else
-          Utils.log Time.new, '!', '请求通过失败'
+          Utils.log Time.new, '×', '请求通过失败'
         end
       end
 
@@ -34,7 +77,7 @@ module CQHttp
         if data['status'] == 'ok'
           Utils.log Time.new, '√', '已拒绝好友请求'
         else
-          Utils.log Time.new, '!', '请求拒绝失败'
+          Utils.log Time.new, '×', '请求拒绝失败'
         end
       end
 
@@ -44,7 +87,7 @@ module CQHttp
         if data['status'] == 'ok'
           Utils.log Time.new, '√', '已通过加群请求'
         else
-          Utils.log Time.new, '!', '请求通过失败'
+          Utils.log Time.new, '×', '请求通过失败'
         end
       end
 
@@ -54,7 +97,7 @@ module CQHttp
         if data['status'] == 'ok'
           Utils.log Time.new, '√', '已拒绝加群请求'
         else
-          Utils.log Time.new, '!', '请求拒绝失败'
+          Utils.log Time.new, '×', '请求拒绝失败'
         end
       end
     end

data/lib/Bot/Bot.rb

@@ -98,7 +98,13 @@ module CQHttp
             if msg['sub_type'] == 'kick_me' # 被踢出
               Utils.log Time.at(tar.time), '!', "被 #{msg['operator_id']} 踢出群 #{msg['group_id']}"
             end
+          when 'group_recall'
+            Utils.log Time.at(tar.time), '!', "群 #{msg['group_id']} 中 #{msg['user_id']} 撤回了一条消息 (#{msg['message_id']})"
+          when 'friend_recall'
+            Utils.log Time.at(tar.time), '!', "好友 #{msg['user_id']} 撤回了一条消息 (#{msg['message_id']})"
           end
+          emit :notice, msg['notice_type'], msg
+          
         #
         # 消息事件
         #

data/lib/ruby-cqhttp.rb

@@ -5,7 +5,8 @@ require 'event_emitter'
 require 'net/http'
 
 module CQHttp
-  autoload :Api, File.expand_path('Bot/Api', __dir__)
   autoload :Bot, File.expand_path('Bot/Bot', __dir__)
+  autoload :Api, File.expand_path('Bot/Api', __dir__)
   autoload :Utils, File.expand_path('Bot/Utils', __dir__)
 end
+

data/ruby-cqhttp.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |s|
   s.name = 'ruby-cqhttp'
-  s.version       = '0.0.2'
+  s.version       = '0.0.3'
   s.date          = '2020-11-04'
   s.summary       = 'ruby-cqhttp for osucat'
   s.description   = 'ruby-cqhttp for osucat'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-cqhttp
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - fantasyzhjk