ruby-cqhttp 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b423809199376adf6d399e697c3e1e9129453815a92aa5308df2b05e49844c63
-  data.tar.gz: 1f979eac7d6f35a094b7ca2e966b30e95583b953c0154d96a93d9f0af5e6721e
+  metadata.gz: 925802d93d0690ccc22b020a3236b52c837b3d0961d55a9962cd9bb4f6d55b69
+  data.tar.gz: ac87d2efe8fc65a2f8a3b6c5216306b69c7c59b25c68c3f1c9067b4b2138c87a
 SHA512:
-  metadata.gz: 7f0ed93f862d094a9dc0240e02ae1409f60c63a00edd1670ae2b89deaae8165b7591b6861f50e370ed6e21d38f734f3e4a86b476ccc6516622aca55e1e8ee81f
-  data.tar.gz: 1caf072fa4d44e77c6a41e6b1bf3ed102687074f5a07ad14317986109b0a337fcc89fc0ab5ac0158dcddee67c27e2c8526f709994a1660c1fc86ff86974e7af0
+  metadata.gz: c1e82a77d99140324a348d12d5aac54a5dffa137c577ba9260773607849dfa596934cd79a86ad6f98d35f1ec4ad8b4020eac8049e1bf2b1a38908804d517fc07
+  data.tar.gz: 483be6c942157ed36fe9f206e2a6b14265dd563a6441e5effc36e9ffa9d18d03dbc3060932c17d2f5f7a34d2ca36936c4677619d9db2fb2395517b3330da2454

data/.gitignore

@@ -9,3 +9,4 @@ go-cqhttp*
 session.token
 device.json
 config.yml
+.yardoc

data/README.md

@@ -42,10 +42,10 @@ Onebot::Core.connect url: "ws://127.0.0.1:6700", logger: logger do |bot|
     logger.log('我开了欸')
   end
 
-  bot.on :message do |session|
+  bot.on :message do |data|
     logger.log('我收到消息了欸')
     # 复读
-    bot.sendMessage(session.message, session)
+    bot.sendMessage(data.message, data)
   end
 
   # 获取并发出好友撤回的消息

data/lib/Core/Http/API.rb

@@ -31,7 +31,7 @@ module Onebot
       # @param url [URI]
       # @return [Hash]
       def setGroupName(group_id, group_name)
-        data = send('set_group_name', { group_id: group_id.to_i, group_name: })
+        data = sendReq('set_group_name', { group_id: group_id.to_i, group_name: })
         if data['status'] == 'ok'
           @logger.log '设置群头像成功'
         else
@@ -46,7 +46,7 @@ module Onebot
       # @param url [URI]
       # @return [Hash]
       def getImage(file)
-        data = send('get_image', { file: })
+        data = sendReq('get_image', { file: })
         if data['status'] == 'ok'
           @logger.log '下载图片成功'
         else
@@ -61,7 +61,7 @@ module Onebot
       # @param url [URI]
       # @return [Hash]
       def get_msg(message_id)
-        data = send('get_msg', { message_id: })
+        data = sendReq('get_msg', { message_id: })
         if data['status'] == 'ok'
           @logger.log '消息获取成功'
         else
@@ -77,7 +77,7 @@ module Onebot
       # @param url [URI]
       # @return [Hash]
       def sendPrivateMessage(msg, user_id)
-        data = send('send_private_msg', { user_id:, message: msg })
+        data = sendReq('send_private_msg', { user_id:, message: msg })
         if data['status'] == 'ok'
           message_id = data['data']['message_id']
           @logger.log "发送至私聊 #{user_id} 的消息: #{msg} (#{message_id})"
@@ -94,7 +94,7 @@ module Onebot
       # @param url [URI]
       # @return [Hash]
       def sendGroupMessage(msg, group_id)
-        data = send('send_group_msg', { group_id:, message: msg })
+        data = sendReq('send_group_msg', { group_id:, message: msg })
         if data['status'] == 'ok'
           message_id = data['data']['message_id']
           @logger.log "发送至群 #{group_id} 的消息: #{msg} (#{message_id})"
@@ -111,7 +111,7 @@ module Onebot
       # @param url [URI]
       # @return [Boolean]
       def acceptFriendRequest(flag, reason = nil)
-        data = send('set_friend_add_request', { flag:, approve: true, remark: reason })
+        data = sendReq('set_friend_add_request', { flag:, approve: true, remark: reason })
         if data['status'] == 'ok'
           @logger.log '已通过好友请求'
           true
@@ -127,7 +127,7 @@ module Onebot
       # @param url [URI]
       # @return [Boolean]
       def refuseFriendRequest(flag)
-        data = send('set_friend_add_request', { flag:, approve: false })
+        data = sendReq('set_friend_add_request', { flag:, approve: false })
         if data['status'] == 'ok'
           @logger.log '已拒绝好友请求'
           true
@@ -144,7 +144,7 @@ module Onebot
       # @param url [URI]
       # @return [Boolean]
       def acceptGroupRequest(flag, sub_type)
-        data = send('set_group_add_request', { flag:, sub_type:, approve: true })
+        data = sendReq('set_group_add_request', { flag:, sub_type:, approve: true })
         if data['status'] == 'ok'
           @logger.log '已通过加群请求'
           true
@@ -162,7 +162,7 @@ module Onebot
       # @param url [URI]
       # @return [Boolean]
       def refuseGroupRequest(flag, sub_type, reason = nil)
-        data = send('set_group_add_request', { flag:, sub_type:, approve: false, reason: })
+        data = sendReq('set_group_add_request', { flag:, sub_type:, approve: false, reason: })
         if data['status'] == 'ok'
           @logger.log '已拒绝加群请求'
           true
@@ -174,7 +174,7 @@ module Onebot
 
       private
 
-      def send(action, params, url = @url)
+      def sendReq(action, params, url = @url)
         url.path = action
         JSON.parse(Utils.httpPost(url, params.to_json))
       end

data/lib/Core/WebSocket/API.rb

@@ -11,7 +11,7 @@ module Onebot
       end
 
       def get_msg(message_id, _url = @apiUrl)
-        ret = send('get_msg', { message_id: })
+        ret = sendReq('get_msg', { message_id: })
         if parseRet(ret)
           @eventLogger.log "获取消息成功 (#{message_id})"
         else
@@ -26,7 +26,7 @@ module Onebot
       # @param user_id [Number]
       # @return [Hash]
       def sendPrivateMessage(message, user_id)
-        ret = send('send_private_msg', { user_id:, message: })
+        ret = sendReq('send_private_msg', { user_id:, message: })
         if parseRet(ret)
           @eventLogger.log "发送至私聊 #{user_id} 的消息: #{message} (#{ret.data.message_id})"
         else
@@ -41,7 +41,7 @@ module Onebot
       # @param group_id [Number]
       # @return [Hash]
       def sendGroupMessage(message, group_id)
-        ret = send('send_group_msg', { group_id:, message: })
+        ret = sendReq('send_group_msg', { group_id:, message: })
         if parseRet(ret)
           @eventLogger.log "发送至群 #{group_id} 的消息: #{message} (#{ret.data.message_id})"
         else
@@ -50,6 +50,74 @@ module Onebot
         ret[:data]
       end
 
+      # 接受好友邀请
+      #
+      # @param flag [String]
+      # @param reason [String]
+      # @param url [URI]
+      # @return [Boolean]
+      def acceptFriendRequest(flag, reason = nil)
+        data = sendReq('set_friend_add_request', { flag:, approve: true, remark: reason })
+        if parseRet(data)
+          @logger.log '已通过好友请求'
+          true
+        else
+          @logger.log '请求通过失败', Logger::WARN
+          false
+        end
+      end
+
+      # 拒绝好友邀请
+      #
+      # @param flag [String]
+      # @param url [URI]
+      # @return [Boolean]
+      def refuseFriendRequest(flag)
+        data = sendReq('set_friend_add_request', { flag:, approve: false })
+        if parseRet(data)
+          @logger.log '已拒绝好友请求'
+          true
+        else
+          @logger.log '请求拒绝失败', Logger::WARN
+          false
+        end
+      end
+
+      # 接受加群请求
+      #
+      # @param flag [String]
+      # @param sub_type [String]
+      # @param url [URI]
+      # @return [Boolean]
+      def acceptGroupRequest(flag, sub_type)
+        data = sendReq('set_group_add_request', { flag:, sub_type:, approve: true })
+        if parseRet(data)
+          @logger.log '已通过加群请求'
+          true
+        else
+          @logger.log '请求通过失败', Logger::WARN
+          false
+        end
+      end
+
+      # 拒绝加群请求
+      #
+      # @param flag [String]
+      # @param sub_type [String]
+      # @param reason [String]
+      # @param url [URI]
+      # @return [Boolean]
+      def refuseGroupRequest(flag, sub_type, reason = nil)
+        data = sendReq('set_group_add_request', { flag:, sub_type:, approve: false, reason: })
+        if parseRet(data)
+          @logger.log '已拒绝加群请求'
+          true
+        else
+          @logger.log '请求拒绝失败', Logger::WARN
+          false
+        end
+      end
+
       private
 
       #
@@ -60,7 +128,7 @@ module Onebot
         return false if ret.status == 'failed'
       end
 
-      def send(action, params)
+      def sendReq(action, params)
         echo = Time.now.to_i.to_s
         @ws.send({ action:, params:, echo: }.to_json)
         @queueList[echo] = Queue.new

data/lib/onebot-ruby.rb

@@ -28,11 +28,11 @@ module Onebot
   end
 
   module WebSocket
-    autoload :Session, File.expand_path('Core/Websocket/Session', __dir__)
-    autoload :API, File.expand_path('Core/Websocket/API', __dir__)
-    autoload :Bot, File.expand_path('Core/Websocket/Bot', __dir__)
-    autoload :Client, File.expand_path('Core/Websocket/Client', __dir__)
-    autoload :Server, File.expand_path('Core/Websocket/Server', __dir__)
+    autoload :Session, File.expand_path('Core/WebSocket/Session', __dir__)
+    autoload :API, File.expand_path('Core/WebSocket/API', __dir__)
+    autoload :Bot, File.expand_path('Core/WebSocket/Bot', __dir__)
+    autoload :Client, File.expand_path('Core/WebSocket/Client', __dir__)
+    autoload :Server, File.expand_path('Core/WebSocket/Server', __dir__)
   end
 
   module Http

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.1.0'
+  s.version = '0.1.2'
   s.summary = '一个基于 OneBot 标准的 QQ 机器人框架'
   s.description = '一个基于 OneBot 标准的 QQ 机器人框架'
   s.authors = ['fantasyzhjk']

data/tests/client.rb

@@ -8,8 +8,8 @@ Onebot::Core.connect url: 'ws://localhost:7700', logger: logger, options: { head
     logger.log('我开了欸')
   end
 
-  bot.on :privateMessage do |session|
-    bot.sendMessage(session.message, session)
+  bot.on :privateMessage do |data|
+    bot.sendMessage(session.message, data)
   end
 
   bot.on :notice do |notice_type, data|

data/tests/server.rb

@@ -14,11 +14,11 @@ App = lambda do |env|
       logger.log('我开了欸')
     end
 
-    bot.on :privateMessage do |session|
-      # p session.message
-      # p session
-      p Onebot::Utils.cqParse(session.message)
-      bot.sendPrivateMessage(session.message, session.userId)
+    bot.on :privateMessage do |data|
+      # p data.message
+      # p data
+      p Onebot::Utils.cqParse(data.message)
+      bot.sendPrivateMessage(data.message, data.userId)
     end
 
     bot.rack_response

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-cqhttp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - fantasyzhjk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-17 00:00:00.000000000 Z
+date: 2022-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: event_emitter