Merge branch 'feature/digest-email' into 'develop'
Feature/digest email See merge request pleroma/pleroma!1078
This commit is contained in:
commit
29807ef6a5
33 changed files with 658 additions and 17 deletions
20
priv/repo/migrations/20190412052952_add_user_info_fields.exs
Normal file
20
priv/repo/migrations/20190412052952_add_user_info_fields.exs
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
defmodule Pleroma.Repo.Migrations.AddEmailNotificationsToUserInfo do
|
||||
use Ecto.Migration
|
||||
|
||||
def up do
|
||||
execute("
|
||||
UPDATE users
|
||||
SET info = info || '{
|
||||
\"email_notifications\": {
|
||||
\"digest\": false
|
||||
}
|
||||
}'")
|
||||
end
|
||||
|
||||
def down do
|
||||
execute("
|
||||
UPDATE users
|
||||
SET info = info - 'email_notifications'
|
||||
")
|
||||
end
|
||||
end
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
defmodule Pleroma.Repo.Migrations.AddSigninAndLastDigestDatesToUser do
|
||||
use Ecto.Migration
|
||||
|
||||
def change do
|
||||
alter table(:users) do
|
||||
add(:last_digest_emailed_at, :naive_datetime, default: fragment("now()"))
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -68,3 +68,5 @@ config :pleroma, Pleroma.Uploaders.Local, uploads: "<%= uploads_dir %>"
|
|||
# For using third-party S3 clones like wasabi, also do:
|
||||
# config :ex_aws, :s3,
|
||||
# host: "s3.wasabisys.com"
|
||||
|
||||
config :joken, default_signer: "<%= jwt_secret %>"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue