vbatts/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add entity cache (#7271)

Browse source 
* Add entity cache

Use a caching layer for mentions and custom emojis that are
dynamically extracted from text.

Reduce duplicate text extractions

* Fix code style issue
This commit is contained in:
Eugen Rochko 2018-04-27 01:38:10 +02:00 • committed by GitHub
parent 63553c6b5c
commit a872392cd9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 48 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/account.rb
View file

@ -391,7 +391,7 @@ class Account < ApplicationRecord
end
def emojis
CustomEmoji.from_text(note, domain)
@emojis ||= CustomEmoji.from_text(note, domain)
end
before_create :generate_keys

10
app/models/custom_emoji.rb
View file

@ -42,6 +42,8 @@ class CustomEmoji < ApplicationRecord
include Attachmentable
after_commit :remove_entity_cache
def local?
domain.nil?
end
@ -58,11 +60,17 @@ class CustomEmoji < ApplicationRecord
return [] if shortcodes.empty?
where(shortcode: shortcodes, domain: domain, disabled: false)
EntityCache.instance.emoji(shortcodes, domain)
end
def search(shortcode)
where('"custom_emojis"."shortcode" ILIKE ?', "%#{shortcode}%")
end
end
private
def remove_entity_cache
Rails.cache.delete(EntityCache.instance.to_key(:emoji, shortcode, domain))
end
end

2
app/models/status.rb
View file

@ -160,7 +160,7 @@ class Status < ApplicationRecord
end
def emojis
CustomEmoji.from_text([spoiler_text, text].join(' '), account.domain)
@emojis ||= CustomEmoji.from_text([spoiler_text, text].join(' '), account.domain)
end
after_create_commit :store_uri, if: :local?