]> cat aescling's git repositories - mastodon.git/commit
Set correct attachment type for rejected media (#2599)
authorPatrick Figel <patrick@figel.email>
Fri, 28 Apr 2017 22:18:32 +0000 (00:18 +0200)
committerEugen Rochko <eugen@zeonfederated.com>
Fri, 28 Apr 2017 22:18:32 +0000 (00:18 +0200)
commit8ac7fca5d06b776cc09127f9c6a9018e9acade5b
treeadb3c38b5908c6fc26014da208ef391ff97fdf66
parenta823509b99eb428b1f68ed89594b88f48546253a
Set correct attachment type for rejected media (#2599)

In #2110, a new attachment type "unknown" was introduced for
attachments that were rejected due to a domain being blocked using
reject_media. However, the "type" field was never set to "unknown"
because a default value of "0" (image) is set for that column,
causing the `type.blank?` expression to always equal false.

This version uses type_changed? instead, causing the type to be set
to "unknown" unless a type has been explicitly set. This introduces
a small change in behaviour causing the type to be set to unknown
before paperclip calls `before_post_process`. Presumably this
behaviour is more appropriate than the current one because the
attachment type has not been determined by that point.

Included are new tests for `ProcessFeedService` and
`UpdateRemoteProfileService` which now check that remote media is
downloaded for non-blocked domains and is rejected for others.
app/models/media_attachment.rb
spec/services/process_feed_service_spec.rb
spec/services/update_remote_profile_service_spec.rb