censor_bear 0.1.15 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 775cd9c238b951f9b9d5ce8564ae76e3e4b5d38fb3e9b71dc599d6a75bc04f5e
-  data.tar.gz: f8daa1001d2682697143aec92e6098d1e291d3c4d8cb7c9d28f60455fee7e6b4
+  metadata.gz: da82f8fafa1a258c9009099fc66621805e19ac0750662f92153eb3a1a8ba5b01
+  data.tar.gz: 4a51f1c4260ba69397dfc583093fb59417ba0f9b95b458243d2b28ec58087454
 SHA512:
-  metadata.gz: 3bd8ea39fb05994a01083fdaf574501657bf085238a1c9a24b883bddadf374a8a441f910a95594f7a42081d981a2800b9b2b02c9b3cc578e200536faa52ed4b8
-  data.tar.gz: 6ee79015b14bf37b4f070e041c91738d906bb3d1f8c39b215a94ccf6fbe89ccc0816a9d919e1436ee3689b3bb62bd9be2df1a025afbe1090e09ee9bf0be1022d
+  metadata.gz: 0fed9c06844c55e4fca2c9d997d8f7af7a1bb04c33c0cc73f7fe1d1cbf4c1f0bce029a239f058a0eda4bd8bd11c9b670ad4019d8f3d75e9916d00f8d66a6ddf2
+  data.tar.gz: 11a70e93051a636a39240dd09327ef38778c82fc22af53b325e28e1635036de93f9ab85ab4b66d6cc8e78d1c04ae6b74ad31b7fa31ee5a958a75b9ac09dcccb7

data/app/controllers/censor_bear/logs_controller.rb

@@ -52,6 +52,23 @@ module CensorBear
       end
     end
 
+    def remove_data
+      builder = log_scope
+      case params[:type]
+      when '3days'
+        builder = builder.where("created_at >= ?", (Time.now - 3.days).beginning_of_day)
+      when '7days'
+        builder = builder.where("created_at >= ?", (Time.now - 7.days).beginning_of_day)
+      when '30days'
+        builder = builder.where("created_at >= ?", (Time.now - 30.days).beginning_of_day)
+      when 'all'
+        builder
+      end
+      builder.delete_all
+
+      redirect_to logs_url, notice: "Mod log was successfully destroyed."
+    end
+
     def load_logs
       builder ||= log_scope
       builder = builder.where("original_content ilike ?", "%#{params[:q]}%") if params[:q].present?

data/app/controllers/censor_bear/mod_logs_controller.rb

@@ -45,7 +45,6 @@ module CensorBear
       end
     end
 
-
     def suspend
       @mod_log.suspend!
 
@@ -59,8 +58,11 @@ module CensorBear
     end
 
     def undo
-      # TODO: 判断状态，确定是撤销通过呢还是撤销删除
-      @mod_log.cancel
+      if @mod_log.passed?
+        @mod_log.undo_approve
+      elsif @mod_log.rejected?
+        @mod_log.undo_remove
+      end
 
       redirect_to mod_logs_url, notice: 'Mod log was successfully ignored.'
     end

data/app/models/censor_bear/mod_log.rb

@@ -5,6 +5,16 @@ module CensorBear
     REASONS = %w(无 广告/SPAM 恶意灌水 违规内容 文不对题 重复发布 其它).freeze
     belongs_to :record, polymorphic: true, required: false
 
+    validates :record_id, uniqueness: { scope: [:record_type] }
+
+    def images
+      return [] if record.blank?
+
+      raise NoMethodError, 'undefined censor_images for record' unless record.respond_to?(:censor_images)
+
+      record.censor_images
+    end
+
     def record_path
       return '#' if record.blank?
 
@@ -21,6 +31,14 @@ module CensorBear
       reject!(reason) if ret
     end
 
+    def undo_remove
+      return if record.blank?
+      raise NoMethodError unless record.respond_to?(:censor_undo_remove)
+
+      ret = record.censor_undo_remove
+      undo! if ret
+    end
+
     def approve
       return if record.blank?
       raise NoMethodError unless record.respond_to?(:censor_approve)
@@ -29,11 +47,11 @@ module CensorBear
       pass! if ret
     end
 
-    def cancel
+    def undo_approve
       return if record.blank?
-      raise NoMethodError unless record.respond_to?(:censor_cancel)
+      raise NoMethodError unless record.respond_to?(:censor_undo_approve)
 
-      ret = record.censor_cancel
+      ret = record.censor_undo_approve
       undo! if ret
     end
 

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

@@ -2,7 +2,7 @@
   %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 :stage, options_for_select([%w[check_text check_text], %w[aliyun_check aliyun_check], %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"

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

@@ -4,11 +4,15 @@
       = 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.select :stage, options_for_select([%w[aliyun_check aliyun_check], %w[check_search check_search], %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{class: "text-sm text-gray-600"}="共 #{@pagy.count} 条"
+    %div{class: "flex space-x-2 items-center"}
+      %div{class: "text-sm text-gray-600"}="共 #{@pagy.count} 条"
+      = form_with(url: remove_data_logs_path, method: :delete, class: "flex items-center space-x-2") do |f|
+        = f.select :type, options_for_select([%w[最近3天 3days], %w[最近7天 7days], %w[最近30天 30days], %w[全部 all]], params[:type]), {include_blank: "-- 选择删除范围 --"}, class: "border text-red-600 border-red-600 rounded-md m py-0.5 px-1"
+        = f.submit "删除日志", class: "rounded-md px-2 py-1 text-xs bg-red-600 text-white cursor-pointer"
   %div
     - if @logs.blank?
       %div{class: "flex justify-center text-gray-500 p-8 border rounded-md"} 空空如也

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

@@ -21,21 +21,20 @@
             %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 ? "审核通过" : "审核中..."
+              - unless mod_log.labels.blank?
+                - mod_log.labels.each do |label|
+                  %span{class: "border border-yellow-600 text-yellow-600 rounded-lg text-xs p-0.5"}=t("censor_log.label.#{label}")
+              - unless mod_log.mod_words.blank?
+                - mod_log.mod_words.each do |word|
+                  %span{class: "border border-red-600 text-red-600 rounded-lg text-xs p-0.5"}="##{word}"
             - 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}"
+              - mod_log.images.each do |img|
+                = image_tag img[:src], class: "w-16 rounded-md"
       %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"

data/config/locales/censor_bear.yml

@@ -1,4 +1,4 @@
-en:
+"zh-CN":
   censor_log:
     action:
       mod: 审核
@@ -31,4 +31,4 @@ en:
       contraband: 违禁
       meaningless: 无意义
       harmful: 不良场景
-      customized: 自定义
+      customized: 自定义

data/config/routes.rb

@@ -6,7 +6,9 @@ CensorBear::Engine.routes.draw do
     get :undo
     get :ban
   end
-  resources :logs
+  resources :logs do
+    delete :remove_data, on: :collection
+  end
   resources :stop_words
 
   get '/welcome', to: 'home#index'

data/db/migrate/20211129110218_create_censor_bear_mod_logs.rb

@@ -6,7 +6,6 @@ class CreateCensorBearModLogs < ActiveRecord::Migration[6.1]
       t.text :content
       t.string :reason
       t.string :mod_words, array: true, default: []
-      t.integer :status, default: 0
       t.bigint :user_id
 
       t.timestamps

data/lib/censor_bear/censor.rb

@@ -115,17 +115,19 @@ module CensorBear
       rate = r['rate']
       @mod_words = concat_words(r['details'])
       @labels = concat_labels(r['details'])
-      if action == 'block' && rate >= 70 && %w[politics terrorism].include?(r['label'])
-        CensorBear.info(
-          d['content'], @type, 'banned', 'aliyun_check',
-          filtered_content: d['filteredContent'],
-          mod_words: @mod_words,
-          labels: @labels,
-          ip: @ip, user_id: @user_id,
-          response: response
-        )
-        raise NotPassedException
-      elsif action == 'block' && rate >= 90
+      # if action == 'block' && rate >= 70 && %w[politics terrorism].include?(r['label'])
+      #   @is_mod = true
+      #   CensorBear.info(
+      #     d['content'], @type, 'mod', 'aliyun_check',
+      #     filtered_content: d['filteredContent'],
+      #     mod_words: @mod_words,
+      #     labels: @labels,
+      #     ip: @ip, user_id: @user_id,
+      #     response: response
+      #   )
+      #   # raise NotPassedException
+      # elsif action == 'block' && rate >= 90
+      if action == 'block'
         @is_mod = true
         CensorBear.info(
           d['content'], @type, 'mod', 'aliyun_check',

data/lib/censor_bear/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: censor_bear
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.17
 platform: ruby
 authors:
 - 42up
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-09 00:00:00.000000000 Z
+date: 2021-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails