censor_bear 0.1.2 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '078a28407918d44f7b3d06d43c666f1bf98e68356069e3d1bfee2ef5d329e865'
-  data.tar.gz: 2d2470c0a97cf841387ed7467b2c5b5e5e79a1c60685dcd29a1445277bff83be
+  metadata.gz: 3808c2d3d47946f4109915ed8dbc7958693e4f90c2f33bfa588752848dcb287d
+  data.tar.gz: 273b95b59c959c83fe077d9bd2a81df28fa823472ddb5e620683ed97e4e8787f
 SHA512:
-  metadata.gz: eebc94c7d69c693cdc6f8917b377caff1e108ce34e13a497feb2acd7599c550d043dbcbfdc3bc2d099e27de8c3e3d7f294139149c8c54b16fe06f89ac12ceb60
-  data.tar.gz: abe0d7ad46a83b0ecc37bb3f5ab4244d5afa68c1a028e9bdd1c3e53e85c58f3c98ab30e0a85b64c6c2acec53c7c86a7f9ec86fa84b2a548141c55744fae1eec4
+  metadata.gz: 7003eaf638b80b5a3d5d0e1303c45841cfbf4dba9c3dab24e38c1b03f5d30b20d9f5ce5447cf924a3656f82b0797066fa1b844325e99d930809b0d06cb471cd5
+  data.tar.gz: 29c9cb99c1df3c8039a88e7b363c012064d94366419f845920cc0978a6652cc66c3ffd1f28b15138b5c2e8843b7ce33edd92d125b1ed29cc3e814152198620f1

data/app/controllers/censor_bear/logs_controller.rb

@@ -6,7 +6,7 @@ module CensorBear
 
     # GET /logs
     def index
-      @logs = Log.all
+      load_logs
     end
 
     # GET /logs/1
@@ -48,12 +48,26 @@ module CensorBear
       redirect_to logs_url, notice: 'Log was successfully destroyed.'
     end
 
+    def load_logs
+      builder ||= log_scope
+      builder = builder.where("original_content ilike ?", "%#{params[:q]}%") if params[:q].present?
+      builder = builder.order(id: :desc)
+
+      @pagy, @logs = pagy(builder)
+    end
+
+
     private
+
       # Use callbacks to share common setup or constraints between actions.
       def set_log
         @log = Log.find(params[:id])
       end
 
+      def log_scope
+        Log
+      end
+
       # Only allow a list of trusted parameters through.
       def log_params
         params.require(:log).permit(:original_content, :action, :filtered_content, :mod_words)

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,17 +17,24 @@
     <% @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>
         <td><%= link_to 'Show', log %></td>
         <td><%= link_to 'Edit', edit_log_path(log) %></td>
-        <td><%= link_to 'Destroy', log, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        <td><%= button_to 'Destroy', log, method: :delete, data: { confirm: 'Are you sure?', turbo: false } %></td>
       </tr>
     <% end %>
   </tbody>
 </table>
 
+
+<br>
+
+<%= raw pagy_nav(@pagy) %>
+
 <br>
 
 <%= link_to 'New Log', new_log_path %>

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,34 +25,39 @@ 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)
     end
 
+    # default type = :ugc
+    def check_search
+      result = false
+      stop_words = CensorBear::StopWord.where("#{@type} != 'IGNORE'")
+      stop_words.each do |word|
+        finder = Regexp.new(Regexp.escape(word.key))
+        action = word.send(@type.to_sym).upcase
+        if finder.match(@content)
+          result = true
+          CensorBear.info(@content, @type, action, 'check_search', mod_words: [word.key])
+          break
+        end
+      end
+      result
+    end
+
     def local_check
       original_content = @content.dup
       stop_words = CensorBear::StopWord.where("#{@type} != 'IGNORE'")
@@ -64,14 +69,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.6'.freeze
 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,23 @@ module CensorBear
       Censor.new(content, type).check_text
     end
 
+    def check_search(content)
+      Censor.new(content, "ugc").check_search
+    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] }

data/lib/tasks/censor_bear_tasks.rake

@@ -4,7 +4,7 @@ namespace :censor_bear do
     from_file = File.read(CensorBear.config.format_from_file_path)
     File.open(CensorBear.config.format_dest_file_path, 'w') do |f|
       from_file.each_line do |word|
-        line = "#{word.strip!}={BANNED}|{BANNED}|{BANNED}|{BANNED}\r\n"
+        line = "#{word.strip}={BANNED}|{BANNED}|{BANNED}|{BANNED}\r\n"
         f.write(line)
         f.flush
       end
@@ -35,7 +35,7 @@ namespace :censor_bear do
         dialog: dialog,
         nickname: nickname,
         replacement: replacement,
-        user_id: User.last&.id,
+        user_id: CensorBear.config.user_class.constantize.last&.id,
         created_at: Time.now,
         updated_at: Time.now
       }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: censor_bear
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.6
 platform: ruby
 authors:
 - 42up
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-01 00:00:00.000000000 Z
+date: 2021-12-05 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