diff options
| author | multiple creatures <dev@multiple-creature.party> | 2019-07-24 13:01:12 -0500 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2019-07-24 13:01:12 -0500 |
| commit | 25d628fca314aebb25e3976f006cc96629a3d780 (patch) | |
| tree | bb4304947f7727264038b90b0e48a9783a1f30ff /app/serializers | |
| parent | d83fcfd1f15a97bfb5c6f36a82d7253175518daf (diff) | |
revert the current unfinished chat implementation
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/activitypub/actor_serializer.rb | 4 | ||||
| -rw-r--r-- | app/serializers/rest/account_serializer.rb | 2 | ||||
| -rw-r--r-- | app/serializers/rest/status_serializer.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/serializers/activitypub/actor_serializer.rb b/app/serializers/activitypub/actor_serializer.rb index 85d2482db..5ca962291 100644 --- a/app/serializers/activitypub/actor_serializer.rb +++ b/app/serializers/activitypub/actor_serializer.rb @@ -7,14 +7,14 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer context_extensions :manually_approves_followers, :featured, :also_known_as, :moved_to, :property_value, :hashtag, :emoji, :identity_proof, - :adult_content, :gently, :kobold, :supports_chat, :froze + :adult_content, :gently, :kobold, :froze attributes :id, :type, :following, :followers, :inbox, :outbox, :featured, :preferred_username, :name, :summary, :url, :manually_approves_followers, :gently, :kobold, :adult_content, - :supports_chat, :froze + :froze has_one :public_key, serializer: ActivityPub::PublicKeySerializer diff --git a/app/serializers/rest/account_serializer.rb b/app/serializers/rest/account_serializer.rb index bd98989e2..30fe4897f 100644 --- a/app/serializers/rest/account_serializer.rb +++ b/app/serializers/rest/account_serializer.rb @@ -6,7 +6,7 @@ class REST::AccountSerializer < ActiveModel::Serializer attributes :id, :username, :acct, :display_name, :locked, :bot, :created_at, :note, :url, :avatar, :avatar_static, :header, :header_static, :followers_count, :following_count, :statuses_count, :replies, - :adult_content, :supports_chat, :gently, :kobold, :role, :froze + :adult_content, :gently, :kobold, :role, :froze has_one :moved_to_account, key: :moved, serializer: REST::AccountSerializer, if: :moved_and_not_nested? has_many :emojis, serializer: REST::CustomEmojiSerializer diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb index 284e634df..58ee81d1a 100644 --- a/app/serializers/rest/status_serializer.rb +++ b/app/serializers/rest/status_serializer.rb @@ -58,7 +58,7 @@ class REST::StatusSerializer < ActiveModel::Serializer def visibility if object.limited_visibility? 'private' - elsif object.local_visibility? || object.chat_visibility? + elsif object.local_visibility? 'unlisted' else object.visibility |