tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tootsuite/master at 3023725936

Browse Source
This commit is contained in:
Surinna Curtis
2017-11-16 01:21:16 -06:00
parent 3023725936 88627fd7aa
commit 35fbdc36f9
230 changed files with 8548 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/serializers/initial_state_serializer.rb
View File

@ -53,6 +53,6 @@ class InitialStateSerializer < ActiveModel::Serializer
end
def media_attachments
{ accept_content_types: MediaAttachment::IMAGE_FILE_EXTENSIONS + MediaAttachment::VIDEO_FILE_EXTENSIONS + MediaAttachment::IMAGE_MIME_TYPES + MediaAttachment::VIDEO_MIME_TYPES }
{ accept_content_types: MediaAttachment::IMAGE_FILE_EXTENSIONS + MediaAttachment::VIDEO_FILE_EXTENSIONS + MediaAttachment::AUDIO_FILE_EXTENSIONS + MediaAttachment::IMAGE_MIME_TYPES + MediaAttachment::VIDEO_MIME_TYPES + MediaAttachment::AUDIO_MIME_TYPES }
end
end

15
app/serializers/rest/mute_serializer.rb Normal file
View File

@ -0,0 +1,15 @@
# frozen_string_literal: true
class REST::MuteSerializer < ActiveModel::Serializer
include RoutingHelper
attributes :id, :account, :target_account, :created_at, :hide_notifications
def account
REST::AccountSerializer.new(object.account)
end
def target_account
REST::AccountSerializer.new(object.target_account)
end
end