Refactor formatter (#17828)
* Refactor formatter * Move custom emoji pre-rendering logic to view helpers * Move more methods out of Formatter * Fix code style issues * Remove Formatter * Add inline poll options to RSS feeds * Remove unused helper method * Fix code style issues * Various fixes and improvements * Fix test
This commit is contained in:
@ -2,6 +2,7 @@
|
||||
|
||||
class ActivityPub::ActorSerializer < ActivityPub::Serializer
|
||||
include RoutingHelper
|
||||
include FormattingHelper
|
||||
|
||||
context :security
|
||||
|
||||
@ -102,7 +103,7 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
|
||||
end
|
||||
|
||||
def summary
|
||||
object.suspended? ? '' : Formatter.instance.simplified_format(object)
|
||||
object.suspended? ? '' : html_aware_format(object.note, object.local?)
|
||||
end
|
||||
|
||||
def icon
|
||||
@ -185,6 +186,8 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
|
||||
end
|
||||
|
||||
class Account::FieldSerializer < ActivityPub::Serializer
|
||||
include FormattingHelper
|
||||
|
||||
attributes :type, :name, :value
|
||||
|
||||
def type
|
||||
@ -192,7 +195,7 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
|
||||
end
|
||||
|
||||
def value
|
||||
Formatter.instance.format_field(object.account, object.value)
|
||||
html_aware_format(object.value, object.account.value?, with_rel_me: true, with_domains: true, multiline: false)
|
||||
end
|
||||
end
|
||||
|
||||
|
Reference in New Issue
Block a user