b1be9415ef
Revert "Merge branch 'revert-a26d5e6b' into 'develop'"
...
This reverts commit d31bbb1cfe340ab3cb90
2018-10-05 20:49:34 +00:00
a3cffd3566
formatter: Stop using phoenix HTML and format it ourselves
...
* Pheonix has an extra scheme whitelist conflicting with ours
* Pheonix doesn’t seems to do URL encoding, just HTML encoding
Closes: https://git.pleroma.social/pleroma/pleroma/issues/307
2018-09-28 17:32:27 +02:00
ac486fc59b
everywhere: use Pleroma.HTML module instead of HtmlSanitizeEx directly
2018-09-10 00:14:47 +00:00
7ca2a2ddea
Merge branch 'nil-bio-emojis' into 'develop'
...
add nil clause for Formatter.get_emoji/1 to return an empty result
Closes #274
See merge request pleroma/pleroma!315
2018-09-03 05:54:11 +00:00
4257f784bc
sloop around get_emoji/1 to check is_binary and have a fallthrough
...
default that returns empty
2018-09-02 20:44:37 -03:00
834515fb51
formatter: don't add XSS emoji
2018-09-02 00:04:09 +00:00
a9c0f395cb
add nil clause for Formatter.get_emoji/1 to return an empty result
2018-08-31 14:29:23 -03:00
58539e1357
Revert "Merge branch 'feature/rich-text' into 'develop'"
...
This reverts merge request !309
2018-08-31 09:51:20 +00:00
6aa65b68b8
common api: add support for formatting messages outside of twitter-style plain text
2018-08-31 03:13:59 +00:00
3e10d13909
formatter: adjust regexp captures to match local users with single character nicknames ( closes #163 )
2018-08-24 18:22:47 +00:00
183ccd1812
Merge branch 'dev-lanodan-url-regex' into 'develop'
...
lib/pleroma/formatter.ex: Fix URL regex
Closes #127
See merge request pleroma/pleroma!69
2018-08-16 15:41:16 +00:00
0ee29994a5
formatter: preserve case of hashtags
...
when generating hashtag links, we used the casefolded version that we use in
the link URLs, instead of the original version.
accordingly, adjust the formatter to use the original text for the links, while
keeping the casefolded version for the URLs.
2018-08-05 00:37:38 +00:00
d5091c3175
Allow additionnal schemes in the config
2018-08-01 02:52:42 +02:00
3623504e5d
[Pleroma.Formatter]: Add support for non-HTTP schemes in URIs
...
The call to the regex in add_links is there just to be sure it’s a legal URI, it can be removed if you want to get more performance.
The URI Schemes list is sorted, but with http(s) at the start (in case it might make it faster for common links).
Closes: https://git.pleroma.social/pleroma/pleroma/issues/127
2018-07-30 22:01:48 +02:00
748fff6544
Fix auto-shortcode emoji
...
Emoji were broken due to `Pleroma.Formatter` not knowing about the
auto-shortcode emoji. This moves that logic from
`Pleroma.Web.TwitterAPI.UtilController` to `Pleroma.Formatter`.
Additionally, it's now possible to specify multiple shortcode globs, and
the default globs were changed to `["/emoji/custom/**/*.png"]`, since
that's in the .gitignore and the files there would have to be shortcode
emoji anyway.
2018-06-30 21:31:08 -04:00
d7eb2e1b65
run mix format
2018-05-27 13:06:38 +00:00
a8df7fc690
formatter: use class='mention' on links to user profiles
...
helps mastodon frontend and apps have better context:
https://mastodon.social/users/Gargron/statuses/100101267352899379
2018-05-27 12:56:24 +00:00
6f39ecc41b
Support Undo like activities ( Fix #139 )
2018-05-19 22:14:15 +02:00
df95118c81
Fix linking problem.
2018-05-19 11:27:14 +02:00
0574df273c
Small cleanup.
2018-04-22 10:01:10 +02:00
0c221943ef
Formatter: Use proper escaping for links.
2018-04-21 18:27:31 +02:00
60f92e406c
Accept port number in urls.
2018-04-06 16:35:54 +02:00
81600c94f4
Handle + in links.
2018-04-04 11:29:03 +02:00
806550c921
Use user url in mention if we have it.
2018-04-03 18:32:46 +02:00
4afbef39f4
Format the code.
2018-03-30 15:01:53 +02:00
df8fc72491
Don't go through all available emoji.
...
object carry their emoji information.
2018-03-28 09:56:32 +02:00
61692c7efa
Include the '#' symbol into the link itself
2018-03-27 02:00:04 -04:00
eb7ce61ca5
Fix hashtags.
2018-03-24 11:03:10 +01:00
fbe9aa3506
Strip html from emoji stuff.
2018-03-23 19:52:08 +01:00
ab8b9ababa
Split emoji to default and custom.
2018-01-31 16:29:22 +02:00
35ac549a99
Merge branch 'media-proxy' into 'develop'
...
Media proxy
See merge request pleroma/pleroma!34
2017-12-20 14:22:24 +00:00
f1f79c0dca
Fix timelines in subway tooter.
2017-12-19 16:15:07 +01:00
47887ac848
MastoAPI: Fix always-sensitive bugs.
2017-12-18 16:56:03 +01:00
f909aec050
proxy emojis
...
(i fix emojos better than gargon but sshhhhh)
2017-12-12 12:30:24 +01:00
a3e68f0233
Allow parentheses in links.
2017-12-07 21:38:31 +02:00
bf91e5659f
Fix HTML escape breaking some links.
2017-12-07 21:36:06 +02:00
f53cdabcdf
Add #nsfw tag if sensitive content bit is set
2017-11-18 16:30:18 +02:00
be67db5547
Merge branch 'mastodon-emoji-endpoint' into 'develop'
...
Add mastodon API endpoint for custom emoji.
See merge request pleroma/pleroma!8
2017-11-07 20:01:15 +00:00
c6210183e1
Add mastodon API endpoint for custom emoji.
2017-11-07 21:55:01 +02:00
7da978f3f5
Linkify fixes.
2017-11-07 12:06:37 +01:00
fe7804e42d
Add an API endpoint for emoji.
2017-10-19 22:51:56 +03:00
fb46d6fbc4
Prefer post-specific emoji.
2017-09-17 13:24:52 +02:00
7c82b82197
Make emoji configurable in files.
2017-09-16 16:49:46 +02:00
959e993c7d
Apply incoming custom emoji.
2017-09-16 16:40:20 +02:00
884006a9e9
Federate emoji out.
2017-09-16 16:14:23 +02:00
79aeb219d8
Small emoji refactor.
2017-09-16 15:47:45 +02:00
8004ee8ccf
Merge branch 'patch-1' into 'develop'
...
Fix finmoji title attribute.
See merge request !23
2017-08-18 05:33:42 -04:00
2ab1d915e3
Use unicode regex in mentions and links.
2017-08-14 17:56:45 +02:00
6c70980bff
Fix finmoji title attribute.
2017-07-09 11:00:02 -04:00
66b4fee80e
Add finmoji.
2017-06-19 17:51:43 +02:00
6cac8e3c8b
Downcase tags coming in through the TwAPI.
2017-06-18 19:04:46 +02:00
a9bfbcae80
Slightly better html link regex.
2017-06-18 13:29:30 +02:00
1af9c77736
Move mention parsing to Formatter module.
2017-06-14 13:58:56 +02:00
dcfd494e97
Add Formatter.
2017-05-17 18:00:09 +02:00
William Pitcock
Haelwenn (lanodan) Monnier
kaniini
Thurloat
lambda
Jorty
Thog
lain
Francis Dinh
eal
href
Roger Braun
Roger Braun
lambadalambda