Commit graph

3707 commits

Author SHA1 Message Date
href
cdc5e6ff5c
ActivityPub: restrict_since/restrict_max: ignore empty param 2019-01-23 11:26:35 +01:00
href
9d63b27dcd
Test FlakeID old id compat & Ecto type 2019-01-23 11:26:34 +01:00
href
28d77e373c
Flake Ids for Users and Activities 2019-01-23 11:26:27 +01:00
href
b624b7a150 Merge branch 'mr/20190122-activity-visibility-update' into 'develop'
slightly changes definition so that autovacuum works parallel safe too

Closes #540

See merge request pleroma/pleroma!697
2019-01-22 16:10:38 +00:00
Michael Loftis
98cbeae49c slightly changes definition so that autovacuum works paralell safe too 2019-01-22 15:35:21 +00:00
Haelwenn
707cd9389c Merge branch 'fix/activity_get_by_id' into 'develop'
Add get_by_id to activity.ex

See merge request pleroma/pleroma!695
2019-01-22 14:28:17 +00:00
lambda
7d55bb0896 Merge branch '502_stats_fix_for_nil_info_deactivated' into 'develop'
[#502] Stats fix (users with nil or missing `info.deactivated` should be treated active)

Closes #502

See merge request pleroma/pleroma!696
2019-01-22 14:18:36 +00:00
Ivan Tashkinov
34d59e4008 [#502] Fixed User.active_local_user_query to return users with nil or missing info.deactivated. Adjusted test. 2019-01-22 17:12:53 +03:00
kaniini
d17a4b1891 Merge branch 'uploader-controller' into 'develop'
Uploader callback controller

See merge request pleroma/pleroma!694
2019-01-22 09:03:03 +00:00
rinpatch
e460820fcf Add get_by_id to activity.ex 2019-01-22 10:55:10 +03:00
href
f9a3269099
Uploader callback controller 2019-01-21 22:44:14 +01:00
rinpatch
afb8d9ec13 Merge branch 'fix-buggy-test' into 'develop'
Fix buggy test.

See merge request pleroma/pleroma!693
2019-01-21 20:02:58 +00:00
lain
762fafe738 Fix buggy test. 2019-01-21 17:54:11 +01:00
lambda
3f9c778320 Merge branch 'proxy-no-default-plug-cache' into 'develop'
Always override plug's default cache-control in reverse proxy

See merge request pleroma/pleroma!692
2019-01-21 16:19:15 +00:00
href
99763999c1
reverse_proxy - always override plug's cache-control 2019-01-21 15:17:24 +01:00
href
97412d9f94
S3 Namespace 2019-01-21 14:42:16 +01:00
lambda
8cd853ce0c Merge branch '530_federator_user_info_overwrite_fix' into 'develop'
[#530] Prevents user `info` from being overwritten because of race conditions

Closes #530

See merge request pleroma/pleroma!691
2019-01-21 13:03:32 +00:00
lambda
69454c8345 Merge branch 'feature/dm-sanity' into 'develop'
DM sanitization

See merge request pleroma/pleroma!458
2019-01-21 12:35:10 +00:00
Ivan Tashkinov
a4d3fec8a7 [#502] Code comments update. 2019-01-21 14:52:41 +03:00
Ivan Tashkinov
789a9843da [#530] Fixed test. 2019-01-21 14:30:01 +03:00
Ivan Tashkinov
aa480f4a8b [#530] Prevents user info from being overwritten because of race conditions
and non-partial update of embed (in WebFinger.ensure_keys_present and other places).
2019-01-21 14:16:51 +03:00
Haelwenn (lanodan) Monnier
7390192c03
Activity: mix format (2 empty lines) 2019-01-21 08:00:41 +01:00
Haelwenn (lanodan) Monnier
98c8184c1f
Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1 2019-01-21 08:00:41 +01:00
Haelwenn (lanodan) Monnier
2fdbd4d137
Activity: create_activity_by_object_id_query/1 → create_by_object_ap_id/1 when is_list 2019-01-21 08:00:40 +01:00
Haelwenn (lanodan) Monnier
f8ab1b7427
Activity: get_all_by_object_ap_id/1 → get_all_create_by_object_ap_id/1 2019-01-21 08:00:38 +01:00
Haelwenn (lanodan) Monnier
4ad5a0abb9
Activity: all_by_object_ap_id_q/1 → create_by_object_ap_id/1 2019-01-21 07:51:01 +01:00
Haelwenn (lanodan) Monnier
75e4c8f0b2
Activity: all_non_create_by_object_ap_id_q → by_object_ap_id 2019-01-21 07:50:57 +01:00
Haelwenn (lanodan) Monnier
b82c6dc536
Activity: all_by_object_ap_id/1 → get_all_by_object_ap_id/1 2019-01-21 07:49:59 +01:00
rinpatch
52006f8f8a Merge branch 'bugfix/gen_signing_salt' into 'develop'
Mix.Tasks.Pleroma.Instance: Generate signing_salt

Closes #533

See merge request pleroma/pleroma!689
2019-01-21 05:22:34 +00:00
Haelwenn (lanodan) Monnier
f94cc6d824
Mix.Tasks.Pleroma.Instance: Generate signing_salt
Closes: https://git.pleroma.social/pleroma/pleroma/issues/533
2019-01-21 01:16:41 +01:00
kaniini
5803672ae5 Merge branch '116-send-delete-event' into 'develop'
Send delete event over Mastodon streaming api

Closes #116

See merge request pleroma/pleroma!688
2019-01-20 23:06:21 +00:00
lain
cf1f35a93a Send delete event over Mastodon streaming api
Closes #116
2019-01-20 13:00:46 +01:00
lambda
501fba33d6 Merge branch 'add-custom-emoji-test' into 'develop'
Add a test to ensure #39 is fixed.

See merge request pleroma/pleroma!687
2019-01-20 10:58:19 +00:00
lain
be0fb5dec4 Add a test to ensure #39 is fixed. 2019-01-20 11:48:53 +01:00
lambda
2020f26040 Merge branch '2019-1-20-update-frontend' into 'develop'
update frontend

See merge request pleroma/pleroma!686
2019-01-20 10:42:06 +00:00
lain
deeda94513 update frontend 2019-01-20 11:28:11 +01:00
lambda
f3045a179e Merge branch 'i1t/pleroma-477_user_search_improvements' into 'develop'
I1t/pleroma 477 user search improvements

See merge request pleroma/pleroma!685
2019-01-20 10:24:05 +00:00
lain
5834b08fe7 Set custom similarity limit. 2019-01-20 10:57:49 +01:00
William Pitcock
aa37313416 activitypub: short-circuit is_public?() with directMessage flag check 2019-01-20 02:33:21 +00:00
William Pitcock
cf3099231d test: transmogrifier: verify directMessage flag is sent outbound based on declared visibility 2019-01-20 02:28:28 +00:00
William Pitcock
7c9749f793 transmogrifier: slightly clean up fix_explicit_addressing pipeline 2019-01-20 02:27:48 +00:00
William Pitcock
420651157b transmogrifier: don't apply heuristics against messages which have directMessage set true 2019-01-20 02:27:48 +00:00
William Pitcock
ddae43eb43 activitypub: add is_private?/is_direct? helpers 2019-01-20 02:27:48 +00:00
William Pitcock
9adc80afff common api: set directMessage flag on our own posts 2019-01-20 02:27:48 +00:00
William Pitcock
75bb663749 litepub schema: add litepub:directMessage flag 2019-01-20 02:27:48 +00:00
William Pitcock
75dfa1f0b0 mastodon api: get_visibility(): DMs never have a cc list. 2019-01-20 02:27:48 +00:00
William Pitcock
21ac35fcc0 tests: add tests for DM sanitizer 2019-01-20 02:27:48 +00:00
William Pitcock
681f40ee5c activitypub: transmogrifier: fix up to/cc addressing brain damage caused by mastodon-style explicit DMs 2019-01-20 02:27:48 +00:00
William Pitcock
8d06be35e0 activitypub: utils: add determine_explicit_mentions() and tests 2019-01-20 02:27:48 +00:00
kaniini
42612b1c8d Merge branch 'bugfix/improve-boost-targeting' into 'develop'
improve handling of non-public Announces

See merge request pleroma/pleroma!681
2019-01-19 23:44:08 +00:00