nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use small avatar in the person json

Browse source 
closes #7376
This commit is contained in:
Steffen van Bergerem 2017-03-19 18:58:55 +01:00 committed by Benjamin Neff
parent 13a44be306
commit 4a944c5ab4
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -5,6 +5,7 @@
* Remove jQuery deprecations [#7356](https://github.com/diaspora/diaspora/pull/7356) * Remove jQuery deprecations [#7356](https://github.com/diaspora/diaspora/pull/7356)
* Use empty selector where "#" was used as a selector before (prepare jQuery 3 upgrade) [#7372](https://github.com/diaspora/diaspora/pull/7372) * Use empty selector where "#" was used as a selector before (prepare jQuery 3 upgrade) [#7372](https://github.com/diaspora/diaspora/pull/7372)
* Increase maximal height of large thumbnail on mobile [#7383](https://github.com/diaspora/diaspora/pull/7383) * Increase maximal height of large thumbnail on mobile [#7383](https://github.com/diaspora/diaspora/pull/7383)
* Reduce conversation recipient size [#7376](https://github.com/diaspora/diaspora/pull/7376)
## Bug fixes ## Bug fixes
* Don't hide posts when blocking someone from the profile [#7379](https://github.com/diaspora/diaspora/pull/7379) * Don't hide posts when blocking someone from the profile [#7379](https://github.com/diaspora/diaspora/pull/7379)

12
app/models/person.rb
View file

@ -271,12 +271,12 @@ class Person < ActiveRecord::Base
def as_json( opts = {} ) def as_json( opts = {} )
opts ||= {} opts ||= {}
json = { json = {
:id => self.id, id: id,
:guid => self.guid, guid: guid,
:name => self.name, name: name,
:avatar => self.profile.image_url(:thumb_medium), avatar: profile.image_url(:thumb_small),
:handle => self.diaspora_handle, handle: diaspora_handle,
:url => Rails.application.routes.url_helpers.person_path(self), url: Rails.application.routes.url_helpers.person_path(self)
} }
json.merge!(:tags => self.profile.tags.map{|t| "##{t.name}"}) if opts[:includes] == "tags" json.merge!(:tags => self.profile.tags.map{|t| "##{t.name}"}) if opts[:includes] == "tags"
json json