censor_bear 0.1.9 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 995b08638f4f34912cf688f3e0bf2ca6989766119595d8bd84ae98c9daf85409
-  data.tar.gz: f7be07a68fe5aeefe1ef4f9da1cbc589fca9a42d110e7ba992d5b5a75038eee1
+  metadata.gz: a3bf3dd6d88b6f7ece7434deabf56aa6322c305536e44d5ead4bae5c1aa94111
+  data.tar.gz: 9484d90389880990a519229d851394f7a484455972316f90f3d9891dda32851d
 SHA512:
-  metadata.gz: b0e1a136b46f06f977b400925cfa351ac2aa10f9ca546662cc5f9d5c6c69089b4b38f456b72aa76aec0dbe8f8affcbdd48dcf29a49db6f43fc05f3d3375ae164
-  data.tar.gz: 67abd4a402d55b81ae48e8942ecbef814c30f56f02f2da97c287ad5cacc7b612078461b3919f429d8e700d9ef56fa317882abec4aa9b71e8985c5e2b10016b7a
+  metadata.gz: e283297831488e216fe57089166d37084725ef93a387ea615d6897298d95616b181880af06c19e1ce3caf536ac29bdaedf1a25408f7392719390da40d721be8d
+  data.tar.gz: 11568a082cc47a024aecb4bd7a2b1f09e785b7690e88bba1bb6acb5445b7eb31ac4f4834f4a63c5429fe8a2c1c40ae6e6c72c21efd130903d3cdb4df81a25d16

data/app/controllers/censor_bear/mod_logs_controller.rb

@@ -79,7 +79,7 @@ module CensorBear
     end
 
     def load_mod_logs
-      builder ||= mod_log_scope
+      builder ||= mod_log_scope.includes(:record)
       builder = builder.where("content ilike ?", "%#{params[:q]}%") if params[:q].present?
 
       builder = builder.order(id: :desc)

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/models/censor_bear/mod_log.rb

@@ -10,6 +10,8 @@ module CensorBear
     end
 
     def delete(reason)
+      return if record.blank?
+      return if record.discarded?
       # ugc内容需要开软删，便于撤销&查看统计，可以定时删除统计并删除软删内容，类似回收站机制
       raise NoMethodError.new("undefined censor_delete for record") unless record.respond_to?(:censor_delete)
 
@@ -18,6 +20,7 @@ module CensorBear
     end
 
     def approve
+      return if record.blank?
       raise NoMethodError unless record.respond_to?(:censor_approve)
 
       ret = record.censor_approve
@@ -25,6 +28,7 @@ module CensorBear
     end
 
     def ban_user
+      return if record.blank?
       raise NoMethodError unless record.respond_to?(:censor_ban_user)
 
       ret = record.censor_ban_user

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

@@ -16,7 +16,6 @@
           - unless log.labels.blank?
             - 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}")
-
           %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
@@ -33,5 +32,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)
+            %span= link_to word, stop_words_path(q: word), data: { turbo: false }
             %span ]

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

@@ -7,7 +7,7 @@
           = 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/mod_logs/_mod_log.html.haml

@@ -3,7 +3,7 @@
     %div{class: "border rounded-md mb-2 p-2 flex flex-col space-y-1"}
       %div{class: "flex justify-between"}
         %div{class: ""}
-          = link_to mod_log.record_path do
+          = 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|
@@ -24,7 +24,7 @@
             - if mod_log.status == 2
               = "暂缓"
           %span
-            = link_to "详情", mod_log
+            = 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"}

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

@@ -7,7 +7,7 @@
           = 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: "text-sm text-gray-600"}="共 #{@pagy.count} 条"
   %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,9 @@
   %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 "控制台", main_app.send(CensorBear.config.main_app_root_path_method.to_sym)
       %li= current_user.email
     %div
       = yield

data/config/locales/censor_bear.yml

@@ -9,11 +9,12 @@ en:
       pass: 忽略
       review: 审核
     stage:
-      aliyun_check: "阿里云检查"
-      tencent_check: "腾讯云检查"
-      local_check: "本地检查"
-      qq_regex: "QQ正则检查"
-      wechat_regex: "微信正则检查"
+      check_search: 搜索检查
+      aliyun_check: 阿里云检查
+      tencent_check: 腾讯云检查
+      local_check: 本地检查
+      qq_regex: QQ正则检查
+      wechat_regex: 微信正则检查
     label:
       normal: 正常文本
       spam: 含垃圾信息

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,7 +115,7 @@ 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',
           filtered_content: d['filteredContent'],
@@ -148,6 +148,7 @@ module CensorBear
     private
 
     def concat_labels(data)
+      return [] if data.blank?
       labels = []
       data.map do |d|
         next if d['label'].blank?
@@ -158,6 +159,7 @@ module CensorBear
     end
 
     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.9'.freeze
+  VERSION = '0.1.13'.freeze
 end

data/lib/censor_bear.rb

@@ -24,6 +24,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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: censor_bear
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.13
 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