From 396d466a9b4fcdad2194052e6771e74c43cdd2c9 Mon Sep 17 00:00:00 2001 From: evazion Date: Sun, 19 Mar 2017 23:21:59 -0500 Subject: [PATCH 1/3] /posts/:id - make flagger/appealer ip addresses visible to mods. --- app/helpers/post_appeals_helper.rb | 7 ++++++- app/helpers/post_flags_helper.rb | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/helpers/post_appeals_helper.rb b/app/helpers/post_appeals_helper.rb index 819c676c0..8f9616d6e 100644 --- a/app/helpers/post_appeals_helper.rb +++ b/app/helpers/post_appeals_helper.rb @@ -4,7 +4,12 @@ module PostAppealsHelper html << '' diff --git a/app/helpers/post_flags_helper.rb b/app/helpers/post_flags_helper.rb index f487b0de1..e3762cff2 100644 --- a/app/helpers/post_flags_helper.rb +++ b/app/helpers/post_flags_helper.rb @@ -8,7 +8,7 @@ module PostFlagsHelper html << DText.parse_inline(flag.reason).html_safe if CurrentUser.is_moderator? - html << ' - ' + link_to_user(flag.creator) + html << " - #{link_to_user(flag.creator)} (#{link_to_ip(flag.creator_ip_addr)})" end html << ' - ' + time_ago_in_words_tagged(flag.created_at) From 85d1f18ba5ffc939ed052ff3231986dadec9865b Mon Sep 17 00:00:00 2001 From: evazion Date: Sun, 19 Mar 2017 23:40:21 -0500 Subject: [PATCH 2/3] comments: make commenter ip addresses visible to mods. --- app/views/comments/partials/show/_comment.html.erb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/views/comments/partials/show/_comment.html.erb b/app/views/comments/partials/show/_comment.html.erb index 501a6a8a6..b240e144d 100644 --- a/app/views/comments/partials/show/_comment.html.erb +++ b/app/views/comments/partials/show/_comment.html.erb @@ -36,6 +36,13 @@ + <% if CurrentUser.is_moderator? %> +
  • |
  • +
  • + IP + <%= link_to_ip comment.ip_addr %> +
  • + <% end %> <% end %> <% if comment.editable_by?(CurrentUser.user) %> From cae86d8290a2f549f90dcb9e2a74b76c0923a5ea Mon Sep 17 00:00:00 2001 From: Albert Yi Date: Mon, 20 Mar 2017 13:45:56 -0700 Subject: [PATCH 3/3] add role check for displaying ip address --- app/helpers/post_appeals_helper.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/helpers/post_appeals_helper.rb b/app/helpers/post_appeals_helper.rb index 8f9616d6e..052b006d4 100644 --- a/app/helpers/post_appeals_helper.rb +++ b/app/helpers/post_appeals_helper.rb @@ -6,10 +6,14 @@ module PostAppealsHelper post.appeals.each do |appeal| reason = DText.parse_inline(appeal.reason).html_safe user = link_to_user(appeal.creator) - ip = link_to_ip(appeal.creator_ip_addr) + if CurrentUser.is_moderator? + ip = "(#{link_to_ip(appeal.creator_ip_addr)})" + else + ip = "" + end time = time_ago_in_words_tagged(appeal.created_at) - html << "
  • #{reason} - #{user} (#{ip}) #{time}
  • " + html << "
  • #{reason} - #{user} #{ip} #{time}
  • " end html << ''