From c8e0ceed564263884b08f9a899f1f06c8a0c9a7f Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 9 Dec 2016 11:56:27 +0100 Subject: [PATCH] Fix OpenGraph meta tags --- app/views/accounts/show.html.haml | 6 ++++++ app/views/stream_entries/show.html.haml | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml index db8e45e6b9..9390272e05 100644 --- a/app/views/accounts/show.html.haml +++ b/app/views/accounts/show.html.haml @@ -5,6 +5,12 @@ %link{ rel: 'salmon', href: api_salmon_url(@account.id) }/ %link{ rel: 'alternate', type: 'application/atom+xml', href: account_url(@account, format: 'atom') }/ + %meta{ property: 'og:site_name', content: 'Mastodon' }/ + %meta{ property: 'og:type', content: 'profile' }/ + %meta{ property: 'og:title', content: "#{@account.username} on #{Rails.configuration.x.local_domain}" }/ + %meta{ property: 'og:description', content: @account.note }/ + %meta{ property: 'og:image', content: full_asset_url(@account.avatar.url(:original)) }/ + = render partial: 'header' - if @statuses.empty? diff --git a/app/views/stream_entries/show.html.haml b/app/views/stream_entries/show.html.haml index 1bacaf32b2..a7f5653e61 100644 --- a/app/views/stream_entries/show.html.haml +++ b/app/views/stream_entries/show.html.haml @@ -2,12 +2,12 @@ %link{ rel: 'alternate', type: 'application/atom+xml', href: account_stream_entry_url(@account, @stream_entry, format: 'atom') }/ %link{ rel: 'alternate', type: 'application/json+oembed', href: api_oembed_url(url: account_stream_entry_url(@account, @stream_entry), format: 'json') }/ - %meta{ name: 'og:site_name', content: 'Mastodon' }/ - %meta{ name: 'og:type', content: 'article' }/ - %meta{ name: 'og:title', content: "#{@account.username} on #{Rails.configuration.x.local_domain}" }/ - %meta{ name: 'og:article:author', content: @account.username }/ - %meta{ name: 'og:description', content: @stream_entry.activity.content }/ - %meta{ name: 'og:image', content: @stream_entry.activity.is_a?(Status) && @stream_entry.activity.media_attachments.size > 0 ? full_asset_url(@stream_entry.activity.media_attachments.first.file.url( :small)) : full_asset_url(@account.avatar.url( :original)) }/ + %meta{ property: 'og:site_name', content: 'Mastodon' }/ + %meta{ property: 'og:type', content: 'article' }/ + %meta{ property: 'og:title', content: "#{@account.username} on #{Rails.configuration.x.local_domain}" }/ + %meta{ property: 'og:article:author', content: @account.username }/ + %meta{ property: 'og:description', content: @stream_entry.activity.content }/ + %meta{ property: 'og:image', content: @stream_entry.activity.is_a?(Status) && @stream_entry.activity.media_attachments.size > 0 ? full_asset_url(@stream_entry.activity.media_attachments.first.file.url( :small)) : full_asset_url(@account.avatar.url(:original)) }/ .activity-stream.activity-stream-headless = render partial: @type, locals: { @type.to_sym => @stream_entry.activity, include_threads: true }