abead01ab6
Merge branch 'correct-and-improve-http-options' into 'develop'
...
Correct and improve http options
See merge request pleroma/pleroma!505
6 years ago
2ae1128d9f
MastoAPI: Fix put_settings
6 years ago
79668c08fc
cleanup
6 years ago
3d492795b7
clean up
6 years ago
4944498133
Merge branch 'develop' into feature/compat/push-subscriptions
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/plugs/oauth_plug.ex
6 years ago
8b4397c704
Merge branch 'develop' into feature/compat/push-subscriptions
...
# Conflicts:
# lib/mix/tasks/sample_config.eex
# lib/pleroma/web/twitter_api/controllers/util_controller.ex
# mix.exs
# mix.lock
6 years ago
04a48286e6
Add web push support
6 years ago
ccf0b46dd6
Merge branch '210_twitter_api_uploads_alt_text' into 'develop'
...
[#210 ] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix.
See merge request pleroma/pleroma!496
6 years ago
3e90f688f1
[ #210 ] Mastodon: actor storing for media uploads, ownership check to update_media.
...
Refactoring.
6 years ago
96ba95df2e
remove follow_redirect options
6 years ago
505d820827
Merge remote-tracking branch 'origin/debug-suggestions-api' into correct-and-improve-http-options
6 years ago
76d6b1c6ab
Merge remote-tracking branch 'origin' into follower-hiding
6 years ago
3ea4476445
MastodonAPI: Show users their own network.
6 years ago
a418547bdf
debug /api/v1/suggestions
6 years ago
87109482f3
status_code -> status
6 years ago
4b70e5eae9
Parse bio for MastodonAPI
6 years ago
2a639de9b3
MastodonApi: Implement hide_network.
6 years ago
347df6421d
Fix masto api user updating.
6 years ago
c443c9bd72
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info
6 years ago
02d3dc6869
Uploads fun, part. 2
6 years ago
b19597f602
reverse proxy / uploads
6 years ago
d0ec2812bd
Merge remote-tracking branch 'origin' into validate-user-info
6 years ago
d388a99143
Web.MastodonAPI.MastodonSocket: Put access_token at function-level
6 years ago
5346fabf14
Web.MastodonAPI.MastodonSocket: Add unauthentified websocket endpoints
...
reported by soka on CRTNet
6 years ago
0896cf4c0f
Fix most mastodon api bugs.
6 years ago
bc5cf2c192
Improved version string
6 years ago
2cf40237ff
MastodonAPI: Add pagination to private messages.
6 years ago
1592fa2bea
Mastodon API: Fix list streaming
6 years ago
b451a92d78
Merge branch 'runtime-config' into 'develop'
...
Runtime configuration
See merge request pleroma/pleroma!430
6 years ago
e42f2efae4
/api/v1/accounts/relationships Return an empty array if no id in params
...
This copies Mastodon API behaviour & fixes Mastalab app.
6 years ago
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
a8f1e30cb8
Formatting.
6 years ago
4f640c43ed
Unify Mastodon Login with OAuth login.
...
This removes duplication in the login code.
6 years ago
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
3e50bb667f
Pleroma.Web.MastodonAPI.StatusView: Content isn’t nullable
6 years ago
0cca7edbe0
Fix hashtag search
...
When we lowercase the search it will succesfully do a case insenstive
match. Now #Linux will match #linux and #LINUX whereas previously it
would only match the exact case.
6 years ago
4d8f076125
mastodon api: add support for rendering Page objects
6 years ago
755f166406
Pleroma.Web.MastodonAPI.StatusView: Do not fail when URL isn’t a string
6 years ago
181f3bb56a
mastodon api: enforce upload limits for avatars and banners
6 years ago
5c6ec2d9fc
twitter/mastodon api: always use mediaproxy URLs in attachments
...
if using local media, the mediaproxy will not replace the URL anyway.
6 years ago
26eb11c172
activitypub: add support for filtering broken threads out of timelines
6 years ago
b386888a0e
[Pleroma.Web.MastodonAPI.MastodonAPIController]: fallback for try_render/4
...
Better be sure than sorry
6 years ago
b112112c11
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Wrap around render/4
6 years ago
b0a940d5a2
[Pleroma.Web.MastodonAPI.StatusView]: Remove unused arguments
6 years ago
2da0ffeb28
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex: Output an error when render(status.json) gives a nil
6 years ago
0c10be8731
[Pleroma.Web.MastodonAPI.StatusView]: Remove nils from lists.json
6 years ago
3b0e9287a5
[Pleroma.Web.MastodonAPI.StatusView]: Return nil as fallback for missing views
6 years ago
e8c698af41
Add an endpoint /api/v1/accounts/:id/lists to get lists to which account belongs
6 years ago
7b3fff9af8
{mastodon api, twitter api}: make the follow handshake timeout configurable
6 years ago
7f530f6f80
mastodon api: relationship view: better handle no pre-existing follow activity
6 years ago
e69faf550c
user: add wait_and_refresh() for async three-way handshake case
6 years ago
3e751496e3
mastodon api: account view: fetch follow state and use it to populate `requested` field
6 years ago
d94ee5cd50
Mastodon API: Support push subscription CRUD
6 years ago
df00a364fb
mastodon api: formatting
6 years ago
958e085acb
mastodon api: add support for user-supplied html policy
6 years ago
40c51f118f
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to 2.5.0
6 years ago
f74725df41
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Remove unused variables
6 years ago
a8eaecadee
[Pleroma.Web.MastodonAPI.AccountView]: relationship.json: fake endorsed value (false)
6 years ago
43d0b7bf7a
[Pleroma.Web.MastodonAPI.StatusView] add replies_count
6 years ago
0cac493fdc
mastodon api: default attachment type to image if one is not present
6 years ago
f4fcea5258
Revert "Mastodon API: Fake support for loading filters"
...
This reverts commit c1d07da4e16e030129fb
6 years ago
c2650f0ffb
Merge branch 'feature/html-scrub-policy' into 'develop'
...
html scrub policy
See merge request pleroma/pleroma!339
6 years ago
39aed5348a
Add visible_in_picker to status emojis
6 years ago
ac486fc59b
everywhere: use Pleroma.HTML module instead of HtmlSanitizeEx directly
6 years ago
4e1bb7bccb
make limit for /api/v1/suggestions
6 years ago
c1d07da4e1
Mastodon API: Fake support for loading filters
6 years ago
619f67768a
Mastodon API: Add unsupported attributes to relationship responses
...
These attributes are documented as required by the Mastodon API.
Since we don’t support them (I think?), respond with default values.
6 years ago
4a3dbd9d4e
Merge branch 'fix/sign-in-with-toot' into 'develop'
...
Fix sign-in and sign-out with Toot!
See merge request pleroma/pleroma!306
6 years ago
1c9e539b47
Merge branch 'feature/mastodon_api_2.4.x' into 'develop'
...
Add/Fix Mastodon endpoints for 2.4.3 compatibility
See merge request pleroma/pleroma!266
6 years ago
35515cfa66
Update mastodon_api_controller.ex
6 years ago
26f8697400
Update mastodon_api_controller.ex
6 years ago
2b2bd0e047
Render notification IDs as strings, not numbers
6 years ago
b60d232719
AccountView: `sensitive` is supposed to be a boolean, not a string
6 years ago
2e2f458705
Merge branch 'lanodan/code-dup_in_mastoapi_search' into 'develop'
...
Clean code duplication in MastoAPI search(v1/v2)
See merge request pleroma/pleroma!316
6 years ago
0c2a0e3551
Specify default scope in verify_credentials
...
Certain Mastodon/Pleroma front ends call verify_credentials to get the
default scope of a new toot.
Currently, Pleroma hardcodes this value to "public".
This patch changes it to the user's default_scope value.
6 years ago
8885d16e1b
[Pleroma.Web.MastodonAPI.MastodonAPIController].search(2)?: Remove code duplication
6 years ago
e838969495
Merge branch 'use-media-proxy-in-suggestions-api' into 'develop'
...
use media proxy for the suggestions api
See merge request pleroma/pleroma!305
6 years ago
ddc6f32b75
Fix Mastodon API when actor's nickname is null
6 years ago
ded9091206
mastodon api: use bounded AP object graph query to enforce containment of private statuses
6 years ago
6cbfb5ab5d
use media proxy for suggestions api
6 years ago
6973b77e94
[Pleroma.Web.MastodonAPI.FilterView] fix expires_at being a unsafe variable
6 years ago
9bddb39ff0
[Pleroma.Web.MastodonAPI.FilterView]: expires_at should be null when N/A
6 years ago
d571a571fe
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to 2.4.3
6 years ago
6e030129fb
[MastodonAPI] Add filters
6 years ago
a5adb251ab
[Pleroma.Web.MastodonAPI.AccountView]: Add fields support
6 years ago
d008f2d69c
[Pleroma.Web.MastodonAPI.AccountView]: Add bot field
6 years ago
83efaa3af6
[MastodonAPI] Add streaming of hashtags
6 years ago
bf9f68b681
debug
6 years ago
5dde6e4a00
[Pleroma.Web.MastodonAPI.StatusView] Fix rendering peertube videos
6 years ago
f6b06d2ac8
Merge branch 'feature/peertube_2' into 'develop'
...
rebase/update of feature/peertube
See merge request pleroma/pleroma!217
6 years ago
046741c60d
[Pleroma.Web.MastodonAPI.StatusView] Support Peertube Video titles
6 years ago
3b8ef24532
Fix attachement rendering
6 years ago
a6b021a52b
Render peertube videos in mastodon.
6 years ago
c381d0b577
Use activitypub to fetch posts.
...
This falls back to ostatus.
6 years ago
175f0bebbc
mastodon api: sanitize the bio HTML
6 years ago
6698749073
Fix typo in app creation response
...
Mastodon sends redirect_uri (singular), so should Pleroma.
6 years ago
a3ef2ebb35
mastodon api controller: client_name, not name
6 years ago
b5a92b1199
mastodon api: add undocumented fields to json response, return app id as string like mastodon itself does
6 years ago
9908cf8fda
Merge branch 'feature/suggestions-api-with-third-party-recommendation-engine' into 'develop'
...
Feature / Suggestions API with third party recommendation engine
See merge request pleroma/pleroma!254
6 years ago
c2d1a5e9c4
MastoAPI AccountView: render profile emoji.
6 years ago
kaniini