mastofe

commit: 3ba6531611458dfe6c6538c27eec394e92d0fd75
parent: 50638174c89a1a953359781e7c0749aed0ef7b2d
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Mon, 28 Nov 2016 19:24:49 +0100

Fix setting of confirmed=true on successful confirmation

Diffstat:
M
app/controllers/admin/pubsubhubbub_controller.rb
2
+-
M
app/workers/pubsubhubbub/confirmation_worker.rb
1
+

2 files changed, 2 insertions(+), 1 deletion(-)
diff --git 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
@@ -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)