diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-09-19 02:42:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-19 02:42:40 +0200 |
| commit | 81cec35dbf1b348d23363559e3f4e6b1ec3415c5 (patch) | |
| tree | d449c3c19a8147bd1bc44fc703a1fccb9b9b894d /spec/fabricators | |
| parent | c155d843f4d523d52ce4ce67491578385c06fd1b (diff) | |
Custom emoji (#4988)
* Custom emoji
- In OStatus: `<link rel="emoji" name="coolcat" href="http://..." />`
- In ActivityPub: `{ type: "Emoji", name: ":coolcat:", href: "http://..." }`
- In REST API: Status object includes `emojis` array (`shortcode`, `url`)
- Domain blocks with reject media stop emojis
- Emoji file up to 50KB
- Web UI handles custom emojis
- Static pages render custom emojis as `<img />` tags
Side effects:
- Undo #4500 optimization, as I needed to modify it to restore
shortcode handling in emojify()
- Formatter#plaintext should now make sure stripped out line-breaks
and paragraphs are replaced with newlines
* Fix emoji at the start not being converted
Diffstat (limited to 'spec/fabricators')
| -rw-r--r-- | spec/fabricators/custom_emoji_fabricator.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/spec/fabricators/custom_emoji_fabricator.rb b/spec/fabricators/custom_emoji_fabricator.rb new file mode 100644 index 00000000000..18a7d23dc49 --- /dev/null +++ b/spec/fabricators/custom_emoji_fabricator.rb @@ -0,0 +1,5 @@ +Fabricator(:custom_emoji) do + shortcode 'coolcat' + domain nil + image { File.open(Rails.root.join('spec', 'fixtures', 'files', 'emojo.png')) } +end |