FIX: httpshttps ultra secure URLs

lib/pretty_text.rb

@@ -37,18 +37,11 @@ module PrettyText
       UrlHelper.schemaless UrlHelper.absolute avatar_template
     end
 
-    def mention_lookup(username)
-      return false unless username
-      if Group.exec_sql('SELECT 1 FROM groups WHERE name = ?', username).values.length == 1
-        "group"
-      else
-        username = username.downcase
-        if User.exec_sql('SELECT 1 FROM users WHERE username_lower = ?', username).values.length == 1
-          "user"
-        else
-          nil
-        end
-      end
+    def mention_lookup(name)
+      return false   if name.blank?
+      return "group" if Group.where(name: name).exists?
+      return "user"  if User.where(username_lower: name.downcase).exists?
+      nil
     end
 
     def category_hashtag_lookup(category_slug)
@@ -306,12 +299,7 @@ JS
   def self.add_s3_cdn(doc)
     doc.css("img").each do |img|
       next unless img["src"]
-      if img["src"].include? Discourse.store.absolute_base_url
-        src = img["src"].sub(Discourse.store.absolute_base_url, SiteSetting.s3_cdn_url)
-        # absolute is // style so we may have added an extra https:// here
-        src = src.sub(/https?:h/, "h")
-        img["src"] = src
-      end
+      img["src"] = Discourse.store.cdn_url(img["src"])
     end
   end