Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-05 08:59:27 +08:00
Code Packages Activity Actions 11

FIX: remove memoization on class method used in a job

Browse source
This commit is contained in:
Régis Hanol 2017-05-22 23:35:41 +02:00
parent 4e8beda332
commit 9dddb81cf6
2 changed files with 40 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lib/email/receiver.rb
View file

@ -461,17 +461,16 @@ module Email
true
end
def self.reply_by_email_address_regex
@reply_by_email_address_regex ||= begin
reply_addresses = [
SiteSetting.reply_by_email_address,
*(SiteSetting.alternative_reply_by_email_addresses.presence || "").split("|")
]
escaped_reply_addresses = reply_addresses.select(&:present?)
.map { |a| Regexp.escape(a) }
.map { |a| a.gsub(Regexp.escape("%{reply_key}"), "(\\h{32})") }
Regexp.new(escaped_reply_addresses.join("|"))
end
def self.reply_by_email_address_regex(extract_reply_key=true)
reply_addresses = [SiteSetting.reply_by_email_address]
reply_addresses << (SiteSetting.alternative_reply_by_email_addresses.presence || "").split("|")
reply_addresses.flatten!
reply_addresses.select!(&:present?)
reply_addresses.map! { |a| Regexp.escape(a) }
reply_addresses.map! { |a| a.gsub(Regexp.escape("%{reply_key}"), "(\\h{32})") }
/#{reply_addresses.join("|")}/
end
def group_incoming_emails_regex
@ -529,9 +528,7 @@ module Email
end
def post_action_for(body)
if likes.include?(body.strip.downcase)
PostActionType.types[:like]
end
PostActionType.types[:like] if likes.include?(body.strip.downcase)
end
def create_topic(options={})