censor_bear 0.1.4 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '084b5a745f3e2eeef9a39a15bc2f87a9a0dadfe1b0cb41a30ac4bf131338c074'
-  data.tar.gz: c1351c23521fad8b976b36cb7d8d4eeaaf04688eb9c3463152ddd6edbd786019
+  metadata.gz: 4a5519d5695908f0b7d3316070221bb2350da7d5869d7c6f8f202d1cb5d3a903
+  data.tar.gz: aa507b18784d4472427dad1c694f1cf1a552b957c54ef89d66fd1e57faa73403
 SHA512:
-  metadata.gz: 71533c0392c3e6af14ad00fed488dcbc41d1cfe8d6dff8ee8664735857ee158f78ae70ab644b073e9f5e60c48ba4a05ee1d35a61310bccf31368892d897f8714
-  data.tar.gz: f97b66983de762c530c79d2b541c756092c5fb1e2e6fd93178783cd26633121df88afe32cd28c4cc4851215c191901614ea255dc0375397cdceb42a321382157
+  metadata.gz: b1b68d93591c793a14c52d19c8fdbadf601adb5c2c24ce7575f3da001bf8922e6ee074e2ee5f3873005fdb8c620dfc50f5d6527f9b646573d190f8823470a592
+  data.tar.gz: 5763a681a0dc9c7dcb813ccf6b8f997e8df5ea782fc64c928d6dd04d870ef5c46a5e662ad4de0e2b9f4b4da341b6f11be4fd7044c6c04afe1f69d0e542384e29

data/README.md

@@ -25,7 +25,7 @@ $ gem install censor_bear
 ### Devise
 ```ruby
 authenticate :user, ->(user) { user.admin? } do
-  mount Blazer::Engine, at: "blazer"
+  mount Blazer::Engine, at: "censor_bear"
 end
 ```
 

data/app/controllers/censor_bear/logs_controller.rb

@@ -2,11 +2,11 @@ require_dependency "censor_bear/application_controller"
 
 module CensorBear
   class LogsController < ApplicationController
-    before_action :set_log, only: [:show, :edit, :update, :destroy]
+    before_action :set_log, only: %i[show edit update destroy]
 
     # GET /logs
     def index
-      @logs = Log.all
+      load_logs
     end
 
     # GET /logs/1
@@ -45,18 +45,35 @@ module CensorBear
     # DELETE /logs/1
     def destroy
       @log.destroy
-      redirect_to logs_url, notice: 'Log was successfully destroyed.'
+
+      respond_to do |format|
+        format.turbo_stream
+        format.html { redirect_to logs_url, notice: 'Log was successfully destroyed.' }
+      end
+    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
 
-      # Only allow a list of trusted parameters through.
-      def log_params
-        params.require(:log).permit(:original_content, :action, :filtered_content, :mod_words)
-      end
+    # 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)
+    end
   end
 end

data/app/controllers/censor_bear/mod_logs_controller.rb

@@ -2,10 +2,11 @@ require_dependency "censor_bear/application_controller"
 
 module CensorBear
   class ModLogsController < ApplicationController
-    before_action :set_mod_log, only: [:show, :edit, :update, :destroy, :ignore, :approve, :ban, :delete]
+    before_action :set_mod_log, only: %i[show edit update destroy ignore approve ban delete]
 
     # GET /mod_logs
     def index
+      load_mod_logs
       @mod_logs = ModLog.pending.all
     end
 
@@ -45,9 +46,14 @@ module CensorBear
     # DELETE /mod_logs/1
     def destroy
       @mod_log.destroy
-      redirect_to mod_logs_url, notice: 'Mod log was successfully destroyed.'
+
+      respond_to do |format|
+        format.turbo_stream
+        format.html { redirect_to mod_logs_url, notice: 'Mod log was successfully destroyed.' }
+      end
     end
 
+
     def ignore
       @mod_log.suspend!
 
@@ -73,15 +79,29 @@ module CensorBear
       redirect_to mod_logs_url, notice: 'successfully baned.'
     end
 
+    def load_mod_logs
+      builder ||= mod_log_scope
+      builder = builder.where("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_mod_log
-        @mod_log = ModLog.find(params[:id] || params[:mod_log_id])
-      end
 
-      # Only allow a list of trusted parameters through.
-      def mod_log_params
-        params.require(:mod_log).permit(:record_id, :record_type, :mod_words, :user_id, :reason)
-      end
+    # Use callbacks to share common setup or constraints between actions.
+    def set_mod_log
+      @mod_log = ModLog.find(params[:id] || params[:mod_log_id])
+    end
+
+    def mod_log_scope
+      ModLog
+    end
+
+    # Only allow a list of trusted parameters through.
+    def mod_log_params
+      params.require(:mod_log).permit(:record_id, :record_type, :mod_words, :user_id, :reason)
+    end
   end
 end

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,37 @@
+= turbo_frame_tag dom_id(log) do
+  %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"}=t("censor_log.stage.#{log.stage}")
+          - unless log.action.blank?
+            %span{class: "text-sm bg-yellow-100 text-yellow-600 py-1 px-2 rounded-lg"}=t("censor_log.action.#{log.action.downcase}")
+          - 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
+          - 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
+            = link_to '详情', log
+          %span
+            = button_to '删除', 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"}
+        %div{class: "flex flex-col"}
+          %div{class: ""}
+            %div= log.original_content
+          - if log.filtered_content
+            %div{class: "border-t"}
+              %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/destroy.turbo_stream.haml

@@ -0,0 +1 @@
+= turbo_stream.remove(@log)

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: 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 "重置", mod_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/mod_logs/_mod_log.html.haml

@@ -0,0 +1,45 @@
+= turbo_frame_tag dom_id(mod_log) do
+  %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: ""}
+          = link_to mod_log.record_path 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|
+              %span{class: "text-sm bg-red-100 text-red-600 py-1 px-2 rounded-lg"}=t("censor_log.label.#{label}")
+          - unless mod_log.mod_words.blank?
+            - mod_log.mod_words.each do |word|
+              %span{class: "text-sm bg-yellow-100 text-yellow-600 py-1 px-2 rounded-lg"}="##{word}"
+          %span{class: "text-sm bg-gray-100 text-gray-600 py-1 px-2 rounded-lg"}= mod_log.created_at
+        %div{class: "flex space-x-2 items-center"}
+          - if mod_log.reason
+            %span{class: "bg-red-100 text-red-600 p-1 rounded-lg"}
+              = mod_log.reason
+          %span{class: "bg-green-100 text-green-600 rounded-md p-1"}
+            - if mod_log.status == 0
+              = "待审"
+            - if mod_log.status == 1
+              = "已处理"
+            - if mod_log.status == 2
+              = "暂缓"
+          %span
+            = link_to "详情", mod_log
+          %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"}
+        %div{class: "flex flex-col"}
+          %div{class: "text-sm border rounded-lg border-black p-2"}
+            %div= mod_log.content
+      %div
+        %div{class: "flex space-x-2"}
+          %span{class: "text-yellow-600"}
+            = link_to "忽略", mod_log_ignore_path(mod_log)
+          %span{class: "text-green-600"}
+            = link_to "通过", mod_log_approve_path(mod_log)
+        %div
+          = form_with(url: mod_log_delete_path(mod_log), method: :get, class: "space-x-1 flex items-center") do |f|
+            = f.submit "删除", class: "rounded-md px-2 py-1 text-sm bg-red-600 text-white cursor-pointer"
+            = f.text_field :reason, value: mod_log.reason, placeholder: "不通过原因", class: "border rounded-md m py-0.5 px-1"
+        -#%span{class: "text-red-600 font-bold"}
+        -#  = link_to "封禁用户!", mod_log_ban_path(mod_log)

data/app/views/censor_bear/mod_logs/destroy.turbo_stream.haml

@@ -0,0 +1 @@
+= turbo_stream.remove(@mod_log)

data/app/views/censor_bear/mod_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/config/locales/censor_bear.yml

@@ -4,4 +4,26 @@ en:
       mod: 审核
       banned: 禁用
       ignore: 忽略
-      replace: 替换
+      replace: 替换
+      block: 禁用
+      pass: 忽略
+      review: 审核
+    stage:
+      aliyun_check: "阿里云检查"
+      tencent_check: "腾讯云检查"
+      local_check: "本地检查"
+      qq_regex: "QQ正则检查"
+      wechat_regex: "微信正则检查"
+    label:
+      normal: 正常文本
+      spam: 含垃圾信息
+      ad: 广告
+      politics: 涉政
+      terrorism: 暴恐
+      abuse: 辱骂
+      porn: 色情
+      flood: 灌水
+      contraband: 违禁
+      meaningless: 无意义
+      harmful: 不良场景
+      customized: 自定义

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/db/migrate/20211208041114_add_labels_to_censor_bear_logs.rb

@@ -0,0 +1,6 @@
+class AddLabelsToCensorBearLogs < ActiveRecord::Migration[6.1]
+  def change
+    add_column :censor_bear_logs, :labels, :string, array: true, default: []
+    add_column :censor_bear_mod_logs, :labels, :string, array: true, default: []
+  end
+end

data/lib/censor_bear/censor.rb

@@ -1,10 +1,11 @@
 module CensorBear
   class Result
-    attr_accessor :is_mod, :mod_words, :content
+    attr_accessor :is_mod, :mod_words, :content, :labels
 
-    def initialize(content, is_mod = false, mod_words = [])
+    def initialize(content, is_mod = false, mod_words = [], labels = [])
       @is_mod = is_mod
       @mod_words = mod_words
+      @labels = labels
       @content = content || ''
     end
   end
@@ -13,33 +14,57 @@ 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 = []
+      @labels = []
       @content = content
       @type = type.to_s
+      @options = options
+      @ip = options[:ip] || nil
+      @user_id = options[:user_id] || nil
     end
 
     def check_text
       return Result.new(@content) if @content.blank?
       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
 
+      # 本地自定义词库粗查
       local_check
+      # 第三方云端复查
+      aliyun_check unless @is_mod
 
       # 用户相关类型直接禁止创建
       raise NotPassedException if @is_mod && %w[username signature dialog nickname].include?(@type)
 
-      Result.new(@content, @is_mod, @mod_words.uniq)
+      Result.new(@content, @is_mod, @mod_words.uniq, @labels.uniq)
+    end
+
+    # default type = :ugc
+    def check_search
+      flag = 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)
+          flag = true
+          CensorBear.info(@content, @type, action, 'check_search', mod_words: [word.key], ip: @ip, user_id: @user_id)
+          break
+        end
+      end
+      flag
     end
 
     def local_check
@@ -49,41 +74,101 @@ module CensorBear
         finder = Regexp.new(Regexp.escape(word.key))
         action = word.send(@type.to_sym).upcase
         next unless finder.match(@content)
+
         @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
           # 禁止的直接抛出异常
           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
       end
     end
 
-    def cloud_check() end
+    def aliyun_check
+      response = AliyunGreen::Text.scan(@content)
+      d = response['data'].first
+      r = d['results'].first
+      action = r['suggestion']
+      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'])
+        CensorBear.info(
+          d['content'], @type, action, 'aliyun_check',
+          filtered_content: d['filteredContent'],
+          mod_words: @mod_words,
+          labels: @labels,
+          ip: @ip, user_id: @user_id
+        )
+        raise NotPassedException
+      elsif action == 'block'
+        @is_mod = true
+        CensorBear.info(
+          d['content'], @type, action, 'aliyun_check',
+          filtered_content: d['filteredContent'],
+          mod_words: @mod_words,
+          labels: @labels,
+          ip: @ip, user_id: @user_id
+        )
+      elsif action == 'review'
+        @is_mod = true
+        CensorBear.info(
+          d['content'], @type, action, 'aliyun_check',
+          filtered_content: d['filteredContent'],
+          mod_words: @mod_words,
+          labels: @labels,
+          ip: @ip, user_id: @user_id
+        )
+      end
+    end
 
     private
 
-    def tencent_check() end
+    def concat_labels(data)
+      labels = []
+      data.map do |d|
+        next if d['label'].blank?
+
+        labels.push(d['label'])
+      end
+      labels
+    end
+
+    def concat_words(data)
+      words = []
+      data.each do |d|
+        next if d['contexts'].blank?
+
+        d['contexts'].each do |c|
+          words.push(c['context'])
+        end
+      end
+      words
+    end
 
-    def aliyun_check() end
+    def tencent_check; end
   end
 end

data/lib/censor_bear/configuration.rb

@@ -13,5 +13,9 @@ module CensorBear
     attr_accessor :import_file_path
     attr_accessor :format_from_file_path
     attr_accessor :format_dest_file_path
+
+    attr_accessor :aliyun_green_access_key_id
+    attr_accessor :aliyun_green_access_key_secret
+    attr_accessor :aliyun_green_enable_internal
   end
 end

data/lib/censor_bear/engine.rb

@@ -7,5 +7,13 @@ module CensorBear
     initializer "censor_bear.assets.precompile" do |app|
       app.config.assets.precompile += %w( censor_bear/application.css )
     end
+
+    config.after_initialize do
+      AliyunGreen.configure do |config|
+        config.access_key_id = CensorBear.config.aliyun_green_access_key_id
+        config.access_key_secret = CensorBear.config.aliyun_green_access_key_secret
+        config.enable_internal = CensorBear.config.aliyun_green_enable_internal
+      end
+    end
   end
 end

data/lib/censor_bear/version.rb

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

data/lib/censor_bear.rb

@@ -5,6 +5,7 @@ require 'censor_bear/configuration'
 
 require 'hamlit'
 require 'pagy'
+require 'aliyun_green'
 
 module CensorBear
   class NotPassedException < StandardError; end
@@ -20,6 +21,9 @@ module CensorBear
       @config.import_file_path = "#{Rails.root}/tmp/dest_sensitives.txt"
       @config.format_from_file_path = "#{Rails.root}/tmp/from_sensitives.txt"
       @config.format_dest_file_path = "#{Rails.root}/tmp/dest_sensitives.txt"
+      @config.aliyun_green_access_key_id = ''
+      @config.aliyun_green_access_key_secret = ''
+      @config.aliyun_green_enable_internal = false
       @config
     end
 
@@ -27,13 +31,20 @@ 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] || []
+      labels = options[:labels] || []
+      ip = options[:ip] || nil
+      user_id = options[:user_id] || nil
 
       CensorBear::Log.create(
         original_content: content,
@@ -41,7 +52,10 @@ module CensorBear
         action: action,
         stage: stage,
         filtered_content: filtered_content,
-        mod_words: mod_words
+        mod_words: mod_words,
+        labels: labels,
+        ip: ip,
+        user_id: user_id,
       )
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: censor_bear
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.8
 platform: ruby
 authors:
 - 42up
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-02 00:00:00.000000000 Z
+date: 2021-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,6 +30,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.4.1
+- !ruby/object:Gem::Dependency
+  name: aliyun_green
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: hamlit
   requirement: !ruby/object:Gem::Requirement
@@ -59,33 +73,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: turbo-rails
+  name: pagy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.6'
 - !ruby/object:Gem::Dependency
-  name: pagy
+  name: turbo-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.6'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.6'
+        version: '0'
 description: Description of CensorBear.
 email:
 - foobar@v2up.com
@@ -118,13 +132,17 @@ 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/destroy.turbo_stream.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
+- app/views/censor_bear/mod_logs/_mod_log.html.haml
+- app/views/censor_bear/mod_logs/destroy.turbo_stream.haml
 - app/views/censor_bear/mod_logs/edit.html.erb
-- app/views/censor_bear/mod_logs/index.html.erb
+- app/views/censor_bear/mod_logs/index.html.haml
 - app/views/censor_bear/mod_logs/new.html.erb
 - app/views/censor_bear/mod_logs/show.html.erb
 - app/views/censor_bear/stop_words/_form.html.haml
@@ -142,6 +160,8 @@ 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
+- db/migrate/20211208041114_add_labels_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 %>
-
-

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

@@ -1,44 +0,0 @@
-<p id="notice"><%= notice %></p>
-
-<h1>Mod Logs</h1>
-
-<table>
-  <thead>
-    <tr>
-      <th>Record</th>
-      <th>Record type</th>
-      <th>Mod words</th>
-      <th>User</th>
-      <th colspan="3"></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% @mod_logs.each do |mod_log| %>
-      <tr>
-        <td><%= mod_log.record_id %></td>
-        <td><%= mod_log.record_type %></td>
-        <td><%= mod_log.mod_words %></td>
-        <td><%= mod_log.user_id %></td>
-        <td><%= link_to 'Show', mod_log %></td>
-        <td><%= link_to 'Show', mod_log %></td>
-        <td><%= link_to 'Edit', edit_mod_log_path(mod_log) %></td>
-        <td><%= link_to 'Destroy', mod_log, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-        <td><%= link_to "查看详情", mod_log.record_path %></td>
-        <td><%= link_to "忽略内容", mod_log_ignore_path(mod_log) %></td>
-        <td><%= link_to "通过内容", mod_log_approve_path(mod_log) %></td>
-        <td><%= link_to "封禁用户", mod_log_ban_path(mod_log) %></td>
-        <td>
-          <%= form_with(url: mod_log_delete_path(mod_log), method: :get, class: "flex items-center") do |f| %>
-            <%= f.text_field :reason, value: mod_log.reason, placeholder: "原因", class: "border rounded-md m py-0.5 px-1" %>
-          <td><%= f.submit "删除内容", class: "rounded-md px-2 py-1 text-sm bg-black text-white cursor-pointer"  %></td>
-          <% end %>
-        </td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-
-<br>
-
-<%= link_to 'New Mod Log', new_mod_log_path %>