ruby-cqhttp 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc16893adf2a71ea90af191c3d83c6bbea44417d58b661914f10d1a38284b6fa
-  data.tar.gz: b25414575ff09da58a404ec81fca6832a195f9935b3a5c0e9da1f629db002479
+  metadata.gz: 9e05ea3a7529706ede1358efa6735e455e8ca125242beab7107145ba78032f9b
+  data.tar.gz: 9aeeb36d26f766ee178aff75920e60256a8b7d38f9b26731ac89dc9c0f07eefc
 SHA512:
-  metadata.gz: 83bd2c919fd51fe8f356fc91ab2c4a2e04b4f778ff70b492fe0f5d18b07165fb3bf201caecfc818ecca812fd1c7f1e200e6d6b6407233b7d9e34aeeadefbd9e2
-  data.tar.gz: d0dc12c9582ca47c100886c80c4baa2eed56e44a44b42f09d8a1f7b80da01b61619ed7aa652546c9902d9c6c737742987835e6680d83466905bbbb1fbc936938
+  metadata.gz: 0fbf62999904bee4c4c3811be5ab6ad315e0ef1b10a057ac4d6ea117a982c3a353c9b614283369bb58103c1f80dcedd67c6d126417fe4603c3ed5c41b8958ac6
+  data.tar.gz: 9d5b13fb23d8f0334cf57aea46ed33e60978c517026755f8bf6880c7ac6c5fd13115ec08f378af20a8505cec64d3444a2e1b81b7f9e21b2cd2d537d480cbf159

data/README.md

@@ -1,10 +1,14 @@
 # RUBY-CQHTTP
 
 [![Gem Version](https://badge.fury.io/rb/ruby-cqhttp.svg)](https://badge.fury.io/rb/ruby-cqhttp)
-[![yard docs](http://img.shields.io/badge/yard-docs-blue.svg)](https://www.rubydoc.info/gems/ruby-cqhttp)
+[![yard docs](http://img.shields.io/badge/yard-docs-blue.svg)](https://rubydoc.info/github/fantasyzhjk/ruby-cqhttp)
+
+一个基于 OneBot 标准的 QQ 机器人框架
 
 用 Ruby 写 QQ 机器人！
 
+本库还在快速迭代更新中。。
+
 ## 使用
 
 安装
@@ -16,15 +20,13 @@
 在 `Gemfile` 中添加
 
 ```ruby
-gem 'eventmachine'
+gem 'ruby-cqhttp'
 ```
 
 然后运行
 
     $ bundle
 
-安装
-
 ## 示例
 
 ```ruby
@@ -48,12 +50,12 @@ CQHttp::Bot.connect host: '127.0.0.1', port: 6700 do |bot|
   end
   
   # 自动同意群邀请和好友请求
-  bot.on :request do |request_type, sub_type, flag|
+  bot.on :request do |request_type, data|
     if request_type == 'group'
-      CQHttp::Api.acceptGroupRequest(flag, sub_type) if sub_type == 'invite'
+      CQHttp::Api.acceptGroupRequest(data['flag'], data['sub_type']) if data['sub_type'] == 'invite'
     elsif request_type == 'friend'
-      CQHttp::Api.acceptFriendRequest(flag)
+      CQHttp::Api.acceptFriendRequest(data['flag'])
     end
   end
 end
-```
+```

data/lib/Bot/Api.rb

@@ -1,10 +1,29 @@
 module CQHttp
+  # OneBot标准API
+  # [OneBot文档] (https://github.com/howmanybots/onebot)
+  #
+  # Example:
+  #   CQHttp::Api.getImage file
   class Api
+    # @return [URI] HTTP API链接
     attr_accessor :apiUrl
     class << self
+
+      # 设置API地址
+      #
+      # @param apiIp [String]
+      # @param apiPort [Number]
+      # @return [URI]
       def setUrl(apiIp:'127.0.0.1', apiPort:5700)
         @apiUrl = URI::HTTP.build(host: apiIp, port: apiPort)
       end
+
+      # 设置群名
+      #
+      # @param group_id [Number]
+      # @param group_name [String]
+      # @param url [URI]
+      # @return [Hash]
       def setGroupName(group_id, group_name, url=@apiUrl)
         url.path = "/set_group_name"
         ret = { group_id: group_id.to_i, group_name: group_name }.to_json
@@ -14,33 +33,49 @@ module CQHttp
         else
           Utils.log '设置群头像失败', Logger::WARN
         end
+        return data['data']
       end
 
-      def getImage(file, url=@apiUrl)   # UNFINSHED
+      # 下载图片(未完成)
+      #
+      # @param file [String]
+      # @param url [URI]
+      # @return [Hash]
+      def getImage(file, url=@apiUrl)
         url.path = "/get_image"
         ret = { file: file }.to_json
         data = JSON.parse(Utils.httpPost(url, ret))
         if data['status'] == 'ok'
           Utils.log '下载图片成功'
-          return data['data']
         else
           Utils.log '下载图片失败', Logger::WARN
         end
+        return data['data']
       end
 
-      def get_msg(message_id, url=@apiUrl)   # UNFINSHED
+      # 获取消息
+      #
+      # @param message_id [Number]
+      # @param url [URI]
+      # @return [Hash]
+      def get_msg(message_id, url=@apiUrl)
         url.path = "/get_msg"
         ret = { message_id: message_id }.to_json
         data = JSON.parse(Utils.httpPost(url, ret))
         if data['status'] == 'ok'
           Utils.log '消息获取成功'
-          return data['data']
         else
           Utils.log '消息获取失败', Logger::WARN
         end
-        
+        return data['data']
       end
 
+      # 发送私聊消息
+      #
+      # @param msg [String]
+      # @param user_id [Number]
+      # @param url [URI]
+      # @return [Hash]
       def sendPrivateMessage(msg, user_id, url=@apiUrl)
         url.path = "/send_private_msg"
         ret = { user_id: user_id, message: msg }.to_json
@@ -48,12 +83,18 @@ module CQHttp
         if data['status'] == 'ok'
           message_id = data['data']['message_id']
           Utils.log "发送至私聊 #{user_id} 的消息: #{msg} (#{message_id})"
-          return message_id
         else
           Utils.log '发送消息失败', Logger::WARN
         end
+        return data['data']
       end
 
+      # 发送群聊消息
+      #
+      # @param msg [String]
+      # @param group_id [Number]
+      # @param url [URI]
+      # @return [Hash]
       def sendGroupMessage(msg, group_id, url=@apiUrl)
         url.path = "/send_group_msg"
         ret = { group_id: group_id, message: msg }.to_json
@@ -61,53 +102,85 @@ module CQHttp
         if data['status'] == 'ok'
           message_id = data['data']['message_id']
           Utils.log "发送至群 #{group_id} 的消息: #{msg} (#{message_id})"
-          return message_id
         else
           Utils.log '发送消息失败', Logger::WARN
         end
+        return data['data']
       end
 
-      def acceptFriendRequest(flag, url=@apiUrl)
+      # 接受好友邀请
+      #
+      # @param flag [String]
+      # @param reason [String]
+      # @param url [URI]
+      # @return [Boolean]
+      def acceptFriendRequest(flag, reason=nil, url=@apiUrl)
         url.path = "/set_friend_add_request"
-        ret = { flag: flag, approve: true }.to_json
+        ret = { flag: flag, approve: true, remark: reason }.to_json
         data = JSON.parse(Utils.httpPost(url, ret))
         if data['status'] == 'ok'
           Utils.log '已通过好友请求'
+          true
         else
           Utils.log '请求通过失败', Logger::WARN
+          false
         end
       end
 
+      # 拒绝好友邀请
+      #
+      # @param flag [String]
+      # @param url [URI]
+      # @return [Boolean]
       def refuseFriendRequest(flag, url=@apiUrl)
         url.path = "/set_friend_add_request"
         ret = { flag: flag, approve: false }.to_json
         user_id = JSON.parse(Utils.httpPost(url, ret))
         if data['status'] == 'ok'
           Utils.log '已拒绝好友请求'
+          true
         else
           Utils.log '请求拒绝失败', Logger::WARN
+          false
         end
       end
 
+      # 接受加群请求
+      #
+      # @param flag [String]
+      # @param sub_type [String]
+      # @param url [URI]
+      # @return [Boolean]
       def acceptGroupRequest(flag, sub_type, url=@apiUrl)
         url.path = "/set_group_add_request"
         ret = { flag: flag, sub_type: sub_type, approve: true }.to_json
         data = JSON.parse(Utils.httpPost(url, ret))
         if data['status'] == 'ok'
           Utils.log '已通过加群请求'
+          true
         else
           Utils.log '请求通过失败', Logger::WARN
+          false
         end
       end
 
-      def refuseGroupRequest(flag, sub_type, url=@apiUrl)
+      # 拒绝加群请求
+      #
+      # @param flag [String]
+      # @param sub_type [String]
+      # @param reason [String]
+      # @param url [URI]
+      # @return [Boolean]
+      def refuseGroupRequest(flag, sub_type, reason=nil, url=@apiUrl)
         url.path = "/set_group_add_request"
-        ret = { flag: flag, sub_type: sub_type, approve: false }.to_json
+        ret = { flag: flag, sub_type: sub_type, approve: false, reason: reason }.to_json
         data = JSON.parse(Utils.httpPost(url, ret))
         if data['status'] == 'ok'
           Utils.log '已拒绝加群请求'
+          true
         else
           Utils.log '请求拒绝失败', Logger::WARN
+          false
         end
       end
     end

data/lib/Bot/Bot.rb

@@ -1,7 +1,55 @@
 module CQHttp
+  # 消息处理，ws连接
+  #
+  # Example:
+  #   CQHttp::Bot.connect host: host, port: port {|bot| ... }
   class Bot
-    Sender = Struct.new(:age, :member_role, :card, :qqlevel, :nickname, :title, :sex)
-    Target = Struct.new(:messagetype, :time, :group_id, :user_id, :message_id, :message)
+    # 发送人信息
+    # 
+    # @!attribute age
+    #    @return [Number] 年龄
+    # @!attribute member_role
+    #    @return [String] 角色，owner 或 admin 或 member
+    # @!attribute card
+    #    @return [String] 群名片／备注
+    # @!attribute user_id
+    #    @return [Number] 发送者 QQ 号
+    # @!attribute qqlevel
+    #    @return [String] 成员等级
+    # @!attribute nickname
+    #    @return [String] 昵称
+    # @!attribute title
+    #    @return [String] 专属头衔
+    # @!attribute sex
+    #    @return [String] 性别，male 或 female 或 unknown
+    Sender = Struct.new(:age, :member_role, :card, :user_id, :qqlevel, :nickname, :title, :sex)
+    # 消息事件数据
+    #
+    # @!attribute messagetype
+    #   @return [String] 成员等级
+    # @!attribute time
+    #   @return [Number] 事件发生的时间戳
+    # @!attribute group_id
+    #   @return [Number] 群号
+    # @!attribute user_id
+    #   @return [Number] 发送者 QQ 号
+    # @!attribute message_id
+    #   @return [Number] 消息 ID
+    # @!attribute message
+    #   @return [String] 消息内容
+    # @!attribute raw_message
+    #   @return [String] 原始消息内容
+    # @!attribute sub_type
+    #   @return [String] 消息子类型，私聊中如果是好友则是 friend，如果是群临时会话则是 group，群聊中正常消息是 normal，匿名消息是 anonymous，系统提示（如「管理员已禁止群内匿名聊天」）是 notice
+    # @!attribute anonymous
+    #   @return [Hash] 匿名信息，如果不是匿名消息则为 null
+    Target = Struct.new(:messagetype, :time, :group_id, :user_id, :message_id, :message, :raw_message, :sub_type, :anonymous)
+    
+    # 新建连接
+    #
+    # @param host [String]
+    # @param port [Number]
+    # @return [WebSocket]
     def self.connect(host:, port:)
       url = URI::WS.build(host: host, port: port)
       Api.setUrl()
@@ -12,22 +60,30 @@ module CQHttp
       client
     end
 
+    # WebSocket连接处理部分
     class WebSocket
+      # @return [URI] WS URL
       attr_accessor :url
+      # @return [Faye::WebSocket::Client] WS Conn
+      attr_accessor :ws
+      # @return [Number] self QQ id
       attr_accessor :selfID
 
       include EventEmitter
 
+      # 设置 WS URL
       def initialize(url)
+        @queueList = {}
         @url = url
       end
 
+      # 连接 WS
       def connect
         EM.run do
           @ws = Faye::WebSocket::Client.new(@url.to_s)
 
           @ws.on :message do |event|
-            Thread.new { dataParse(event.data)}
+            Thread.new { dataParse(event.data) }
           end
 
           @ws.on :close do |event|
@@ -44,26 +100,68 @@ module CQHttp
         end
       end
 
-
+      # 发送私聊消息
+      #
+      # @param msg [String]
+      # @param user_id [Number]
+      # @return [Hash]
       def sendPrivateMessage(msg, user_id)
-        ret = { action: 'send_private_msg', params: { user_id: user_id, message: msg }, echo: 'BotPrivateMessage' }.to_json
-        Utils.log "发送至私聊 #{user_id} 的消息: #{msg}"
-        @ws.send ret
+        echo = Time.now.to_i.to_s
+        params = { action: 'send_private_msg', params: { user_id: user_id, message: msg }, echo: echo }.to_json
+        @ws.send params
+        @queueList[echo] = Queue.new
+        ret = @queueList[echo].pop
+        if parseRet(ret)
+          Utils.log "发送至私聊 #{user_id} 的消息: #{msg} (#{ret['data']['message_id']})"
+        else
+          Utils.log "发送消息失败，错误码: #{ret['msg']}, 错误消息: #{ret['wording']}", Logger::WARN
+        end
+        return ret['data']
       end
 
+      # 发送群聊消息
+      #
+      # @param msg [String]
+      # @param group_id [Number]
+      # @return [Hash]
       def sendGroupMessage(msg, group_id)
-        ret = { action: 'send_group_msg', params: { group_id: group_id, message: msg }, echo: 'BotGroupMessage' }.to_json
-        Utils.log "发送至群 #{group_id} 的消息: #{msg}"
-        @ws.send ret
+        echo = Time.now.to_i.to_s
+        params = { action: 'send_group_msg', params: { group_id: group_id, message: msg }, echo: echo }.to_json
+        @ws.send params
+        @queueList[echo] = Queue.new
+        ret = @queueList[echo].pop
+        @queueList.delete(echo)
+        if parseRet(ret)
+          Utils.log "发送至群 #{group_id} 的消息: #{msg} (#{ret['data']['message_id']})"
+        else
+          Utils.log "发送消息失败，错误码: #{ret['msg']}, 错误消息: #{ret['wording']}", Logger::WARN
+        end
+        return ret['data']
       end
       
+      # 发送消息
+      # 根据 target [Struct] 自动选择
+      #
+      # @param msg [String]
+      # @param target [Struct]
+      # @return [Hash]
       def sendMessage(msg, target)
-        sendGroupMessage msg, target.group_id if target.messagetype == 'group'
-        sendPrivateMessage msg, target.user_id if target.messagetype == 'private'
+        return sendGroupMessage msg, target.group_id if target.messagetype == 'group'
+        return sendPrivateMessage msg, target.user_id if target.messagetype == 'private'
       end
 
       private
 
+      #
+      #  解析API返回
+      #
+      def parseRet(ret)
+        return true if ret['status'] == 'ok'
+        return false if ret['status'] == 'failed'
+      end
+      #
+      #  消息解析部分
+      #
       def dataParse(data)
         msg = JSON.parse(data)
         sdr = Sender.new
@@ -74,7 +172,13 @@ module CQHttp
           Utils.log "连接成功, BotQQ: #{@selfID}"
           emit :logged, @selfID
         end
-        Utils.log msg, Logger::DEBUG if msg['meta_event_type'] != 'heartbeat' # 过滤心跳
+        Utils.log data, Logger::DEBUG if msg['meta_event_type'] != 'heartbeat' # 过滤心跳
+        #
+        # 函数回调
+        #
+        if msg.include?('echo')
+          @queueList[msg['echo']] << msg
+        end
         case msg['post_type']
         #
         # 请求事件
@@ -82,25 +186,35 @@ module CQHttp
         when 'request'
           case msg['request_type']
           when 'group'
-            if msg['sub_type'] == 'invite' # 加群邀请
-              Utils.log "收到用户 #{msg['user_id']} 的加群 #{msg['group_id']} 请求 (#{msg['flag']})"
-            end
+            Utils.log "收到用户 #{msg['user_id']} 加群 #{msg['group_id']} 的请求 (#{msg['flag']})" if msg['sub_type'] == 'add' # 加群请求
+            Utils.log "收到用户 #{msg['user_id']} 的加群 #{msg['group_id']} 请求 (#{msg['flag']})" if msg['sub_type'] == 'invite' # 加群邀请
           when 'friend' # 加好友邀请
             Utils.log "收到用户 #{msg['user_id']} 的好友请求 (#{msg['flag']})"
           end
-          emit :request, msg['request_type'], msg['sub_type'], msg['flag']
+          emit :request, msg['request_type'], msg
         #
         # 提醒事件
         #
         when 'notice'
           case msg['notice_type']
-          when 'group_decrease' # 群数量减少
-            if msg['sub_type'] == 'kick_me' # 被踢出
-              Utils.log "被 #{msg['operator_id']} 踢出群 #{msg['group_id']}"
-            end
-          when 'group_recall'
-            Utils.log "群 #{msg['group_id']} 中 #{msg['user_id']} 撤回了一条消息 (#{msg['message_id']})"
-          when 'friend_recall'
+          when 'group_admin' # 群管理员变动
+            Utils.log "群 #{msg['group_id']} 内 #{msg['user_id']} 成了管理员" if msg['sub_type'] == 'set' # 设置管理员
+            Utils.log "群 #{msg['group_id']} 内 #{msg['user_id']} 没了管理员" if msg['sub_type'] == 'unset' # 取消管理员
+          when 'group_increase' # 群成员增加
+            Utils.log "#{msg['operator_id']} 已同意 #{msg['user_id']} 进入了群 #{msg['group_id']}" if msg['sub_type'] == 'approve' # 管理员已同意入群
+            Utils.log "#{msg['operator_id']} 邀请 #{msg['user_id']} 进入了群 #{msg['group_id']}" if msg['sub_type'] == 'invite' # 管理员邀请入群
+          when 'group_decrease' # 群成员减少
+            Utils.log "被 #{msg['operator_id']} 踢出了群 #{msg['group_id']}" if msg['sub_type'] == 'kick_me' # 登录号被踢
+            Utils.log "#{msg['user_id']} 被 #{msg['operator_id']} 踢出了群 #{msg['group_id']}" if msg['sub_type'] == 'kick' # 成员被踢
+            Utils.log "#{msg['operator_id']} 退出了群 #{msg['group_id']}" if msg['sub_type'] == 'leave' # 主动退群
+          when 'group_ban' # 群禁言
+            Utils.log "群 #{msg['group_id']} 内 #{msg['user_id']} 被 #{msg['operator_id']} 禁言了 #{msg['duration']} 秒" if msg['sub_type'] == 'ban' # 禁言
+            Utils.log "群 #{msg['group_id']} 内 #{msg['user_id']} 被 #{msg['operator_id']} 解除禁言" if msg['sub_type'] == 'lift_ban' # 解除禁言
+          when 'friend_add' # 好友添加
+            Utils.log "#{msg['user_id']} 成了你的好友"
+          when 'group_recall' # 群消息撤回
+            Utils.log "群 #{msg['group_id']} 内 #{msg['user_id']} 撤回了一条消息 (#{msg['message_id']})"
+          when 'friend_recall' # 好友消息撤回
             Utils.log "好友 #{msg['user_id']} 撤回了一条消息 (#{msg['message_id']})"
           end
           emit :notice, msg['notice_type'], msg
@@ -110,14 +224,18 @@ module CQHttp
         #
         when 'message'
           tar.user_id = msg['user_id'] # 用户id
+          sdr.user_id = msg['sender']['user_id'] # 用户id
           tar.message_id = msg['message_id'] # 消息id
           tar.message = msg['message'] # 消息内容
+          tar.raw_message = msg['raw_message'] # 消息内容
           sdr.age = msg['sender']['age'] # 年龄
           sdr.nickname = msg['sender']['nickname'] # 原有用户名
           sdr.sex = msg['sender']['sex'] # 性别
           tar.messagetype = msg['message_type'] # 消息类型
+          tar.sub_type = msg['sub_type'] # 消息子类型
           # 下面仅群聊
           tar.group_id = msg['group_id'] # 群id
+          tar.anonymous = msg['anonymous'] # 匿名信息
           sdr.card = msg['sender']['card'] # 群昵称
           sdr.title = msg['sender']['title'] # 头衔
           sdr.member_role = msg['sender']['role'] # 群成员地位

data/lib/Bot/Utils.rb

@@ -1,34 +1,50 @@
 module CQHttp
+  # 各种工具包
+  #
+  # Example:
+  #   CQHttp::Utils.log str, Logger::INFO
   class Utils
+    # @!method stdLogger
+    #   @return [Logger] 终端Logger
+    # @!method fileLogger
+    #   @return [Logger] 文件Logger
+    # @!method loggerFile
+    #   @return [String] Logger文件地址
     attr_accessor :stdLogger, :fileLogger, :loggerFile
     class << self
-      def setLogger(logger)
-        logger.level = 'INFO'
-        logger.formatter = proc do |severity, datetime, progname, msg|
-            if progname == nil
-                "[#{datetime.strftime('%Y-%m-%d %H:%M:%S')}][#{severity}]: #{msg.gsub(/\n/,'\n').gsub(/\r/,'\r') }\n"
-            else
-                "[#{datetime.strftime('%Y-%m-%d %H:%M:%S')}][#{progname}][#{severity}]: #{msg.gsub(/\n/,'\n').gsub(/\r/,'\r') }\n"
-            end
-        end
-        logger
-      end
+
+      # 初始化日志
+      #
+      # @param loggerFile [String]
       def initLogger(loggerFile=nil)
         @loggerFile = loggerFile
         @stdLogger = setLogger(Logger.new(STDOUT))
         @fileLogger = setLogger(Logger.new(@loggerFile, 'daily')) if @loggerFile
       end
-
+      
+      # 设置日志等级
+      #
+      # @param loggerLevel [String]
       def setLoggerLevel(loggerLevel)
         @stdLogger.level = loggerLevel
         @fileLogger.level = loggerLevel if @loggerFile
       end
-
+      
+      # 输出日志
+      #
+      # @param str [String]
+      # @param severity [Logger::INFO, Logger::DEBUG, Logger::WARN, Logger::ERROR]
+      # @param app [String]
       def log(str, severity=Logger::INFO, app="RUBY-CQHTTP")
         @stdLogger.log(severity, str, app)
         @fileLogger.log(severity, str, app) if @loggerFile
       end
-
+      
+      # post发包
+      #
+      # @param url [URI]
+      # @param ret [String]
+      # @return [String]
       def httpPost(url, ret)
         req = Net::HTTP::Post.new(url.path, { 'Content-Type' => 'application/json' })
         req.body = ret
@@ -37,6 +53,67 @@ module CQHttp
         end
         res.body
       end
+      alias post httpPost
+      
+      # 消息转义  
+      # &amp; -> &  
+      # &#91; -> [  
+      # &#93; -> ]  
+      #
+      # @param msg [String]
+      # @return [String]
+      def msg_change(msg)
+        msg.gsub!('&amp;','&')
+        msg.gsub!('&#91;','[')
+        msg.gsub!('&#93;',']')
+        msg
+      end
+      
+      # 消息反转义  
+      # & -> &amp;  
+      # [ -> &#91;  
+      # ] -> &#93;  
+      #
+      # @param msg [String]
+      # @return [String]
+      def msg_change!(msg)
+        msg.gsub!('&','&amp;')
+        msg.gsub!('[','&#91;')
+        msg.gsub!(']','&#93;')
+        msg
+      end
+      
+      # CQ码解析
+      #
+      # @param cqmsg [String]
+      # @return [Hash]
+      def cq_parse(cqmsg)
+        cqary = []
+        cqmsg.scan(/\[CQ:(.*?),(.*?)\]/m).each do |matches|
+          cqcode = { type: matches[0], data: {} }
+          matches[1].split(',').each do |arg|
+            args = arg.split('=')
+            cqcode[:data][args[0].to_sym] = args[1]
+          end
+          cqary << cqcode
+        end
+        cqary
+      end
+
+      private
+
+      # 设置logger
+      def setLogger(logger)
+        logger.level = 'INFO'
+        logger.formatter = proc do |severity, datetime, progname, msg|
+            if progname == nil
+                "[#{datetime.strftime('%Y-%m-%d %H:%M:%S')}][#{severity}]: #{msg.to_s.gsub(/\n/,'\n').gsub(/\r/,'\r') }\n"
+            else
+                "[#{datetime.strftime('%Y-%m-%d %H:%M:%S')}][#{progname}][#{severity}]: #{msg.to_s.gsub(/\n/,'\n').gsub(/\r/,'\r') }\n"
+            end
+        end
+        logger
+      end
     end
   end
 end

data/lib/ruby-cqhttp.rb

@@ -7,6 +7,7 @@ require 'uri/ws'
 require 'uri'
 require 'logger'
 
+# 一个基于 OneBot 标准的 QQ 机器人框架
 module CQHttp
   autoload :Bot, File.expand_path('Bot/Bot', __dir__)
   autoload :Api, File.expand_path('Bot/Api', __dir__)

data/ruby-cqhttp.gemspec

@@ -3,10 +3,9 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |s|
   s.name = 'ruby-cqhttp'
-  s.version       = '0.0.6'
-  s.date          = '2021-03-23'
-  s.summary       = 'ruby-cqhttp for osucat'
-  s.description   = 'ruby-cqhttp for osucat'
+  s.version       = '0.0.7'
+  s.summary       = '一个基于 OneBot 标准的 QQ 机器人框架'
+  s.description   = '一个基于 OneBot 标准的 QQ 机器人框架'
   s.authors       = ['fantasyzhjk']
   s.email         = 'fantasyzhjk@outlook.com'
   s.platform    = Gem::Platform::RUBY

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-cqhttp
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - fantasyzhjk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-23 00:00:00.000000000 Z
+date: 2021-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -94,7 +94,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ruby-cqhttp for osucat
+description: 一个基于 OneBot 标准的 QQ 机器人框架
 email: fantasyzhjk@outlook.com
 executables: []
 extensions: []
@@ -127,8 +127,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
-summary: ruby-cqhttp for osucat
+summary: 一个基于 OneBot 标准的 QQ 机器人框架
 test_files: []