beetle_reporter 0.1.5 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8c4ae7fc8b53cb021dece1af970833d533766605f1f8a93fb030186f5354a2a
-  data.tar.gz: e0ecb462118820163770227a8526c70826db2083fafada52e8f23737fbdb655b
+  metadata.gz: 0cb5fc2a8becc1cdd26a861c38be040cb31540897aad4ca5de09b3d2a429f7d0
+  data.tar.gz: 15bd9e2db23818bfbf4ea73eaf033b146bc32476253b96cfe44240876b34de7c
 SHA512:
-  metadata.gz: b61c8f8abbf0ec9b48ba55495b1d74c1b73b9ecd800a30d56e85e3c0b08155e47ec6bff73e260aad5fac83f09eb1cb46f1555bb52942ccc60c726b477dab70ff
-  data.tar.gz: 3261b751d9c67649c3abe72d0d8dbfb8a6dd08cb7f75f34f000203cec42b1b337f1af73a9ebc1199837616c6afce8642150f31ed5a6b658b60c0593611d2f73d
+  metadata.gz: 477f5b928cd1682592bb7a645d284c51e4542f812fbd0856d56b6019ad233d7de28fd1c5dd066f4f366ac8b7435346a3219aeaa5bba9aba281e610ce710aaad0
+  data.tar.gz: d10bcf571be5363d800f3dfc0c1326df3fa7a3983b625523c12b77a6006c61d751a9ade5edc81fb8a9a40c649f986d986e1bdbae984865e91f3f0c9bd10817d2

data/app/helpers/beetle_reporter/application_helper.rb

@@ -5,5 +5,10 @@ module BeetleReporter
     def current_user
       main_app.scope.request.env['warden']&.user
     end
+
+    def avatar(user)
+      return user.avatar unless user.avatar.blank?
+      Avatarro.image(user.nickname.first) if user.respond_to?(:nickname)
+    end
   end
 end

data/app/models/beetle_reporter/report.rb

@@ -4,6 +4,15 @@ module BeetleReporter
     include Discard::Model
 
     REASON_TYPES = %w(垃圾广告营销 侮辱谩骂内容 淫秽色情内容 涉政敏感信息 违法有害信息 内容令人不适 内容存在错误)
+    PROCESS_REASON_LIST = %w(
+      发布垃圾、无意义内容
+      发布恐吓行为/骚扰内容
+      发布营销广告内容
+      发布谩骂、酸讽、引战内容
+      发布令人不适内容
+      发布淫秽色情内容
+      发布涉政敏感违法有害信息
+    )
 
     belongs_to :record, polymorphic: true, required: false
     belongs_to :user, class_name: BeetleReporter.config.user_class, optional: true

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

@@ -1,3 +1,32 @@
+- content_for :head do
+  :javascript
+    document.addEventListener("turbo:load", () => {
+      const hide_reason_input = document.querySelector('#hide_reason');
+      const hide_reason_list = document.querySelector('#hide_reason_list');
+      hide_reason_list.addEventListener('change', (event) => {
+        hide_reason_input.value = event.target.value;
+      })
+
+      const remove_reason_input = document.querySelector('#remove_reason');
+      const remove_reason_list = document.querySelector('#remove_reason_list');
+      remove_reason_list.addEventListener('change', (event) => {
+        remove_reason_input.value = event.target.value;
+      })
+
+      const mute_reason_input = document.querySelector('#mute_reason');
+      const mute_reason_list = document.querySelector('#mute_reason_list');
+      mute_reason_list.addEventListener('change', (event) => {
+        mute_reason_input.value = event.target.value;
+      })
+
+      const ban_reason_input = document.querySelector('#ban_reason');
+      const ban_reason_list = document.querySelector('#ban_reason_list');
+      ban_reason_list.addEventListener('change', (event) => {
+        ban_reason_input.value = event.target.value;
+      })
+    });
+
+
 = turbo_frame_tag dom_id(report) do
   %div{class: "flex flex-col space-y-2 border rounded-md p-2 mt-2"}
     %div{class: "flex justify-between text-xs"}
@@ -12,11 +41,12 @@
       %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.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}"
+        %span{class: "flex space-x-0.5"}
+          - users = User.where(id: report.user_ids.compact.uniq)
+          - users.each do |user|
+            = link_to main_app.send(BeetleReporter.config.main_app_user_path_method.to_sym, user.id), data: {turbo: false} do
+              = image_tag avatar(user), size: '24x24', class: "h-5 w-5 rounded-full border"
+        %span{class: "w-5 h-5 flex justify-center items-center text-blue-600"}= "+#{report.reported_count}"
         %span{class: "bg-gray-100 text-gray-600 py-1 px-2 rounded-lg"}
           = link_to report.created_at, report_path(report), data: {turbo: false}
         - unless current_user&.admin?
@@ -31,25 +61,35 @@
           = 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"
+        = button_to "无效举报", report_ignore_path(report), class: "cursor-pointer px-2 py-0.5 bg-green-700 text-white rounded-lg"
+        %span{class: "text-xs text-gray-500"} 用户乱举报的，没有触犯社区规范，点击后不会影响用户内容的可见性。
       - 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"
+        = button_to "暂缓处理", report_suspend_path(report), class: "cursor-pointer px-2 py-0.5 bg-yellow-700 text-white rounded-lg"
+        %span{class: "text-xs text-gray-500"} 有争议的内容，拿捏不准的，先搁置，让大家一起来看一看怎么处理。
       - 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?
         = 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.text_field :reason, value: report.reason, placeholder: "隐藏原因是什么？", class: "border rounded-md py-0.5 px-1", id: "hide_reason"
+          = select_tag "process_reason", options_for_select(BeetleReporter::Report::PROCESS_REASON_LIST.map{|r| [r, r]}), prompt: "选择原因", id: "hide_reason_list", class: "border rounded-md 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"
+        %span{class: "text-xs text-gray-500"} 举报属实，内容不适合公开展示，对其它人隐藏，对创建者可见。
       - if report.may_remove?
         = 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.text_field :reason, value: report.reason, placeholder: "删除原因是什么？", class: "border rounded-md py-0.5 px-1", id: "remove_reason"
+          = select_tag "process_reason", options_for_select(BeetleReporter::Report::PROCESS_REASON_LIST.map{|r| [r, r]}), prompt: "选择原因", id: "remove_reason_list", class: "border rounded-md 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"
+        %span{class: "text-xs text-gray-500"} 举报属实，不仅不适合展示，也不适合在平台里存在，违法乱纪、破坏和谐气氛的内容，直接删掉。
       - if report.may_mute?
         = 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.text_field :mute_days, value: report.mute_days, placeholder: "禁言天数", class: "border rounded-md py-0.5 px-1"
+          = f.text_field :reason, value: report.reason, placeholder: "禁言原因是什么？", class: "border rounded-md py-0.5 px-1", id: "mute_reason"
+          = select_tag "process_reason", options_for_select(BeetleReporter::Report::PROCESS_REASON_LIST.map{|r| [r, r]}), prompt: "选择原因", id: "mute_reason_list", class: "border rounded-md 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"
+        %span{class: "text-xs text-gray-500"} 举报属实，该用户其它内容正常，只有少数几条奇怪的内容，除了删除内容之外也要禁言用户，关小黑屋清醒清醒。
       - if report.may_forbid?
         = 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.text_field :reason, value: report.reason, placeholder: "封禁原因是什么？", class: "border rounded-md py-0.5 px-1", id: "ban_reason"
+          = select_tag "process_reason", options_for_select(BeetleReporter::Report::PROCESS_REASON_LIST.map{|r| [r, r]}), prompt: "选择原因", id: "ban_reason_list", class: "border rounded-md 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"
+        %span{class: "text-xs text-gray-500"} 举报属实，ta就不是正常用户，搞黄色、发广告、违法乱纪的捣乱份子直接永久封禁，并删除其名下所有内容。

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.5'
+  VERSION = '0.1.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beetle_reporter
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.9
 platform: ruby
 authors:
 - 42up
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-19 00:00:00.000000000 Z
+date: 2021-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.6'
+- !ruby/object:Gem::Dependency
+  name: avatarro
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 description: Description of BeetleReporter.
 email:
 - foobar@v2up.com