censor_bear 0.1.11 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d66f337e22893a4e167117afdc22e5d7645968e71bf6efa8d63da423d10b72ab
-  data.tar.gz: 78ddb85ff26bebe0e8d095e77918be861b75c038f9ce41cd6ad23e6f6ddae0d3
+  metadata.gz: 775cd9c238b951f9b9d5ce8564ae76e3e4b5d38fb3e9b71dc599d6a75bc04f5e
+  data.tar.gz: f8daa1001d2682697143aec92e6098d1e291d3c4d8cb7c9d28f60455fee7e6b4
 SHA512:
-  metadata.gz: 211817d225399526a04702f2477f4b12df5df055bb18486505db058eff0d563c1b99efc253bc64bc5cfded0624e830377f9ed9984b5c8f6fd4f766d728795ef1
-  data.tar.gz: 9bc3c4c91e07400f1f81b38e4a45ff833e6c35422632aa3235cf0eeb2db86b669d52a0dbd754158bd37514ee48a49144ddf47b820aaeab5f297410b9b98ea466
+  metadata.gz: 3bd8ea39fb05994a01083fdaf574501657bf085238a1c9a24b883bddadf374a8a441f910a95594f7a42081d981a2800b9b2b02c9b3cc578e200536faa52ed4b8
+  data.tar.gz: 6ee79015b14bf37b4f070e041c91738d906bb3d1f8c39b215a94ccf6fbe89ccc0816a9d919e1436ee3689b3bb62bd9be2df1a025afbe1090e09ee9bf0be1022d

data/README.md

@@ -50,10 +50,12 @@ rails censor_bear:install:migrations
 
 ## 🦆 Methods
 ```ruby
-censor_delete # 删除内容
+censor_remove # 删除内容
+censor_cancel # 撤销删除
 censor_approve # 通过审核
 censor_show_path # 详情路由
 censor_ban_user # 封禁用户
+
 ```
 
 ## Exceptions
@@ -63,6 +65,22 @@ censor_ban_user # 封禁用户
 class NotPassedException < StandardError; end
 ```
 
+## 初始化配置
+详细配置项可在`lib/censor_bear/configuration.rb`中查看。
+
+```ruby
+CensorBear.configure do |config|
+  config.user_class = 'User'
+  config.user_name_method = 'nickname'
+
+  config.aliyun_green_access_key_id = 'access key id'
+  config.aliyun_green_access_key_secret = 'access key  secret'
+  config.aliyun_green_enable_internal = false
+
+  config.main_app_root_path_method = 'root_path'
+end
+```
+
 ## 注意事项
 1. 为 MOD 时，表示需要人工审核，需要被审查对象(UGC内容)支持`is_approved`字段（默认为`true`），此时内容自己能看到，别人暂时看不到，需审核通过后可见。
 2. 被审查对象可以通过软删实现，隐藏（目的是防止错判，撤销），删除的内容对自己和别人都是不可见的。

data/app/assets/stylesheets/censor_bear/home.css

@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/

data/app/controllers/censor_bear/home_controller.rb

@@ -0,0 +1,31 @@
+require_dependency 'censor_bear/application_controller'
+
+module CensorBear
+  class HomeController < ApplicationController
+    def index; end
+
+    def debugger; end
+
+    def debug
+      content = params[:content]
+      type = params[:type]
+
+      case params[:stage]
+      when 'aliyun_check'
+        @r = AliyunGreen::Text.scan(content)
+      when 'check_text'
+        @r = CensorBear.check_text(content, type.to_sym)
+      when 'check_search'
+        # TODO: 搜索前置检查
+        @r = {}
+      when 'check_image'
+        # TODO: 检查图片
+        @r = {}
+      when 'qq_regex'
+        @r = content.match(Censor::QQ_REG)
+      when 'wx_regex'
+        @r = content.match(Censor::WX_REG)
+      end
+    end
+  end
+end

data/app/controllers/censor_bear/logs_controller.rb

@@ -55,6 +55,7 @@ module CensorBear
     def load_logs
       builder ||= log_scope
       builder = builder.where("original_content ilike ?", "%#{params[:q]}%") if params[:q].present?
+      builder = builder.where(stage: params[:stage]) if params[:stage].present?
       builder = builder.order(id: :desc)
 
       @pagy, @logs = pagy(builder)

data/app/controllers/censor_bear/mod_logs_controller.rb

@@ -1,28 +1,23 @@
-require_dependency "censor_bear/application_controller"
+require_dependency 'censor_bear/application_controller'
 
 module CensorBear
   class ModLogsController < ApplicationController
-    before_action :set_mod_log, only: %i[show edit update destroy ignore approve ban delete]
+    before_action :set_mod_log, only: %i[show edit update destroy suspend ban pass undo reject]
 
-    # GET /mod_logs
     def index
       load_mod_logs
     end
 
-    # GET /mod_logs/1
     def show
     end
 
-    # GET /mod_logs/new
     def new
       @mod_log = ModLog.new
     end
 
-    # GET /mod_logs/1/edit
     def edit
     end
 
-    # POST /mod_logs
     def create
       @mod_log = ModLog.new(mod_log_params)
 
@@ -33,7 +28,6 @@ module CensorBear
       end
     end
 
-    # PATCH/PUT /mod_logs/1
     def update
       if @mod_log.update(mod_log_params)
         redirect_to @mod_log, notice: 'Mod log was successfully updated.'
@@ -42,7 +36,6 @@ module CensorBear
       end
     end
 
-    # DELETE /mod_logs/1
     def destroy
       @mod_log.destroy
 
@@ -53,23 +46,29 @@ module CensorBear
     end
 
 
-    def ignore
+    def suspend
       @mod_log.suspend!
 
       redirect_to mod_logs_url, notice: 'Mod log was successfully ignored.'
     end
 
-    def delete
-      # TODO: 判断参数不能为空
-      @mod_log.delete(params[:reason])
+    def pass
+      @mod_log.approve
 
-      redirect_to mod_logs_url, notice: 'Mod log was successfully deleted.'
+      redirect_to mod_logs_url, notice: 'Mod log was successfully ignored.'
     end
 
-    def approve
-      @mod_log.approve
+    def undo
+      # TODO: 判断状态，确定是撤销通过呢还是撤销删除
+      @mod_log.cancel
+
+      redirect_to mod_logs_url, notice: 'Mod log was successfully ignored.'
+    end
+
+    def reject
+      @mod_log.remove(params[:reason])
 
-      redirect_to mod_logs_url, notice: 'Mod log was successfully approved.'
+      redirect_to mod_logs_url, notice: 'Mod log was successfully ignored.'
     end
 
     def ban
@@ -80,8 +79,11 @@ module CensorBear
 
     def load_mod_logs
       builder ||= mod_log_scope.includes(:record)
-      builder = builder.where("content ilike ?", "%#{params[:q]}%") if params[:q].present?
-
+      builder = builder.where('content ilike ?', "%#{params[:q]}%") if params[:q].present?
+      if params[:filter] != 'all'
+        builder = builder.pending
+        builder = builder.unscope(where: :aasm_state).where(aasm_state: params[:state]) if params[:state].present?
+      end
       builder = builder.order(id: :desc)
 
       @pagy, @mod_logs = pagy(builder)
@@ -89,7 +91,6 @@ module CensorBear
 
     private
 
-    # Use callbacks to share common setup or constraints between actions.
     def set_mod_log
       @mod_log = ModLog.find(params[:id] || params[:mod_log_id])
     end
@@ -98,7 +99,6 @@ module CensorBear
       ModLog
     end
 
-    # Only allow a list of trusted parameters through.
     def mod_log_params
       params.require(:mod_log).permit(:record_id, :record_type, :mod_words, :user_id, :reason)
     end

data/app/controllers/censor_bear/stop_words_controller.rb

@@ -1,4 +1,4 @@
-require_dependency "censor_bear/application_controller"
+require_dependency 'censor_bear/application_controller'
 
 module CensorBear
   class StopWordsController < ApplicationController
@@ -46,7 +46,16 @@ module CensorBear
 
     def load_stop_words
       builder ||= stop_word_scope
-      builder = builder.where("key ilike ?", "%#{params[:q]}%") if params[:q].present?
+      builder = builder.where('key ilike ?', "%#{params[:q]}%") if params[:q].present?
+      case params[:filter]
+      when 'size_one'
+        builder = builder.where('length(key) = 1')
+      when 'size_two'
+        builder = builder.where('length(key) = 2')
+      when 'size_three'
+        builder = builder.where('length(key) = 3')
+      end
+      builder = builder.where('key ilike ?', "%#{params[:q]}%")
       builder = builder.order(id: :desc)
 
       @pagy, @stop_words = pagy(builder)

data/app/helpers/censor_bear/home_helper.rb

@@ -0,0 +1,4 @@
+module CensorBear
+  module HomeHelper
+  end
+end

data/app/models/censor_bear/log.rb

@@ -1,5 +1,23 @@
 module CensorBear
   class Log < ApplicationRecord
     belongs_to :user, class_name: CensorBear.config.user_class, optional: true
+
+    def suggestion
+      return nil if response.blank?
+
+      response['data']&.first['results']&.first['suggestion']
+    end
+
+    def rate
+      return nil if response.blank?
+
+      response['data']&.first['results']&.first['rate']
+    end
+
+    def label
+      return nil if response.blank?
+
+      response['data']&.first['results']&.first['label']
+    end
   end
 end

data/app/models/censor_bear/mod_log.rb

@@ -1,6 +1,8 @@
 module CensorBear
   class ModLog < ApplicationRecord
-    REASONS = %w(无 广告/SPAM 恶意灌水 违规内容 文不对题 重复发布 其它)
+    include AASM
+
+    REASONS = %w(无 广告/SPAM 恶意灌水 违规内容 文不对题 重复发布 其它).freeze
     belongs_to :record, polymorphic: true, required: false
 
     def record_path
@@ -9,14 +11,14 @@ module CensorBear
       record.censor_show_path
     end
 
-    def delete(reason)
+    def remove(reason)
       return if record.blank?
       return if record.discarded?
       # ugc内容需要开软删，便于撤销&查看统计，可以定时删除统计并删除软删内容，类似回收站机制
-      raise NoMethodError.new("undefined censor_delete for record") unless record.respond_to?(:censor_delete)
+      raise NoMethodError, 'undefined censor_remove for record' unless record.respond_to?(:censor_remove)
 
-      ret = record.censor_delete
-      handled!(reason) if ret
+      ret = record.censor_remove
+      reject!(reason) if ret
     end
 
     def approve
@@ -24,7 +26,15 @@ module CensorBear
       raise NoMethodError unless record.respond_to?(:censor_approve)
 
       ret = record.censor_approve
-      handled! if ret
+      pass! if ret
+    end
+
+    def cancel
+      return if record.blank?
+      raise NoMethodError unless record.respond_to?(:censor_cancel)
+
+      ret = record.censor_cancel
+      undo! if ret
     end
 
     def ban_user
@@ -32,23 +42,36 @@ module CensorBear
       raise NoMethodError unless record.respond_to?(:censor_ban_user)
 
       ret = record.censor_ban_user
-      delete if ret
+      reject!('已被封禁该用户') if ret
     end
 
-    scope :pending, -> { where(status: 0) }
-    scope :handled, -> { where(status: 1) }
-    scope :suspended, -> { where(status: 2) }
+    aasm do
+      state :pending, initial: true
+      state :rejected, :passed, :suspended
+
+      event :reject do
+        transitions from: %i[pending suspended], to: :rejected, after: Proc.new {|*args| set_reason(*args) }
+      end
+
+      event :pass do
+        transitions from: %i[pending suspended], to: :passed
+      end
+
+      event :suspend do
+        transitions from: :pending, to: :suspended, after: :unset_reason
+      end
 
-    def handled!(reason = nil)
-      update_columns(status: 1, reason: reason)
+      event :undo do
+        transitions from: %i[passed rejected], to: :pending, after: :unset_reason
+      end
     end
 
-    def pend!
-      update_columns(status: 0)
+    def unset_reason
+      update_columns(reason: nil)
     end
 
-    def suspend!
-      update_columns(status: 2)
+    def set_reason(reason)
+      update_columns(reason: reason)
     end
   end
 end

data/app/models/censor_bear/stop_word.rb

@@ -1,7 +1,7 @@
 module CensorBear
   class StopWord < ApplicationRecord
-    FIELDS = %w(ugc username nickname signature dialog)
-    ACTIONS_MAP = %w(ignore mod banned replace)
+    FIELDS = %w(ugc username nickname signature dialog).freeze
+    ACTIONS_MAP = %w(ignore mod banned replace).freeze
     belongs_to :user, class_name: CensorBear.config.user_class
   end
 end

data/app/views/censor_bear/home/debug.turbo_stream.haml

@@ -0,0 +1,8 @@
+= turbo_stream.update(:result) do
+  %h3{class: "text-lg"} 检测结果
+  %div{class: "bg-yellow-100 text-yellow-700 p-4 rounded-lg"}
+    %pre{class: "whitespace-pre-wrap"}
+      - if @r.is_a?(MatchData)
+        = @r.pretty_inspect
+      - else
+        = JSON.pretty_generate(@r.is_a?(CensorBear::Result) ? JSON.parse(@r.to_json) : @r)

data/app/views/censor_bear/home/debugger.html.haml

@@ -0,0 +1,9 @@
+%div{class: "flex flex-col space-y-2 rounded-lg border p-4"}
+  %h2{class: "text-xl font-medium text-center"} 在线调试
+  %div{class: "flex justify-center"}
+    = form_with(url: debug_path, method: :post, class: "flex flex-col items-center w-full space-y-4") do |f|
+      = f.select :stage, options_for_select([%w[check_text check_text], %w[check_search check_search], %w[check_search check_search], %w[qq_regex qq_regex], %w[wx_regex wx_regex]], params[:stage]), {}, class: "border rounded-md m py-0.5 px-1"
+      = f.select :type, options_for_select(CensorBear::StopWord::FIELDS.map{|f| [f.upcase, f]}, params[:type]), {}, class: "border rounded-md m py-0.5 px-1"
+      = f.text_area :content, value: params[:content], placeholder: "输入正文", rows: 6, class: "bg-gray-100 rounded-lg p-4 w-full"
+      = f.submit "检测", class: "rounded-lg px-10 py-1 bg-black text-white cursor-pointer"
+  #result

data/app/views/censor_bear/home/index.html.erb

@@ -0,0 +1,2 @@
+<h1>Home#index</h1>
+<p>Find me in app/views/censor_bear/home/index.html.erb</p>

data/app/views/censor_bear/logs/_log.html.haml

@@ -9,6 +9,12 @@
             %span{class: "text-sm bg-pink-100 text-pink-600 py-1 px-2 rounded-lg"}=t("censor_log.stage.#{log.stage}")
           - unless log.action.blank?
             %span{class: "text-sm bg-yellow-100 text-yellow-600 py-1 px-2 rounded-lg"}=t("censor_log.action.#{log.action.downcase}")
+          - unless log.suggestion.blank?
+            %span{class: "text-sm bg-green-100 text-green-600 py-1 px-2 rounded-lg"}=log.suggestion.upcase
+          - unless log.rate.blank?
+            %span{class: "text-sm bg-green-100 text-green-600 py-1 px-2 rounded-lg"}=log.rate
+          - unless log.label.blank?
+            %span{class: "text-sm bg-green-100 text-green-600 py-1 px-2 rounded-lg"}=log.label.upcase
           - unless log.user_id.blank?
             %span{class: "text-sm bg-gray-100 text-gray-600 py-1 px-2 rounded-lg font-bold"}="##{log.user_id}"
           - unless log.ip.blank?
@@ -19,7 +25,7 @@
           %span{class: "text-sm bg-gray-100 text-gray-600 py-1 px-2 rounded-lg"}= log.created_at
         %div{class: "flex space-x-2 items-center"}
           %span
-            = link_to '详情', log
+            = link_to '详情', log, data: { turbo: false }
           %span
             = button_to '删除', log, method: :delete, data: { confirm: 'Are you sure?' }, class: "text-red-600 rounded-md px-2 py-0.5"
       %div{class: "flex justify-between items-center"}
@@ -32,5 +38,5 @@
         %div{class: "text-yellow-500 font-meidum text-xl"}
           - log.mod_words.each do |word|
             %span [
-            %span= link_to word, stop_words_path(q: word), data: { turbo: false }, target: "_blank"
+            %span= link_to word, stop_words_path(q: word), data: { turbo: false }
             %span ]

data/app/views/censor_bear/logs/index.html.haml

@@ -4,10 +4,11 @@
       = form_with(url: logs_path, method: :get, class: "flex items-center") do |f|
         %div{class: "space-x-0.5"}
           = f.text_field :q, value: params[:q], placeholder: "关键词", class: "border rounded-md m py-0.5 px-1"
+          = f.select :stage, options_for_select([%w[aliyun_check aliyun_check], %w[aliyun_check aliyun_check], %w[qq_regex qq_regex], %w[wx_regex wx_regex], %w[local_check local_check]], params[:stage]), {include_blank: "-- 按Stage筛选 --"}, class: "border rounded-md m py-0.5 px-1"
           = f.submit "检索", class: "rounded-md px-2 py-1 text-sm bg-black text-white cursor-pointer"
           = link_to "重置", logs_path, class: "text-sm"
 
-    %div="共 #{@pagy.count} 条"
+    %div{class: "text-sm text-gray-600"}="共 #{@pagy.count} 条"
   %div
     - if @logs.blank?
       %div{class: "flex justify-center text-gray-500 p-8 border rounded-md"} 空空如也

data/app/views/censor_bear/logs/show.html.haml

@@ -0,0 +1,29 @@
+%div{class: "flex flex-col space-y-2"}
+  %div
+    %div{class: "font-bold"} 源内容:
+    %div= @log.original_content
+  %div
+    %div{class: "font-bold"} 过滤后内容:
+    %div= @log.filtered_content
+  %div
+    %div{class: "font-bold"} 动作:
+    %div= @log.action
+  %div
+    %div{class: "font-bold"} 场景:
+    %div= @log.scenario
+  %div
+    %div{class: "font-bold"} 检测阶段:
+    %div= @log.stage
+  %div
+    %div{class: "font-bold"} 命中敏感词:
+    %div= @log.mod_words
+  %div
+    %div{class: "font-bold"} 云检测返回标签:
+    %div= @log.labels
+  %div
+    %div{class: "font-bold"} 云检测返回标签:
+    %div= @log.labels
+  %div
+    %div{class: "font-bold"} 云检测返回:
+    %div{class: "p-1 bg-gray-100 rounded-lg"}
+      %pre= JSON.pretty_generate(@log.response)

data/app/views/censor_bear/mod_logs/_mod_log.html.haml

@@ -2,44 +2,49 @@
   %div{class: "flex flex-col"}
     %div{class: "border rounded-md mb-2 p-2 flex flex-col space-y-1"}
       %div{class: "flex justify-between"}
-        %div{class: ""}
+        %div{class: "text-sm"}
           = link_to mod_log.record_path, data: { turbo: false }, target: "_blank" do
-            %span{class: "text-sm bg-indigo-100 text-indigo-600 py-1 px-2 rounded-lg"}="#{mod_log.record_type.upcase}##{mod_log.record_id}"
-          - unless mod_log.labels.blank?
-            - mod_log.labels.each do |label|
-              %span{class: "text-sm bg-red-100 text-red-600 py-1 px-2 rounded-lg"}=t("censor_log.label.#{label}")
-          - unless mod_log.mod_words.blank?
-            - mod_log.mod_words.each do |word|
-              %span{class: "text-sm bg-yellow-100 text-yellow-600 py-1 px-2 rounded-lg"}="##{word}"
-          %span{class: "text-sm bg-gray-100 text-gray-600 py-1 px-2 rounded-lg"}= mod_log.created_at
-        %div{class: "flex space-x-2 items-center"}
+            %span{class: "bg-indigo-100 text-indigo-600 py-1 px-2 rounded-lg"}="#{mod_log.record_type.upcase}##{mod_log.record_id}"
+          %span{class: "bg-yellow-100 text-yellow-600 rounded-md p-1"}=t("censor_log.aasm_state.#{mod_log.aasm_state}")
+        %div{class: "flex space-x-2 items-center text-sm"}
           - if mod_log.reason
             %span{class: "bg-red-100 text-red-600 p-1 rounded-lg"}
               = mod_log.reason
-          %span{class: "bg-green-100 text-green-600 rounded-md p-1"}
-            - if mod_log.status == 0
-              = "待审"
-            - if mod_log.status == 1
-              = "已处理"
-            - if mod_log.status == 2
-              = "暂缓"
-          %span
-            = link_to "详情", mod_log, data: { turbo: false }, target: "_blank"
-          %span
-            = button_to '删除', mod_log, method: :delete, data: { confirm: 'Are you sure?'}, class: "text-red-600 rounded-md px-2 py-0.5"
-      %div{class: "flex justify-between items-center"}
-        %div{class: "flex flex-col"}
-          %div{class: "text-sm border rounded-lg border-black p-2"}
-            %div= mod_log.content
-      %div
-        %div{class: "flex space-x-2"}
-          %span{class: "text-yellow-600"}
-            = link_to "忽略", mod_log_ignore_path(mod_log)
-          %span{class: "text-green-600"}
-            = link_to "通过", mod_log_approve_path(mod_log)
-        %div
-          = form_with(url: mod_log_delete_path(mod_log), method: :get, class: "space-x-1 flex items-center") do |f|
-            = f.submit "删除", class: "rounded-md px-2 py-1 text-sm bg-red-600 text-white cursor-pointer"
-            = f.text_field :reason, value: mod_log.reason, placeholder: "不通过原因", class: "border rounded-md m py-0.5 px-1"
-        -#%span{class: "text-red-600 font-bold"}
-        -#  = link_to "封禁用户!", mod_log_ban_path(mod_log)
+          %span{class: "bg-gray-100 text-gray-600 py-1 px-2 rounded-lg"}= mod_log.created_at
+          - if current_user.admin?
+            = button_to '删除', mod_log, method: :delete, data: { confirm: 'Are you sure?'}, class: "bg-red-600 text-white rounded-md px-2 py-0.5 cursor-pointer"
+      %div{class: "flex justify-between items-center py-2 w-full"}
+        %div{class: "flex flex-col rounded-lg bg-gray-50 p-3 text-sm space-y-4 w-full"}
+          -unless mod_log.record
+            %h3{class: "text-2xl text-red-600"} 对应条目已被永久删除，当前审核请求已无效，请删除
+          - else
+            %div
+              %span{class: "border border-pink-600 text-pink-600 rounded-lg text-xs p-0.5"}=mod_log.record.is_private ? "隐私" : "公开"
+              %span{class: "border border-blue-600 text-blue-600 rounded-lg text-xs p-0.5"}=mod_log.record.is_approved ? "审核通过" : "审核中..."
+            - if mod_log.record.discarded?
+              %div{class: "text-gray-900 leading-relaxed"}
+                %del= mod_log.record.content
+            - else
+              %div{class: "text-gray-900 leading-relaxed"}= mod_log.record.content
+            %div
+              - mod_log.record.pictures.each do |pic|
+                = image_tag pic.full_url, class: "w-16 rounded-md"
+          %div
+            - unless mod_log.labels.blank?
+              - mod_log.labels.each do |label|
+                %span{class: "text-xs bg-gray-200 text-gray-600 py-0.5 px-1 rounded-lg"}=t("censor_log.label.#{label}")
+            - unless mod_log.mod_words.blank?
+              - mod_log.mod_words.each do |word|
+                %span{class: "text-sm bg-gray-100 text-gray-600 py-0.5 px-1 rounded-lg"}="##{word}"
+      %div{class: "flex space-x-2 items-center justify-end"}
+        - if mod_log.may_suspend?
+          = link_to "忽略", mod_log_suspend_path(mod_log), class: "text-yellow-600 cursor-pointer"
+        - if mod_log.may_pass?
+          = link_to "通过", mod_log_pass_path(mod_log), class: "text-green-600 cursor-pointer"
+        - if mod_log.may_undo?
+          = link_to "撤销", mod_log_undo_path(mod_log), class: "text-red-600 cursor-pointer"
+        - if mod_log.may_reject?
+          = form_with(url: mod_log_reject_path(mod_log), method: :get, class: "space-x-1 flex items-center") do |f|
+            = f.submit "拒绝", class: "text-red-600 bg-transparent cursor-pointer"
+            = f.text_field :reason, value: mod_log.reason, placeholder: "不通过原因", class: "border rounded-md m py-0.5 px-1 text-sm"
+

data/app/views/censor_bear/mod_logs/index.html.haml

@@ -6,8 +6,18 @@
           = f.text_field :q, value: params[:q], placeholder: "关键词", class: "border rounded-md m py-0.5 px-1"
           = f.submit "检索", class: "rounded-md px-2 py-1 text-sm bg-black text-white cursor-pointer"
           = link_to "重置", mod_logs_path, class: "text-sm"
-
-    %div="共 #{@pagy.count} 条"
+    %div{class: "flex items-center space-x-2"}
+      %div{class: "text-sm text-gray-600"}="共 #{@pagy.count} 条"
+      %div{class: "bg-gray-200 rounded-full px-3 py-1 text-xs #{params[:filter] == "all" ? 'font-bold' : ''}"}
+        = link_to "全部", request.params.merge(filter: "all", state: "")
+      %div{class: "bg-gray-200 rounded-full px-3 py-1 text-xs #{params[:state].blank? && params[:filter].blank? ? 'font-bold' : ''}"}
+        = link_to "待处理", request.params.merge(state: "", filter: "")
+      %div{class: "bg-gray-200 rounded-full px-3 py-1 text-xs #{params[:state] == 'rejected' ? 'font-bold' : ''}"}
+        = link_to "被驳回", request.params.merge(state: "rejected", filter: "")
+      %div{class: "bg-gray-200 rounded-full px-3 py-1 text-xs #{params[:state] == 'passed' ? 'font-bold' : ''}"}
+        = link_to "通过", request.params.merge(state: "passed", filter: "")
+      %div{class: "bg-gray-200 rounded-full px-3 py-1 text-xs #{params[:state] == 'suspended' ? 'font-bold' : ''}"}
+        = link_to "暂缓处理", request.params.merge(state: "suspended", filter: "")
   %div
     - if @mod_logs.blank?
       %div{class: "flex justify-center text-gray-500 p-8 border rounded-md"} 空空如也

data/app/views/censor_bear/stop_words/index.html.haml

@@ -4,10 +4,11 @@
       = form_with(url: stop_words_path, method: :get, class: "flex items-center") do |f|
         %div{class: "space-x-0.5"}
           = f.text_field :q, value: params[:q], placeholder: "关键词", class: "border rounded-md m py-0.5 px-1"
+          = f.select :filter, options_for_select([%w[长度为1 size_one], %w[长度为2 size_two], %w[长度为3 size_three]], params[:filter]), {include_blank: "-- 按敏感词长度筛选 --"}, class: "border rounded-md m py-0.5 px-1"
           = f.submit "检索", class: "rounded-md px-2 py-1 text-sm bg-black text-white cursor-pointer"
           = link_to "重置", stop_words_path, class: "text-sm"
-
     %div
+      %span{class: "text-sm text-gray-600"}="共 #{@pagy.count} 条"
       = link_to '批量导入', "#", class: "text-sm"
       = link_to '新增', new_stop_word_path, class: "rounded-md px-2 py-1 text-sm bg-black text-white cursor-pointer"
   %div

data/app/views/layouts/censor_bear/application.html.haml

@@ -10,9 +10,10 @@
   %body{class: "flex flex-col space-y-6 p-4"}
     %ul{class: "flex justify-end items-center space-x-2 text-blue-600"}
       %li= link_to "审查(#{CensorBear::ModLog.pending.count})", mod_logs_path
-      %li= link_to "敏感词", stop_words_path
       %li= link_to "日志", logs_path
-      %li= link_to "回主站", "/"
+      %li= link_to "敏感词", stop_words_path
+      %li= link_to "调试", debugger_path
+      %li= link_to "控制台", main_app.send(CensorBear.config.main_app_root_path_method.to_sym)
       %li= current_user.email
     %div
       = yield

data/config/locales/censor_bear.yml

@@ -8,7 +8,12 @@ en:
       block: 禁用
       pass: 忽略
       review: 审核
+    aasm_state:
+      pending: 待审
+      handled: 已处理
+      suspended: 暂缓处理
     stage:
+      check_search: 搜索检查
       aliyun_check: 阿里云检查
       tencent_check: 腾讯云检查
       local_check: 本地检查

data/config/routes.rb

@@ -1,12 +1,17 @@
 CensorBear::Engine.routes.draw do
   resources :mod_logs do
-    get :ignore
-    get :approve
-    get :delete
+    get :suspend
+    get :reject
+    get :pass
+    get :undo
     get :ban
   end
   resources :logs
   resources :stop_words
 
-  root to: "stop_words#index"
+  get '/welcome', to: 'home#index'
+  get '/debugger', to: 'home#debugger'
+  post '/debug', to: 'home#debug'
+
+  root to: 'mod_logs#index'
 end

data/db/migrate/20211209093050_add_response_to_censor_bear_logs.rb

@@ -0,0 +1,5 @@
+class AddResponseToCensorBearLogs < ActiveRecord::Migration[6.0]
+  def change
+    add_column :censor_bear_logs, :response, :json
+  end
+end

data/db/migrate/20211209113710_add_aasm_state_to_censor_bear_mod_logs.rb

@@ -0,0 +1,5 @@
+class AddAasmStateToCensorBearModLogs < ActiveRecord::Migration[6.0]
+  def change
+    add_column :censor_bear_mod_logs, :aasm_state, :string
+  end
+end

data/lib/censor_bear/censor.rb

@@ -30,15 +30,15 @@ module CensorBear
       return Result.new(@content) unless CensorBear::StopWord::FIELDS.include?(@type)
 
       # 正则过滤
-      if @content.match(QQ_REG)
-        CensorBear.info(@content, @type, 'BANNED', 'qq_regex', ip: @ip, user_id: @user_id)
-        raise NotPassedException
-      end
+      # if @content.match(QQ_REG)
+      #   CensorBear.info(@content, @type, 'BANNED', 'qq_regex', ip: @ip, user_id: @user_id)
+      #   raise NotPassedException
+      # end
 
-      if @content.match(WX_REG)
-        CensorBear.info(@content, @type, 'BANNED', 'wx_regex', ip: @ip, user_id: @user_id)
-        raise NotPassedException
-      end
+      # if @content.match(WX_REG)
+      #   CensorBear.info(@content, @type, 'BANNED', 'wx_regex', ip: @ip, user_id: @user_id)
+      #   raise NotPassedException
+      # end
 
       # 本地自定义词库粗查
       local_check
@@ -115,32 +115,44 @@ module CensorBear
       rate = r['rate']
       @mod_words = concat_words(r['details'])
       @labels = concat_labels(r['details'])
-      if action == 'block' && rate >= 70 && %w[politics terrorism abuse].include?(r['label'])
+      if action == 'block' && rate >= 70 && %w[politics terrorism].include?(r['label'])
         CensorBear.info(
-          d['content'], @type, action, 'aliyun_check',
+          d['content'], @type, 'banned', 'aliyun_check',
           filtered_content: d['filteredContent'],
           mod_words: @mod_words,
           labels: @labels,
-          ip: @ip, user_id: @user_id
+          ip: @ip, user_id: @user_id,
+          response: response
         )
         raise NotPassedException
-      elsif action == 'block'
+      elsif action == 'block' && rate >= 90
         @is_mod = true
         CensorBear.info(
-          d['content'], @type, action, 'aliyun_check',
+          d['content'], @type, 'mod', 'aliyun_check',
           filtered_content: d['filteredContent'],
           mod_words: @mod_words,
           labels: @labels,
-          ip: @ip, user_id: @user_id
+          ip: @ip, user_id: @user_id,
+          response: response
         )
       elsif action == 'review'
         @is_mod = true
         CensorBear.info(
-          d['content'], @type, action, 'aliyun_check',
+          d['content'], @type, 'mod', 'aliyun_check',
           filtered_content: d['filteredContent'],
           mod_words: @mod_words,
           labels: @labels,
-          ip: @ip, user_id: @user_id
+          ip: @ip, user_id: @user_id,
+          response: response
+        )
+      else
+        CensorBear.info(
+          d['content'], @type, 'ignore', 'aliyun_check',
+          filtered_content: d['filteredContent'],
+          mod_words: @mod_words,
+          labels: @labels,
+          ip: @ip, user_id: @user_id,
+          response: response
         )
       end
     end
@@ -149,6 +161,7 @@ module CensorBear
 
     def concat_labels(data)
       return [] if data.blank?
+
       labels = []
       data.map do |d|
         next if d['label'].blank?
@@ -160,6 +173,7 @@ module CensorBear
 
     def concat_words(data)
       return [] if data.blank?
+
       words = []
       data.each do |d|
         next if d['contexts'].blank?

data/lib/censor_bear/configuration.rb

@@ -17,5 +17,7 @@ module CensorBear
     attr_accessor :aliyun_green_access_key_id
     attr_accessor :aliyun_green_access_key_secret
     attr_accessor :aliyun_green_enable_internal
+
+    attr_accessor :main_app_root_path_method
   end
 end

data/lib/censor_bear/version.rb

@@ -1,3 +1,3 @@
 module CensorBear
-  VERSION = '0.1.11'.freeze
+  VERSION = '0.1.15'.freeze
 end

data/lib/censor_bear.rb

@@ -3,6 +3,7 @@ require 'censor_bear/engine'
 require 'censor_bear/censor'
 require 'censor_bear/configuration'
 
+require 'aasm'
 require 'hamlit'
 require 'pagy'
 require 'aliyun_green'
@@ -24,6 +25,8 @@ module CensorBear
       @config.aliyun_green_access_key_id = ''
       @config.aliyun_green_access_key_secret = ''
       @config.aliyun_green_enable_internal = false
+      @config.main_app_root_path_method = 'root_path'
+
       @config
     end
 
@@ -45,6 +48,7 @@ module CensorBear
       labels = options[:labels] || []
       ip = options[:ip] || nil
       user_id = options[:user_id] || nil
+      response = options[:response] || {}
 
       CensorBear::Log.create(
         original_content: content,
@@ -56,6 +60,7 @@ module CensorBear
         labels: labels,
         ip: ip,
         user_id: user_id,
+        response: response
       )
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: censor_bear
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.15
 platform: ruby
 authors:
 - 42up
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-08 00:00:00.000000000 Z
+date: 2021-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,6 +30,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.4.1
+- !ruby/object:Gem::Dependency
+  name: aasm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aliyun_green
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +126,19 @@ files:
 - Rakefile
 - app/assets/config/censor_bear_manifest.js
 - app/assets/stylesheets/censor_bear/application.css
+- app/assets/stylesheets/censor_bear/home.css
 - app/assets/stylesheets/censor_bear/logs.css
 - app/assets/stylesheets/censor_bear/mod_logs.css
 - app/assets/stylesheets/censor_bear/stop_words.css
 - app/assets/stylesheets/censor_bear/tailwind.min.css
 - app/assets/stylesheets/scaffold.css
 - app/controllers/censor_bear/application_controller.rb
+- app/controllers/censor_bear/home_controller.rb
 - app/controllers/censor_bear/logs_controller.rb
 - app/controllers/censor_bear/mod_logs_controller.rb
 - app/controllers/censor_bear/stop_words_controller.rb
 - app/helpers/censor_bear/application_helper.rb
+- app/helpers/censor_bear/home_helper.rb
 - app/helpers/censor_bear/logs_helper.rb
 - app/helpers/censor_bear/mod_logs_helper.rb
 - app/helpers/censor_bear/stop_words_helper.rb
@@ -131,13 +148,16 @@ files:
 - app/models/censor_bear/log.rb
 - app/models/censor_bear/mod_log.rb
 - app/models/censor_bear/stop_word.rb
+- app/views/censor_bear/home/debug.turbo_stream.haml
+- app/views/censor_bear/home/debugger.html.haml
+- app/views/censor_bear/home/index.html.erb
 - app/views/censor_bear/logs/_form.html.erb
 - app/views/censor_bear/logs/_log.html.haml
 - app/views/censor_bear/logs/destroy.turbo_stream.haml
 - app/views/censor_bear/logs/edit.html.erb
 - app/views/censor_bear/logs/index.html.haml
 - app/views/censor_bear/logs/new.html.erb
-- app/views/censor_bear/logs/show.html.erb
+- app/views/censor_bear/logs/show.html.haml
 - app/views/censor_bear/mod_logs/_form.html.erb
 - app/views/censor_bear/mod_logs/_mod_log.html.haml
 - app/views/censor_bear/mod_logs/destroy.turbo_stream.haml
@@ -162,6 +182,8 @@ files:
 - db/migrate/20211129110218_create_censor_bear_mod_logs.rb
 - db/migrate/20211206092626_add_ip_to_censor_bear_logs.rb
 - db/migrate/20211208041114_add_labels_to_censor_bear_logs.rb
+- db/migrate/20211209093050_add_response_to_censor_bear_logs.rb
+- db/migrate/20211209113710_add_aasm_state_to_censor_bear_mod_logs.rb
 - lib/censor_bear.rb
 - lib/censor_bear/censor.rb
 - lib/censor_bear/configuration.rb

data/app/views/censor_bear/logs/show.html.erb

@@ -1,34 +0,0 @@
-<p id="notice"><%= notice %></p>
-
-<p>
-  <strong>Orginal content:</strong>
-  <%= @log.original_content %>
-</p>
-
-<p>
-  <strong>Action:</strong>
-  <%= @log.action %>
-</p>
-
-<p>
-  <strong>Scenario:</strong>
-  <%= @log.scenario %>
-</p>
-
-<p>
-  <strong>Stage:</strong>
-  <%= @log.stage %>
-</p>
-
-<p>
-  <strong>Filtered content:</strong>
-  <%= @log.filtered_content %>
-</p>
-
-<p>
-  <strong>Mod words:</strong>
-  <%= @log.mod_words %>
-</p>
-
-<%= link_to 'Edit', edit_log_path(@log) %> |
-<%= link_to 'Back', logs_path %>