b5d8213e70
Merge branch 'fix/oauth-http-basic' into 'develop'
...
Make OAuth token endpoint work with HTTP Basic auth
See merge request pleroma/pleroma!191
6 years ago
3607dc4558
Make token exchange return errors with 400 as status code
6 years ago
f9719b064c
Merge branch 'fix/emoji-picker' into 'develop'
...
set visible_in_picker to true in custom_emojis
Closes #177 and mastofe#16
See merge request pleroma/pleroma!188
6 years ago
73904e8f78
Make OAuth token endpoint work with HTTP Basic auth
...
client_id/client_secret can now be supplied in an Authorization header
6 years ago
8073af6e10
Better error handling for OstatusController.
6 years ago
06439f64d0
Better error handling for ActivityPubController
6 years ago
4856ba596f
Better error handling for MastodonApiController.
6 years ago
0f70e83e8c
Better error handling in TwitterApiController.
6 years ago
b143694b98
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex: set visible_in_picker to true in custom_emojis
...
Fixes: https://github.com/ilianaw/emojos.in/issues/4
Closes: https://git.pleroma.social/pleroma/pleroma/issues/177
Closes: https://git.pleroma.social/pleroma/mastofe/issues/16
6 years ago
dca1d6d162
Merge branch 'fix/user-timeline-reading-user' into 'develop'
...
MastoAPI user timelines: render statuses for the logged in user.
See merge request pleroma/pleroma!187
6 years ago
8c609ee3f9
MastoAPI user timelines: render statuses for the logged in user.
6 years ago
98b8f08783
Merge branch 'fix/twitterapi-incorrect-follows-you' into 'develop'
...
TwitterAPI: fix "Follows you" being shown for the wrong user.
Closes pleroma-fe#89
See merge request pleroma/pleroma!185
6 years ago
935e544e19
TwitterAPI: fix "Follows you" being shown for the wrong user.
6 years ago
349400c06a
Fix url guessing attacks.
6 years ago
7cb2e2971e
MastoAPI: fix dm_timeline getting non-create activities.
6 years ago
35cb8969c4
MastoAPI: Fix link headers with restrictive params.
6 years ago
461f201caa
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
6 years ago
3ece4a3ebc
Only return certain activities in TwitterAPI mentions.
6 years ago
d7eb2e1b65
run mix format
6 years ago
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
a9e36e5a64
Fix user topic streaming.
6 years ago
841ee8e3e4
Simplify DM query.
...
Should also use indexes better.
6 years ago
4b3ec53514
Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api
6 years ago
6138b29783
There are no symbols in JSON.
6 years ago
745072b2cc
Merge branch 'kaniini/pleroma-feature/activitypub-accept-reject-conformance' into develop
6 years ago
0a6c897c94
Formatting.
6 years ago
bfce29866f
Make Mastodon follow hack more explicit.
6 years ago
3839a11ef5
Don't treat remote accepts/rejects as local.
...
Also, use specialized functions to get safe data.
6 years ago
dd9bb37893
Rename id helper method.
6 years ago
7e873756e7
activitypub transmogrifier: use fetch_latest_follow to verify a follow object exists
6 years ago
1c926c7b60
activitypub: allow mastodon S2S block extension support to be disabled
6 years ago
7cf3cf77cf
activitypub transmogrifier: cleanups and tests for incoming accepts/rejects
6 years ago
f35e6bf75b
activitypub transmogrifier: clean up accept/reject handling a bit
6 years ago
e80d91c64a
introduce User.maybe_direct_follow() and use it where we used to call User.follow()
6 years ago
c89b90222c
twitter api: also remove explicit User.follow here
6 years ago
62c95e8d4d
run mix format
6 years ago
5d6d86bf00
Merge branch 'feature/blocks-deny-refollow' into 'develop'
...
activitypub conformance: deny refollow for blocks
See merge request pleroma/pleroma!170
6 years ago
502ba33d01
activitypub: fix up accept/reject semantics for following
...
fixes #175
6 years ago
c0ca9f82b9
mastodon api: properly track if an account is locked or not
6 years ago
47dc52a758
activitypub utils: optimize block and follow activity lookup
...
multi-field @> comparison is very expensive, so only use @> for the field where it matters
this makes the query take only a few usec to execute verses many msec on a busy instance
6 years ago
1d88abf2d4
user: do not allow refollowing somebody who has blocked a user
6 years ago
f3a71f2986
Merge branch 'feature/lists' into 'develop'
...
Mastodon List API
See merge request pleroma/pleroma!138
6 years ago
c2dcd767cf
Merge branch 'feature/incoming-remote-unfollow' into 'develop'
...
Add support for incoming remote unfollows and blocks/unblocks
See merge request pleroma/pleroma!158
6 years ago
1197ec10a8
Rewrite block fetch query
6 years ago
c41012053a
Merge branch 'feature/change-password' into 'develop'
...
Feature/change password
See merge request pleroma/pleroma!166
6 years ago
3dbd9809d4
MastoAPI: add lists.
6 years ago
1cd6194dee
More efficient queries.
6 years ago
a8369db4f2
MastoAPI: add lists.
6 years ago
0b5bc62b33
Don't save double tags in AP objects we create
...
This crashed Mastodon workers.
6 years ago
06c97f211f
Merge branch 'feature/deps-migration' into 'develop'
...
Migrate to comeonin 4 and Cachex 3
See merge request pleroma/pleroma!162
6 years ago
lambda