Use `Tag#formatted_name` where relevant

pull/32725/head
Matt Jankowski 2024-10-17 10:16:58 -04:00
parent 0a599d08d8
commit 866ee8ed9a
7 changed files with 21 additions and 11 deletions

View File

@ -51,7 +51,7 @@ module SettingsHelper
def post_link_to_featured_tag(tag)
link_to(
"##{tag.display_name}",
tag.formatted_name,
settings_featured_tags_path(featured_tag: { name: tag.name }),
method: :post
)

View File

@ -30,6 +30,8 @@ class FeaturedTag < ApplicationRecord
scope :by_name, ->(name) { joins(:tag).where(tag: { name: HashtagNormalizer.new.normalize(name) }) }
delegate :formatted_name, to: :tag
LIMIT = 10
def sign?

View File

@ -182,7 +182,7 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
end
def name
"##{object.name}"
object.formatted_name
end
end

View File

@ -12,7 +12,7 @@ class ActivityPub::HashtagSerializer < ActivityPub::Serializer
end
def name
"##{object.display_name}"
object.formatted_name
end
def href

View File

@ -287,7 +287,7 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
end
def name
"##{object.name}"
object.formatted_name
end
end

View File

@ -1,7 +1,7 @@
# frozen_string_literal: true
RSS::Builder.build do |doc|
doc.title("##{@tag.display_name}")
doc.title(@tag.formatted_name)
doc.description(I18n.t('rss.descriptions.tag', hashtag: @tag.display_name))
doc.link(tag_url(@tag))
doc.last_build_date(@statuses.first.created_at) if @statuses.any?

View File

@ -115,14 +115,22 @@ RSpec.describe Tag do
end
describe '#formatted_name' do
it 'returns name with a proceeding hash symbol' do
tag = Fabricate(:tag, name: 'foo')
expect(tag.formatted_name).to eq '#foo'
context 'when display name is not present' do
let(:tag) { Fabricate.build :tag, name: 'foo' }
it 'returns name with a preceding hash symbol' do
expect(tag.formatted_name)
.to eq '#foo'
end
end
it 'returns display_name with a proceeding hash symbol, if display name present' do
tag = Fabricate(:tag, name: 'foobar', display_name: 'FooBar')
expect(tag.formatted_name).to eq '#FooBar'
context 'when display name is present' do
let(:tag) { Fabricate.build :tag, name: 'foobar', display_name: 'FooBar' }
it 'returns display_name with a preceding hash symbol' do
expect(tag.formatted_name)
.to eq '#FooBar'
end
end
end