censor_bear 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '078a28407918d44f7b3d06d43c666f1bf98e68356069e3d1bfee2ef5d329e865'
-  data.tar.gz: 2d2470c0a97cf841387ed7467b2c5b5e5e79a1c60685dcd29a1445277bff83be
+  metadata.gz: 0c0acc1f6d43f1e10ddbc406e7dc4aa1bfb37ad8c821d048282695d5c9d0ade9
+  data.tar.gz: b6228ea570225303bc1c8147f8006b1efa362f19aeb95673f72ed6414d879d22
 SHA512:
-  metadata.gz: eebc94c7d69c693cdc6f8917b377caff1e108ce34e13a497feb2acd7599c550d043dbcbfdc3bc2d099e27de8c3e3d7f294139149c8c54b16fe06f89ac12ceb60
-  data.tar.gz: abe0d7ad46a83b0ecc37bb3f5ab4244d5afa68c1a028e9bdd1c3e53e85c58f3c98ab30e0a85b64c6c2acec53c7c86a7f9ec86fa84b2a548141c55744fae1eec4
+  metadata.gz: c09a551d136e8bc286399cb40e66b17103d8124861b8620650b3e63a221829562ef3e17262fa82f9b14e336b9c6ed79f0f3de05b9ec9935eb9910688b5d668d0
+  data.tar.gz: 21dc98c9d40fa65381f623d4f37b2dbe465590d2dd41136d18c8743d82c5f6cbaa4de3b4cd351434b3e13917f21fc0064c634b1a9712f4cb44194fad8f2967f1

data/app/controllers/censor_bear/stop_words_controller.rb

@@ -46,7 +46,7 @@ module CensorBear
 
     def load_stop_words
       builder ||= stop_word_scope
-      builder = builder.where("word ilike ?", "%#{params[:q]}%") if params[:q].present?
+      builder = builder.where("key ilike ?", "%#{params[:q]}%") if params[:q].present?
       builder = builder.order(id: :desc)
 
       @pagy, @stop_words = pagy(builder)

data/app/helpers/censor_bear/application_helper.rb

@@ -1,5 +1,9 @@
 module CensorBear
   module ApplicationHelper
     include Pagy::Frontend
+
+    def current_user
+      main_app.scope.request.env['warden'].user
+    end
   end
 end

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

@@ -17,6 +17,8 @@
     <% @logs.each do |log| %>
       <tr>
         <td><%= log.original_content %></td>
+        <td><%= log.scenario %></td>
+        <td><%= log.stage %></td>
         <td><%= log.action %></td>
         <td><%= log.filtered_content %></td>
         <td><%= log.mod_words %></td>

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

@@ -10,6 +10,16 @@
   <%= @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 %>

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

@@ -10,19 +10,19 @@
       %div= form.text_field :key, class: "border p-1 w-full rounded-md"
     %div
       %div{class: "text-gray-500 text-xs"}= form.label :ugc, "UGC内容处理方式"
-      %div= form.select :ugc, options_for_select(CensorBear.action_options, params[:action_type]), class: "border p-1 w-full rounded-md"
+      %div= form.select :ugc, options_for_select(CensorBear.action_options, stop_word.ugc), class: "border p-1 w-full rounded-md"
     %div
       %div{class: "text-gray-500 text-xs"}= form.label :username, "用户名处理方式"
-      %div= form.select :username, options_for_select(CensorBear.action_options, params[:action_type]), class: "border p-1 w-full rounded-md"
+      %div= form.select :username, options_for_select(CensorBear.action_options, stop_word.username), class: "border p-1 w-full rounded-md"
     %div
       %div{class: "text-gray-500 text-xs"}= form.label :nickname, "用户昵称处理方式"
-      %div= form.select :nickname, options_for_select(CensorBear.action_options, params[:action_type]), class: "border p-1 w-full rounded-md"
+      %div= form.select :nickname, options_for_select(CensorBear.action_options, stop_word.nickname), class: "border p-1 w-full rounded-md"
     %div
       %div{class: "text-gray-500 text-xs"}= form.label :signature, "签名处理方式"
-      %div= form.select :signature, options_for_select(CensorBear.action_options, params[:action_type]), class: "border p-1 w-full rounded-md"
+      %div= form.select :signature, options_for_select(CensorBear.action_options, stop_word.signature), class: "border p-1 w-full rounded-md"
     %div
       %div{class: "text-gray-500 text-xs"}= form.label :dialog, "私信处理方式"
-      %div= form.select :dialog, options_for_select(CensorBear.action_options, params[:action_type]), class: "border p-1 w-full rounded-md"
+      %div= form.select :dialog, options_for_select(CensorBear.action_options, stop_word.dialog), class: "border p-1 w-full rounded-md"
     %div
       %div{class: "text-gray-500 text-xs"}= form.label :replacement, "过滤词替换"
       %div= form.text_field :replacement, class: "border p-1 w-full rounded-md"

data/db/migrate/20211129093508_create_censor_bear_logs.rb

@@ -2,7 +2,9 @@ class CreateCensorBearLogs < ActiveRecord::Migration[6.1]
   def change
     create_table :censor_bear_logs do |t|
       t.text :original_content
+      t.string :scenario
       t.string :action
+      t.string :stage
       t.text :filtered_content
       t.string :mod_words, array: true, default: []
 

data/lib/censor_bear/censor.rb

@@ -25,29 +25,18 @@ module CensorBear
       return Result.new(@content) unless CensorBear::StopWord::FIELDS.include?(@type)
 
       if @content.match(QQ_REG)
-        CensorBear::Log.create(
-          original_content: @content,
-          action: "#{@type}_regex_qq",
-          filtered_content: nil,
-          mod_words: @mod_words
-        )
+        CensorBear.info(@content, @type, 'BANNED', 'qq_regex')
         raise NotPassedException
       end
 
       if @content.match(WX_REG)
-        @is_mod = true
-        CensorBear::Log.create(
-          original_content: @content,
-          action: "#{@type}_regex_wx",
-          filtered_content: nil,
-          mod_words: @mod_words
-        )
+        CensorBear.info(@content, @type, 'BANNED', 'wx_regex')
         raise NotPassedException
       end
 
       local_check
 
-      # 用户相关类型直接封禁，速错
+      # 用户相关类型直接禁止创建
       raise NotPassedException if @is_mod && %w[username signature dialog nickname].include?(@type)
 
       Result.new(@content, @is_mod, @mod_words.uniq)
@@ -64,14 +53,26 @@ module CensorBear
         case action
         when 'REPLACE'
           @content = @content.gsub(finder, word.replacement)
-          CensorBear::Log.create(original_content: original_content, action: "#{@type}_#{action}", filtered_content: @content, mod_words: [word.key])
+          CensorBear.info(
+            original_content, @type, action, 'local_check',
+            filtered_content: @content,
+            mod_words: [word.key]
+          )
         when 'MOD'
           @is_mod = true
-          CensorBear::Log.create(original_content: original_content, action: "#{@type}_#{action}", filtered_content: nil, mod_words: [word.key])
+          CensorBear.info(
+            original_content, @type, action, 'local_check',
+            filtered_content: nil,
+            mod_words: [word.key]
+          )
         when 'BANNED'
           @is_mod = true
           # 禁止的直接抛出异常
-          CensorBear::Log.create(original_content: original_content, action: "#{@type}_#{action}", filtered_content: nil, mod_words: [word.key])
+          CensorBear.info(
+            original_content, @type, action, 'local_check',
+            filtered_content: nil,
+            mod_words: [word.key]
+          )
           raise NotPassedException
         end
       end

data/lib/censor_bear/version.rb

@@ -1,3 +1,3 @@
 module CensorBear
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/lib/censor_bear.rb

@@ -1,9 +1,9 @@
-require "censor_bear/version"
-require "censor_bear/engine"
-require "censor_bear/censor"
-require "censor_bear/configuration"
+require 'censor_bear/version'
+require 'censor_bear/engine'
+require 'censor_bear/censor'
+require 'censor_bear/configuration'
 
-require "hamlit"
+require 'hamlit'
 require 'pagy'
 
 module CensorBear
@@ -31,6 +31,19 @@ module CensorBear
       Censor.new(content, type).check_text
     end
 
+    def info(content, scenario, action, stage, options = {})
+      filtered_content = options['filtered_content'] || nil
+      mod_words = options['mod_words'] || []
+
+      CensorBear::Log.create(
+        original_content: content,
+        scenario: scenario,
+        action: action,
+        stage: stage,
+        filtered_content: filtered_content,
+        mod_words: mod_words
+      )
+    end
 
     def action_options
       I18n.t('censor_log.action').map { |k, v| [v, k.to_s] }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: censor_bear
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - 42up
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-01 00:00:00.000000000 Z
+date: 2021-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.0.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.0.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.0.4.1
 - !ruby/object:Gem::Dependency
   name: hamlit
   requirement: !ruby/object:Gem::Requirement