Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add media dimensions #2448

Merged
merged 5 commits into from Apr 26, 2017
Merged

Add media dimensions #2448

merged 5 commits into from Apr 26, 2017

Conversation

siuying
Copy link
Contributor

@siuying siuying commented Apr 25, 2017

See #1985

- add migration AddMediaAttachmentMeta, which add meta field to media_attachments
- before saving attachment, set file meta if needed
- add meta in api
@@ -23,5 +23,11 @@
it 'leaves original file as-is' do
expect(media.file_content_type).to eq 'image/gif'
end

it 'sets dimensions' do
expect(media.meta[:width]).to eq 600
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this needs to be media.file.meta

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed, sorry have not setup the test env, not got it sorted.

@Gargron Gargron merged commit 193dddb into mastodon:master Apr 26, 2017
seefood pushed a commit to Toootim/mastodon that referenced this pull request Apr 26, 2017
* Fixes mastodon#1985

- add migration AddMediaAttachmentMeta, which add meta field to media_attachments
- before saving attachment, set file meta if needed
- add meta in api

* add spec

* align the “size” format for image and video

* fix code climate

* fixes media_attachment_spec.rb
seefood pushed a commit to Toootim/mastodon that referenced this pull request Apr 28, 2017
* Fixes mastodon#1985

- add migration AddMediaAttachmentMeta, which add meta field to media_attachments
- before saving attachment, set file meta if needed
- add meta in api

* add spec

* align the “size” format for image and video

* fix code climate

* fixes media_attachment_spec.rb
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants