fixup
This commit is contained in:
		| @ -4,83 +4,6 @@ module StatusesHelper | ||||
|   EMBEDDED_CONTROLLER = 'statuses' | ||||
|   EMBEDDED_ACTION = 'embed' | ||||
|  | ||||
| <<<<<<< HEAD | ||||
|   def display_name(account, **options) | ||||
|     if options[:custom_emojify] | ||||
|       Formatter.instance.format_display_name(account, options) | ||||
|     else | ||||
|       account.display_name.presence || account.username | ||||
|     end | ||||
|   end | ||||
|  | ||||
|   def account_action_button(account) | ||||
|     if user_signed_in? | ||||
|       if account.id == current_user.account_id | ||||
|         link_to settings_profile_url, class: 'button logo-button' do | ||||
|           safe_join([t('settings.edit_profile')]) | ||||
|         end | ||||
|       elsif current_account.following?(account) || current_account.requested?(account) | ||||
|         link_to account_unfollow_path(account), class: 'button logo-button button--destructive', data: { method: :post } do | ||||
|           safe_join([t('accounts.unfollow')]) | ||||
|         end | ||||
|       elsif !(account.memorial? || account.moved?) | ||||
|         link_to account_follow_path(account), class: "button logo-button#{account.blocking?(current_account) ? ' disabled' : ''}", data: { method: :post } do | ||||
|           safe_join([t('accounts.follow')]) | ||||
|         end | ||||
|       end | ||||
|     elsif !(account.memorial? || account.moved?) | ||||
|       link_to account_remote_follow_path(account), class: 'button logo-button modal-button', target: '_new' do | ||||
|         safe_join([t('accounts.follow')]) | ||||
|       end | ||||
|     end | ||||
|   end | ||||
|  | ||||
|   def minimal_account_action_button(account) | ||||
|     if user_signed_in? | ||||
|       return if account.id == current_user.account_id | ||||
|  | ||||
|       if current_account.following?(account) || current_account.requested?(account) | ||||
|         link_to account_unfollow_path(account), class: 'icon-button active', data: { method: :post }, title: t('accounts.unfollow') do | ||||
|           fa_icon('user-times fw') | ||||
|         end | ||||
|       elsif !(account.memorial? || account.moved?) | ||||
|         link_to account_follow_path(account), class: "icon-button#{account.blocking?(current_account) ? ' disabled' : ''}", data: { method: :post }, title: t('accounts.follow') do | ||||
|           fa_icon('user-plus fw') | ||||
|         end | ||||
|       end | ||||
|     elsif !(account.memorial? || account.moved?) | ||||
|       link_to account_remote_follow_path(account), class: 'icon-button modal-button', target: '_new', title: t('accounts.follow') do | ||||
|         fa_icon('user-plus fw') | ||||
|       end | ||||
|     end | ||||
|   end | ||||
|  | ||||
|   def svg_logo | ||||
|     content_tag(:svg, tag(:use, 'xlink:href' => '#hometownlogo'), 'viewBox' => '0 0 100 100') | ||||
|   end | ||||
|  | ||||
|   def svg_logo_full | ||||
|     content_tag(:svg, tag(:use, 'xlink:href' => '#mastodon-svg-logo-full'), 'viewBox' => '0 0 713.35878 175.8678') | ||||
|   end | ||||
|  | ||||
|   def account_badge(account, all: false) | ||||
|     if account.bot? | ||||
|       content_tag(:div, content_tag(:div, t('accounts.roles.bot'), class: 'account-role bot'), class: 'roles') | ||||
|     elsif (Setting.show_staff_badge && account.user_staff?) || all | ||||
|       content_tag(:div, class: 'roles') do | ||||
|         if all && !account.user_staff? | ||||
|           content_tag(:div, t('admin.accounts.roles.user'), class: 'account-role') | ||||
|         elsif account.user_admin? | ||||
|           content_tag(:div, t('accounts.roles.admin'), class: 'account-role admin') | ||||
|         elsif account.user_moderator? | ||||
|           content_tag(:div, t('accounts.roles.moderator'), class: 'account-role moderator') | ||||
|         end | ||||
|       end | ||||
|     end | ||||
|   end | ||||
|  | ||||
| ======= | ||||
| >>>>>>> e0f3a4583c68b560425e30306153cf1b8f4dabe0 | ||||
|   def link_to_more(url) | ||||
|     link_to t('statuses.show_more'), url, class: 'load-more load-gap' | ||||
|   end | ||||
|  | ||||
		Reference in New Issue
	
	Block a user