gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge commit '9ffe6817e0' into kb_migration

Browse source
This commit is contained in:
KMY 2023-05-25 09:03:06 +09:00
commit db5c358f4f
54 changed files with 155 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/helpers/application_helper.rb
View file

@ -124,6 +124,8 @@ module ApplicationHelper
fa_icon('unlock', title: I18n.t('statuses.visibilities.unlisted'))
elsif status.public_unlisted_visibility?
fa_icon('cloud', title: I18n.t('statuses.visibilities.public_unlisted'))
elsif status.login_visibility?
fa_icon('key', title: I18n.t('statuses.visibilities.login'))
elsif status.private_visibility? || status.limited_visibility?
fa_icon('lock', title: I18n.t('statuses.visibilities.private'))
elsif status.direct_visibility?
@ -189,8 +191,8 @@ module ApplicationHelper
text: [params[:title], params[:text], params[:url]].compact.join(' '),
}
permit_visibilities = %w(public unlisted public_unlisted private direct)
permit_searchabilities = %w(public unlisted public_unlisted private direct)
permit_visibilities = %w(public unlisted public_unlisted login private direct)
permit_searchabilities = %w(public unlisted public_unlisted login private direct)
default_privacy = current_account&.user&.setting_default_privacy
permit_visibilities.shift(permit_visibilities.index(default_privacy) + 1) if default_privacy.present?
state_params[:visibility] = params[:visibility] if permit_visibilities.include? params[:visibility]

2
app/helpers/formatting_helper.rb
View file

@ -58,6 +58,6 @@ module FormattingHelper
end
def account_field_value_format(field, with_rel_me: true)
html_aware_format(field.value, field.account.local?, markdown: true, with_rel_me: with_rel_me, with_domains: true, multiline: false)
html_aware_format(field.value, field.account.local?, markdown: false, with_rel_me: with_rel_me, with_domains: true, multiline: false)
end
end

2
app/helpers/statuses_helper.rb
View file

@ -100,6 +100,8 @@ module StatusesHelper
fa_icon 'unlock fw'
when 'public_unlisted'
fa_icon 'cloud fw'
when 'login'
fa_icon 'key fw'
when 'private'
fa_icon 'lock fw'
when 'direct'