Commit graph

1653 commits

Author SHA1 Message Date
Syldexia
a16117225f Added endpoint for user account deletion 2018-05-13 14:35:48 +01:00
lain
89954a2ce7 Fix format. 2018-05-13 13:02:24 +02:00
lain
94c1f28ba4 Modify sort index for activities.
This prevents a problem that made the local timeline very slow when
there were few posts.
2018-05-13 12:54:08 +02:00
lain
c7a85de35c Revert "Remove 'unlisted' handling for now."
This reverts commit 1027d1f696.
2018-05-13 12:38:13 +02:00
lain
1027d1f696 Remove 'unlisted' handling for now.
It's just too slow (over 1 second on small systems, haven't looked at
the queries in detail yet). We'll need some other way to handle it.
2018-05-13 12:07:11 +02:00
lain
a5c9dd0a2a Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop 2018-05-13 11:59:35 +02:00
lain
3c3933e40b Unlisted fetching: Reverse logic
Generates a faster query.
2018-05-13 11:58:03 +02:00
lambda
aeff2d6474 Merge branch 'feature/unrepeats' into 'develop'
Add unrepeats

Closes #69

See merge request pleroma/pleroma!113
2018-05-13 09:32:29 +00:00
lain
7e9f14bf3c Merge branch 'kaniini/pleroma-bugfix/unlisted-statuses' into develop 2018-05-13 11:19:08 +02:00
lain
ec531ca281 Add test. 2018-05-13 11:18:48 +02:00
lain
29376fcc13 Format. 2018-05-13 10:56:44 +02:00
lain
76722ea9c8 Merge branch 'develop' into kaniini/pleroma-bugfix/unlisted-statuses 2018-05-13 10:56:11 +02:00
lambda
bb864e96ad Merge branch 'patch-2' into 'develop'
Nginx config - secure defaults

See merge request pleroma/pleroma!146
2018-05-13 08:39:37 +00:00
lambda
17bcff6445 Merge branch 'feld-varnish' into 'develop'
More varnish fixes

See merge request pleroma/pleroma!149
2018-05-13 08:34:58 +00:00
lambda
4ad5e72012 Merge branch 'feature/chain-policies' into 'develop'
chain policies

See merge request pleroma/pleroma!150
2018-05-13 08:24:18 +00:00
lambda
2d83efa5de Merge branch 'no-self-notification' into 'develop'
Do not create notification for yourself

Closes #121

See merge request pleroma/pleroma!148
2018-05-13 08:16:54 +00:00
Francis Dinh
54ccbd8479 Use original status id instead of announce id 2018-05-13 03:42:31 -04:00
csaurus
c8d418acdd api/v1/timelines/direct implementation 2018-05-12 21:50:59 -04:00
csaurus
392bd9ef56 Stream function to handle direct messages. 2018-05-12 17:40:59 -04:00
csaurus
c60a5405db Detect and try to stream incoming "direct" messages 2018-05-12 17:40:59 -04:00
Francis Dinh
aee49724f5 Merge branch 'feature/unrepeat-tests' into feature/unrepeats 2018-05-12 11:11:13 -04:00
Francis Dinh
694e376954 Update test fixture 2018-05-12 11:10:49 -04:00
Francis Dinh
4d88747561 Revert "Log error when handling unrepeats"
This reverts commit c17c55e989.
2018-05-11 15:34:46 -04:00
Francis Dinh
16b793656d Add tests for unrepeats 2018-05-11 15:30:47 -04:00
Francis Dinh
c17c55e989 Log error when handling unrepeats 2018-05-11 15:29:19 -04:00
Francis Dinh
271fb5ccb1 Probably better way of handling non-follow undos in ostatus 2018-05-11 11:59:53 -04:00
Francis Dinh
4151cbe6b2 Revert "Do not send non-follow undos over ostatus for now"
This reverts commit 07fdc07238.
2018-05-11 11:53:28 -04:00
Francis Dinh
0b527b5528 Revert "Use [] instead of nil"
This reverts commit 42268b0981.
2018-05-11 11:53:06 -04:00
Pierrick Brun
89603eda9e do not create notification for yourself 2018-05-11 11:31:17 +02:00
lambda
853f183fd3 Merge branch 'patch-1' into 'develop'
Remove alias directive in service file

See merge request pleroma/pleroma!151
2018-05-11 07:18:25 +00:00
Francis Dinh
42268b0981 Use [] instead of nil 2018-05-11 01:48:56 -04:00
Francis Dinh
07fdc07238 Do not send non-follow undos over ostatus for now 2018-05-11 01:45:10 -04:00
Normandy
38f5f6f659 Remove alias directive in service file
Systemd will complain otherwise.
2018-05-11 05:19:20 +00:00
href
c220a6db43
format & made get_policies/1 private 2018-05-10 18:51:58 +02:00
href
e9e6f37bda
Chain policies
- The `:pleroma, :instance, :rewrite_policy` can now be either a policy
or a list of policies
- Made a behaviour for MRF policies
2018-05-10 18:41:06 +02:00
Francis Dinh
900c735467 Match proper number of values from unannounce 2018-05-09 00:04:14 -04:00
Francis Dinh
54f6628590 Change argument order and call correct # of args 2018-05-08 23:59:36 -04:00
Francis Dinh
e55f69a676 Handle Undo activites containing an Announce 2018-05-08 23:50:19 -04:00
Francis Dinh
4d5ec883b7 Federate correct activity 2018-05-08 21:52:21 -04:00
Mark Felder
a85d051675 Don't strip headers from backend for /notice/ either 2018-05-07 23:44:40 +00:00
Mark Felder
4233b1504f Caching notice URLs does not produce pleasant results 2018-05-07 23:43:27 +00:00
lain
ffe028cd73 More warning fixes. 2018-05-07 18:11:37 +02:00
lambda
a9baf955fa Merge branch 'feld-varnish' into 'develop'
Caching /objects/ URLs breaks them in Mastoweb as they don't redirect to the /notice/

See merge request pleroma/pleroma!110
2018-05-06 18:43:57 +00:00
lambda
6c2903d9a1 Merge branch 'feld-warnings' into 'develop'
Clean up warnings

See merge request pleroma/pleroma!144
2018-05-06 18:42:31 +00:00
lambda
2b708f76e0 Merge branch 'fix/unsafe-variables' into 'develop'
Get rid of unsafe variables.

See merge request pleroma/pleroma!145
2018-05-06 18:41:46 +00:00
Artik Banana
0a1fd8adf0 Added headers for a more secure default. 2018-05-06 14:19:29 +00:00
eal
bfad57c7c9 Get rid of unsafe variables. 2018-05-06 09:58:59 +03:00
lain
1e83727fdd Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop 2018-05-05 13:41:27 +02:00
lain
9810153aeb Streamer: Don't send out stream events for blocked users. 2018-05-05 13:40:47 +02:00
lain
96add86b50 Unify wss uri generation. 2018-05-05 13:40:31 +02:00