commit: ff44b2e92d496c6027b20157fea6ebd885906bea
parent: 188aa3ea50799f4a81f28416fe47b3330091ef6f
Author: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 9 Mar 2018 00:35:07 +0100
Add missing meta description to profiles, some other SEO stuff (#6706)
- Add missing meta description to profiles
- Add canonical rel link to landing page
- Remove linebreaks from title tags
- Add username to profile title
- Add toots/following/followers to profile description tags
- Add next/prev rel links to profiles
- Do not index follower/following variants of profiles
Diffstat:
7 files changed, 37 insertions(+), 16 deletions(-)
diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb
@@ -8,6 +8,27 @@ module StreamEntriesHelper
account.display_name.presence || account.username
end
+ def account_description(account)
+ prepend_str = [
+ [
+ number_to_human(account.statuses_count, strip_insignificant_zeros: true),
+ t('accounts.posts'),
+ ].join(' '),
+
+ [
+ number_to_human(account.following_count, strip_insignificant_zeros: true),
+ t('accounts.following'),
+ ].join(' '),
+
+ [
+ number_to_human(account.followers_count, strip_insignificant_zeros: true),
+ t('accounts.followers'),
+ ].join(' '),
+ ].join(', ')
+
+ [prepend_str, account.note].join(' ยท ')
+ end
+
def stream_link_target
embedded_view? ? '_blank' : nil
end
diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml
@@ -2,6 +2,7 @@
= site_hostname
- content_for :header_tags do
+ %link{ rel: 'canonical', href: about_url }/
%script#initial-state{ type: 'application/json' }!= json_escape(@initial_state_json)
= javascript_pack_tag 'about', integrity: true, crossorigin: 'anonymous'
= render partial: 'shared/og'
diff --git a/app/views/accounts/_og.html.haml b/app/views/accounts/_og.html.haml
@@ -1,7 +1,7 @@
= opengraph 'og:url', url
= opengraph 'og:site_name', site_title
= opengraph 'og:title', [yield(:page_title).strip.presence, site_title].compact.join(' - ')
-= opengraph 'og:description', account.note
+= opengraph 'og:description', account_description(account)
= opengraph 'og:image', full_asset_url(account.avatar.url(:original))
= opengraph 'og:image:width', '120'
= opengraph 'og:image:height', '120'
diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml
@@ -1,7 +1,9 @@
- content_for :page_title do
- = display_name(@account)
+ = "#{display_name(@account)} (@#{@account.username})"
- content_for :header_tags do
+ %meta{ name: 'description', content: account_description(@account) }/
+
- if @account.user&.setting_noindex
%meta{ name: 'robots', content: 'noindex' }/
@@ -9,6 +11,11 @@
%link{ rel: 'alternate', type: 'application/atom+xml', href: account_url(@account, format: 'atom') }/
%link{ rel: 'alternate', type: 'application/activity+json', href: ActivityPub::TagManager.instance.uri_for(@account) }/
+ - if @older_url
+ %link{ rel: 'next', href: @older_url }/
+ - if @newer_url
+ %link{ rel: 'prev', href: @newer_url }/
+
= opengraph 'og:type', 'profile'
= render 'og', account: @account, url: short_account_url(@account, only_path: false)
@@ -42,6 +49,6 @@
- if @newer_url || @older_url
.pagination
- if @older_url
- = link_to safe_join([fa_icon('chevron-left'), t('pagination.older')], ' '), @older_url, class: 'older', rel: 'older'
+ = link_to safe_join([fa_icon('chevron-left'), t('pagination.older')], ' '), @older_url, class: 'older', rel: 'next'
- if @newer_url
- = link_to safe_join([t('pagination.newer'), fa_icon('chevron-right')], ' '), @newer_url, class: 'newer', rel: 'newer'
+ = link_to safe_join([t('pagination.newer'), fa_icon('chevron-right')], ' '), @newer_url, class: 'newer', rel: 'prev'
diff --git a/app/views/follower_accounts/index.html.haml b/app/views/follower_accounts/index.html.haml
@@ -2,9 +2,7 @@
= t('accounts.people_who_follow', name: display_name(@account))
- content_for :header_tags do
- - if @account.user&.setting_noindex
- %meta{ name: 'robots', content: 'noindex' }/
-
+ %meta{ name: 'robots', content: 'noindex' }/
= render 'accounts/og', account: @account, url: account_followers_url(@account, only_path: false)
= render 'accounts/header', account: @account
diff --git a/app/views/following_accounts/index.html.haml b/app/views/following_accounts/index.html.haml
@@ -2,9 +2,7 @@
= t('accounts.people_followed_by', name: display_name(@account))
- content_for :header_tags do
- - if @account.user&.setting_noindex
- %meta{ name: 'robots', content: 'noindex' }/
-
+ %meta{ name: 'robots', content: 'noindex' }/
= render 'accounts/og', account: @account, url: account_followers_url(@account, only_path: false)
= render 'accounts/header', account: @account
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -2,7 +2,7 @@
%html{ lang: I18n.locale }
%head
%meta{ charset: 'utf-8' }/
- %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1' }/
+ %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1' }/
%link{ rel: 'icon', href: favicon_path, type: 'image/x-icon' }/
%link{ rel: 'apple-touch-icon', sizes: '180x180', href: '/apple-touch-icon.png' }/
%link{ rel: 'mask-icon', href: '/mask-icon.svg', color: '#2B90D9' }/
@@ -11,11 +11,7 @@
%meta{ name: 'theme-color', content: '#282c37' }/
%meta{ name: 'apple-mobile-web-app-capable', content: 'yes' }/
- %title<
- - if content_for?(:page_title)
- = yield(:page_title)
- = ' - '
- = title
+ %title= content_for?(:page_title) ? safe_join([yield(:page_title).chomp, ' - ', title]) : title
= stylesheet_pack_tag 'common', media: 'all'
= stylesheet_pack_tag current_theme, media: 'all'
