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
eal
3dbd9809d4
MastoAPI: add lists.
2018-05-24 15:34:39 +03:00
lain
1cd6194dee
More efficient queries.
2018-05-24 12:44:26 +02:00
eal
a8369db4f2
MastoAPI: add lists.
2018-05-24 13:18:39 +03:00
lain
0b5bc62b33
Don't save double tags in AP objects we create
...
This crashed Mastodon workers.
2018-05-23 17:25:24 +02:00
lambda
06c97f211f
Merge branch 'feature/deps-migration' into 'develop'
...
Migrate to comeonin 4 and Cachex 3
See merge request pleroma/pleroma!162
2018-05-23 09:03:11 +00:00
Francis Dinh
72b93d13f8
Hook up block/unblock to TwitterAPI
2018-05-22 05:41:17 -04:00
Francis Dinh
55f9aefd08
Hook unfollow into TwitterAPI
2018-05-22 04:49:30 -04:00
Francis Dinh
b2c6ae7d82
Hook up unfollow and (un)block to MastoAPI + tests
2018-05-22 04:27:40 -04:00
csaurus
4fd9df100f
Merge branch 'develop' into feature/mstdn-direct-api
2018-05-21 20:19:37 -04:00
Syldexia
d0690622cd
Added endpoint for changing passwords
2018-05-21 23:06:03 +01:00
lambda
b4064dfe30
Merge branch 'feature/clarify-http-sig-error' into 'develop'
...
clarify HTTP signature error in logs
See merge request pleroma/pleroma!165
2018-05-21 21:20:41 +00:00
William Pitcock
9a2d097ed8
activitypub controller: note that the HTTP Host header must be forwarded for http signature validation to work
2018-05-21 19:22:30 +00:00
Francis Dinh
46427cb90f
Pass correct number of arguments to unfollow
2018-05-21 11:57:15 -04:00
William Pitcock
75cfd9d34d
webfinger: fix finding the XRD uri for statusnet instances
2018-05-21 12:41:31 +00:00
lain
d269c69a0b
Actually fix missing alias.
2018-05-21 12:32:29 +02:00
lain
bf64208b52
Add missing alias.
2018-05-21 12:09:03 +02:00
Francis Dinh
d045b96f95
Add tests for incoming unfollow over OStatus
2018-05-21 05:11:13 -04:00
Francis Dinh
cc5373b846
Fix unblock handling
2018-05-21 05:00:58 -04:00