Haelwenn [Mon, 28 Jan 2019 08:23:21 +0000 (08:23 +0000)]
Merge branch 'patch-2' into 'develop'
Update the openrc service's retry with the correct format
See merge request pleroma/pleroma!727
vaartis [Mon, 28 Jan 2019 08:18:11 +0000 (08:18 +0000)]
Update the openrc service's retry with the correct format
rinpatch [Sun, 27 Jan 2019 22:01:20 +0000 (22:01 +0000)]
Merge branch 'notice-404-to-fe' into 'develop'
/notice/:id - send the FE index even if 404
See merge request pleroma/pleroma!725
href [Sun, 27 Jan 2019 21:51:50 +0000 (22:51 +0100)]
/notice/:id - send the FE index even if 404
this allows to open private activities by URL when you are logged in,
and to let the FE display a 404 page
lambda [Sun, 27 Jan 2019 20:10:09 +0000 (20:10 +0000)]
Merge branch 'safe-render-activities' into 'develop'
Views: wrap activity rendering in a rescue
See merge request pleroma/pleroma!723
kaniini [Sun, 27 Jan 2019 19:10:15 +0000 (19:10 +0000)]
Merge branch 'discard-invalid-likes' into 'develop'
Transmogrifier: fix incoming objects with invalid likes
See merge request pleroma/pleroma!724
href [Sun, 27 Jan 2019 18:27:16 +0000 (19:27 +0100)]
Transmogrifier: fix incoming objects with invalid likes
href [Sun, 27 Jan 2019 18:15:35 +0000 (19:15 +0100)]
Views: wrap activity rendering in a rescue
this avoids complete timeline breakage when an activity fucks up
rendering.
kaniini [Sun, 27 Jan 2019 15:22:08 +0000 (15:22 +0000)]
Merge branch 'hotfix/favorites-index' into 'develop'
add activities likes index, fixes favorites API call
See merge request pleroma/pleroma!722
kaniini [Sun, 27 Jan 2019 15:16:06 +0000 (15:16 +0000)]
Merge branch 'flake-random-worker-id' into 'develop'
Flake: random worker id
See merge request pleroma/pleroma!721
William Pitcock [Sun, 27 Jan 2019 15:15:33 +0000 (15:15 +0000)]
add activities likes index, fixes favorites API call
href [Sun, 27 Jan 2019 15:04:36 +0000 (16:04 +0100)]
Flake: random worker id
rinpatch [Sun, 27 Jan 2019 14:28:51 +0000 (14:28 +0000)]
Merge branch 'docs/emoji-endpoint-similarities' into 'develop'
docs/Pleroma-API.md: Add note about emoji endpoints similarities
See merge request pleroma/pleroma!720
Haelwenn (lanodan) Monnier [Sun, 27 Jan 2019 13:30:21 +0000 (14:30 +0100)]
docs/Pleroma-API.md: Add note about emoji endpoints similarities
[ci skip]
kaniini [Sun, 27 Jan 2019 12:45:50 +0000 (12:45 +0000)]
Merge branch 'features/mastoapi-multi-hashtag' into 'develop'
MastodonAPI multi-hashtag
See merge request pleroma/pleroma!652
Haelwenn [Sun, 27 Jan 2019 09:45:51 +0000 (09:45 +0000)]
Merge branch 'features/masto-account-view-rights' into 'develop'
Web.MastodonAPI.AccountView: Add is_moderator and is_admin
Closes #557
See merge request pleroma/pleroma!718
Haelwenn (lanodan) Monnier [Sun, 27 Jan 2019 09:21:13 +0000 (10:21 +0100)]
Web.MastodonAPI.AccountView: Add is_moderator and is_admin
Closes: https://git.pleroma.social/pleroma/pleroma/issues/557
Haelwenn [Sat, 26 Jan 2019 17:30:51 +0000 (17:30 +0000)]
Merge branch 'hardening/mastodon-rich-media' into 'develop'
rich media: minor hardening
See merge request pleroma/pleroma!717
kaniini [Sat, 26 Jan 2019 17:27:14 +0000 (17:27 +0000)]
Merge branch 'webpush-endpoint-size' into 'develop'
Change webpush endpoint to unlimited varchar
Closes #552
See merge request pleroma/pleroma!716
William Pitcock [Sat, 26 Jan 2019 16:26:11 +0000 (16:26 +0000)]
rich media: gracefully handle fetching nil URIs
href [Sat, 26 Jan 2019 16:17:37 +0000 (17:17 +0100)]
Change webpush endpoint to unlimited varchar
Fixes #552
kaniini [Sat, 26 Jan 2019 16:17:50 +0000 (16:17 +0000)]
Merge branch 'flake-from-int' into 'develop'
Flake: support integers in from_string/1
See merge request pleroma/pleroma!715
href [Sat, 26 Jan 2019 15:58:23 +0000 (16:58 +0100)]
Flake: support integers in from_string/1
Some previously issued stateless tokens have integer ids in them.
kaniini [Sat, 26 Jan 2019 15:57:02 +0000 (15:57 +0000)]
Merge branch 'join-in-preloads' into 'develop'
Join on preloads to avoid N+1 queries
See merge request pleroma/pleroma!714
kaniini [Sat, 26 Jan 2019 15:47:52 +0000 (15:47 +0000)]
Merge branch 'features/mastoapi-cards' into 'develop'
MastoAPI: Add Rich-Media support
See merge request pleroma/pleroma!664
Haelwenn (lanodan) Monnier [Sat, 26 Jan 2019 15:46:20 +0000 (16:46 +0100)]
Web.MastodonAPI.MastodonAPIController: tag+any bookmark params in a array and flatten it
William Pitcock [Sat, 26 Jan 2019 15:20:27 +0000 (15:20 +0000)]
mastodon api: use OGP uri instead of page_url for deducing domain name, fix test
William Pitcock [Sat, 26 Jan 2019 14:56:14 +0000 (14:56 +0000)]
mastodon api: use HTML.extract_first_external_url()
href [Sat, 26 Jan 2019 14:55:53 +0000 (15:55 +0100)]
Join on preloads to avoid N+1 queries
William Pitcock [Sat, 26 Jan 2019 14:55:12 +0000 (14:55 +0000)]
html: add utility function to extract first URL from an object and cache the result
William Pitcock [Sat, 26 Jan 2019 14:47:32 +0000 (14:47 +0000)]
mastodon api: provider_name setting is required too on the card
Haelwenn (lanodan) Monnier [Sun, 20 Jan 2019 23:53:41 +0000 (00:53 +0100)]
Web.MastodonAPI.MastodonAPIController: generic get_status_card/1 function for MastoAPI 2.6.x
Mastodon API 2.6.x added a card key to the Status object so the Card can be shown in the timeline without an extra request at each status.
Haelwenn (lanodan) Monnier [Sun, 13 Jan 2019 23:06:55 +0000 (00:06 +0100)]
Web.MastodonAPI.MastodonAPIController: Add Rich-Media support
Haelwenn (lanodan) Monnier [Sun, 13 Jan 2019 23:05:45 +0000 (00:05 +0100)]
Move definitions of RichMedia fixtures to test/support/http_request_mock.ex
kaniini [Sat, 26 Jan 2019 14:10:42 +0000 (14:10 +0000)]
Merge branch 'documentation/mastalab' into 'develop'
README: Mastalab officially supports Pleroma.
See merge request pleroma/pleroma!713
William Pitcock [Sat, 26 Jan 2019 14:10:26 +0000 (14:10 +0000)]
README: Mastalab officially supports Pleroma.
kaniini [Sat, 26 Jan 2019 13:41:18 +0000 (13:41 +0000)]
Merge branch 'bugfix/content_nil_lenght_check' into 'develop'
Web.ActivityPub.ActivityPub: Fix check_remote_limit/1 against activities with content: nil
See merge request pleroma/pleroma!711
Haelwenn (lanodan) Monnier [Tue, 22 Jan 2019 14:42:46 +0000 (15:42 +0100)]
Web.MastodonAPI.MastodonAPIControllerTest: Update for difference between all and any parameters
Haelwenn (lanodan) Monnier [Thu, 10 Jan 2019 15:44:28 +0000 (16:44 +0100)]
Fix the logic in multi-hashtag TLs
Haelwenn (lanodan) Monnier [Thu, 10 Jan 2019 15:07:32 +0000 (16:07 +0100)]
Web.ActivityPub.ActivityPub: Simplify multi-hashtag, add tests
Haelwenn (lanodan) Monnier [Fri, 21 Dec 2018 18:34:08 +0000 (19:34 +0100)]
Web.MastodonAPI.MastodonAPIControllerTest: Add test against multi-hashtag timeline
Haelwenn (lanodan) Monnier [Fri, 21 Dec 2018 17:24:13 +0000 (18:24 +0100)]
[Web.ActivityPub.ActivityPub]: Fix restrict_tag()
Thanks to Senko-san <kurisu@iscute.moe> for the help on array-matching
Haelwenn (lanodan) Monnier [Wed, 19 Dec 2018 16:21:35 +0000 (17:21 +0100)]
[WIP,MastoAPI] Multi-tag timelines
Haelwenn (lanodan) Monnier [Sat, 26 Jan 2019 03:23:52 +0000 (04:23 +0100)]
Web.ActivityPub.ActivityPubTest: test against inserting activities with content: null
Haelwenn (lanodan) Monnier [Sat, 26 Jan 2019 02:50:49 +0000 (03:50 +0100)]
Web.ActivityPub.ActivityPub: Fix check_remote_limit/1 against activities with content: nil
kaniini [Fri, 25 Jan 2019 15:16:12 +0000 (15:16 +0000)]
Merge branch 'oembed_provider' into 'develop'
Opengraph/TwitterCard::summary for statuses and user profiles
See merge request pleroma/pleroma!533
lambda [Fri, 25 Jan 2019 10:23:43 +0000 (10:23 +0000)]
Merge branch 'update/pleroma-fe-
20190125-hotfix' into 'develop'
update pleroma frontend (summary_html hotfix)
See merge request pleroma/pleroma!710
William Pitcock [Fri, 25 Jan 2019 10:17:00 +0000 (10:17 +0000)]
update pleroma frontend (summary_html hotfix)
rinpatch [Fri, 25 Jan 2019 07:51:06 +0000 (10:51 +0300)]
Fix OGP provider tests
rinpatch [Fri, 25 Jan 2019 07:40:51 +0000 (10:40 +0300)]
Merge remote-tracking branch 'pl/develop' into oembed_provider
kaniini [Fri, 25 Jan 2019 05:19:32 +0000 (05:19 +0000)]
Merge branch 'fix/tusky-dm' into 'develop'
Add actor to recipients list
Closes #390
See merge request pleroma/pleroma!683
kaniini [Fri, 25 Jan 2019 05:00:47 +0000 (05:00 +0000)]
Merge branch 'develop' into 'oembed_provider'
# Conflicts:
# lib/pleroma/activity.ex
kaniini [Fri, 25 Jan 2019 04:59:06 +0000 (04:59 +0000)]
Merge branch 'classic-flakeids' into 'develop'
Flake Ids for Users and Activities
Closes #450
See merge request pleroma/pleroma!645
kaniini [Fri, 25 Jan 2019 04:57:05 +0000 (04:57 +0000)]
Merge branch 'update/pleroma-fe-
20190125' into 'develop'
update pleroma frontend
See merge request pleroma/pleroma!709
William Pitcock [Fri, 25 Jan 2019 04:49:35 +0000 (04:49 +0000)]
update pleroma frontend
Maxim Filippov [Thu, 24 Jan 2019 20:30:43 +0000 (23:30 +0300)]
Use correct logic to determine "attentions" list
href [Thu, 24 Jan 2019 15:15:13 +0000 (16:15 +0100)]
Fix clippy with one/five lines
kaniini [Thu, 24 Jan 2019 13:22:34 +0000 (13:22 +0000)]
Merge branch 'fix-activity_visibility-autovacuum' into 'develop'
Fix postgres activity_visibility when running in autovacuum
See merge request pleroma/pleroma!708
href [Thu, 24 Jan 2019 13:13:20 +0000 (14:13 +0100)]
Fix postgres activity_visibility when running in autovacuum
href [Thu, 24 Jan 2019 12:08:27 +0000 (13:08 +0100)]
FlakeId: ignore null mac for workerid, use first mac
href [Thu, 24 Jan 2019 10:20:22 +0000 (10:20 +0000)]
Merge branch 'feature/mrf-anti-followbot' into 'develop'
mrf: add anti-followbot policy
See merge request pleroma/pleroma!706
William Pitcock [Thu, 24 Jan 2019 09:50:40 +0000 (09:50 +0000)]
test: add anti-followbot policy tests
William Pitcock [Thu, 24 Jan 2019 09:35:19 +0000 (09:35 +0000)]
mrf: add anti-followbot policy
kaniini [Wed, 23 Jan 2019 23:47:36 +0000 (23:47 +0000)]
Merge branch 'fix/hide-network-setting' into 'develop'
Send "hide_network" in user_view
See merge request pleroma/pleroma!704
Maxim Filippov [Wed, 23 Jan 2019 16:47:51 +0000 (19:47 +0300)]
Send "hide_network" in user_view
kaniini [Wed, 23 Jan 2019 13:25:04 +0000 (13:25 +0000)]
Merge branch 's3-namespace' into 'develop'
S3 uploader: support for namespaced bucket
Closes #532
See merge request pleroma/pleroma!699
href [Wed, 23 Jan 2019 13:20:34 +0000 (13:20 +0000)]
Merge branch 'fix-info-id' into 'develop'
Fix info ids.
Closes #511
See merge request pleroma/pleroma!702
lain [Wed, 23 Jan 2019 13:00:23 +0000 (14:00 +0100)]
Fix info ids.
The previous migration actually created values for the key "id", including the
quotes. This one should fill out all missing ids.
Closes #511
lambda [Wed, 23 Jan 2019 12:14:41 +0000 (12:14 +0000)]
Merge branch 'rename/pleroma_activity_consistency' into 'develop'
Consistent fonction names in Pleroma.Activity
See merge request pleroma/pleroma!690
lain [Wed, 23 Jan 2019 12:05:58 +0000 (13:05 +0100)]
Merge branch 'develop' into rename/pleroma_activity_consistency
href [Wed, 23 Jan 2019 11:09:21 +0000 (12:09 +0100)]
FlakeId: chain alter statements
href [Wed, 23 Jan 2019 10:22:31 +0000 (11:22 +0100)]
Flake: migrate pinned_activities in jsonb
href [Wed, 23 Jan 2019 10:21:52 +0000 (11:21 +0100)]
Clippy!
href [Mon, 21 Jan 2019 12:10:48 +0000 (13:10 +0100)]
Lock activities/users table during flake migration.
href [Wed, 16 Jan 2019 15:15:46 +0000 (16:15 +0100)]
Treat User.Info pinned ids as strings
href [Wed, 16 Jan 2019 09:01:15 +0000 (10:01 +0100)]
FlakeId.from_string/1: remove old, un-needed conversion
href [Tue, 15 Jan 2019 15:42:33 +0000 (16:42 +0100)]
2019
href [Tue, 15 Jan 2019 15:39:23 +0000 (16:39 +0100)]
ActivityPub: restrict_since/restrict_max: ignore empty param
href [Tue, 15 Jan 2019 15:18:18 +0000 (16:18 +0100)]
Test FlakeID old id compat & Ecto type
href [Wed, 9 Jan 2019 15:08:24 +0000 (16:08 +0100)]
Flake Ids for Users and Activities
href [Tue, 22 Jan 2019 16:10:38 +0000 (16:10 +0000)]
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
Michael Loftis [Tue, 22 Jan 2019 15:35:21 +0000 (15:35 +0000)]
slightly changes definition so that autovacuum works paralell safe too
Haelwenn [Tue, 22 Jan 2019 14:28:17 +0000 (14:28 +0000)]
Merge branch 'fix/activity_get_by_id' into 'develop'
Add get_by_id to activity.ex
See merge request pleroma/pleroma!695
lambda [Tue, 22 Jan 2019 14:18:36 +0000 (14:18 +0000)]
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
Ivan Tashkinov [Tue, 22 Jan 2019 14:12:53 +0000 (17:12 +0300)]
[#502] Fixed User.active_local_user_query to return users with nil or missing `info.deactivated`. Adjusted test.
kaniini [Tue, 22 Jan 2019 09:03:03 +0000 (09:03 +0000)]
Merge branch 'uploader-controller' into 'develop'
Uploader callback controller
See merge request pleroma/pleroma!694
rinpatch [Tue, 22 Jan 2019 07:54:11 +0000 (10:54 +0300)]
Add get_by_id to activity.ex
href [Mon, 21 Jan 2019 21:44:14 +0000 (22:44 +0100)]
Uploader callback controller
rinpatch [Mon, 21 Jan 2019 20:02:58 +0000 (20:02 +0000)]
Merge branch 'fix-buggy-test' into 'develop'
Fix buggy test.
See merge request pleroma/pleroma!693
lain [Mon, 21 Jan 2019 16:54:11 +0000 (17:54 +0100)]
Fix buggy test.
lambda [Mon, 21 Jan 2019 16:19:15 +0000 (16:19 +0000)]
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
href [Mon, 21 Jan 2019 14:17:24 +0000 (15:17 +0100)]
reverse_proxy - always override plug's cache-control
href [Mon, 21 Jan 2019 13:42:16 +0000 (14:42 +0100)]
S3 Namespace
lambda [Mon, 21 Jan 2019 13:03:32 +0000 (13:03 +0000)]
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
lambda [Mon, 21 Jan 2019 12:35:10 +0000 (12:35 +0000)]
Merge branch 'feature/dm-sanity' into 'develop'
DM sanitization
See merge request pleroma/pleroma!458
Ivan Tashkinov [Mon, 21 Jan 2019 11:52:41 +0000 (14:52 +0300)]
[#502] Code comments update.
Ivan Tashkinov [Mon, 21 Jan 2019 11:30:01 +0000 (14:30 +0300)]
[#530] Fixed test.
Ivan Tashkinov [Mon, 21 Jan 2019 11:16:51 +0000 (14:16 +0300)]
[#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).
Haelwenn (lanodan) Monnier [Mon, 21 Jan 2019 06:37:45 +0000 (07:37 +0100)]
Activity: mix format (2 empty lines)
Haelwenn (lanodan) Monnier [Mon, 21 Jan 2019 06:14:20 +0000 (07:14 +0100)]
Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1
projects / akkoma / log