From fcc9f660766732d966a18be04f535572a2a04b5a Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Mon, 24 Mar 2025 15:29:00 -0500 Subject: [PATCH] welcome/charge/confirm copy changes, send email confirmation token before welcome --- app/create.rb | 4 ++-- views/templates/email/charge_failure.erb | 7 ++++--- views/templates/email/confirm.erb | 3 +-- views/templates/email/welcome.erb | 4 +++- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/create.rb b/app/create.rb index 9788823a..d5ad17f3 100644 --- a/app/create.rb +++ b/app/create.rb @@ -141,12 +141,12 @@ post '/create' do end unless education_whitelisted? + send_confirmation_email @site + @site.send_email( subject: "[Neocities] Welcome to Neocities!", body: Tilt.new('./views/templates/email/welcome.erb', pretty: true).render(self) ) - - send_confirmation_email @site end session[:id] = @site.id diff --git a/views/templates/email/charge_failure.erb b/views/templates/email/charge_failure.erb index 1cfd91fd..fb338f6d 100644 --- a/views/templates/email/charge_failure.erb +++ b/views/templates/email/charge_failure.erb @@ -4,7 +4,8 @@ We're writing to let you know that Neocities has had an issue charging your card We will retry over the next few weeks. If we can't make a successful charge, we will automatically switch your account over to the free plan. -If you need to change the card on file, you can do so on your account settings page. If you run into any issues, please contact us at https://neocities.org/contact. +If you need to change the card on file, you can do so on your account settings page. -Regards, -- The Neocities Team +Thank you! + +The Neocities Team diff --git a/views/templates/email/confirm.erb b/views/templates/email/confirm.erb index b83b0be2..f8b0fc99 100644 --- a/views/templates/email/confirm.erb +++ b/views/templates/email/confirm.erb @@ -8,7 +8,6 @@ You can also confirm your email address using the link below: https://neocities.org/site/<%= site.username %>/confirm_email/<%= site.email_confirmation_token %> - Thank you! -- The Neocities Team +The Neocities Team \ No newline at end of file diff --git a/views/templates/email/welcome.erb b/views/templates/email/welcome.erb index d7567a9d..31bea9fb 100644 --- a/views/templates/email/welcome.erb +++ b/views/templates/email/welcome.erb @@ -6,7 +6,9 @@ Making your first (or your latest) web site is a powerful thing. Unlike traditio Since you're new, we've put together a basic "hello world" page for you. Now all you need to do is login and edit your "index.html" file, and you're on your way to being a webmaster of your own site on the World Wide Web! -If you have any questions or comments, or just want to say hi, feel free to contact us at https://neocities.org/contact. You can also reach us on Bluesky at @neocities.org. We're super busy, so we can't help you with everything, but if you have a problem or bug to report, we'll try our best to look into it. +If you have any questions or comments, or just want to say hi, feel free to contact us at https://neocities.org/contact. You can also reach us on Bluesky at @neocities.org. We're super busy, so we can't always help with everything, but if you have a problem with the site or a bug to report, we'll try our best to look into it. + +Neocities doesn't have investors, doesn't put ads on your site, and doesn't sell your data to marketing companies. Instead, all of our funding comes directly from Neocities users just like you. If you would like to help withs our mission to save the creative web from the smoldering tire fire that is modern social media, please consider becoming a supporter. You can do so at any time at https://neocities.org/supporter From Penelope (the Neocities cat), the Neocities Team, and on behalf of all our sites, our very best wishes for you (and your awesome web site). We can't wait to see what it looks like!