diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-01-28 15:39:14 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-01-28 15:39:14 +0300 |
| commit | d3f9e6f6fed382ede8e314c370c21e84a119f65a (patch) | |
| tree | c8cd63007993d25bb8c17b5b83e8761db9de3295 /docs | |
| parent | 1d2f41642cfec5710055bcf8409778bb362beecb (diff) | |
| parent | de0fb88a9cf587b9613e267d5dddfe55b0f414b7 (diff) | |
| download | pleroma-d3f9e6f6fed382ede8e314c370c21e84a119f65a.tar.gz pleroma-d3f9e6f6fed382ede8e314c370c21e84a119f65a.zip | |
[#534] Merged `upstream/develop`.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/Pleroma-API.md | 1 | ||||
| -rw-r--r-- | docs/config.md | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/docs/Pleroma-API.md b/docs/Pleroma-API.md index da58babf9..0c4586dd3 100644 --- a/docs/Pleroma-API.md +++ b/docs/Pleroma-API.md @@ -15,6 +15,7 @@ Request parameters can be passed via [query strings](https://en.wikipedia.org/wi * Params: none * Response: JSON * Example response: `{"kalsarikannit_f":"/finmoji/128px/kalsarikannit_f-128.png","perkele":"/finmoji/128px/perkele-128.png","blobdab":"/emoji/blobdab.png","happiness":"/finmoji/128px/happiness-128.png"}` +* Note: Same data as Mastodon API’s `/api/v1/custom_emojis` but in a different format ## `/api/pleroma/follow_import` ### Imports your follows, for example from a Mastodon CSV file. diff --git a/docs/config.md b/docs/config.md index 3f4588299..26ce842d4 100644 --- a/docs/config.md +++ b/docs/config.md @@ -212,3 +212,9 @@ curl "http://localhost:4000/api/pleroma/admin/invite_token?admin_token=somerando * `max_jobs`: The maximum amount of parallel federation jobs running at the same time. * `initial_timeout`: The initial timeout in seconds * `max_retries`: The maximum number of times a federation job is retried + +## Pleroma.Web.Metadata +* `providers`: a list of metadata providers to enable. Providers availible: + * Pleroma.Web.Metadata.Providers.OpenGraph + * Pleroma.Web.Metadata.Providers.TwitterCard +* `unfurl_nsfw`: If set to `true` nsfw attachments will be shown in previews |