From 73ecec099d52cf798aaf408d4e67430e6c53fa6b Mon Sep 17 00:00:00 2001 From: Binyamin Yawitz <316103+byawitz@users.noreply.github.com> Date: Fri, 2 Aug 2024 08:59:47 -0400 Subject: [PATCH 1/4] feat: adding team email and changing base to noreplay --- .env | 3 ++- app/config/variables.php | 13 +++++++++++-- src/Appwrite/Platform/Tasks/Specs.php | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.env b/.env index 9cccf5ee7e..ee93723c17 100644 --- a/.env +++ b/.env @@ -9,7 +9,8 @@ _APP_CONSOLE_WHITELIST_IPS= _APP_CONSOLE_COUNTRIES_DENYLIST=AQ _APP_CONSOLE_HOSTNAMES=localhost,appwrite.io,*.appwrite.io _APP_SYSTEM_EMAIL_NAME=Appwrite -_APP_SYSTEM_EMAIL_ADDRESS=team@appwrite.io +_APP_SYSTEM_EMAIL_ADDRESS=noreplay@appwrite.io +_APP_SYSTEM_TEAM_EMAIL=teams@appwrite.io _APP_EMAIL_SECURITY=security@appwrite.io _APP_EMAIL_CERTIFICATES=certificates@appwrite.io _APP_SYSTEM_RESPONSE_FORMAT= diff --git a/app/config/variables.php b/app/config/variables.php index b986ce4247..03d99d3ec2 100644 --- a/app/config/variables.php +++ b/app/config/variables.php @@ -144,9 +144,18 @@ return [ ], [ 'name' => '_APP_SYSTEM_EMAIL_ADDRESS', - 'description' => 'This is the sender email address that will appear on email messages sent to developers from the Appwrite console. The default value is \'team@appwrite.io\'. You should choose an email address that is allowed to be used from your SMTP server to avoid the server email ending in the users\' SPAM folders.', + 'description' => 'This is the sender email address that will appear on email messages sent to developers from the Appwrite console. The default value is \'noreplay@appwrite.io\'. You should choose an email address that is allowed to be used from your SMTP server to avoid the server email ending in the users\' SPAM folders.', 'introduction' => '0.7.0', - 'default' => 'team@appwrite.io', + 'default' => 'noreplay@appwrite.io', + 'required' => false, + 'question' => '', + 'filter' => '' + ], + [ + 'name' => '_APP_SYSTEM_TEAM_EMAIL', + 'description' => 'This is the sender email address that will appear in the generated specs. The default value is \'teams@appwrite.io\'.', + 'introduction' => '1.6.0', + 'default' => 'temas@appwrite.io', 'required' => false, 'question' => '', 'filter' => '' diff --git a/src/Appwrite/Platform/Tasks/Specs.php b/src/Appwrite/Platform/Tasks/Specs.php index 114e12ac85..c90d4dabd3 100644 --- a/src/Appwrite/Platform/Tasks/Specs.php +++ b/src/Appwrite/Platform/Tasks/Specs.php @@ -259,7 +259,7 @@ class Specs extends Action $specs = new Specification($formatInstance); $endpoint = System::getEnv('_APP_HOME', '[HOSTNAME]'); - $email = System::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM); + $email = System::getEnv('_APP_SYSTEM_TEAM_EMAIL', APP_EMAIL_TEAM); $formatInstance ->setParam('name', APP_NAME) From e12e28c1f198ce6ee2428690c74daa1c532d881f Mon Sep 17 00:00:00 2001 From: Binyamin Yawitz <316103+byawitz@users.noreply.github.com> Date: Mon, 5 Aug 2024 15:46:12 -0400 Subject: [PATCH 2/4] typo Co-authored-by: Steven Nguyen <1477010+stnguyen90@users.noreply.github.com> --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index ee93723c17..e0a1ce9bd8 100644 --- a/.env +++ b/.env @@ -9,7 +9,7 @@ _APP_CONSOLE_WHITELIST_IPS= _APP_CONSOLE_COUNTRIES_DENYLIST=AQ _APP_CONSOLE_HOSTNAMES=localhost,appwrite.io,*.appwrite.io _APP_SYSTEM_EMAIL_NAME=Appwrite -_APP_SYSTEM_EMAIL_ADDRESS=noreplay@appwrite.io +_APP_SYSTEM_EMAIL_ADDRESS=noreply@appwrite.io _APP_SYSTEM_TEAM_EMAIL=teams@appwrite.io _APP_EMAIL_SECURITY=security@appwrite.io _APP_EMAIL_CERTIFICATES=certificates@appwrite.io From 18a519f32da00c8462c47d4ea350bbf307b663bf Mon Sep 17 00:00:00 2001 From: Binyamin Yawitz <316103+byawitz@users.noreply.github.com> Date: Mon, 5 Aug 2024 15:46:23 -0400 Subject: [PATCH 3/4] typo Co-authored-by: Steven Nguyen <1477010+stnguyen90@users.noreply.github.com> --- app/config/variables.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/variables.php b/app/config/variables.php index 03d99d3ec2..7d3161107c 100644 --- a/app/config/variables.php +++ b/app/config/variables.php @@ -146,7 +146,7 @@ return [ 'name' => '_APP_SYSTEM_EMAIL_ADDRESS', 'description' => 'This is the sender email address that will appear on email messages sent to developers from the Appwrite console. The default value is \'noreplay@appwrite.io\'. You should choose an email address that is allowed to be used from your SMTP server to avoid the server email ending in the users\' SPAM folders.', 'introduction' => '0.7.0', - 'default' => 'noreplay@appwrite.io', + 'default' => 'noreply@appwrite.io', 'required' => false, 'question' => '', 'filter' => '' From c0770621cf482e467d46d73498d0fe3e852723ff Mon Sep 17 00:00:00 2001 From: Binyamin Yawitz <316103+byawitz@users.noreply.github.com> Date: Mon, 12 Aug 2024 07:36:15 -0400 Subject: [PATCH 4/4] fix: reviews --- .env | 2 +- app/config/variables.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.env b/.env index e0a1ce9bd8..b4341ba2ca 100644 --- a/.env +++ b/.env @@ -10,7 +10,7 @@ _APP_CONSOLE_COUNTRIES_DENYLIST=AQ _APP_CONSOLE_HOSTNAMES=localhost,appwrite.io,*.appwrite.io _APP_SYSTEM_EMAIL_NAME=Appwrite _APP_SYSTEM_EMAIL_ADDRESS=noreply@appwrite.io -_APP_SYSTEM_TEAM_EMAIL=teams@appwrite.io +_APP_SYSTEM_TEAM_EMAIL=team@appwrite.io _APP_EMAIL_SECURITY=security@appwrite.io _APP_EMAIL_CERTIFICATES=certificates@appwrite.io _APP_SYSTEM_RESPONSE_FORMAT= diff --git a/app/config/variables.php b/app/config/variables.php index 7d3161107c..c59af4a104 100644 --- a/app/config/variables.php +++ b/app/config/variables.php @@ -144,7 +144,7 @@ return [ ], [ 'name' => '_APP_SYSTEM_EMAIL_ADDRESS', - 'description' => 'This is the sender email address that will appear on email messages sent to developers from the Appwrite console. The default value is \'noreplay@appwrite.io\'. You should choose an email address that is allowed to be used from your SMTP server to avoid the server email ending in the users\' SPAM folders.', + 'description' => 'This is the sender email address that will appear on email messages sent to developers from the Appwrite console. The default value is \'noreply@appwrite.io\'. You should choose an email address that is allowed to be used from your SMTP server to avoid the server email ending in the users\' SPAM folders.', 'introduction' => '0.7.0', 'default' => 'noreply@appwrite.io', 'required' => false, @@ -153,9 +153,9 @@ return [ ], [ 'name' => '_APP_SYSTEM_TEAM_EMAIL', - 'description' => 'This is the sender email address that will appear in the generated specs. The default value is \'teams@appwrite.io\'.', + 'description' => 'This is the sender email address that will appear in the generated specs. The default value is \'team@appwrite.io\'.', 'introduction' => '1.6.0', - 'default' => 'temas@appwrite.io', + 'default' => 'team@appwrite.io', 'required' => false, 'question' => '', 'filter' => ''