diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-10-10 02:21:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-10 02:21:30 +0200 |
| commit | 2459da29c2e117c43c142bc386c2f4baf613cdc9 (patch) | |
| tree | e2273afdcb5d0d776d5f9b93eb25aecbce796019 | |
| parent | da7705b2746b36ccbe093d404d3f4c83a9b5e13e (diff) | |
Add description meta tag additionally to og:description (#8941)
Fix #8685
| -rw-r--r-- | app/views/accounts/_og.html.haml | 6 | ||||
| -rw-r--r-- | app/views/shared/_og.html.haml | 6 | ||||
| -rw-r--r-- | app/views/stream_entries/_og_description.html.haml | 5 |
3 files changed, 14 insertions, 3 deletions
diff --git a/app/views/accounts/_og.html.haml b/app/views/accounts/_og.html.haml index a583b39c2..de948ec6a 100644 --- a/app/views/accounts/_og.html.haml +++ b/app/views/accounts/_og.html.haml @@ -1,7 +1,11 @@ +- description = account_description(account) + +%meta{ name: 'description', content: description }/ + = opengraph 'og:url', url = opengraph 'og:site_name', site_title = opengraph 'og:title', yield(:page_title).strip -= opengraph 'og:description', account_description(account) += opengraph 'og:description', description = 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/shared/_og.html.haml b/app/views/shared/_og.html.haml index 76db511cd..802d8c41d 100644 --- a/app/views/shared/_og.html.haml +++ b/app/views/shared/_og.html.haml @@ -1,9 +1,13 @@ - thumbnail = @instance_presenter.thumbnail +- description = strip_tags(@instance_presenter.site_short_description.presence || @instance_presenter.site_description.presence || t('about.about_mastodon_html')) + +%meta{ name: 'description', content: description }/ + = opengraph 'og:site_name', t('about.hosted_on', domain: site_hostname) = opengraph 'og:url', url_for(only_path: false) = opengraph 'og:type', 'website' = opengraph 'og:title', @instance_presenter.site_title -= opengraph 'og:description', strip_tags(@instance_presenter.site_short_description.presence || @instance_presenter.site_description.presence || t('about.about_mastodon_html')) += opengraph 'og:description', description = opengraph 'og:image', full_asset_url(thumbnail&.file&.url || asset_pack_path('preview.jpg', protocol: :request)) = opengraph 'og:image:width', thumbnail ? thumbnail.meta['width'] : '1200' = opengraph 'og:image:height', thumbnail ? thumbnail.meta['height'] : '630' diff --git a/app/views/stream_entries/_og_description.html.haml b/app/views/stream_entries/_og_description.html.haml index 3d122b94e..a7b18424d 100644 --- a/app/views/stream_entries/_og_description.html.haml +++ b/app/views/stream_entries/_og_description.html.haml @@ -1 +1,4 @@ -= opengraph 'og:description', status_description(activity) +- description = status_description(activity) + +%meta{ name: 'description', content: description }/ += opengraph 'og:description', description |