Merge pull request #371 from linuxfrorg/unblock_and_unplonk

Be able to un-plonk and un-block an account

Author: Oumph

app/controllers/moderation/block_controller.rb

@@ -6,7 +6,12 @@ def create
     nb_days  = (params[:nb_days] || 2).to_i
     @account = Account.find(params[:account_id])
     @account.block(nb_days, current_user.id)
-    Board.amr_notification("Les commentaires de #{@account.login} #{user_url @account.login} ont été bloqués pendant #{pluralize nb_days, "jour"} par #{current_user.name} #{user_url(current_user)}")
-    render json: { notice: "Les commentaires de #{@account.login} sont bloqués pendant #{pluralize nb_days, "jour"}" }
+    if nb_days > 0
+      Board.amr_notification("Les commentaires de #{@account.login} #{user_url @account.login} ont été bloqués pendant #{pluralize nb_days, "jour"} par #{current_user.name} #{user_url(current_user)}")
+      render json: { notice: "Les commentaires de #{@account.login} sont bloqués pendant #{pluralize nb_days, "jour"}" }
+    else
+      Board.amr_notification("Les commentaires de #{@account.login} #{user_url @account.login} ont été débloqués par #{current_user.name} #{user_url(current_user)}")
+      render json: { notice: "Les commentaires de #{@account.login} sont débloqués" }
+    end
   end
 end

app/controllers/moderation/plonk_controller.rb

@@ -6,7 +6,12 @@ def create
     nb_days  = (params[:nb_days] || 2).to_i
     @account = Account.find(params[:account_id])
     @account.plonk(nb_days, current_user.id)
-    Board.amr_notification("Le compte #{@account.login} #{user_url @account.login} a été plonké pendant #{pluralize nb_days, "jour"} par #{current_user.name} #{user_url(current_user)}")
-    render json: { notice: "#{@account.login} a été plonké pendant #{pluralize nb_days, "jour"}" }
+    if nb_days > 0
+      Board.amr_notification("Le compte #{@account.login} #{user_url @account.login} a été privé de tribune pendant #{pluralize nb_days, "jour"} par #{current_user.name} #{user_url(current_user)}")
+      render json: { notice: "#{@account.login} a été privé de tribune pendant #{pluralize nb_days, "jour"}" }
+    else
+      Board.amr_notification("Le compte #{@account.login} #{user_url @account.login} a été réautorisé sur la tribune par #{current_user.name} #{user_url(current_user)}")
+      render json: { notice: "#{@account.login} a été réautorisé sur la tribune" }
+    end
   end
 end

app/models/account.rb

@@ -288,7 +288,11 @@ def blocked?
   def block(nb_days, user_id)
     $redis.set("block/#{self.id}", 1)
     $redis.expire("block/#{self.id}", nb_days * 86400)
-    logs.create(description: "Interdiction de poster des commentaires pendant #{pluralize nb_days, "jour"}", user_id: user_id)
+    if nb_days > 0
+      logs.create(description: "Interdiction de poster des commentaires pendant #{pluralize nb_days, "jour"}", user_id: user_id)
+    else
+      logs.create(description: "Réautorisation de poster des commentaires", user_id: user_id)
+    end
   end
 
   def can_block?
@@ -304,7 +308,11 @@ def plonked?
   def plonk(nb_days, user_id)
     $redis.set("plonk/#{self.id}", 1)
     $redis.expire("plonk/#{self.id}", nb_days * 86400)
-    logs.create(description: "Interdiction de tribune pendant #{pluralize nb_days, "jour"}", user_id: user_id)
+    if nb_days > 0
+      logs.create(description: "Interdiction de tribune pendant #{pluralize nb_days, "jour"}", user_id: user_id)
+    else
+      logs.create(description: "Réautorisation de poster des commentaires", user_id: user_id)
+    end
   end
 
   def can_plonk?

app/views/admin/accounts/index.html.haml

@@ -26,6 +26,10 @@
           = image_tag "/images/icones/x_red.svg", alt: "Inactif", title: "Inactif", width: "15px"
         - else
           = image_tag "/images/icones/check.svg", alt: "Actif", title: "Actif", width: "16px"
+        - if account.plonked?
+          📢 #{ image_tag "/images/icones/denied.png", alt: "interdiction de tribune", title: "interdiction de tribune", width: "16px" }
+        - if account.blocked?
+          🖍️  #{ image_tag "/images/icones/denied.png", alt: "interdiction de commentaire", title: "interdiction de commentaire", width: "16px" }
         %br
         = account.email
         - if account.user.homesite.present?

app/views/users/_recent.html.haml

@@ -20,6 +20,10 @@
     - if current_account.admin?
       %p Visibilité
       %ul
+        - if @user.account.plonked?
+          %li interdiction de tribune ;
+        - if @user.account.blocked?
+          %li interdiction de commentaire ;
         - if @user.comments.count > 0
           %li commentaires : #{ @user.comments.published.count } sur #{ @user.comments.count } ;
         - else
@@ -39,6 +43,7 @@
       %button.more.block Interdire de commenter
       .more_actions.block(style="display: none;")
         %ul
+          %li= button_to "réautorisation", moderation_block_index_path(nb_days: 0, account_id: @user.account.id), remote: true, class: "block"
           %li= button_to "24 h", moderation_block_index_path(nb_days: 1, account_id: @user.account.id), remote: true, class: "block"
           %li= button_to "48 h", moderation_block_index_path(nb_days: 2, account_id: @user.account.id), remote: true, class: "block"
           %li= button_to "une semaine", moderation_block_index_path(nb_days: 7, account_id: @user.account.id), remote: true, class: "block"
@@ -47,6 +52,7 @@
       %button.more.plonk Interdire de tribune
       .more_actions.plonk(style="display: none;")
         %ul
+          %li= button_to "réautorisation", moderation_plonk_index_path(nb_days: 0, account_id: @user.account.id), remote: true, class: "plonk"
           %li= button_to "24 heures", moderation_plonk_index_path(nb_days: 1, account_id: @user.account.id), remote: true, class: "plonk"
           %li= button_to "48 heures", moderation_plonk_index_path(nb_days: 2, account_id: @user.account.id), remote: true, class: "plonk"
           %li= button_to "une semaine", moderation_plonk_index_path(nb_days: 7, account_id: @user.account.id), remote: true, class: "plonk"