beetle_reporter 0.1.4 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e21f52dd81361247e7975618d2845f2f4fcad19105ccc425de454b56ac2d68e
-  data.tar.gz: 78a8a0b42e6109b2635999728cbd17007b9cdc848d218e73f01fb0add257d085
+  metadata.gz: 89a824b1134a4d7c1db329309cff7ec1074e7b18a56854a911e7c22cdf3b80c3
+  data.tar.gz: af1e7cff0b5eef232f253195f8b551dde655529356f2580d7d6225a828e7d483
 SHA512:
-  metadata.gz: 3a433451965599cf2dd833c770d4a588e742158cf99fcafe3d47822fd005dc41cc2acfafea4cf606ab95825017e7fd778d12b0b9d316d5c038f0082f1dcedea7
-  data.tar.gz: 8ad3142dc940e29a0990e4ed054da58251dbcdcb8af33e006abdf131fb4bdd42c9aec86d54db4bbc8e9e4e13d623192c073a5c3b2e946ae0d7c2345bbd2c570a
+  metadata.gz: 6d52929b375e412dc1c4c98aace2bf38a8cfa8acc67f481f2b845372b88a6b6fd65f30130ffc0ce0013fc8d0f9e2d904357cc8f92b87379141b016f389936d12
+  data.tar.gz: a6c2bc9a18227aca88727ab259102781b28652ddfece8d9e56364aa78065ffa324a0fbab2cd8add842e1c2a2ace99fb0b53261dd126fafbe03840461b5747028

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

@@ -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
 

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

@@ -12,11 +12,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 +32,31 @@
           = 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.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.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.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.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.4'
+  VERSION = '0.1.8'
 end

metadata

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