censor_bear 0.1.3 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c0acc1f6d43f1e10ddbc406e7dc4aa1bfb37ad8c821d048282695d5c9d0ade9
-  data.tar.gz: b6228ea570225303bc1c8147f8006b1efa362f19aeb95673f72ed6414d879d22
+  metadata.gz: 58ec10c9991ef9cd50eee20651e4e4433b09b4c455cfc1089e67da4eb835875a
+  data.tar.gz: a60d24c01590c3c89ff14f376db5ec67b82b494e73aa77bd1cef94df497f05c2
 SHA512:
-  metadata.gz: c09a551d136e8bc286399cb40e66b17103d8124861b8620650b3e63a221829562ef3e17262fa82f9b14e336b9c6ed79f0f3de05b9ec9935eb9910688b5d668d0
-  data.tar.gz: 21dc98c9d40fa65381f623d4f37b2dbe465590d2dd41136d18c8743d82c5f6cbaa4de3b4cd351434b3e13917f21fc0064c634b1a9712f4cb44194fad8f2967f1
+  metadata.gz: 9e1e3ad9f9afdae97ad89fce16ed0f4faa252595c1219bc9270020c0f049e1a59360b2bcf37964f282c08494b71f1764c9e55f36c47fda95eb431a810fb5c768
+  data.tar.gz: 8f2d44931bbed7280c83548e11a6251dd65ed4f9e6fa84b93e560a81a571ebe966dad3cd5919797c636f4d606cd8c44050a7fdfdbfaae25f9a6811e606b9905f

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

@@ -1,4 +1,5 @@
 module CensorBear
   class Log < ApplicationRecord
+    belongs_to :user, class_name: CensorBear.config.user_class, optional: true
   end
 end

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

@@ -0,0 +1,32 @@
+%div{class: "flex flex-col"}
+	%div{class: "border rounded-md mb-2 p-2 flex flex-col space-y-1"}
+		%div{class: "flex justify-between"}
+			%div{class: ""}
+				- unless log.scenario.blank?
+					%span{class: "text-sm bg-blue-100 text-blue-600 py-1 px-2 rounded-lg"}= log.scenario.upcase
+				- unless log.stage.blank?
+					%span{class: "text-sm bg-pink-100 text-pink-600 py-1 px-2 rounded-lg"}= log.stage.upcase
+				- unless log.action.blank?
+					%span{class: "text-sm bg-yellow-100 text-yellow-600 py-1 px-2 rounded-lg"}= log.action.upcase
+				- unless log.user_id.blank?
+					%span{class: "text-sm bg-gray-100 text-gray-600 py-1 px-2 rounded-lg font-bold"}="##{log.user_id}"
+				- unless log.ip.blank?
+					%span{class: "text-sm bg-gray-100 text-gray-600 py-1 px-2 rounded-lg"}=log.ip
+				%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
+					= link_to '详情', log
+				%span
+					= button_to '删除', log, method: :delete, data: { confirm: 'Are you sure?', turbo: false }, class: "text-red-600 rounded-md px-2 py-0.5"
+		%div{class: "flex justify-between items-center"}
+			%div{class: "flex flex-col"}
+				%div
+					%div= log.original_content
+				- if log.filtered_content
+					%div{class: "border-t pb-2"}
+						%div= log.filtered_content
+			%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 ]

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

@@ -0,0 +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|
+        %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"
+
+    %div="共 #{@pagy.count} 条"
+  %div
+    - if @logs.blank?
+      %div{class: "flex justify-center text-gray-500 p-8 border rounded-md"} 空空如也
+    - else
+      - @logs.each do |log|
+        = render log
+  %div{class: "flex justify-center"}
+    = raw pagy_nav(@pagy)

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

@@ -24,7 +24,7 @@
           %div{class: "text-center"}=I18n.t("censor_log.action.#{stop_word.dialog}")
           %div{class: "text-gray-500 text-xs text-center"} 私信处理
         %div{class: "flex flex-col justify-center border rounded-md p-1"}
-          %div{class: "text-center"}=stop_word.replacement
+          %div{class: "text-center"}=stop_word.replacement || "**"
           %div{class: "text-gray-500 text-xs text-center"} 过滤词替换
     %div{class: "flex justify-end space-x-2 text-sm text-blue-600"}
       %span

data/db/migrate/20211206092626_add_ip_to_censor_bear_logs.rb

@@ -0,0 +1,6 @@
+class AddIpToCensorBearLogs < ActiveRecord::Migration[6.1]
+  def change
+    add_column :censor_bear_logs, :ip, :string
+    add_column :censor_bear_logs, :user_id, :bigint
+  end
+end

data/lib/censor_bear/censor.rb

@@ -13,11 +13,14 @@ module CensorBear
     QQ_REG = /(?:[加茄qQ企鹅号码\s]{1,}|[群号]{1,}|[叩叩]{1,}|[抠抠]{1,}|[扣扣]{1,})(?:[\u4e00-\u9eff]*)(?:[:，：]?)([\d\s]{6,})/
     WX_REG = /(?:[加+微＋+➕薇？vV威卫星♥❤姓xX信]{2,}|weixin|weix)(?:[，❤️.\s]?)(?:[\u4e00-\u9eff]?)(?:[:，：]?)([\w\s]{6,})/
 
-    def initialize(content, type = 'ugc')
+    def initialize(content, type = 'ugc', options = {})
       @is_mod = false
       @mod_words = []
       @content = content
       @type = type.to_s
+      @options = options
+      @ip = options[:ip] || nil
+      @user_id = options[:user_id] || nil
     end
 
     def check_text
@@ -25,12 +28,12 @@ module CensorBear
       return Result.new(@content) unless CensorBear::StopWord::FIELDS.include?(@type)
 
       if @content.match(QQ_REG)
-        CensorBear.info(@content, @type, 'BANNED', 'qq_regex')
+        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')
+        CensorBear.info(@content, @type, 'BANNED', 'wx_regex', ip: @ip, user_id: @user_id)
         raise NotPassedException
       end
 
@@ -42,6 +45,22 @@ module CensorBear
       Result.new(@content, @is_mod, @mod_words.uniq)
     end
 
+    # default type = :ugc
+    def check_search(user = nil, ip = nil)
+      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], ip: @ip, user_id: @user_id)
+          break
+        end
+      end
+      result
+    end
+
     def local_check
       original_content = @content.dup
       stop_words = CensorBear::StopWord.where("#{@type} != 'IGNORE'")
@@ -52,18 +71,21 @@ module CensorBear
         @mod_words.push(word.key)
         case action
         when 'REPLACE'
-          @content = @content.gsub(finder, word.replacement)
+          replacement = word.replacement.blank? ? "**" : word.replacement
+          @content = @content.gsub(finder, replacement)
           CensorBear.info(
             original_content, @type, action, 'local_check',
             filtered_content: @content,
-            mod_words: [word.key]
+            mod_words: [word.key],
+            ip: @ip, user_id: @user_id
           )
         when 'MOD'
           @is_mod = true
           CensorBear.info(
             original_content, @type, action, 'local_check',
             filtered_content: nil,
-            mod_words: [word.key]
+            mod_words: [word.key],
+            ip: @ip, user_id: @user_id
           )
         when 'BANNED'
           @is_mod = true
@@ -71,7 +93,8 @@ module CensorBear
           CensorBear.info(
             original_content, @type, action, 'local_check',
             filtered_content: nil,
-            mod_words: [word.key]
+            mod_words: [word.key],
+            ip: @ip, user_id: @user_id
           )
           raise NotPassedException
         end

data/lib/censor_bear/version.rb

@@ -1,3 +1,3 @@
 module CensorBear
-  VERSION = '0.1.3'
+  VERSION = '0.1.7'.freeze
 end

data/lib/censor_bear.rb

@@ -27,13 +27,19 @@ module CensorBear
       yield(config)
     end
 
-    def check_text(content, type = 'ugc')
-      Censor.new(content, type).check_text
+    def check_text(content, type = 'ugc', options = {})
+      Censor.new(content, type, options).check_text
+    end
+
+    def check_search(content, options = {})
+      Censor.new(content, "ugc", options).check_search
     end
 
     def info(content, scenario, action, stage, options = {})
-      filtered_content = options['filtered_content'] || nil
-      mod_words = options['mod_words'] || []
+      filtered_content = options[:filtered_content] || nil
+      mod_words = options[:mod_words] || []
+      ip = options[:ip] || nil
+      user_id = options[:user_id] || nil
 
       CensorBear::Log.create(
         original_content: content,
@@ -41,7 +47,9 @@ module CensorBear
         action: action,
         stage: stage,
         filtered_content: filtered_content,
-        mod_words: mod_words
+        mod_words: mod_words,
+        ip: ip,
+        user_id: user_id,
       )
     end
 

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.3
+  version: 0.1.7
 platform: ruby
 authors:
 - 42up
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-02 00:00:00.000000000 Z
+date: 2021-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -118,8 +118,9 @@ files:
 - app/models/censor_bear/mod_log.rb
 - app/models/censor_bear/stop_word.rb
 - app/views/censor_bear/logs/_form.html.erb
+- app/views/censor_bear/logs/_log.html.haml
 - app/views/censor_bear/logs/edit.html.erb
-- app/views/censor_bear/logs/index.html.erb
+- app/views/censor_bear/logs/index.html.haml
 - app/views/censor_bear/logs/new.html.erb
 - app/views/censor_bear/logs/show.html.erb
 - app/views/censor_bear/mod_logs/_form.html.erb
@@ -142,6 +143,7 @@ files:
 - db/migrate/20211126133758_create_censor_bear_stop_words.rb
 - db/migrate/20211129093508_create_censor_bear_logs.rb
 - db/migrate/20211129110218_create_censor_bear_mod_logs.rb
+- db/migrate/20211206092626_add_ip_to_censor_bear_logs.rb
 - lib/censor_bear.rb
 - lib/censor_bear/censor.rb
 - lib/censor_bear/configuration.rb

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

@@ -1,37 +0,0 @@
-<p id="notice"><%= notice %></p>
-
-<h1>Logs</h1>
-
-<table>
-  <thead>
-    <tr>
-      <th>Orginal content</th>
-      <th>Action</th>
-      <th>Filtered content</th>
-      <th>Mod words</th>
-      <th colspan="3"></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% @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>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-
-<br>
-
-<%= link_to 'New Log', new_log_path %>
-
-