kaniini
c9b418e547
Merge branch 'develop' into 'oembed_provider'
...
# Conflicts:
# lib/pleroma/activity.ex
6 years ago
rinpatch
74346a7035
Fix merge conflict
6 years ago
rinpatch
997f4a5e09
Remove custom emojis and trailing whitespaces from previews
6 years ago
Ivan Tashkinov
65bb9b2fba
[ #491 ] Made full nicknames be preserved in user links text only in Bio.
6 years ago
Ivan Tashkinov
2bfae25a1f
[ #491 ] Made user bio preserve full nicknames (nick@host).
6 years ago
William Pitcock
461ab9489d
formatter: improve microformats markup
6 years ago
rinpatch
9aa69e12b8
Add behaviours to TwitterCard, remove some dumb stuff in Formatter.truncate
6 years ago
rinpatch
e4dc3f71ae
Resolve merge conflict
6 years ago
William Pitcock
980b5288ed
update copyright years to 2019
6 years ago
William Pitcock
2791ce9a1f
add license boilerplate to pleroma core
6 years ago
Maksim
f1b93b5be7
[ #413 ] fix parse mentions
6 years ago
raeno
7fb3780431
Merge branch 'develop' into oembed_provider
6 years ago
rinpatch
059dd6f681
Ignore HTML characters in formatter.ex
6 years ago
raeno
a300336459
Merge branch 'develop' into oembed_provider
6 years ago
Maksim Pechnikov
bc6262d250
fixed typo
6 years ago
Maksim Pechnikov
baead4ea4b
fix markdown formatting
6 years ago
raeno
b5de7c4c4d
Remove oembed for now, will submit it in another MR. Fix warnings
6 years ago
raeno
8902942128
WIP. Implement oembed route and handle both json/xml for "Note" type activity
6 years ago
href
7214d57463
Extended nicknames: allow dashes.
6 years ago
href
7d9ddbe689
Allow underscores in usernames.
...
Fixes #429 .
6 years ago
Vald
3ccfe226c0
added data attrs for user and tag
6 years ago
lain
4c918392c6
Fix most User tests.
6 years ago
href
5bb88fd174
Runtime configuration
...
Related to #85
Everything should now be configured at runtime, with the exception of
the `Pleroma.HTML` scrubbers (the scrubbers used can be
changed at runtime, but their configuration is compile-time) because
it's building a module with a macro.
6 years ago
href
763fc7b44f
Runtime configured emojis
...
The changes are a bit heavy since the emojis were loaded into module
attributes from filesystem.
This introduces a GenServer using an ETS table to cache in memory the
emojis, and allows a runtime-reload with `Pleroma.Emoji.reload()`.
6 years ago
scarlett
ae5beb7b64
Make finmoji optional
6 years ago
kaniini
ad3181895c
Merge branch 'bugfix/html-scrub-schemes' into 'develop'
...
lib/pleroma/html.ex: Fix scheme lists
See merge request pleroma/pleroma!377
6 years ago
Haelwenn (lanodan) Monnier
2154c5dcd8
lib/pleroma/html.ex: Use macros for valid_schemes, change config for schemes
6 years ago
William Pitcock
582dbe5c8d
formatter: fix matching osada users
6 years ago
William Pitcock
52b05137c5
formatter: use Pleroma.HTML module instead of HtmlSanitizeEx directly
6 years ago
William Pitcock
b1be9415ef
Revert "Merge branch 'revert-a26d5e6b' into 'develop'"
...
This reverts commit d31bbb1cfe
, reversing
changes made to 340ab3cb90
.
6 years ago
Haelwenn (lanodan) Monnier
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
6 years ago
William Pitcock
ac486fc59b
everywhere: use Pleroma.HTML module instead of HtmlSanitizeEx directly
6 years ago
kaniini
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
6 years ago
Thurloat
4257f784bc
sloop around get_emoji/1 to check is_binary and have a fallthrough
...
default that returns empty
6 years ago
William Pitcock
834515fb51
formatter: don't add XSS emoji
6 years ago
Thurloat
a9c0f395cb
add nil clause for Formatter.get_emoji/1 to return an empty result
6 years ago
lambda
58539e1357
Revert "Merge branch 'feature/rich-text' into 'develop'"
...
This reverts merge request !309
6 years ago
William Pitcock
6aa65b68b8
common api: add support for formatting messages outside of twitter-style plain text
6 years ago
William Pitcock
3e10d13909
formatter: adjust regexp captures to match local users with single character nicknames ( closes #163 )
6 years ago
kaniini
183ccd1812
Merge branch 'dev-lanodan-url-regex' into 'develop'
...
lib/pleroma/formatter.ex: Fix URL regex
Closes #127
See merge request pleroma/pleroma!69
6 years ago
William Pitcock
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.
6 years ago
Haelwenn (lanodan) Monnier
d5091c3175
Allow additionnal schemes in the config
6 years ago
Haelwenn (lanodan) Monnier
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
6 years ago
Jorty
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.
6 years ago
William Pitcock
d7eb2e1b65
run mix format
6 years ago
William Pitcock
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
6 years ago
Thog
6f39ecc41b
Support Undo like activities ( Fix #139 )
6 years ago
lain
df95118c81
Fix linking problem.
6 years ago
lain
0574df273c
Small cleanup.
7 years ago
lain
0c221943ef
Formatter: Use proper escaping for links.
7 years ago