Fix setting of confirmed=true on successful confirmation

diff --git a/app/controllers/admin/pubsubhubbub_controller.rb b/app/controllers/admin/pubsubhubbub_controller.rb
index fae05bf9d6a4206f24c267588a2958b426d75126..7e6bc75ea344b45738dad8f71adf3632f58861e8 100644 (file)
--- a/app/controllers/admin/pubsubhubbub_controller.rb
+++ b/app/controllers/admin/pubsubhubbub_controller.rb
@@ -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

diff --git a/app/workers/pubsubhubbub/confirmation_worker.rb b/app/workers/pubsubhubbub/confirmation_worker.rb
index 24e1185d4f1fe8e59fe1fd66a7fbdf044890794a..b852970a9924aaeb69e1f8a9e9f533533e58bcb3 100644 (file)
--- a/app/workers/pubsubhubbub/confirmation_worker.rb
+++ b/app/workers/pubsubhubbub/confirmation_worker.rb
@@ -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)