beetle_reporter 0.1.1 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 224576858692394234faa775751f23ebfa338a9aaabd4fd50330f60d87b38751
-  data.tar.gz: 34afd7af8fa7c95315722dc50ee4110c5c8f1924a0bcf02aa334650fc3dc46b1
+  metadata.gz: c8c4ae7fc8b53cb021dece1af970833d533766605f1f8a93fb030186f5354a2a
+  data.tar.gz: e0ecb462118820163770227a8526c70826db2083fafada52e8f23737fbdb655b
 SHA512:
-  metadata.gz: d3c6f2ce890632f07592eeedbe7a7a6d8dbea53d303b28325f931ed0ed4cf934f191c0c0bf0ccf48b60961476fbfc84063f70171cb31016610aaebe0c78117b4
-  data.tar.gz: 667a1644f4244932806802bb813729d9a3569f4d43a8e0f961007ae87c269f2ac1b2638d485d110fc6a5974aea3e32f1c2c7073642162e27c30f3c39aea8b91c
+  metadata.gz: b61c8f8abbf0ec9b48ba55495b1d74c1b73b9ecd800a30d56e85e3c0b08155e47ec6bff73e260aad5fac83f09eb1cb46f1555bb52942ccc60c726b477dab70ff
+  data.tar.gz: 3261b751d9c67649c3abe72d0d8dbfb8a6dd08cb7f75f34f000203cec42b1b337f1af73a9ebc1199837616c6afce8642150f31ed5a6b658b60c0593611d2f73d

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

@@ -69,43 +69,65 @@ module BeetleReporter
     def ignore
       @report.ignore!
 
-      redirect_to reports_url, notice: 'report was successfully ignored.'
+      respond_to do |format|
+        format.turbo_stream { render turbo_stream: turbo_stream.remove(dom_id(@report)) }
+        format.html { redirect_to reports_url, notice: 'report was successfully ignored.' }
+      end
     end
 
     def suspend
       @report.suspend!
 
-      redirect_to reports_url, notice: 'report was successfully ignored.'
+      respond_to do |format|
+        format.turbo_stream { render turbo_stream: turbo_stream.remove(dom_id(@report)) }
+        format.html { redirect_to reports_url, notice: 'report was successfully suspended.' }
+      end
     end
 
     def hide
-      @report.beetle_hide("fooobar hide")
+      @report.beetle_hide(params[:reason])
 
-      redirect_to reports_url, notice: 'report was successfully hidden.'
+      respond_to do |format|
+        format.turbo_stream { render turbo_stream: turbo_stream.remove(dom_id(@report)) }
+        format.html { redirect_to reports_url, notice: 'report was successfully hidden.' }
+      end
     end
 
     def remove
-      @report.beetle_remove("fooobar remove")
+      @report.beetle_remove(params[:reason])
 
-      redirect_to reports_url, notice: 'report was successfully removed.'
+      respond_to do |format|
+        format.turbo_stream { render turbo_stream: turbo_stream.remove(dom_id(@report)) }
+        format.html { redirect_to reports_url, notice: 'report was successfully removed.' }
+      end
     end
 
     def mute
-      @report.beetle_mute("fooobar mute")
+      # TODO: 禁言时间
+      @report.beetle_mute(params[:reason])
 
-      redirect_to reports_url, notice: 'report was successfully muted.'
+      respond_to do |format|
+        format.turbo_stream { render turbo_stream: turbo_stream.remove(dom_id(@report)) }
+        format.html { redirect_to reports_url, notice: 'report was successfully muted.' }
+      end
     end
 
     def forbid
-      @report.beetle_forbid("fooobar forbid")
+      @report.beetle_forbid(params[:reason])
 
-      redirect_to reports_url, notice: 'report was successfully forbiden.'
+      respond_to do |format|
+        format.turbo_stream { render turbo_stream: turbo_stream.remove(dom_id(@report)) }
+        format.html { redirect_to reports_url, notice: 'report was successfully forbiden.' }
+      end
     end
 
     def undo
       @report.undo!
 
-      redirect_to reports_url, notice: 'report was successfully ignored.'
+      respond_to do |format|
+        format.turbo_stream { render turbo_stream: turbo_stream.remove(dom_id(@report)) }
+        format.html { redirect_to reports_url, notice: 'report was successfully undo.' }
+      end
     end
   
     private
@@ -113,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

@@ -3,6 +3,8 @@ module BeetleReporter
     include AASM
     include Discard::Model
 
+    REASON_TYPES = %w(垃圾广告营销 侮辱谩骂内容 淫秽色情内容 涉政敏感信息 违法有害信息 内容令人不适 内容存在错误)
+
     belongs_to :record, polymorphic: true, required: false
     belongs_to :user, class_name: BeetleReporter.config.user_class, optional: true
 
@@ -60,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
 
@@ -78,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
 
@@ -88,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
@@ -106,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,38 +23,33 @@
           = 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"
-    %div{class: "flex space-x-2 items-center justify-end"}
+          = render report.record_partial_path, record: report.record
+    %div{class: "flex flex-col space-y-2"}
       - if report.may_ignore?
-        = link_to "忽略", report_ignore_path(report), class: "text-yellow-600 cursor-pointer"
+        = button_to "无效举报", report_ignore_path(report), class: "text-yellow-600 cursor-pointer px-2 py-0.5 bg-gray-100 rounded-lg"
+      - if report.may_suspend?
+        = button_to "暂缓处理", report_suspend_path(report), class: "text-indigo-600 cursor-pointer px-2 py-0.5 bg-gray-100 rounded-lg"
+      - if report.may_undo?
+        = button_to "撤销", report_undo_path(report), class: "text-red-600 cursor-pointer px-2 py-0.5 bg-gray-100 rounded-lg"
       - if report.may_hide?
-        = link_to "隐藏内容", report_hide_path(report), class: "text-purple-600 cursor-pointer"
+        = form_with(url: report_hide_path(report), class: "space-x-1 flex items-center") do |f|
+          = f.text_field :reason, value: report.reason, placeholder: "隐藏原因是什么？", class: "border rounded-md m py-0.5 px-1"
+          = f.submit "隐藏内容", class: "bg-red-500 text-white cursor-pointer px-2 py-0.5 bg-gray-100 rounded-lg"
       - if report.may_remove?
-        = link_to "删除内容", report_remove_path(report), class: "text-red-800 cursor-pointer"
+        = form_with(url: report_remove_path(report), class: "space-x-1 flex items-center") do |f|
+          = f.text_field :reason, value: report.reason, placeholder: "删除原因是什么？", class: "border rounded-md m py-0.5 px-1"
+          = f.submit "删除内容", class: "bg-red-600 text-white cursor-pointer px-2 py-0.5 bg-gray-100 rounded-lg"
       - if report.may_mute?
-        = link_to "禁言用户", report_mute_path(report), class: "text-red-600 cursor-pointer"
+        = form_with(url: report_mute_path(report), class: "space-x-1 flex items-center") do |f|
+          -# = f.text_field :mute_days, value: report.mute_days, placeholder: "禁言天数", class: "border rounded-md m py-0.5 px-1"
+          = f.text_field :reason, value: report.reason, placeholder: "禁言原因是什么？", class: "border rounded-md m py-0.5 px-1"
+          = f.submit "禁言用户", class: "bg-red-700 text-white cursor-pointer px-2 py-0.5 bg-gray-100 rounded-lg"
       - if report.may_forbid?
-        = link_to "封禁用户",report_forbid_path(report), class: "text-red-700 cursor-pointer"
-      - if report.may_suspend?
-        = link_to "暂缓处理", report_suspend_path(report), class: "text-indigo-600 cursor-pointer"
-      - if report.may_undo?
-        = link_to "撤销", report_undo_path(report), class: "text-red-600 cursor-pointer"
+        = form_with(url: report_forbid_path(report), class: "space-x-1 flex items-center") do |f|
+          = f.text_field :reason, value: report.reason, placeholder: "封禁原因是什么？", class: "border rounded-md m py-0.5 px-1"
+          = f.submit "封禁用户", class: "bg-red-800 text-white cursor-pointer px-2 py-0.5 bg-gray-100 rounded-lg"

data/config/routes.rb

@@ -1,12 +1,12 @@
 BeetleReporter::Engine.routes.draw do
   resources :reports do
-    get :ignore
-    get :suspend
-    get :undo
-    get :hide
-    get :remove
-    get :mute
-    get :forbid
+    post :ignore
+    post :undo
+    post :suspend
+    post :hide
+    post :remove
+    post :mute
+    post :forbid
   end
 
   root "reports#index"

data/lib/beetle_reporter/version.rb

@@ -1,3 +1,3 @@
 module BeetleReporter
-  VERSION = '0.1.1'
+  VERSION = '0.1.5'
 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.1
+  version: 0.1.5
 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