diff --git a/app.rb b/app.rb index 6eb1122d..ebd4969b 100644 --- a/app.rb +++ b/app.rb @@ -234,7 +234,8 @@ post '/admin/banhammer' do DB.transaction { FileUtils.mv site_base_path(site.username), File.join(settings.public_folder, 'banned_sites', site.username) - site.update is_banned: true + site.is_banned = true + site.save(validate: false) } flash[:success] = 'MISSION ACCOMPLISHED' diff --git a/models/site.rb b/models/site.rb index d3f3c5ed..14d8194a 100644 --- a/models/site.rb +++ b/models/site.rb @@ -77,7 +77,7 @@ class Site < Sequel::Model errors.add :over_capacity, 'We are currently at capacity, and cannot create your home page. We will fix this shortly. Please come back later and try again, our apologies.' end - if values[:username].nil? || values[:username].empty? || values[:username].match(BAD_USERNAME_REGEX) # || USERNAME_SHITLIST.include?(values[:username]) + if new? && (values[:username].nil? || values[:username].empty? || values[:username].match(BAD_USERNAME_REGEX)) # || USERNAME_SHITLIST.include?(values[:username]) errors.add :username, 'A valid username is required.' end diff --git a/views/admin.slim b/views/admin.slim index 0b2f5ad3..f5bfb637 100644 --- a/views/admin.slim +++ b/views/admin.slim @@ -16,4 +16,5 @@ .span6 h2 Banned Terrorists - @banned_sites.each do |banned_site| - = banned_site.username \ No newline at end of file + = banned_site.username + br