Merge branch 'master' into feature/rs-oauth

db/migrate/20230319101128_add_remember_created_at_to_users.rb

@@ -0,0 +1,6 @@
+class AddRememberCreatedAtToUsers < ActiveRecord::Migration[7.0]
+  def change
+    add_column :users, :remember_created_at, :datetime
+    add_column :users, :remember_token, :string
+  end
+end

db/migrate/20230403135149_add_preferences_to_users.rb

@@ -0,0 +1,5 @@
+class AddPreferencesToUsers < ActiveRecord::Migration[7.0]
+  def change
+    add_column :users, :preferences, :text
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2023_03_12_212030) do
+ActiveRecord::Schema[7.0].define(version: 2023_04_03_150200) do
   create_table "donations", force: :cascade do |t|
     t.integer "user_id"
     t.integer "amount_sats"
@@ -71,6 +71,10 @@ ActiveRecord::Schema[7.0].define(version: 2023_03_12_212030) do
     t.text "ln_login_ciphertext"
     t.text "ln_password_ciphertext"
     t.string "ln_account"
+    t.string "nostr_pubkey"
+    t.datetime "remember_created_at"
+    t.string "remember_token"
+    t.text "preferences"
     t.index ["email"], name: "index_users_on_email", unique: true
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
   end