censor_bear 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0727b29e168a3f9a2fc4abb8979db9979bbfaf351e88738585bd667b3be7856a
-  data.tar.gz: 1d2c67774a6d20a4ad0b907c43115ea0cedfdb6410cbad16b60addc4a4a6ec2d
+  metadata.gz: d66f337e22893a4e167117afdc22e5d7645968e71bf6efa8d63da423d10b72ab
+  data.tar.gz: 78ddb85ff26bebe0e8d095e77918be861b75c038f9ce41cd6ad23e6f6ddae0d3
 SHA512:
-  metadata.gz: 93b0e0d47cfe57651d59aa23689c54de9003f3ef1494545834f0c4708f95fafc50abd4f68906d96a73320f5e45d6d5bb846b8f316e1d27abfcd2701b3f0c0ea8
-  data.tar.gz: 3c9e731f73a57075cf9ea868d75c9d707a2be4ba6666a7671d20b0306a169dc2d9e616e64670d614d4ceb72dc08719196cc97e35779ee555430f72879cf71899
+  metadata.gz: 211817d225399526a04702f2477f4b12df5df055bb18486505db058eff0d563c1b99efc253bc64bc5cfded0624e830377f9ed9984b5c8f6fd4f766d728795ef1
+  data.tar.gz: 9bc3c4c91e07400f1f81b38e4a45ff833e6c35422632aa3235cf0eeb2db86b669d52a0dbd754158bd37514ee48a49144ddf47b820aaeab5f297410b9b98ea466

data/app/controllers/censor_bear/mod_logs_controller.rb

@@ -79,7 +79,7 @@ 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)

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/lib/censor_bear/version.rb

@@ -1,3 +1,3 @@
 module CensorBear
-  VERSION = '0.1.10'.freeze
+  VERSION = '0.1.11'.freeze
 end

metadata

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