FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply anon display name settings to question author display

This commit is contained in:
Karina Kwiatek 2022-06-21 14:52:23 +02:00 committed by Karina Kwiatek
parent 768d360ce7
commit d1ad34eb9c
5 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/helpers/application_helper/title_methods.rb
View File

@ -26,7 +26,8 @@ module ApplicationHelper::TitleMethods
end end
def question_title(question) def question_title(question)
name = user_screen_name question.user, anonymous: question.author_is_anonymous, url: false context_user = question.answers&.first&.user if question.direct
name = user_screen_name question.user, context_user: context_user, anonymous: question.author_is_anonymous, url: false
generate_title name, "asked", question.content generate_title name, "asked", question.content
end end

2
app/helpers/social_helper/tumblr_methods.rb
View File

@ -3,7 +3,7 @@ require 'cgi'
module SocialHelper::TumblrMethods module SocialHelper::TumblrMethods
def tumblr_title(answer) def tumblr_title(answer)
asker = if answer.question.author_is_anonymous? asker = if answer.question.author_is_anonymous?
APP_CONFIG['anonymous_name'] answer.user.profile.anon_display_name.presence || APP_CONFIG['anonymous_name']
else else
answer.question.user.profile.safe_name answer.question.user.profile.safe_name
end end

11
app/helpers/user_helper.rb
View File

@ -1,13 +1,16 @@
module UserHelper module UserHelper
# Decides what user name to show. # Decides what user name to show.
# @param context_user [User] the user whose the profile preferences should be applied
# @return [String] The user name # @return [String] The user name
def user_screen_name(user, anonymous: false, url: true, link_only: false) def user_screen_name(user, context_user: nil, anonymous: false, url: true, link_only: false)
return APP_CONFIG['anonymous_name'] if user.nil? || anonymous return context_user&.profile&.anon_display_name.presence || APP_CONFIG['anonymous_name'] if user.nil? || anonymous
name = user.profile.display_name.blank? ? user.screen_name : user.profile.display_name
name = user.profile.display_name.presence || user.screen_name
if url if url
link = show_user_profile_path(user.screen_name) link = show_user_profile_path(user.screen_name)
return link if link_only return link if link_only
return link_to(name, link, class: "#{"user--banned" if user.banned?}")
return link_to(name, link, class: ("user--banned" if user.banned?).to_s)
end end
name.strip name.strip
end end

2
app/views/answerbox/_header.haml
View File

@ -23,7 +23,7 @@
%i.fa.fa-gears %i.fa.fa-gears
View in Kontrollzentrum View in Kontrollzentrum
%h6.text-muted.media-heading.answerbox__question-user %h6.text-muted.media-heading.answerbox__question-user
= raw t('views.answerbox.asked', user: user_screen_name(a.question.user, anonymous: a.question.author_is_anonymous), time: time_tooltip(a.question)) = raw t('views.answerbox.asked', user: user_screen_name(a.question.user, context_user: a.user, anonymous: a.question.author_is_anonymous), time: time_tooltip(a.question))
- if !a.question.author_is_anonymous && !a.question.direct - if !a.question.author_is_anonymous && !a.question.direct
· ·
%a{ href: show_user_question_path(a.question.user.screen_name, a.question.id) } %a{ href: show_user_question_path(a.question.user.screen_name, a.question.id) }

2
app/views/inbox/_entry.haml
View File

@ -6,7 +6,7 @@
%img.answerbox__question-user-avatar.avatar-md{ src: i.question.user.profile_picture.url(:medium) } %img.answerbox__question-user-avatar.avatar-md{ src: i.question.user.profile_picture.url(:medium) }
.media-body .media-body
%h6.text-muted.media-heading.answerbox__question-user %h6.text-muted.media-heading.answerbox__question-user
= t(".asked_html", user: user_screen_name(i.question.user, anonymous: i.question.author_is_anonymous), time: time_tooltip(i.question)) = t(".asked_html", user: user_screen_name(i.question.user, context_user: i.user, anonymous: i.question.author_is_anonymous), time: time_tooltip(i.question))
- if !i.question.author_is_anonymous && i.question.answer_count.positive? - if !i.question.author_is_anonymous && i.question.answer_count.positive?
· ·
%a{ href: show_user_question_path(i.question.user.screen_name, i.question.id) } %a{ href: show_user_question_path(i.question.user.screen_name, i.question.id) }