Browse Source

Fix setting of confirmed=true on successful confirmation

closed-social-glitch-2
Eugen Rochko 7 years ago
parent
commit
3ba6531611
2 changed files with 2 additions and 1 deletions
  1. +1
    -1
      app/controllers/admin/pubsubhubbub_controller.rb
  2. +1
    -0
      app/workers/pubsubhubbub/confirmation_worker.rb

+ 1
- 1
app/controllers/admin/pubsubhubbub_controller.rb View File

@ -6,6 +6,6 @@ class Admin::PubsubhubbubController < ApplicationController
layout 'public'
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

+ 1
- 0
app/workers/pubsubhubbub/confirmation_worker.rb View File

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

Loading…
Cancel
Save