censor_bear 0.1.8 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a5519d5695908f0b7d3316070221bb2350da7d5869d7c6f8f202d1cb5d3a903
-  data.tar.gz: aa507b18784d4472427dad1c694f1cf1a552b957c54ef89d66fd1e57faa73403
+  metadata.gz: 58d7a9f6214a5f560794d6bca513cf288d01e7444aa293e243a3cf3e33e8e8d8
+  data.tar.gz: c1385ce54281b8d764f191f262c7941b32c0590b304d57976ef8e661f24c49ec
 SHA512:
-  metadata.gz: b1b68d93591c793a14c52d19c8fdbadf601adb5c2c24ce7575f3da001bf8922e6ee074e2ee5f3873005fdb8c620dfc50f5d6527f9b646573d190f8823470a592
-  data.tar.gz: 5763a681a0dc9c7dcb813ccf6b8f997e8df5ea782fc64c928d6dd04d870ef5c46a5e662ad4de0e2b9f4b4da341b6f11be4fd7044c6c04afe1f69d0e542384e29
+  metadata.gz: 97924df8a0ab45a7afc36d483e20bba15ecd98c23134d629bb4c93e44c233eff45e935871579303b68f107ba3b555d5b595c7f5e0a129bf107b4b213b4827272
+  data.tar.gz: e964103ec3434614e1d7eea7829efebf1bc66b6ad2b8bec9c8e6b2c8868b637c13baa2aad85ccc7f3427437ba3e04eb5a8f649f4f8c85dc947246d50c1bd4494

data/app/controllers/censor_bear/mod_logs_controller.rb

@@ -7,7 +7,6 @@ module CensorBear
     # GET /mod_logs
     def index
       load_mod_logs
-      @mod_logs = ModLog.pending.all
     end
 
     # GET /mod_logs/1
@@ -80,12 +79,12 @@ 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)
 
-      @pagy, @logs = pagy(builder)
+      @pagy, @mod_logs = pagy(builder)
     end
 
     private

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 }, target: "_blank"
             %span ]

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

@@ -1,11 +1,11 @@
 %div{class: "flex flex-col space-y-2 justify-center"}
   %div{class: "flex justify-between"}
     %div
-      = form_with(url: mod_logs_path, method: :get, class: "flex items-center") do |f|
+      = 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.submit "检索", class: "rounded-md px-2 py-1 text-sm bg-black text-white cursor-pointer"
-          = link_to "重置", mod_logs_path, class: "text-sm"
+          = link_to "重置", logs_path, class: "text-sm"
 
     %div="共 #{@pagy.count} 条"
   %div

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

@@ -1,18 +1,18 @@
 %div{class: "flex flex-col space-y-2 justify-center"}
   %div{class: "flex justify-between"}
     %div
-      = form_with(url: logs_path, method: :get, class: "flex items-center") do |f|
+      = form_with(url: mod_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.submit "检索", class: "rounded-md px-2 py-1 text-sm bg-black text-white cursor-pointer"
-          = link_to "重置", logs_path, class: "text-sm"
+          = link_to "重置", mod_logs_path, class: "text-sm"
 
     %div="共 #{@pagy.count} 条"
   %div
-    - if @logs.blank?
+    - if @mod_logs.blank?
       %div{class: "flex justify-center text-gray-500 p-8 border rounded-md"} 空空如也
     - else
-      - @logs.each do |log|
+      - @mod_logs.each do |log|
         = render log
   %div{class: "flex justify-center"}
     = raw pagy_nav(@pagy)

data/config/locales/censor_bear.yml

@@ -9,11 +9,11 @@ en:
       pass: 忽略
       review: 审核
     stage:
-      aliyun_check: "阿里云检查"
-      tencent_check: "腾讯云检查"
-      local_check: "本地检查"
-      qq_regex: "QQ正则检查"
-      wechat_regex: "微信正则检查"
+      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
@@ -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/version.rb

@@ -1,3 +1,3 @@
 module CensorBear
-  VERSION = '0.1.8'.freeze
+  VERSION = '0.1.12'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: censor_bear
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.12
 platform: ruby
 authors:
 - 42up