diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-01-27 15:46:50 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-27 15:46:50 +0100 |
| commit | c56a504d116d62fe669d15a270133d7c78dd61f1 (patch) | |
| tree | 7400f3182f2a4ebd1606c37a1a5cad4cc95e443b /app/serializers/rest/account_serializer.rb | |
| parent | 8924743349ec5ce37cd949445e071c14968ec2ec (diff) | |
| parent | c2dfd5e4e24a70fbfa02678fde4cfc6f6750deb4 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/serializers/rest/account_serializer.rb`: Upstream added code too close to glitch-soc-specific followers-hiding code. Ported upstream changes.
Diffstat (limited to 'app/serializers/rest/account_serializer.rb')
| -rw-r--r-- | app/serializers/rest/account_serializer.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/serializers/rest/account_serializer.rb b/app/serializers/rest/account_serializer.rb index 657dd36f3..4e497cdbd 100644 --- a/app/serializers/rest/account_serializer.rb +++ b/app/serializers/rest/account_serializer.rb @@ -56,6 +56,10 @@ class REST::AccountSerializer < ActiveModel::Serializer object.moved? && object.moved_to_account.moved_to_account_id.nil? end + def last_status_at + object.last_status_at&.to_date&.iso8601 + end + def followers_count (Setting.hide_followers_count || object.user&.setting_hide_followers_count) ? -1 : object.followers_count end |