-
- Téléchargements
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
parent
c155d843
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Affichage de
- app/javascript/mastodon/emoji.js 40 ajouts, 20 suppressionsapp/javascript/mastodon/emoji.js
- app/javascript/mastodon/reducers/statuses.js 7 ajouts, 2 suppressionsapp/javascript/mastodon/reducers/statuses.js
- app/lib/activitypub/activity/create.rb 13 ajouts, 0 suppressionapp/lib/activitypub/activity/create.rb
- app/lib/formatter.rb 51 ajouts, 3 suppressionsapp/lib/formatter.rb
- app/lib/ostatus/activity/creation.rb 20 ajouts, 0 suppressionapp/lib/ostatus/activity/creation.rb
- app/lib/ostatus/atom_serializer.rb 4 ajouts, 0 suppressionapp/lib/ostatus/atom_serializer.rb
- app/models/custom_emoji.rb 38 ajouts, 0 suppressionapp/models/custom_emoji.rb
- app/models/status.rb 4 ajouts, 0 suppressionapp/models/status.rb
- app/serializers/activitypub/note_serializer.rb 19 ajouts, 1 suppressionapp/serializers/activitypub/note_serializer.rb
- app/serializers/rest/status_serializer.rb 11 ajouts, 0 suppressionapp/serializers/rest/status_serializer.rb
- app/views/stream_entries/_detailed_status.html.haml 1 ajout, 1 suppressionapp/views/stream_entries/_detailed_status.html.haml
- app/views/stream_entries/_simple_status.html.haml 1 ajout, 1 suppressionapp/views/stream_entries/_simple_status.html.haml
- db/migrate/20170917153509_create_custom_emojis.rb 13 ajouts, 0 suppressiondb/migrate/20170917153509_create_custom_emojis.rb
- db/schema.rb 13 ajouts, 1 suppressiondb/schema.rb
- spec/fabricators/custom_emoji_fabricator.rb 5 ajouts, 0 suppressionspec/fabricators/custom_emoji_fabricator.rb
- spec/fixtures/files/emojo.png 0 ajout, 0 suppressionspec/fixtures/files/emojo.png
- spec/lib/activitypub/activity/create_spec.rb 25 ajouts, 0 suppressionspec/lib/activitypub/activity/create_spec.rb
- spec/lib/formatter_spec.rb 78 ajouts, 0 suppressionspec/lib/formatter_spec.rb
- spec/lib/ostatus/atom_serializer_spec.rb 14 ajouts, 2 suppressionsspec/lib/ostatus/atom_serializer_spec.rb
- spec/models/custom_emoji_spec.rb 25 ajouts, 0 suppressionspec/models/custom_emoji_spec.rb
Chargement en cours
Veuillez vous inscrire ou vous se connecter pour commenter