diff options
| author | ThibG <thib@sitedethib.com> | 2021-01-06 22:03:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-06 22:03:23 +0100 |
| commit | d42e7e01dcd464f80637682d4eee6e5a7f36f26e (patch) | |
| tree | 3a594f4d232cad40fa268d66539498db2ea217e2 /app/serializers/rest | |
| parent | 225c934a1b66e2fcbedbda7936666c1ca3c9a04b (diff) | |
| parent | 55e84f9125608f12a7d29ec9bf9240e9a48cf4e5 (diff) | |
Merge pull request #1482 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers/rest')
| -rw-r--r-- | app/serializers/rest/account_featured_tag_serializer.rb | 15 | ||||
| -rw-r--r-- | app/serializers/rest/featured_tag_serializer.rb | 8 |
2 files changed, 7 insertions, 16 deletions
diff --git a/app/serializers/rest/account_featured_tag_serializer.rb b/app/serializers/rest/account_featured_tag_serializer.rb deleted file mode 100644 index 84bef2e62..000000000 --- a/app/serializers/rest/account_featured_tag_serializer.rb +++ /dev/null @@ -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 diff --git a/app/serializers/rest/featured_tag_serializer.rb b/app/serializers/rest/featured_tag_serializer.rb index 08121ff16..96adcc7d0 100644 --- a/app/serializers/rest/featured_tag_serializer.rb +++ b/app/serializers/rest/featured_tag_serializer.rb @@ -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 |