mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-22 14:15:22 +00:00
Federate header images, fix open-uri http->https redirection error
This commit is contained in:
parent
5cfc9c7487
commit
2816b1bf8e
|
@ -124,6 +124,10 @@ module AtomBuilderHelper
|
||||||
single_link_avatar(xml, account, :original, 120)
|
single_link_avatar(xml, account, :original, 120)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def link_header(xml, account)
|
||||||
|
xml.link('rel' => 'header', 'type' => account.header_content_type, 'media:width' => 700, 'media:height' => 335, 'href' => full_asset_url(account.header.url(:original)))
|
||||||
|
end
|
||||||
|
|
||||||
def logo(xml, url)
|
def logo(xml, url)
|
||||||
xml.logo url
|
xml.logo url
|
||||||
end
|
end
|
||||||
|
@ -160,6 +164,7 @@ module AtomBuilderHelper
|
||||||
summary xml, account.note
|
summary xml, account.note
|
||||||
link_alternate xml, TagManager.instance.url_for(account)
|
link_alternate xml, TagManager.instance.url_for(account)
|
||||||
link_avatar xml, account
|
link_avatar xml, account
|
||||||
|
link_header xml, account
|
||||||
portable_contact xml, account
|
portable_contact xml, account
|
||||||
privacy_scope xml, account.locked? ? :private : :public
|
privacy_scope xml, account.locked? ? :private : :public
|
||||||
end
|
end
|
||||||
|
|
|
@ -144,7 +144,9 @@ class Account < ApplicationRecord
|
||||||
save!
|
save!
|
||||||
rescue ActiveRecord::RecordInvalid
|
rescue ActiveRecord::RecordInvalid
|
||||||
self.avatar = nil
|
self.avatar = nil
|
||||||
|
self.header = nil
|
||||||
self[:avatar_remote_url] = ''
|
self[:avatar_remote_url] = ''
|
||||||
|
self[:header_remote_url] = ''
|
||||||
save!
|
save!
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -159,6 +161,17 @@ class Account < ApplicationRecord
|
||||||
Rails.logger.debug "Error fetching remote avatar: #{e}"
|
Rails.logger.debug "Error fetching remote avatar: #{e}"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def header_remote_url=(url)
|
||||||
|
parsed_url = URI.parse(url)
|
||||||
|
|
||||||
|
return if !%w(http https).include?(parsed_url.scheme) || parsed_url.host.empty? || self[:header_remote_url] == url
|
||||||
|
|
||||||
|
self.header = parsed_url
|
||||||
|
self[:header_remote_url] = url
|
||||||
|
rescue OpenURI::HTTPError => e
|
||||||
|
Rails.logger.debug "Error fetching remote header: #{e}"
|
||||||
|
end
|
||||||
|
|
||||||
def object_type
|
def object_type
|
||||||
:person
|
:person
|
||||||
end
|
end
|
||||||
|
|
|
@ -14,6 +14,7 @@ class UpdateRemoteProfileService < BaseService
|
||||||
|
|
||||||
unless account.suspended? || DomainBlock.find_by(domain: account.domain)&.reject_media?
|
unless account.suspended? || DomainBlock.find_by(domain: account.domain)&.reject_media?
|
||||||
account.avatar_remote_url = author_xml.at_xpath('./xmlns:link[@rel="avatar"]', xmlns: TagManager::XMLNS)['href'] unless author_xml.at_xpath('./xmlns:link[@rel="avatar"]', xmlns: TagManager::XMLNS).nil? || author_xml.at_xpath('./xmlns:link[@rel="avatar"]', xmlns: TagManager::XMLNS)['href'].blank?
|
account.avatar_remote_url = author_xml.at_xpath('./xmlns:link[@rel="avatar"]', xmlns: TagManager::XMLNS)['href'] unless author_xml.at_xpath('./xmlns:link[@rel="avatar"]', xmlns: TagManager::XMLNS).nil? || author_xml.at_xpath('./xmlns:link[@rel="avatar"]', xmlns: TagManager::XMLNS)['href'].blank?
|
||||||
|
account.header_remote_url = author_xml.at_xpath('./xmlns:link[@rel="header"]', xmlns: TagManager::XMLNS)['href'] unless author_xml.at_xpath('./xmlns:link[@rel="header"]', xmlns: TagManager::XMLNS).nil? || author_xml.at_xpath('./xmlns:link[@rel="header"]', xmlns: TagManager::XMLNS)['href'].blank?
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
8
config/initializers/open_uri_redirection.rb
Normal file
8
config/initializers/open_uri_redirection.rb
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
require 'open-uri'
|
||||||
|
|
||||||
|
module OpenURI
|
||||||
|
def OpenURI.redirectable?(uri1, uri2) # :nodoc:
|
||||||
|
uri1.scheme.downcase == uri2.scheme.downcase ||
|
||||||
|
(/\A(?:http|https|ftp)\z/i =~ uri1.scheme && /\A(?:http|https|ftp)\z/i =~ uri2.scheme)
|
||||||
|
end
|
||||||
|
end
|
|
@ -0,0 +1,5 @@
|
||||||
|
class AddHeaderRemoteUrlToAccounts < ActiveRecord::Migration[5.0]
|
||||||
|
def change
|
||||||
|
add_column :accounts, :header_remote_url, :string, null: false, default: ''
|
||||||
|
end
|
||||||
|
end
|
|
@ -10,7 +10,7 @@
|
||||||
#
|
#
|
||||||
# It's strongly recommended that you check this file into your version control system.
|
# It's strongly recommended that you check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema.define(version: 20170317193015) do
|
ActiveRecord::Schema.define(version: 20170318214217) do
|
||||||
|
|
||||||
# These are extensions that must be enabled in order to support this database
|
# These are extensions that must be enabled in order to support this database
|
||||||
enable_extension "plpgsql"
|
enable_extension "plpgsql"
|
||||||
|
@ -43,6 +43,7 @@ ActiveRecord::Schema.define(version: 20170317193015) do
|
||||||
t.boolean "silenced", default: false, null: false
|
t.boolean "silenced", default: false, null: false
|
||||||
t.boolean "suspended", default: false, null: false
|
t.boolean "suspended", default: false, null: false
|
||||||
t.boolean "locked", default: false, null: false
|
t.boolean "locked", default: false, null: false
|
||||||
|
t.string "header_remote_url", default: "", null: false
|
||||||
t.index "(((setweight(to_tsvector('simple'::regconfig, (display_name)::text), 'A'::\"char\") || setweight(to_tsvector('simple'::regconfig, (username)::text), 'B'::\"char\")) || setweight(to_tsvector('simple'::regconfig, (COALESCE(domain, ''::character varying))::text), 'C'::\"char\")))", name: "search_index", using: :gin
|
t.index "(((setweight(to_tsvector('simple'::regconfig, (display_name)::text), 'A'::\"char\") || setweight(to_tsvector('simple'::regconfig, (username)::text), 'B'::\"char\")) || setweight(to_tsvector('simple'::regconfig, (COALESCE(domain, ''::character varying))::text), 'C'::\"char\")))", name: "search_index", using: :gin
|
||||||
t.index ["username", "domain"], name: "index_accounts_on_username_and_domain", unique: true, using: :btree
|
t.index ["username", "domain"], name: "index_accounts_on_username_and_domain", unique: true, using: :btree
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue