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

rename callbacks

Browse source
This commit is contained in:
Benjamin Neff 2015-08-04 02:09:14 +02:00
parent 846483290f
commit f4066f6105
7 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -43,7 +43,7 @@ DiasporaFederation.configure do |config|
config.server_uri = AppConfig.pod_uri
config.define_callbacks do
on :person_webfinger_fetch do |diaspora_id|
on :fetch_person_for_webfinger do |diaspora_id|
person = Person.find_local_by_diaspora_id(diaspora_id)
if person
DiasporaFederation::Discovery::WebFinger.new(
@ -52,7 +52,7 @@ DiasporaFederation.configure do |config|
end
end
on :person_hcard_fetch do |guid|
on :fetch_person_for_hcard do |guid|
# ...
end
end

2
app/controllers/diaspora_federation/h_card_controller.rb
View file

@ -7,7 +7,7 @@ module DiasporaFederation
#
# GET /hcard/users/:guid
def hcard
person_hcard = DiasporaFederation.callbacks.trigger(:person_hcard_fetch, params[:guid])
person_hcard = DiasporaFederation.callbacks.trigger(:fetch_person_for_hcard, params[:guid])
if person_hcard.nil?
render nothing: true, status: 404

2
app/controllers/diaspora_federation/webfinger_controller.rb
View file

@ -54,7 +54,7 @@ module DiasporaFederation
end
def find_person_webfinger(query)
DiasporaFederation.callbacks.trigger(:person_webfinger_fetch, query.strip.downcase.sub("acct:", ""))
DiasporaFederation.callbacks.trigger(:fetch_person_for_webfinger, query.strip.downcase.sub("acct:", ""))
end
end
end

4
lib/diaspora_federation.rb
View file

@ -16,8 +16,8 @@ module DiasporaFederation
extend Logging
@callbacks = Callbacks.new %i(
person_webfinger_fetch
person_hcard_fetch
fetch_person_for_webfinger
fetch_person_for_hcard
)
class << self

4
spec/controllers/diaspora_federation/h_card_controller_spec.rb
View file

@ -24,9 +24,9 @@ module DiasporaFederation
expect(response).to be_not_found
end
it "calls the person_hcard_fetch callback" do
it "calls the fetch_person_for_hcard callback" do
expect(DiasporaFederation.callbacks).to receive(:trigger)
.with(:person_hcard_fetch, alice.guid)
.with(:fetch_person_for_hcard, alice.guid)
.and_call_original
get :hcard, "guid" => alice.guid
end

4
spec/controllers/diaspora_federation/webfinger_controller_spec.rb
View file

@ -58,9 +58,9 @@ module DiasporaFederation
expect(response).to be_not_found
end
it "calls the person_webfinger_fetch callback" do
it "calls the fetch_person_for_webfinger callback" do
expect(DiasporaFederation.callbacks).to receive(:trigger)
.with(:person_webfinger_fetch, "alice@localhost:3000")
.with(:fetch_person_for_webfinger, "alice@localhost:3000")
.and_call_original
get :legacy_webfinger, "q" => "acct:alice@localhost:3000"
end

4
test/dummy/config/initializers/diaspora_federation.rb
View file

@ -16,7 +16,7 @@ DiasporaFederation.configure do |config|
config.certificate_authorities = ca_file
config.define_callbacks do
on :person_webfinger_fetch do |diaspora_id|
on :fetch_person_for_webfinger do |diaspora_id|
person = Person.find_by(diaspora_id: diaspora_id)
if person
DiasporaFederation::Discovery::WebFinger.new(
@ -33,7 +33,7 @@ DiasporaFederation.configure do |config|
end
end
on :person_hcard_fetch do |guid|
on :fetch_person_for_hcard do |guid|
person = Person.find_by(guid: guid)
if person
DiasporaFederation::Discovery::HCard.new(