9d054d30bc
Revert "Update Mastofe."
...
This reverts commit 726b131b0a
2018-06-02 19:45:23 +02:00
726b131b0a
Update Mastofe.
2018-06-02 16:11:38 +02:00
da9cbf2c05
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2018-06-02 15:39:21 +02:00
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
8c609ee3f9
MastoAPI user timelines: render statuses for the logged in user.
2018-06-01 12:30:11 +03:00
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
935e544e19
TwitterAPI: fix "Follows you" being shown for the wrong user.
2018-05-31 15:27:42 +03:00
5e76adb07e
Fix url guessing attacks.
2018-05-30 20:00:45 +02:00
349400c06a
Fix url guessing attacks.
2018-05-30 20:00:27 +02:00
196d36a7d5
Merge branch 'fix/dm-timeline-activities' into 'develop'
...
MastoAPI: fix dm_timeline getting non-create activities.
See merge request pleroma/pleroma!182
2018-05-30 12:31:59 +00:00
7cb2e2971e
MastoAPI: fix dm_timeline getting non-create activities.
2018-05-30 15:02:22 +03:00
8bd7ace420
Merge branch 'patch-3' into 'develop'
...
Update pleroma.nginx
See merge request pleroma/pleroma!179
2018-05-29 10:58:43 +00:00
52b0413719
Merge branch 'fix/link-headers' into 'develop'
...
MastoAPI: Fix link headers with restrictive params.
See merge request pleroma/pleroma!181
2018-05-29 10:58:27 +00:00
35cb8969c4
MastoAPI: Fix link headers with restrictive params.
2018-05-29 13:31:36 +03:00
461f201caa
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2018-05-28 12:39:49 +02:00
3ece4a3ebc
Only return certain activities in TwitterAPI mentions.
2018-05-28 12:38:48 +02:00
a6fd9c4b00
Update pleroma.nginx
...
proxy_ignore_client_abort will continue to fetch from upstream even if a client aborts the connection. This is highly recommended when cache is being used. If a client leaves/refreshes the page while a user's avatar or some other media is halfway loaded, the cached copy might in some cases be broken. Leaving future requests to the same URL broken until cache expires.
2018-05-28 10:36:27 +00:00
8216d5e40e
Merge branch 'feature/mastodon-context-microformat' into 'develop'
...
formatter: use class='mention' on links to user profiles
See merge request pleroma/pleroma!178
2018-05-27 13:16:10 +00:00
d7eb2e1b65
run mix format
2018-05-27 13:06:38 +00:00
f569b67cda
tests: update for html changes
2018-05-27 13:03:34 +00:00
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
a9e36e5a64
Fix user topic streaming.
2018-05-26 21:06:46 +02:00
46cc6fab07
Merge branch 'csaurus/pleroma-feature/mstdn-direct-api' into develop
2018-05-26 16:26:14 +02:00
841ee8e3e4
Simplify DM query.
...
Should also use indexes better.
2018-05-26 16:25:32 +02:00
4b3ec53514
Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api
2018-05-26 16:00:59 +02:00
6138b29783
There are no symbols in JSON.
2018-05-26 15:20:21 +02:00
745072b2cc
Merge branch 'kaniini/pleroma-feature/activitypub-accept-reject-conformance' into develop
2018-05-26 15:15:52 +02:00
0a6c897c94
Formatting.
2018-05-26 15:11:50 +02:00
bfce29866f
Make Mastodon follow hack more explicit.
2018-05-26 15:07:21 +02:00
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
dd9bb37893
Rename id helper method.
2018-05-26 13:57:11 +02:00
1db0dc3072
tests: add tests to verify the accept request is discarded if no follow activity could be found
2018-05-26 11:20:53 +00:00
7e873756e7
activitypub transmogrifier: use fetch_latest_follow to verify a follow object exists
2018-05-26 11:20:52 +00:00
e1fe46e1cf
Merge branch 'feature/mastodon-s2s-block-opt-out' into 'develop'
...
activitypub: allow mastodon S2S block extension support to be disabled
See merge request pleroma/pleroma!176
2018-05-26 09:50:54 +00:00
1c926c7b60
activitypub: allow mastodon S2S block extension support to be disabled
2018-05-26 08:30:41 +00:00
7cf3cf77cf
activitypub transmogrifier: cleanups and tests for incoming accepts/rejects
2018-05-25 12:53:12 +00:00
f35e6bf75b
activitypub transmogrifier: clean up accept/reject handling a bit
2018-05-25 09:40:11 +00:00
e80d91c64a
introduce User.maybe_direct_follow() and use it where we used to call User.follow()
2018-05-25 09:40:10 +00:00
c89b90222c
twitter api: also remove explicit User.follow here
2018-05-25 09:40:06 +00:00
62c95e8d4d
run mix format
2018-05-25 09:39:46 +00:00
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
caae83e6d5
Merge branch 'bugfix/follow-query-overhead' into 'develop'
...
activitypub utils: optimize block and follow activity lookup
See merge request pleroma/pleroma!171
2018-05-25 07:13:05 +00:00
502ba33d01
activitypub: fix up accept/reject semantics for following
...
fixes #175
2018-05-25 06:14:18 +00:00
c0ca9f82b9
mastodon api: properly track if an account is locked or not
2018-05-25 06:14:09 +00:00
1f3eb0f470
testsuite: fix module name for CommonAPI.Test (was duplicated with CommonAPI.UtilsTest)
2018-05-25 06:12:30 +00:00
5f06a1a3c5
testsuite: fix module name for CommonAPI.Test (was duplicated with CommonAPI.UtilsTest)
2018-05-25 05:29:00 +00:00
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
1d88abf2d4
user: do not allow refollowing somebody who has blocked a user
2018-05-25 03:18:35 +00:00
8d2ee70da1
testsuite: fix module name for CommonAPI.Test (was duplicated with CommonAPI.UtilsTest)
2018-05-25 03:18:34 +00:00
f3a71f2986
Merge branch 'feature/lists' into 'develop'
...
Mastodon List API
See merge request pleroma/pleroma!138
2018-05-24 20:22:43 +00:00
lain
eal
lambda
Dominik V. Salonen
William Pitcock