luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-25 16:24:00 +00:00
Code Issues Projects Releases Wiki Activity

Fix setting of confirmed=true on successful confirmation

Browse source
This commit is contained in:
Eugen Rochko 2016-11-28 19:24:49 +01:00
parent 50638174c8
commit 3ba6531611
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/admin/pubsubhubbub_controller.rb
View file

@ -6,6 +6,6 @@ class Admin::PubsubhubbubController < ApplicationController
layout 'public' layout 'public'
def index def index
@subscriptions = Subscription.includes(:account).paginate(page: params[:page], per_page: 40) @subscriptions = Subscription.order('id desc').includes(:account).paginate(page: params[:page], per_page: 40)
end end
end end

1
app/workers/pubsubhubbub/confirmation_worker.rb
View file

@ -10,6 +10,7 @@ class Pubsubhubbub::ConfirmationWorker
subscription.secret = secret subscription.secret = secret
subscription.lease_seconds = lease_seconds subscription.lease_seconds = lease_seconds
subscription.confirmed = true
response = HTTP.headers(user_agent: 'Mastodon/PubSubHubbub') response = HTTP.headers(user_agent: 'Mastodon/PubSubHubbub')
.timeout(:per_operation, write: 20, connect: 20, read: 50) .timeout(:per_operation, write: 20, connect: 20, read: 50)