beetle_reporter 0.1.2 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d11171951d3f41267ff60f38549fe8448cba2bbd139f5c2e94a2a811ef59b8b0
-  data.tar.gz: db309e98c5fc8b773341534950a3180373624f79f0237a7e788cd59b5c4ebb53
+  metadata.gz: 24b6563a2096ba4ca3eb345d77e54cea2a943094593dda9bcd92b618c401e7f0
+  data.tar.gz: 0a870def812d3a4a859d52a048aa1446441bdf7bbc17777bc1f8a3f960151321
 SHA512:
-  metadata.gz: 190aff907f7d2a7c6c91454661f1005d6a259e51571ec39b0aece2f48f63c9ebf6b417dda9d8b9e87703946a97ec139f48850ecab1e18b9a715a88f81c9e3d5a
-  data.tar.gz: 94416c640937569fa17af54e45cf57636329fcae93ffbaaa7ace994a8602865bd54ece19ab0ed371aff79d4994cc81e371f640c409adb69b76cf9c99882e3bab
+  metadata.gz: 6ad09509f95b58aef57b4b49369da7728bb67dd314b249e90c870087e8b5ef83ed92bcc29e2ef21b5424c500193c96fbd49fb7f40e602371eb4476d77ea1e0c8
+  data.tar.gz: ee6fa6748f925ca7ad340e717017a5de2686c355c950e700cf9400ad263f475d1cf8bcc865082c8915ce11c1eeb2e6d54578013efd23257413d70cd514b8e40d

data/README.md

@@ -76,8 +76,8 @@ class Diary
     true
   end
 
-  def beetle_images
-    pictures.map{|pic| {src: pic.full_url} }
+  def beetle_record_partial_path
+    "admins/diaries/beetle"
   end
 end
 ```

data/app/controllers/beetle_reporter/reports_controller.rb

@@ -135,11 +135,12 @@ module BeetleReporter
     def load_reports
       builder = report_scope.includes(:record)
       builder = builder.where("reason ilike ?", "%#{params[:q]}%") if params[:q].present?
+
       if params[:filter] != 'all'
         builder = builder.pending
         builder = builder.unscope(where: :aasm_state).where(aasm_state: params[:state]) if params[:state].present?
       end
-      builder = builder.where(record_type: params[:type]&.classify) if params[:type]
+      builder = builder.where(record_type: params[:type]&.classify) if params[:type].present?
 
       builder = builder.order(id: :desc, reported_count: :desc)
       builder = builder.reorder(updated_at: :desc) if params[:order] == 'last_updated'

data/app/models/beetle_reporter/report.rb

@@ -62,16 +62,7 @@ module BeetleReporter
       return if record&.user.blank?
       raise NoMethodError unless record.respond_to?(:beetle_mute)
 
-      ret = record.beetle_mute
-      mute!(reason) if ret
-    end
-
-    def beetle_mute(reason)
-      return if record.blank?
-      return if record&.user.blank?
-      raise NoMethodError unless record.respond_to?(:beetle_mute)
-
-      ret = record.beetle_mute
+      ret = record.beetle_mute(reason)
       mute!(reason) if ret
     end
 
@@ -80,7 +71,7 @@ module BeetleReporter
       return if record&.user.blank?
       raise NoMethodError unless record.respond_to?(:beetle_forbid)
 
-      ret = record.beetle_forbid
+      ret = record.beetle_forbid(reason)
       forbid!(reason) if ret
     end
 
@@ -90,6 +81,10 @@ module BeetleReporter
       record.beetle_record_path
     end
 
+    def record_partial_path
+      record.beetle_record_partial_path
+    end
+
     def undo_callback
       if hidden?
         ret = record.beetle_undo_hide
@@ -108,15 +103,6 @@ module BeetleReporter
       end
     end
 
-    def images
-      return [] if record.blank?
-
-      raise NoMethodError, 'undefined beetle_images for record' unless record.respond_to?(:beetle_images)
-
-      record.beetle_images
-    end
-
-
     def set_reason(reason)
       update_columns(reason: reason)
     end

data/app/views/beetle_reporter/reports/_report.html.haml

@@ -5,12 +5,15 @@
         - unless report.record.blank?
           = link_to report.record_path, data: { turbo: false }, target: "_blank" do
             %span{class: "bg-indigo-100 text-indigo-600 py-1 px-2 rounded-lg"}="#{report.record_type.upcase}##{report.record_id}"
-          %span{class: "bg-yellow-100 text-yellow-600 rounded-md p-1"}=t("beetle_reporter.aasm_state.#{report.aasm_state}")
+        %span{class: "bg-yellow-100 text-yellow-600 rounded-md p-1"}=t("beetle_reporter.aasm_state.#{report.aasm_state}")
+        - unless report.reasons.blank?
+          - report.reasons.each do |reason|
+            %span{class: "border border-red-600 text-red-600 rounded-lg text-xs p-0.5"}= reason
       %span{class: "flex space-x-2 items-center text-sm"}
         - if report.reason
           %span{class: "bg-red-100 text-red-600 p-1 rounded-lg"}= "处置原因：#{report.reason}"
         %span{class: "space-x-1"}
-          - report.user_ids.each do |uid|
+          - report.user_ids.compact.uniq.each do |uid|
             = link_to main_app.send(BeetleReporter.config.main_app_user_path_method.to_sym, uid), data: {turbo: false} do
               %span{class: "bg-blue-100 rounded-lg px-1 py-0.5"}= "#{uid}"
         %span{class: "bg-red-600 text-white rounded-full w-5 h-5 flex justify-center items-center"}= "#{report.reported_count}"
@@ -20,26 +23,12 @@
           = button_to '删除', report, method: :delete, data: { confirm: 'Are you sure?'}, class: "bg-red-600 text-white rounded-md px-2 py-0.5 cursor-pointer"
     %div{class: "flex justify-between items-center py-2 w-full"}
       %div{class: "flex flex-col rounded-lg bg-gray-50 p-3 text-sm space-y-4 w-full"}
-        -unless report.record
-          %h3{class: "text-2xl text-red-600"} 对应条目已被永久删除，当前审核请求已无效，请删除
+        - unless report.record
+          %h3{class: "text-2xl text-red-600 flex items-center"}
+            对应条目已被永久删除，当前审核请求已无效
+            =button_to "点我删除", report, method: :delete, class: "ml-2 bg-yellow-500 text-white rounded-lg px-2 py-0.5 cursor-pointer"
         - else
-          %div
-            %span{class: "#{report.record.is_private ? 'bg-black text-white' : 'border border-black text-black' } rounded-lg text-xs p-0.5 px-1"}=report.record.is_private ? "🙈 隐私" : "🙉 公开"
-            %span{class: "border border-blue-600 text-blue-600 rounded-lg text-xs p-0.5"}=report.record.is_approved ? "审核通过" : "审核中..."
-            - unless report.reasons.blank?
-              - report.reasons.each do |reason|
-                %span{class: "border border-red-600 text-red-600 rounded-lg text-xs p-0.5"}= reason
-            - unless report&.record&.user_id&.blank?
-              = link_to main_app.send(CensorBear.config.main_app_user_path_method.to_sym, report.record.user_id), data: {turbo: false} do
-                %span{class: "text-sm bg-gray-100 text-gray-600 py-1 px-2 rounded-lg font-bold"}="✍️ ##{report.record.user_id}"
-          - if report.record.discarded?
-            %div{class: "text-gray-900 leading-relaxed"}
-              %del= report.record.content
-          - else
-            %div{class: "text-gray-900 leading-relaxed"}= report.record.content
-          %div
-            - report.images.each do |img|
-              = image_tag img[:src], class: "w-16 rounded-md"
+          = render report.record_partial_path, record: report.record
     %div{class: "flex flex-col space-y-2"}
       - if report.may_ignore?
         = button_to "无效举报", report_ignore_path(report), class: "text-yellow-600 cursor-pointer px-2 py-0.5 bg-gray-100 rounded-lg"

data/app/views/layouts/beetle_reporter/application.html.haml

@@ -14,7 +14,7 @@
         %span 举报中心
 
       %ul{class: "flex justify-end items-center space-x-2 text-blue-600"}
-        %li= link_to "待处理(#{BeetleReporter::Report.pending.count})", reports_path
+        %li= link_to "待处理(#{BeetleReporter::Report.kept.pending.count})", reports_path
         %li= link_to "控制台", main_app.send(BeetleReporter.config.main_app_root_path_method.to_sym)
         %li= current_user.email
 

data/lib/beetle_reporter/version.rb

@@ -1,3 +1,3 @@
 module BeetleReporter
-  VERSION = '0.1.2'
+  VERSION = '0.1.6'
 end

data/lib/beetle_reporter.rb

@@ -28,7 +28,7 @@ module BeetleReporter
     end
 
     def add(record, user_id, reason)
-      report = BeetleReporter::Report.find_by(record: record)
+      report = BeetleReporter::Report.pending.kept.find_by(record: record)
       if report
         report.user_ids << user_id unless report.user_ids.include?(user_id)
         report.reasons << reason unless report.reasons.include?(reason)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beetle_reporter
 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-17 00:00:00.000000000 Z
+date: 2021-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails