From 158f32bd48a6fee64cb17fdcab660f5ac72d3e40 Mon Sep 17 00:00:00 2001
From: Sea <30443703+seafr@users.noreply.github.com>
Date: Thu, 22 Mar 2018 06:48:47 +0400
Subject: [PATCH] Refactor of Notes controller, using User's new methods to
 check users' roles (see #2448) (#2522)

---
 app/controllers/notes_controller.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index b8c8b30a051..5f866cd08b0 100644
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -64,10 +64,10 @@ def show
     end
 
     if @node.has_power_tag('redirect')
-      if current_user.nil? || (current_user.role != 'admin' && current_user.role != 'moderator')
+      if current_user.nil? || !current_user.can_moderate?
         redirect_to Node.find(@node.power_tag('redirect')).path
         return
-      elsif current_user.role == 'admin' || current_user.role == 'moderator'
+      elsif current_user.can_moderate?
         flash.now[:warning] = "Only moderators and admins see this page, as it is redirected to #{Node.find(@node.power_tag('redirect')).title}.
         To remove the redirect, delete the tag beginning with 'redirect:'"
       end
@@ -158,7 +158,7 @@ def create
 
   def edit
     @node = Node.find_by(nid: params[:id], type: 'note')
-    if current_user.uid == @node.uid || current_user.role == 'admin' || @node.has_tag("with:#{current_user.username}")
+    if current_user.uid == @node.uid || current_user.admin? || @node.has_tag("with:#{current_user.username}")
       if params[:legacy]
         render template: 'editor/post'
       else
@@ -184,7 +184,7 @@ def edit
   # at /notes/update/:id
   def update
     @node = Node.find(params[:id])
-    if current_user.uid == @node.uid || current_user.role == 'admin' || @node.has_tag("with:#{current_user.username}")
+    if current_user.uid == @node.uid || current_user.admin? || @node.has_tag("with:#{current_user.username}")
       @revision = @node.latest
       @revision.title = params[:title]
       @revision.body = params[:body]
@@ -243,7 +243,7 @@ def update
   # only for notes
   def delete
     @node = Node.find(params[:id])
-    if current_user && (current_user.uid == @node.uid || current_user.role == "moderator" || current_user.role == "admin")
+    if current_user && (current_user.uid == @node.uid || current_user.can_moderate?)
       if @node.authors.uniq.length == 1 
         @node.destroy
         respond_with do |format|