Merge tag 'v3.3.0'

This commit is contained in:
wuyingren 2020-12-27 15:02:08 +08:00
commit fc50e22b7c
41 changed files with 735 additions and 524 deletions

View file

@ -1,15 +0,0 @@
# frozen_string_literal: true
class REST::AccountFeaturedTagSerializer < ActiveModel::Serializer
include RoutingHelper
attributes :id, :name, :url
def id
object.tag.id.to_s
end
def url
short_account_tag_url(object.account, object.tag)
end
end

View file

@ -1,9 +1,15 @@
# frozen_string_literal: true
class REST::FeaturedTagSerializer < ActiveModel::Serializer
attributes :id, :name, :statuses_count, :last_status_at
include RoutingHelper
attributes :id, :name, :url, :statuses_count, :last_status_at
def id
object.id.to_s
end
def url
short_account_tag_url(object.account, object.tag)
end
end