jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

emails: remove "Valid?" search option.

Browse Source 
No longer necessary after running previous commit because all invalid
email addresses have been purged.
This commit is contained in:
evazion
2021-01-01 22:46:46 -06:00
parent 1aabc0aae0
commit dbe2eeb00d
3 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/logical/email_validator.rb
View File

@@ -5,7 +5,6 @@ module EmailValidator
# https://www.regular-expressions.info/email.html # https://www.regular-expressions.info/email.html
EMAIL_REGEX = /\A[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}\z/ EMAIL_REGEX = /\A[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}\z/
POSTGRES_EMAIL_REGEX = "[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}"
IGNORE_DOTS = %w[gmail.com] IGNORE_DOTS = %w[gmail.com]
IGNORE_PLUS_ADDRESSING = %w[gmail.com hotmail.com outlook.com live.com] IGNORE_PLUS_ADDRESSING = %w[gmail.com hotmail.com outlook.com live.com]

11
app/models/email_address.rb
View File

@@ -45,21 +45,10 @@ class EmailAddress < ApplicationRecord
end end
end end
def self.valid(valid = true)
if valid.to_s.truthy?
where_regex(:address, EmailValidator::POSTGRES_EMAIL_REGEX.to_s)
elsif valid.to_s.falsy?
where_not_regex(:address, EmailValidator::POSTGRES_EMAIL_REGEX.to_s)
else
all
end
end
def self.search(params) def self.search(params)
q = search_attributes(params, :id, :created_at, :updated_at, :user, :address, :normalized_address, :is_verified, :is_deliverable) q = search_attributes(params, :id, :created_at, :updated_at, :user, :address, :normalized_address, :is_verified, :is_deliverable)
q = q.restricted(params[:is_restricted]) q = q.restricted(params[:is_restricted])
q = q.valid(params[:is_valid])
q = q.apply_default_order(params) q = q.apply_default_order(params)
q q

6
app/views/emails/index.html.erb
View File

@@ -7,7 +7,6 @@
<%= f.input :address_ilike, label: "Address", input_html: { value: params[:search][:address_ilike] }, hint: "Use * for wildcard" %> <%= f.input :address_ilike, label: "Address", input_html: { value: params[:search][:address_ilike] }, hint: "Use * for wildcard" %>
<%= f.input :normalized_address_ilike, label: "Normalized Address", input_html: { value: params[:search][:normalized_address_ilike] }, hint: "Use * for wildcard" %> <%= f.input :normalized_address_ilike, label: "Normalized Address", input_html: { value: params[:search][:normalized_address_ilike] }, hint: "Use * for wildcard" %>
<%= f.input :is_valid, label: "Valid?", as: :select, include_blank: true, selected: params[:search][:is_valid] %>
<%= f.input :is_verified, label: "Verified?", as: :select, include_blank: true, selected: params[:search][:is_verified] %> <%= f.input :is_verified, label: "Verified?", as: :select, include_blank: true, selected: params[:search][:is_verified] %>
<%= f.input :is_restricted, label: "Restricted?", as: :select, include_blank: true, selected: params[:search][:is_restricted] %> <%= f.input :is_restricted, label: "Restricted?", as: :select, include_blank: true, selected: params[:search][:is_restricted] %>
<%= f.submit "Search" %> <%= f.submit "Search" %>
@@ -25,11 +24,6 @@
<%= link_to email.normalized_address, emails_path(search: { normalized_address_ilike: email.normalized_address }) %> <%= link_to email.normalized_address, emails_path(search: { normalized_address_ilike: email.normalized_address }) %>
<% end %> <% end %>
<% end %> <% end %>
<% t.column "Valid?" do |email| %>
<% if !email.is_valid? %>
<%= link_to "No", emails_path(search: { is_valid: false }) %>
<% end %>
<% end %>
<% t.column "Restricted?" do |email| %> <% t.column "Restricted?" do |email| %>
<% if email.is_restricted? %> <% if email.is_restricted? %>
<%= link_to "Yes", emails_path(search: { is_restricted: true }) %> <%= link_to "Yes", emails_path(search: { is_restricted: true }) %>