diff --git a/lib/diaspora_federation.rb b/lib/diaspora_federation.rb index a63b718..781ecbb 100644 --- a/lib/diaspora_federation.rb +++ b/lib/diaspora_federation.rb @@ -53,7 +53,7 @@ module DiasporaFederation # nickname: "user", # full_name: "User Name", # url: "https://server.example/", - # photo_full_url: "https://server.example/uploads/f.jpg", + # photo_large_url: "https://server.example/uploads/f.jpg", # photo_medium_url: "https://server.example/uploads/m.jpg", # photo_small_url: "https://server.example/uploads/s.jpg", # pubkey: "-----BEGIN PUBLIC KEY-----\nABCDEF==\n-----END PUBLIC KEY-----", diff --git a/lib/diaspora_federation/web_finger/h_card.rb b/lib/diaspora_federation/web_finger/h_card.rb index c66d16a..153464b 100644 --- a/lib/diaspora_federation/web_finger/h_card.rb +++ b/lib/diaspora_federation/web_finger/h_card.rb @@ -20,7 +20,7 @@ module DiasporaFederation # nickname: "user", # full_name: "User Name", # url: "https://server.example/", - # photo_full_url: "https://server.example/uploads/f.jpg", + # photo_large_url: "https://server.example/uploads/l.jpg", # photo_medium_url: "https://server.example/uploads/m.jpg", # photo_small_url: "https://server.example/uploads/s.jpg", # pubkey: "-----BEGIN PUBLIC KEY-----\nABCDEF==\n-----END PUBLIC KEY-----", @@ -71,7 +71,7 @@ module DiasporaFederation attr_reader :pubkey # @return [String] url to the big avatar (300x300) - attr_reader :photo_full_url + attr_reader :photo_large_url # @return [String] url to the medium avatar (100x100) attr_reader :photo_medium_url # @return [String] url to the small avatar (50x50) @@ -158,7 +158,7 @@ module DiasporaFederation @nickname = data[:nickname] @full_name = data[:full_name] @url = data[:url] - @photo_full_url = data[:photo_full_url] + @photo_large_url = data[:photo_large_url] @photo_medium_url = data[:photo_medium_url] @photo_small_url = data[:photo_small_url] @pubkey = data[:pubkey] @@ -185,7 +185,7 @@ module DiasporaFederation @nickname = content_from_doc(doc, :nickname) @full_name = content_from_doc(doc, :fn) @url = element_from_doc(doc, :url)["href"] - @photo_full_url = photo_from_doc(doc, :photo) + @photo_large_url = photo_from_doc(doc, :photo) @photo_medium_url = photo_from_doc(doc, :photo_medium) @photo_small_url = photo_from_doc(doc, :photo_small) @pubkey = content_from_doc(doc, :key) unless element_from_doc(doc, :key).nil? @@ -259,7 +259,7 @@ module DiasporaFederation # @see HCard#add_property def add_photos(container) add_property(container, :photo) do |html| - html.img(class: "photo avatar", width: "300", height: "300", src: @photo_full_url.to_s) + html.img(class: "photo avatar", width: "300", height: "300", src: @photo_large_url.to_s) end add_property(container, :photo_medium) do |html| @@ -278,7 +278,7 @@ module DiasporaFederation data.instance_of?(Hash) && %i( guid nickname full_name url - photo_full_url photo_medium_url photo_small_url + photo_large_url photo_medium_url photo_small_url pubkey searchable first_name last_name ).all? {|k| data.key? k } end diff --git a/spec/lib/diaspora_federation/web_finger/h_card_spec.rb b/spec/lib/diaspora_federation/web_finger/h_card_spec.rb index cabcde4..d03aa6f 100644 --- a/spec/lib/diaspora_federation/web_finger/h_card_spec.rb +++ b/spec/lib/diaspora_federation/web_finger/h_card_spec.rb @@ -110,7 +110,7 @@ HTML nickname: nickname, full_name: name, url: url, - photo_full_url: photo_url, + photo_large_url: photo_url, photo_medium_url: photo_url_m, photo_small_url: photo_url_s, pubkey: key, @@ -146,7 +146,7 @@ HTML expect(hcard.nickname).to eq(nickname) expect(hcard.full_name).to eq(name) expect(hcard.url).to eq(url) - expect(hcard.photo_full_url).to eq(photo_url) + expect(hcard.photo_large_url).to eq(photo_url) expect(hcard.photo_medium_url).to eq(photo_url_m) expect(hcard.photo_small_url).to eq(photo_url_s) expect(hcard.pubkey).to eq(key) @@ -235,7 +235,7 @@ HTML hcard = WebFinger::HCard.from_html(historic_html) expect(hcard.url).to eq(url) - expect(hcard.photo_full_url).to eq(photo_url) + expect(hcard.photo_large_url).to eq(photo_url) expect(hcard.photo_medium_url).to eq(photo_url_m) expect(hcard.photo_small_url).to eq(photo_url_s) expect(hcard.searchable).to eq(searchable) diff --git a/test/dummy/app/models/person.rb b/test/dummy/app/models/person.rb index ecd792c..048eaf2 100644 --- a/test/dummy/app/models/person.rb +++ b/test/dummy/app/models/person.rb @@ -21,7 +21,7 @@ class Person < ActiveRecord::Base nickname: diaspora_handle.split("@")[0], full_name: "Dummy User", url: url, - photo_full_url: "#{url}assets/user/default.png", + photo_large_url: "#{url}assets/user/default.png", photo_medium_url: "#{url}assets/user/default.png", photo_small_url: "#{url}assets/user/default.png", pubkey: serialized_public_key,