Change RSS feeds (#18356)
* Change RSS feeds - Use date and time for titles instead of ellipsized text - Use full content in body, even when there is a content warning - Use media extensions * Change feed icons and add width and height attributes to custom emojis * Fix custom emoji animate on hover breaking * Fix tests
This commit is contained in:
Eugen Rochko
GitHub
parent
f17e73da09
commit
2b8dc58b7f
19 changed files with 311 additions and 307 deletions
|
|
@ -11,6 +11,7 @@ class EmojiFormatter
|
|||
# @param [Array<CustomEmoji>] custom_emojis
|
||||
# @param [Hash] options
|
||||
# @option options [Boolean] :animate
|
||||
# @option options [String] :style
|
||||
def initialize(html, custom_emojis, options = {})
|
||||
raise ArgumentError unless html.html_safe?
|
||||
|
||||
|
|
@ -85,14 +86,29 @@ class EmojiFormatter
|
|||
def image_for_emoji(shortcode, emoji)
|
||||
original_url, static_url = emoji
|
||||
|
||||
if animate?
|
||||
image_tag(original_url, draggable: false, class: 'emojione', alt: ":#{shortcode}:", title: ":#{shortcode}:")
|
||||
else
|
||||
image_tag(original_url, draggable: false, class: 'emojione custom-emoji', alt: ":#{shortcode}:", title: ":#{shortcode}:", data: { original: original_url, static: static_url })
|
||||
end
|
||||
image_tag(
|
||||
animate? ? original_url : static_url,
|
||||
image_attributes.merge(alt: ":#{shortcode}:", title: ":#{shortcode}:", data: image_data_attributes(original_url, static_url))
|
||||
)
|
||||
end
|
||||
|
||||
def image_attributes
|
||||
{ rel: 'emoji', draggable: false, width: 16, height: 16, class: image_class_names, style: image_style }
|
||||
end
|
||||
|
||||
def image_data_attributes(original_url, static_url)
|
||||
{ original: original_url, static: static_url } unless animate?
|
||||
end
|
||||
|
||||
def image_class_names
|
||||
animate? ? 'emojione' : 'emojione custom-emoji'
|
||||
end
|
||||
|
||||
def image_style
|
||||
@options[:style]
|
||||
end
|
||||
|
||||
def animate?
|
||||
@options[:animate]
|
||||
@options[:animate] || @options.key?(:style)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
33
app/lib/rss/builder.rb
Normal file
33
app/lib/rss/builder.rb
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class RSS::Builder
|
||||
attr_reader :dsl
|
||||
|
||||
def self.build
|
||||
new.tap do |builder|
|
||||
yield builder.dsl
|
||||
end.to_xml
|
||||
end
|
||||
|
||||
def initialize
|
||||
@dsl = RSS::Channel.new
|
||||
end
|
||||
|
||||
def to_xml
|
||||
('<?xml version="1.0" encoding="UTF-8"?>'.dup << Ox.dump(wrap_in_document, effort: :tolerant)).force_encoding('UTF-8')
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def wrap_in_document
|
||||
Ox::Document.new(version: '1.0').tap do |document|
|
||||
document << Ox::Element.new('rss').tap do |rss|
|
||||
rss['version'] = '2.0'
|
||||
rss['xmlns:webfeeds'] = 'http://webfeeds.org/rss/1.0'
|
||||
rss['xmlns:media'] = 'http://search.yahoo.com/mrss/'
|
||||
|
||||
rss << @dsl.to_element
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
49
app/lib/rss/channel.rb
Normal file
49
app/lib/rss/channel.rb
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class RSS::Channel < RSS::Element
|
||||
def initialize
|
||||
super()
|
||||
|
||||
@root = create_element('channel')
|
||||
end
|
||||
|
||||
def title(str)
|
||||
append_element('title', str)
|
||||
end
|
||||
|
||||
def link(str)
|
||||
append_element('link', str)
|
||||
end
|
||||
|
||||
def last_build_date(date)
|
||||
append_element('lastBuildDate', date.to_formatted_s(:rfc822))
|
||||
end
|
||||
|
||||
def image(url, title, link)
|
||||
append_element('image') do |image|
|
||||
image << create_element('url', url)
|
||||
image << create_element('title', title)
|
||||
image << create_element('link', link)
|
||||
end
|
||||
end
|
||||
|
||||
def description(str)
|
||||
append_element('description', str)
|
||||
end
|
||||
|
||||
def generator(str)
|
||||
append_element('generator', str)
|
||||
end
|
||||
|
||||
def icon(str)
|
||||
append_element('webfeeds:icon', str)
|
||||
end
|
||||
|
||||
def logo(str)
|
||||
append_element('webfeeds:logo', str)
|
||||
end
|
||||
|
||||
def item(&block)
|
||||
@root << RSS::Item.with(&block)
|
||||
end
|
||||
end
|
||||
24
app/lib/rss/element.rb
Normal file
24
app/lib/rss/element.rb
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class RSS::Element
|
||||
def self.with(*args, &block)
|
||||
new(*args).tap(&block).to_element
|
||||
end
|
||||
|
||||
def create_element(name, content = nil)
|
||||
Ox::Element.new(name).tap do |element|
|
||||
yield element if block_given?
|
||||
element << content if content.present?
|
||||
end
|
||||
end
|
||||
|
||||
def append_element(name, content = nil)
|
||||
@root << create_element(name, content).tap do |element|
|
||||
yield element if block_given?
|
||||
end
|
||||
end
|
||||
|
||||
def to_element
|
||||
@root
|
||||
end
|
||||
end
|
||||
45
app/lib/rss/item.rb
Normal file
45
app/lib/rss/item.rb
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class RSS::Item < RSS::Element
|
||||
def initialize
|
||||
super()
|
||||
|
||||
@root = create_element('item')
|
||||
end
|
||||
|
||||
def title(str)
|
||||
append_element('title', str)
|
||||
end
|
||||
|
||||
def link(str)
|
||||
append_element('guid', str) do |guid|
|
||||
guid['isPermaLink'] = 'true'
|
||||
end
|
||||
|
||||
append_element('link', str)
|
||||
end
|
||||
|
||||
def pub_date(date)
|
||||
append_element('pubDate', date.to_formatted_s(:rfc822))
|
||||
end
|
||||
|
||||
def description(str)
|
||||
append_element('description', str)
|
||||
end
|
||||
|
||||
def category(str)
|
||||
append_element('category', str)
|
||||
end
|
||||
|
||||
def enclosure(url, type, size)
|
||||
append_element('enclosure') do |enclosure|
|
||||
enclosure['url'] = url
|
||||
enclosure['length'] = size
|
||||
enclosure['type'] = type
|
||||
end
|
||||
end
|
||||
|
||||
def media_content(url, type, size, &block)
|
||||
@root << RSS::MediaContent.with(url, type, size, &block)
|
||||
end
|
||||
end
|
||||
29
app/lib/rss/media_content.rb
Normal file
29
app/lib/rss/media_content.rb
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class RSS::MediaContent < RSS::Element
|
||||
def initialize(url, type, size)
|
||||
super()
|
||||
|
||||
@root = create_element('media:content') do |content|
|
||||
content['url'] = url
|
||||
content['type'] = type
|
||||
content['fileSize'] = size
|
||||
end
|
||||
end
|
||||
|
||||
def medium(str)
|
||||
@root['medium'] = str
|
||||
end
|
||||
|
||||
def rating(str)
|
||||
append_element('media:rating', str) do |rating|
|
||||
rating['scheme'] = 'urn:simple'
|
||||
end
|
||||
end
|
||||
|
||||
def description(str)
|
||||
append_element('media:description', str) do |description|
|
||||
description['type'] = 'plain'
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class RSS::Serializer
|
||||
include FormattingHelper
|
||||
|
||||
private
|
||||
|
||||
def render_statuses(builder, statuses)
|
||||
statuses.each do |status|
|
||||
builder.item do |item|
|
||||
item.title(status_title(status))
|
||||
.link(ActivityPub::TagManager.instance.url_for(status))
|
||||
.pub_date(status.created_at)
|
||||
.description(status_description(status))
|
||||
|
||||
status.ordered_media_attachments.each do |media|
|
||||
item.enclosure(full_asset_url(media.file.url(:original, false)), media.file.content_type, media.file.size)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def status_title(status)
|
||||
preview = status.proper.spoiler_text.presence || status.proper.text
|
||||
|
||||
if preview.length > 30 || preview[0, 30].include?("\n")
|
||||
preview = preview[0, 30]
|
||||
preview = preview[0, preview.index("\n").presence || 30] + '…'
|
||||
end
|
||||
|
||||
preview = "#{status.proper.spoiler_text.present? ? 'CW ' : ''}“#{preview}”#{status.proper.sensitive? ? ' (sensitive)' : ''}"
|
||||
|
||||
if status.reblog?
|
||||
"#{status.account.acct} boosted #{status.reblog.account.acct}: #{preview}"
|
||||
else
|
||||
"#{status.account.acct}: #{preview}"
|
||||
end
|
||||
end
|
||||
|
||||
def status_description(status)
|
||||
if status.proper.spoiler_text?
|
||||
status.proper.spoiler_text
|
||||
else
|
||||
html = status_content_format(status.proper).to_str
|
||||
after_html = ''
|
||||
|
||||
if status.proper.preloadable_poll
|
||||
poll_options_html = status.proper.preloadable_poll.options.map { |o| "[ ] #{o}" }.join('<br />')
|
||||
after_html = "<p>#{poll_options_html}</p>"
|
||||
end
|
||||
|
||||
"#{html}#{after_html}"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -1,130 +0,0 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class RSSBuilder
|
||||
class ItemBuilder
|
||||
def initialize
|
||||
@item = Ox::Element.new('item')
|
||||
end
|
||||
|
||||
def title(str)
|
||||
@item << (Ox::Element.new('title') << str)
|
||||
|
||||
self
|
||||
end
|
||||
|
||||
def link(str)
|
||||
@item << Ox::Element.new('guid').tap do |guid|
|
||||
guid['isPermalink'] = 'true'
|
||||
guid << str
|
||||
end
|
||||
|
||||
@item << (Ox::Element.new('link') << str)
|
||||
|
||||
self
|
||||
end
|
||||
|
||||
def pub_date(date)
|
||||
@item << (Ox::Element.new('pubDate') << date.to_formatted_s(:rfc822))
|
||||
|
||||
self
|
||||
end
|
||||
|
||||
def description(str)
|
||||
@item << (Ox::Element.new('description') << str)
|
||||
|
||||
self
|
||||
end
|
||||
|
||||
def enclosure(url, type, size)
|
||||
@item << Ox::Element.new('enclosure').tap do |enclosure|
|
||||
enclosure['url'] = url
|
||||
enclosure['length'] = size
|
||||
enclosure['type'] = type
|
||||
end
|
||||
|
||||
self
|
||||
end
|
||||
|
||||
def to_element
|
||||
@item
|
||||
end
|
||||
end
|
||||
|
||||
def initialize
|
||||
@document = Ox::Document.new(version: '1.0')
|
||||
@channel = Ox::Element.new('channel')
|
||||
|
||||
@document << (rss << @channel)
|
||||
end
|
||||
|
||||
def title(str)
|
||||
@channel << (Ox::Element.new('title') << str)
|
||||
|
||||
self
|
||||
end
|
||||
|
||||
def link(str)
|
||||
@channel << (Ox::Element.new('link') << str)
|
||||
|
||||
self
|
||||
end
|
||||
|
||||
def image(str)
|
||||
@channel << Ox::Element.new('image').tap do |image|
|
||||
image << (Ox::Element.new('url') << str)
|
||||
image << (Ox::Element.new('title') << '')
|
||||
image << (Ox::Element.new('link') << '')
|
||||
end
|
||||
|
||||
@channel << (Ox::Element.new('webfeeds:icon') << str)
|
||||
|
||||
self
|
||||
end
|
||||
|
||||
def cover(str)
|
||||
@channel << Ox::Element.new('webfeeds:cover').tap do |cover|
|
||||
cover['image'] = str
|
||||
end
|
||||
|
||||
self
|
||||
end
|
||||
|
||||
def logo(str)
|
||||
@channel << (Ox::Element.new('webfeeds:logo') << str)
|
||||
|
||||
self
|
||||
end
|
||||
|
||||
def accent_color(str)
|
||||
@channel << (Ox::Element.new('webfeeds:accentColor') << str)
|
||||
|
||||
self
|
||||
end
|
||||
|
||||
def description(str)
|
||||
@channel << (Ox::Element.new('description') << str)
|
||||
|
||||
self
|
||||
end
|
||||
|
||||
def item
|
||||
@channel << ItemBuilder.new.tap do |item|
|
||||
yield item
|
||||
end.to_element
|
||||
|
||||
self
|
||||
end
|
||||
|
||||
def to_xml
|
||||
('<?xml version="1.0" encoding="UTF-8"?>' + Ox.dump(@document, effort: :tolerant)).force_encoding('UTF-8')
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def rss
|
||||
Ox::Element.new('rss').tap do |rss|
|
||||
rss['version'] = '2.0'
|
||||
rss['xmlns:webfeeds'] = 'http://webfeeds.org/rss/1.0'
|
||||
end
|
||||
end
|
||||
end
|
||||
Loading…
Add table
Add a link
Reference in a new issue