akkoma
5 years agoMerge branch 'oembed_provider' into 'develop'
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

5 years agoMerge branch 'update/pleroma-fe-20190125-hotfix' into 'develop'
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

5 years agoupdate pleroma frontend (summary_html hotfix)
William Pitcock [Fri, 25 Jan 2019 10:17:00 +0000 (10:17 +0000)]
update pleroma frontend (summary_html hotfix)

5 years agoFix OGP provider tests
rinpatch [Fri, 25 Jan 2019 07:51:06 +0000 (10:51 +0300)]
Fix OGP provider tests

5 years agoMerge remote-tracking branch 'pl/develop' into oembed_provider
rinpatch [Fri, 25 Jan 2019 07:40:51 +0000 (10:40 +0300)]
Merge remote-tracking branch 'pl/develop' into oembed_provider

5 years agoMerge branch 'fix/tusky-dm' into 'develop'
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

5 years agoMerge branch 'develop' into 'oembed_provider'
kaniini [Fri, 25 Jan 2019 05:00:47 +0000 (05:00 +0000)]
Merge branch 'develop' into 'oembed_provider'

# Conflicts:
#   lib/pleroma/activity.ex

5 years agoMerge branch 'classic-flakeids' into 'develop'
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

5 years agoMerge branch 'update/pleroma-fe-20190125' into 'develop'
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

5 years agoupdate pleroma frontend
William Pitcock [Fri, 25 Jan 2019 04:49:35 +0000 (04:49 +0000)]
update pleroma frontend

5 years agoUse correct logic to determine "attentions" list
Maxim Filippov [Thu, 24 Jan 2019 20:30:43 +0000 (23:30 +0300)]
Use correct logic to determine "attentions" list

5 years agoFix clippy with one/five lines
href [Thu, 24 Jan 2019 15:15:13 +0000 (16:15 +0100)]
Fix clippy with one/five lines

5 years agoMerge branch 'fix-activity_visibility-autovacuum' into 'develop'
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

5 years agoFix postgres activity_visibility when running in autovacuum
href [Thu, 24 Jan 2019 13:13:20 +0000 (14:13 +0100)]
Fix postgres activity_visibility when running in autovacuum

5 years agoFlakeId: ignore null mac for workerid, use first mac
href [Thu, 24 Jan 2019 12:08:27 +0000 (13:08 +0100)]
FlakeId: ignore null mac for workerid, use first mac

5 years agoMerge branch 'feature/mrf-anti-followbot' into 'develop'
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

5 years agotest: add anti-followbot policy tests
William Pitcock [Thu, 24 Jan 2019 09:50:40 +0000 (09:50 +0000)]
test: add anti-followbot policy tests

5 years agomrf: add anti-followbot policy
William Pitcock [Thu, 24 Jan 2019 09:35:19 +0000 (09:35 +0000)]
mrf: add anti-followbot policy

5 years agoMerge branch 'fix/hide-network-setting' into 'develop'
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

5 years agoSend "hide_network" in user_view
Maxim Filippov [Wed, 23 Jan 2019 16:47:51 +0000 (19:47 +0300)]
Send "hide_network" in user_view

5 years agoMerge branch 's3-namespace' into 'develop'
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

5 years agoMerge branch 'fix-info-id' into 'develop'
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

5 years agoFix info ids.
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

5 years agoMerge branch 'rename/pleroma_activity_consistency' into 'develop'
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

5 years agoMerge branch 'develop' into rename/pleroma_activity_consistency
lain [Wed, 23 Jan 2019 12:05:58 +0000 (13:05 +0100)]
Merge branch 'develop' into rename/pleroma_activity_consistency

5 years agoFlakeId: chain alter statements
href [Wed, 23 Jan 2019 11:09:21 +0000 (12:09 +0100)]
FlakeId: chain alter statements

5 years agoFlake: migrate pinned_activities in jsonb
href [Wed, 23 Jan 2019 10:22:31 +0000 (11:22 +0100)]
Flake: migrate pinned_activities in jsonb

5 years agoClippy!
href [Wed, 23 Jan 2019 10:21:52 +0000 (11:21 +0100)]
Clippy!

5 years agoLock activities/users table during flake migration.
href [Mon, 21 Jan 2019 12:10:48 +0000 (13:10 +0100)]
Lock activities/users table during flake migration.

5 years agoTreat User.Info pinned ids as strings
href [Wed, 16 Jan 2019 15:15:46 +0000 (16:15 +0100)]
Treat User.Info pinned ids as strings

5 years agoFlakeId.from_string/1: remove old, un-needed conversion
href [Wed, 16 Jan 2019 09:01:15 +0000 (10:01 +0100)]
FlakeId.from_string/1: remove old, un-needed conversion

5 years ago2019
href [Tue, 15 Jan 2019 15:42:33 +0000 (16:42 +0100)]
2019

5 years agoActivityPub: restrict_since/restrict_max: ignore empty param
href [Tue, 15 Jan 2019 15:39:23 +0000 (16:39 +0100)]
ActivityPub: restrict_since/restrict_max: ignore empty param

5 years agoTest FlakeID old id compat & Ecto type
href [Tue, 15 Jan 2019 15:18:18 +0000 (16:18 +0100)]
Test FlakeID old id compat & Ecto type

5 years agoFlake Ids for Users and Activities
href [Wed, 9 Jan 2019 15:08:24 +0000 (16:08 +0100)]
Flake Ids for Users and Activities

5 years agoMerge branch 'mr/20190122-activity-visibility-update' into 'develop'
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

5 years agoslightly changes definition so that autovacuum works paralell safe too
Michael Loftis [Tue, 22 Jan 2019 15:35:21 +0000 (15:35 +0000)]
slightly changes definition so that autovacuum works paralell safe too

5 years agoMerge branch 'fix/activity_get_by_id' into 'develop'
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

5 years agoMerge branch '502_stats_fix_for_nil_info_deactivated' into 'develop'
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

5 years ago[#502] Fixed User.active_local_user_query to return users with nil or missing `info...
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.

5 years agoMerge branch 'uploader-controller' into 'develop'
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

5 years agoAdd get_by_id to activity.ex
rinpatch [Tue, 22 Jan 2019 07:54:11 +0000 (10:54 +0300)]
Add get_by_id to activity.ex

5 years agoUploader callback controller
href [Mon, 21 Jan 2019 21:44:14 +0000 (22:44 +0100)]
Uploader callback controller

5 years agoMerge branch 'fix-buggy-test' into 'develop'
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

5 years agoFix buggy test.
lain [Mon, 21 Jan 2019 16:54:11 +0000 (17:54 +0100)]
Fix buggy test.

5 years agoMerge branch 'proxy-no-default-plug-cache' into 'develop'
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

5 years agoreverse_proxy - always override plug's cache-control
href [Mon, 21 Jan 2019 14:17:24 +0000 (15:17 +0100)]
reverse_proxy - always override plug's cache-control

5 years agoS3 Namespace
href [Mon, 21 Jan 2019 13:42:16 +0000 (14:42 +0100)]
S3 Namespace

5 years agoMerge branch '530_federator_user_info_overwrite_fix' into 'develop'
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

5 years agoMerge branch 'feature/dm-sanity' into 'develop'
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

5 years ago[#502] Code comments update.
Ivan Tashkinov [Mon, 21 Jan 2019 11:52:41 +0000 (14:52 +0300)]
[#502] Code comments update.

5 years ago[#530] Fixed test.
Ivan Tashkinov [Mon, 21 Jan 2019 11:30:01 +0000 (14:30 +0300)]
[#530] Fixed test.

5 years ago[#530] Prevents user `info` from being overwritten because of race conditions
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).

5 years agoActivity: mix format (2 empty lines)
Haelwenn (lanodan) Monnier [Mon, 21 Jan 2019 06:37:45 +0000 (07:37 +0100)]
Activity: mix format (2 empty lines)

5 years agoActivity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1
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

5 years agoActivity: create_activity_by_object_id_query/1 → create_by_object_ap_id/1 when is_list
Haelwenn (lanodan) Monnier [Mon, 21 Jan 2019 06:07:54 +0000 (07:07 +0100)]
Activity: create_activity_by_object_id_query/1 → create_by_object_ap_id/1 when is_list

5 years agoActivity: get_all_by_object_ap_id/1 → get_all_create_by_object_ap_id/1
Haelwenn (lanodan) Monnier [Mon, 21 Jan 2019 05:46:47 +0000 (06:46 +0100)]
Activity: get_all_by_object_ap_id/1 → get_all_create_by_object_ap_id/1

5 years agoActivity: all_by_object_ap_id_q/1 → create_by_object_ap_id/1
Haelwenn (lanodan) Monnier [Mon, 21 Jan 2019 05:39:00 +0000 (06:39 +0100)]
Activity: all_by_object_ap_id_q/1 → create_by_object_ap_id/1

5 years agoActivity: all_non_create_by_object_ap_id_q → by_object_ap_id
Haelwenn (lanodan) Monnier [Mon, 21 Jan 2019 05:15:05 +0000 (06:15 +0100)]
Activity: all_non_create_by_object_ap_id_q → by_object_ap_id

5 years agoActivity: all_by_object_ap_id/1 → get_all_by_object_ap_id/1
Haelwenn (lanodan) Monnier [Mon, 21 Jan 2019 05:29:05 +0000 (06:29 +0100)]
Activity: all_by_object_ap_id/1 → get_all_by_object_ap_id/1

5 years agoMerge branch 'bugfix/gen_signing_salt' into 'develop'
rinpatch [Mon, 21 Jan 2019 05:22:34 +0000 (05:22 +0000)]
Merge branch 'bugfix/gen_signing_salt' into 'develop'

Mix.Tasks.Pleroma.Instance: Generate signing_salt

Closes #533

See merge request pleroma/pleroma!689

5 years agoMix.Tasks.Pleroma.Instance: Generate signing_salt
Haelwenn (lanodan) Monnier [Mon, 21 Jan 2019 00:16:41 +0000 (01:16 +0100)]
Mix.Tasks.Pleroma.Instance: Generate signing_salt

Closes: https://git.pleroma.social/pleroma/pleroma/issues/533
5 years agoMerge branch '116-send-delete-event' into 'develop'
kaniini [Sun, 20 Jan 2019 23:06:21 +0000 (23:06 +0000)]
Merge branch '116-send-delete-event' into 'develop'

Send delete event over Mastodon streaming api

Closes #116

See merge request pleroma/pleroma!688

5 years agoSend delete event over Mastodon streaming api
lain [Sun, 20 Jan 2019 12:00:46 +0000 (13:00 +0100)]
Send delete event over Mastodon streaming api

Closes #116

5 years agoMerge branch 'add-custom-emoji-test' into 'develop'
lambda [Sun, 20 Jan 2019 10:58:19 +0000 (10:58 +0000)]
Merge branch 'add-custom-emoji-test' into 'develop'

Add a test to ensure #39 is fixed.

See merge request pleroma/pleroma!687

5 years agoAdd a test to ensure #39 is fixed.
lain [Sun, 20 Jan 2019 10:48:53 +0000 (11:48 +0100)]
Add a test to ensure #39 is fixed.

5 years agoMerge branch '2019-1-20-update-frontend' into 'develop'
lambda [Sun, 20 Jan 2019 10:42:06 +0000 (10:42 +0000)]
Merge branch '2019-1-20-update-frontend' into 'develop'

update frontend

See merge request pleroma/pleroma!686

5 years agoupdate frontend
lain [Sun, 20 Jan 2019 10:28:11 +0000 (11:28 +0100)]
update frontend

5 years agoMerge branch 'i1t/pleroma-477_user_search_improvements' into 'develop'
lambda [Sun, 20 Jan 2019 10:24:05 +0000 (10:24 +0000)]
Merge branch 'i1t/pleroma-477_user_search_improvements' into 'develop'

I1t/pleroma 477 user search improvements

See merge request pleroma/pleroma!685

5 years agoSet custom similarity limit.
lain [Sun, 20 Jan 2019 09:57:49 +0000 (10:57 +0100)]
Set custom similarity limit.

5 years agoactivitypub: short-circuit is_public?() with directMessage flag check
William Pitcock [Sun, 20 Jan 2019 02:30:29 +0000 (02:30 +0000)]
activitypub: short-circuit is_public?() with directMessage flag check

5 years agotest: transmogrifier: verify directMessage flag is sent outbound based on declared...
William Pitcock [Sun, 23 Dec 2018 15:55:07 +0000 (15:55 +0000)]
test: transmogrifier: verify directMessage flag is sent outbound based on declared visibility

5 years agotransmogrifier: slightly clean up fix_explicit_addressing pipeline
William Pitcock [Sun, 23 Dec 2018 15:44:26 +0000 (15:44 +0000)]
transmogrifier: slightly clean up fix_explicit_addressing pipeline

5 years agotransmogrifier: don't apply heuristics against messages which have `directMessage...
William Pitcock [Sun, 23 Dec 2018 15:35:49 +0000 (15:35 +0000)]
transmogrifier: don't apply heuristics against messages which have `directMessage` set true

5 years agoactivitypub: add is_private?/is_direct? helpers
William Pitcock [Sun, 23 Dec 2018 15:27:08 +0000 (15:27 +0000)]
activitypub: add is_private?/is_direct? helpers

5 years agocommon api: set directMessage flag on our own posts
William Pitcock [Sun, 23 Dec 2018 15:26:07 +0000 (15:26 +0000)]
common api: set directMessage flag on our own posts

5 years agolitepub schema: add litepub:directMessage flag
William Pitcock [Sun, 23 Dec 2018 15:13:06 +0000 (15:13 +0000)]
litepub schema: add litepub:directMessage flag

5 years agomastodon api: get_visibility(): DMs never have a cc list.
William Pitcock [Sat, 17 Nov 2018 16:30:44 +0000 (16:30 +0000)]
mastodon api: get_visibility(): DMs never have a cc list.

5 years agotests: add tests for DM sanitizer
William Pitcock [Sat, 17 Nov 2018 16:18:40 +0000 (16:18 +0000)]
tests: add tests for DM sanitizer

5 years agoactivitypub: transmogrifier: fix up to/cc addressing brain damage caused by mastodon...
William Pitcock [Sat, 17 Nov 2018 16:05:41 +0000 (16:05 +0000)]
activitypub: transmogrifier: fix up to/cc addressing brain damage caused by mastodon-style explicit DMs

5 years agoactivitypub: utils: add determine_explicit_mentions() and tests
William Pitcock [Sat, 17 Nov 2018 15:51:02 +0000 (15:51 +0000)]
activitypub: utils: add determine_explicit_mentions() and tests

5 years agoMerge branch 'bugfix/improve-boost-targeting' into 'develop'
kaniini [Sat, 19 Jan 2019 23:44:08 +0000 (23:44 +0000)]
Merge branch 'bugfix/improve-boost-targeting' into 'develop'

improve handling of non-public Announces

See merge request pleroma/pleroma!681

5 years agoMake use of the indices.
lain [Sat, 19 Jan 2019 23:31:17 +0000 (00:31 +0100)]
Make use of the indices.

Indices in postgresql rely on operators, so they won't be used if you use only functions.

5 years agoFormating
rinpatch [Sat, 19 Jan 2019 22:28:46 +0000 (01:28 +0300)]
Formating

5 years agoProvide local og:url for remote activities
rinpatch [Sat, 19 Jan 2019 07:58:27 +0000 (10:58 +0300)]
Provide local og:url for remote activities

5 years agoMerge branch '491_full_mentions_in_user_bio' into 'develop'
kaniini [Sat, 19 Jan 2019 07:36:58 +0000 (07:36 +0000)]
Merge branch '491_full_mentions_in_user_bio' into 'develop'

[#491] Made user bio preserve full nicknames (nick@host)

Closes #491

See merge request pleroma/pleroma!676

5 years agoFormat
Maxim Filippov [Sat, 19 Jan 2019 01:26:52 +0000 (04:26 +0300)]
Format

5 years agoAdd current user to mentioned
Maxim Filippov [Sat, 19 Jan 2019 01:25:15 +0000 (04:25 +0300)]
Add current user to mentioned

5 years agotest: add regression test for to/cc clobbering
William Pitcock [Fri, 18 Jan 2019 22:32:01 +0000 (22:32 +0000)]
test: add regression test for to/cc clobbering

5 years agoAdd actor to recipients
Maxim Filippov [Fri, 18 Jan 2019 19:40:52 +0000 (22:40 +0300)]
Add actor to recipients

5 years agoFix merge conflict
rinpatch [Fri, 18 Jan 2019 15:31:25 +0000 (18:31 +0300)]
Fix merge conflict

5 years agounfurl_nsfw: false by default
rinpatch [Fri, 18 Jan 2019 15:30:06 +0000 (18:30 +0300)]
unfurl_nsfw: false by default

5 years ago[#477] User trigram index adjustment.
Ivan Tashkinov [Fri, 18 Jan 2019 07:57:42 +0000 (10:57 +0300)]
[#477] User trigram index adjustment.

5 years agoFix ostatus test
rinpatch [Fri, 18 Jan 2019 07:35:52 +0000 (10:35 +0300)]
Fix ostatus test

5 years ago[#477] User: FTS and trigram search results mixing (to handle misspelled requests).
Ivan Tashkinov [Fri, 18 Jan 2019 07:35:45 +0000 (10:35 +0300)]
[#477] User: FTS and trigram search results mixing (to handle misspelled requests).

5 years agoRemove custom emojis and trailing whitespaces from previews
rinpatch [Fri, 18 Jan 2019 07:28:19 +0000 (10:28 +0300)]
Remove custom emojis and trailing whitespaces from previews

5 years agoUse object instead of activity for metadata
rinpatch [Fri, 18 Jan 2019 06:32:52 +0000 (09:32 +0300)]
Use object instead of activity for metadata

5 years ago[#491] Made full nicknames be preserved in user links text only in Bio.
Ivan Tashkinov [Fri, 18 Jan 2019 06:30:16 +0000 (09:30 +0300)]
[#491] Made full nicknames be preserved in user links text only in Bio.

5 years agoactivitypub: add a match clause for objects, not just activities
William Pitcock [Thu, 17 Jan 2019 23:32:16 +0000 (23:32 +0000)]
activitypub: add a match clause for objects, not just activities

5 years agoactivitypub: transmogrifier: do not clobber the addressing on relayed announcements
William Pitcock [Thu, 17 Jan 2019 23:19:15 +0000 (23:19 +0000)]
activitypub: transmogrifier: do not clobber the addressing on relayed announcements