William Pitcock
47c7e259c4
activitypub transmogrifier: fix locked account state from being clobbered
2018-06-08 02:52:29 +00:00
William Pitcock
a003bdc30a
activitypub transmogrifier: learn locked state in Update messages
2018-06-08 02:52:24 +00:00
lambda
0a0c6bf394
Merge branch 'bugfix/webfinger-xml-crash' into 'develop'
...
webfinger robustness improvements
See merge request pleroma/pleroma!195
2018-06-06 16:44:44 +00:00
William Pitcock
1abf0f3b3e
webfinger: use https as default fallback instead of http
...
realistically, all instances need to be on https anyway to properly federate with all
software
2018-06-06 16:27:14 +00:00
William Pitcock
aaa81d3540
XML: handle erlang errors too
2018-06-06 16:27:13 +00:00
lambda
b5d8213e70
Merge branch 'fix/oauth-http-basic' into 'develop'
...
Make OAuth token endpoint work with HTTP Basic auth
See merge request pleroma/pleroma!191
2018-06-06 08:27:08 +00:00
D Anzorge
3607dc4558
Make token exchange return errors with 400 as status code
2018-06-06 03:14:50 +02:00
eal
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
2018-06-05 21:18:25 +00:00
D Anzorge
73904e8f78
Make OAuth token endpoint work with HTTP Basic auth
...
client_id/client_secret can now be supplied in an Authorization header
2018-06-04 00:59:00 +02:00
lain
8073af6e10
Better error handling for OstatusController.
2018-06-03 21:04:44 +02:00
lain
06439f64d0
Better error handling for ActivityPubController
2018-06-03 19:58:59 +02:00
lain
4856ba596f
Better error handling for MastodonApiController.
2018-06-03 19:28:11 +02:00
lain
0f70e83e8c
Better error handling in TwitterApiController.
2018-06-03 19:11:22 +02:00
Haelwenn (lanodan) Monnier
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
2018-06-03 18:41:18 +02:00
eal
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
2018-06-01 09:35:29 +00:00
eal
8c609ee3f9
MastoAPI user timelines: render statuses for the logged in user.
2018-06-01 12:30:11 +03:00
lambda
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
2018-06-01 08:51:04 +00:00
eal
935e544e19
TwitterAPI: fix "Follows you" being shown for the wrong user.
2018-05-31 15:27:42 +03:00
lain
349400c06a
Fix url guessing attacks.
2018-05-30 20:00:27 +02:00
eal
7cb2e2971e
MastoAPI: fix dm_timeline getting non-create activities.
2018-05-30 15:02:22 +03:00
eal
35cb8969c4
MastoAPI: Fix link headers with restrictive params.
2018-05-29 13:31:36 +03:00
lain
461f201caa
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2018-05-28 12:39:49 +02:00
lain
3ece4a3ebc
Only return certain activities in TwitterAPI mentions.
2018-05-28 12:38:48 +02:00
William Pitcock
d7eb2e1b65
run mix format
2018-05-27 13:06:38 +00:00
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
2018-05-27 12:56:24 +00:00
lain
a9e36e5a64
Fix user topic streaming.
2018-05-26 21:06:46 +02:00
lain
841ee8e3e4
Simplify DM query.
...
Should also use indexes better.
2018-05-26 16:25:32 +02:00
lain
4b3ec53514
Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api
2018-05-26 16:00:59 +02:00
lain
6138b29783
There are no symbols in JSON.
2018-05-26 15:20:21 +02:00
lain
745072b2cc
Merge branch 'kaniini/pleroma-feature/activitypub-accept-reject-conformance' into develop
2018-05-26 15:15:52 +02:00
lain
0a6c897c94
Formatting.
2018-05-26 15:11:50 +02:00
lain
bfce29866f
Make Mastodon follow hack more explicit.
2018-05-26 15:07:21 +02:00
lain
3839a11ef5
Don't treat remote accepts/rejects as local.
...
Also, use specialized functions to get safe data.
2018-05-26 14:07:46 +02:00
lain
dd9bb37893
Rename id helper method.
2018-05-26 13:57:11 +02:00
William Pitcock
7e873756e7
activitypub transmogrifier: use fetch_latest_follow to verify a follow object exists
2018-05-26 11:20:52 +00:00
William Pitcock
1c926c7b60
activitypub: allow mastodon S2S block extension support to be disabled
2018-05-26 08:30:41 +00:00
William Pitcock
7cf3cf77cf
activitypub transmogrifier: cleanups and tests for incoming accepts/rejects
2018-05-25 12:53:12 +00:00
William Pitcock
f35e6bf75b
activitypub transmogrifier: clean up accept/reject handling a bit
2018-05-25 09:40:11 +00:00
William Pitcock
e80d91c64a
introduce User.maybe_direct_follow() and use it where we used to call User.follow()
2018-05-25 09:40:10 +00:00
William Pitcock
c89b90222c
twitter api: also remove explicit User.follow here
2018-05-25 09:40:06 +00:00
William Pitcock
62c95e8d4d
run mix format
2018-05-25 09:39:46 +00:00
lambda
5d6d86bf00
Merge branch 'feature/blocks-deny-refollow' into 'develop'
...
activitypub conformance: deny refollow for blocks
See merge request pleroma/pleroma!170
2018-05-25 07:15:01 +00:00
William Pitcock
502ba33d01
activitypub: fix up accept/reject semantics for following
...
fixes #175
2018-05-25 06:14:18 +00:00
William Pitcock
c0ca9f82b9
mastodon api: properly track if an account is locked or not
2018-05-25 06:14:09 +00:00
William Pitcock
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
2018-05-25 05:23:49 +00:00
William Pitcock
1d88abf2d4
user: do not allow refollowing somebody who has blocked a user
2018-05-25 03:18:35 +00:00
lambda
f3a71f2986
Merge branch 'feature/lists' into 'develop'
...
Mastodon List API
See merge request pleroma/pleroma!138
2018-05-24 20:22:43 +00:00
lambda
c2dcd767cf
Merge branch 'feature/incoming-remote-unfollow' into 'develop'
...
Add support for incoming remote unfollows and blocks/unblocks
See merge request pleroma/pleroma!158
2018-05-24 19:52:24 +00:00
Francis Dinh
1197ec10a8
Rewrite block fetch query
2018-05-24 13:26:59 -04:00
lambda
c41012053a
Merge branch 'feature/change-password' into 'develop'
...
Feature/change password
See merge request pleroma/pleroma!166
2018-05-24 17:16:37 +00:00