Merge branch 'master' into live

app/controllers/contributions/donations_controller.rb

@@ -84,26 +84,21 @@ class Contributions::DonationsController < ApplicationController
       @donation.paid_at = DateTime.now
       @donation.payment_status = "settled"
       @donation.save!
-      msg = { success: "Thank you!" }
+      flash_message = { success: "Thank you!" }
     when "Processing"
       unless @donation.processing?
         @donation.payment_status = "processing"
         @donation.save!
-        msg = { success: "Thank you! We will send you an email when the payment is confirmed." }
+        flash_message = { success: "Thank you! We will send you an email when the payment is confirmed." }
         BtcpayCheckDonationJob.set(wait: 20.seconds).perform_later(@donation)
       end
     when "Expired"
-      if invoice["additionalStatus"] &&
-         invoice["additionalStatus"] == "PaidLate"
-        # TODO introduce state machine
-        mark_as_paid(donation)
-      end
-      msg = { warning: "The payment request for this donation has expired" }
+      flash_message = { warning: "The payment request for this donation has expired" }
     else
-      msg = { warning: "Could not determine status of payment" }
+      flash_message = { warning: "Could not determine status of payment" }
     end
 
-    redirect_to contributions_donations_url, flash: msg
+    redirect_to contributions_donations_url, flash: flash_message
   end
 
   private

app/jobs/btcpay_check_donation_job.rb

@@ -9,29 +9,20 @@ class BtcpayCheckDonationJob < ApplicationJob
     )
 
     case invoice["status"]
+    when "Settled"
+      donation.paid_at = DateTime.now
+      donation.payment_status = "settled"
+      donation.save!
+
+      NotificationMailer.with(user: donation.user)
+                        .bitcoin_donation_confirmed
+                        .deliver_later
     when "Processing"
       re_enqueue_job(donation)
-    when "Settled"
-      mark_as_paid(donation)
-    when "Expired"
-      if invoice["additionalStatus"] &&
-         invoice["additionalStatus"] == "PaidLate"
-        mark_as_paid(donation)
-      end
     end
   end
 
   def re_enqueue_job(donation)
     self.class.set(wait: 20.seconds).perform_later(donation)
   end
-
-  def mark_as_paid(donation)
-    donation.paid_at = DateTime.now
-    donation.payment_status = "settled"
-    donation.save!
-
-    NotificationMailer.with(user: donation.user)
-                      .bitcoin_donation_confirmed
-                      .deliver_later
-  end
 end

app/views/admin/users/show.html.erb

@@ -239,7 +239,9 @@
             ) %>
           </td>
           <td class="text-right">
+            <% if @user.nostr_pubkey.present? %>
             <%= link_to "Open profile", "https://njump.me/#{@user.nostr_pubkey_bech32}", class: "btn-sm btn-gray" %>
+            <% end %>
           </td>
         </tr>
         <% end %>

config/sidekiq.yml

@@ -1,4 +1,6 @@
 :concurrency: 2
+production:
+  :concurrency: 10
 :queues:
   - default
   - mailers