From 2aa30eaa28ee6731cc38b07e379559223b67b3fa Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Sun, 18 Feb 2024 14:28:50 -0600 Subject: [PATCH] simplify catch for custom domain resolv issues --- app/settings.rb | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/app/settings.rb b/app/settings.rb index e0cfa112..2a50203a 100644 --- a/app/settings.rb +++ b/app/settings.rb @@ -155,17 +155,7 @@ post '/settings/:username/custom_domain' do begin Socket.gethostbyname @site.values[:domain] rescue SocketError, ResolutionError => e - if e.message =~ /name or service not known/i - flash[:error] = 'Domain needs to be valid and already registered.' - redirect "/settings/#{@site.username}#custom_domain" - elsif e.message =~ /No address associated with hostname/i - #flash[:error] = "The domain isn't setup to use Neocities yet, cannot add. Please make the A and CNAME record changes where you registered your domain." - #redirect "/settings/#{@site.username}#custom_domain" - else - raise e - end - rescue Socket::ResolutionError - flash[:error] = 'Temporary failure in name resolution, please try again later.' + flash[:error] = "The domain isn't setup to use Neocities yet, cannot add. Please make the A and CNAME record changes where you registered your domain." redirect "/settings/#{@site.username}#custom_domain" end