aewens/tilde.news
1
0
Fork 0
forked from tildeverse/tilde.news
Code Issues Pull Requests Releases Wiki Activity

memoize Story#domain

Browse Source
This commit is contained in:
Peter Bhat Harkins 2018-04-18 17:38:18 -05:00
parent 22ed4f4663
commit 828758bb17
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/models/story.rb
View File

@ -70,6 +70,7 @@ class Story < ApplicationRecord
attr_accessor :already_posted_story, :editing_from_suggestions, :editor,
:fetching_ip, :is_hidden_by_cur_user, :is_saved_by_cur_user,
:moderation_reason, :previewing, :seen_previous, :vote
attr_reader :domain
attr_writer :fetched_content
before_validation :assign_short_id_and_upvote, :on => :create
@ -328,12 +329,6 @@ class Story < ApplicationRecord
HTMLEntities.new.decode(s.to_s)
end
def domain
if url.present? && (match = url.match(URL_RE))
match[:domain].sub(/^www\d*\./, '')
end
end
def domain_search_url
"/search?order=newest&q=domain:#{self.domain}"
end
@ -732,8 +727,11 @@ class Story < ApplicationRecord
def url=(u)
super(u) or return if u.blank?
# remove well-known port for http and https if present
if (match = u.match(URL_RE))
# set domain
@domain = match[:domain].sub(/^www\d*\./, '')
# remove well-known port for http and https if present
@url_port = match[:port]
if match[:protocol] == 'http' && match[:port] == ':80' ||
match[:protocol] == 'https' && match[:port] == ':443'