Merge branch 'master' into custom_domain

Author: Soxasora

awards.csv

@@ -189,3 +189,4 @@ Scroogey-SN,pr,#1948,#1849,medium,urgent,,,750k,Scroogey@coinos.io,2025-03-10
 felipebueno,issue,#1947,#1945,good-first-issue,,,,2k,felipebueno@blink.sv,2025-03-10
 ed-kung,pr,#1952,#1951,easy,,,,100k,simplestacker@getalby.com,2025-03-10
 ed-kung,issue,#1952,#1951,easy,,,,10k,simplestacker@getalby.com,2025-03-10
+Scroogey-SN,pr,#1973,#1959,good-first-issue,,,,20k,Scroogey@coinos.io,???

lib/time.js

@@ -23,11 +23,11 @@ export function timeSince (timeStamp) {
 }
 
 export function datePivot (date,
-  { years = 0, months = 0, days = 0, hours = 0, minutes = 0, seconds = 0, milliseconds = 0 }) {
+  { years = 0, months = 0, weeks = 0, days = 0, hours = 0, minutes = 0, seconds = 0, milliseconds = 0 }) {
   return new Date(
     date.getFullYear() + years,
     date.getMonth() + months,
-    date.getDate() + days,
+    date.getDate() + days + weeks * 7,
     date.getHours() + hours,
     date.getMinutes() + minutes,
     date.getSeconds() + seconds,

wallets/lnbits/server.js

@@ -33,7 +33,7 @@ export async function createInvoice (
     out: false
   })
 
-  let hostname = url.replace(/^https?:\/\//, '')
+  let hostname = url.replace(/^https?:\/\//, '').replace(/\/+$/, '')
   const agent = getAgent({ hostname })
 
   if (process.env.NODE_ENV !== 'production' && hostname.startsWith('localhost:')) {