akkoma
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 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 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 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 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 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 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 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

5 years agoactivitypub: allow is_public?() to work on any type of map representing an AS2 object
William Pitcock [Thu, 17 Jan 2019 23:17:59 +0000 (23:17 +0000)]
activitypub: allow is_public?() to work on any type of map representing an AS2 object

5 years agoactivitypub: relay: chase selective public announce changes
William Pitcock [Thu, 17 Jan 2019 23:13:54 +0000 (23:13 +0000)]
activitypub: relay: chase selective public announce changes

5 years agoactivitypub: announce: add new public parameter
William Pitcock [Thu, 17 Jan 2019 23:12:42 +0000 (23:12 +0000)]
activitypub: announce: add new public parameter

5 years agoMerge branch '502_instance_stats_active_users_count_fix' into 'develop'
kaniini [Thu, 17 Jan 2019 19:27:15 +0000 (19:27 +0000)]
Merge branch '502_instance_stats_active_users_count_fix' into 'develop'

[#502] Fixed `user_count` in `/api/v1/instance` to include only active local users

Closes #502

See merge request pleroma/pleroma!678

5 years agoMerge branch 'bad-copy-paste' into 'develop'
kaniini [Thu, 17 Jan 2019 19:22:21 +0000 (19:22 +0000)]
Merge branch 'bad-copy-paste' into 'develop'

Fix bad link in likes collection

See merge request pleroma/pleroma!679

5 years agoMerge branch 'attachment-links' into 'develop'
kaniini [Thu, 17 Jan 2019 19:21:54 +0000 (19:21 +0000)]
Merge branch 'attachment-links' into 'develop'

Make attachment links configurable

See merge request pleroma/pleroma!677

5 years agoMerge branch 'change-mix-location' into 'develop'
kaniini [Thu, 17 Jan 2019 19:21:07 +0000 (19:21 +0000)]
Merge branch 'change-mix-location' into 'develop'

systemd: Add comments and change default path of the Mix binary.

See merge request pleroma/pleroma!680

5 years agoAdd comments and change default path of the Mix binary.
shibayashi [Thu, 17 Jan 2019 18:49:54 +0000 (19:49 +0100)]
Add comments and change default path of the Mix binary.

5 years agoFix bad link in likes collection
sxsdv1 [Thu, 17 Jan 2019 17:21:43 +0000 (18:21 +0100)]
Fix bad link in likes collection

Don't copy and paste, mkay

5 years ago[#502] Fixed `user_count` in `/api/v1/instance` to include only active local users.
Ivan Tashkinov [Thu, 17 Jan 2019 16:16:02 +0000 (19:16 +0300)]
[#502] Fixed `user_count` in `/api/v1/instance` to include only active local users.

5 years agoformatting
Mark Felder [Thu, 17 Jan 2019 16:10:26 +0000 (16:10 +0000)]
formatting

5 years agoDefault to disabled in the code in case the setting is absent from config.exs
Mark Felder [Thu, 17 Jan 2019 16:01:25 +0000 (16:01 +0000)]
Default to disabled in the code in case the setting is absent from config.exs

5 years agoAlso add to default config
Mark Felder [Thu, 17 Jan 2019 15:50:34 +0000 (15:50 +0000)]
Also add to default config

5 years agoMake attachment links configurable
Mark Felder [Thu, 17 Jan 2019 15:48:14 +0000 (15:48 +0000)]
Make attachment links configurable

Thanks @href!

5 years ago[#491] Made user bio preserve full nicknames (nick@host).
Ivan Tashkinov [Thu, 17 Jan 2019 15:03:49 +0000 (18:03 +0300)]
[#491] Made user bio preserve full nicknames (nick@host).

5 years agoMerge branch 'resilient-user-view-2' into 'develop'
kaniini [Thu, 17 Jan 2019 03:19:55 +0000 (03:19 +0000)]
Merge branch 'resilient-user-view-2' into 'develop'

MastoAPI: Don't break on missing users.

See merge request pleroma/pleroma!675

5 years agoMastoAPI: Don't break on missing users.
lain [Wed, 16 Jan 2019 14:13:09 +0000 (15:13 +0100)]
MastoAPI: Don't break on missing users.

5 years agoMerge branch 'feature/improve-microformats' into 'develop'
lambda [Wed, 16 Jan 2019 09:06:47 +0000 (09:06 +0000)]
Merge branch 'feature/improve-microformats' into 'develop'

improve microformats support

See merge request pleroma/pleroma!672

5 years agoMerge branch '518_instance_stats_fix' into 'develop'
lambda [Wed, 16 Jan 2019 08:59:40 +0000 (08:59 +0000)]
Merge branch '518_instance_stats_fix' into 'develop'

[#518] Fix: /api/v1/instance ("domain_count"), /api/v1/instance/peers

Closes #518

See merge request pleroma/pleroma!673

5 years ago[#518] Fixed /api/v1/instance ("domain_count" value) and /api/v1/instance/peers respo...
Ivan Tashkinov [Wed, 16 Jan 2019 08:07:46 +0000 (11:07 +0300)]
[#518] Fixed /api/v1/instance ("domain_count" value) and /api/v1/instance/peers responses.

5 years ago[#477] Minor refactoring (user search query).
Ivan Tashkinov [Wed, 16 Jan 2019 07:44:32 +0000 (10:44 +0300)]
[#477] Minor refactoring (user search query).

5 years agotests: fixup
William Pitcock [Wed, 16 Jan 2019 04:09:01 +0000 (04:09 +0000)]
tests: fixup

5 years agoformatter: improve microformats markup
William Pitcock [Wed, 16 Jan 2019 03:53:36 +0000 (03:53 +0000)]
formatter: improve microformats markup

5 years agohtml: allow microformats-related markup through the html filter
William Pitcock [Wed, 16 Jan 2019 03:48:43 +0000 (03:48 +0000)]
html: allow microformats-related markup through the html filter

5 years agoMerge branch 'bugfix/websub-hardening' into 'develop'
lambda [Tue, 15 Jan 2019 20:02:56 +0000 (20:02 +0000)]
Merge branch 'bugfix/websub-hardening' into 'develop'

websub: improve error handling

See merge request pleroma/pleroma!670

5 years agoMerge branch 'bugfix/tesla-query-params' into 'develop'
lambda [Tue, 15 Jan 2019 20:00:22 +0000 (20:00 +0000)]
Merge branch 'bugfix/tesla-query-params' into 'develop'

Make OStatus Work Again

See merge request pleroma/pleroma!671

5 years agohttp: add support for query parameters, use Jason for JSON encoding instead of Poison...
William Pitcock [Tue, 15 Jan 2019 19:31:13 +0000 (19:31 +0000)]
http: add support for query parameters, use Jason for JSON encoding instead of Poison like everywhere else

5 years agowebsub: improve error handling
William Pitcock [Tue, 15 Jan 2019 18:00:20 +0000 (18:00 +0000)]
websub: improve error handling

5 years ago[#477] User search tests. Normalized search rank in User.search.
Ivan Tashkinov [Tue, 15 Jan 2019 10:05:25 +0000 (13:05 +0300)]
[#477] User search tests. Normalized search rank in User.search.

5 years ago[#477] Added FTS index for `users`. Fixed failing test.
Ivan Tashkinov [Tue, 15 Jan 2019 09:04:54 +0000 (12:04 +0300)]
[#477] Added FTS index for `users`. Fixed failing test.

5 years agoMerge branch 'fix/elixir-1-8-type-annotation' into 'develop'
lambda [Tue, 15 Jan 2019 08:51:59 +0000 (08:51 +0000)]
Merge branch 'fix/elixir-1-8-type-annotation' into 'develop'

Fix Elixir 1.8 type annotation issue

Closes #523

See merge request pleroma/pleroma!668

5 years agoMerge branch 'bugfix/upload_with_question_mark' into 'develop'
rinpatch [Tue, 15 Jan 2019 07:01:50 +0000 (07:01 +0000)]
Merge branch 'bugfix/upload_with_question_mark' into 'develop'

Upload: Fix uploading with a ? in the filename

See merge request pleroma/pleroma!669

5 years agoUpload: Fix uploading with a : in the filename
Haelwenn (lanodan) Monnier [Tue, 15 Jan 2019 06:57:48 +0000 (07:57 +0100)]
Upload: Fix uploading with a : in the filename

5 years agoUpload: Fix uploading with a ? in the filename
Haelwenn (lanodan) Monnier [Tue, 15 Jan 2019 06:40:00 +0000 (07:40 +0100)]
Upload: Fix uploading with a ? in the filename

5 years agoFix Elixir 1.8 type annotation issue
Maxim Filippov [Tue, 15 Jan 2019 00:58:48 +0000 (02:58 +0200)]
Fix Elixir 1.8 type annotation issue

5 years agoMerge branch 'media-url-escape' into 'develop'
rinpatch [Mon, 14 Jan 2019 18:52:23 +0000 (18:52 +0000)]
Merge branch 'media-url-escape' into 'develop'

URI escape file upload URLs

See merge request pleroma/pleroma!665

5 years agoMerge branch 'load-all-dms' into 'develop'
lambda [Mon, 14 Jan 2019 18:49:53 +0000 (18:49 +0000)]
Merge branch 'load-all-dms' into 'develop'

Remove recent activity restriction.

See merge request pleroma/pleroma!644

5 years agoAdd attachment escaping test
Shadowfacts [Mon, 14 Jan 2019 18:29:38 +0000 (13:29 -0500)]
Add attachment escaping test

5 years ago[#477] User search improvements: tsquery search with field weights, friends & followe...
Ivan Tashkinov [Mon, 14 Jan 2019 17:04:45 +0000 (20:04 +0300)]
[#477] User search improvements: tsquery search with field weights, friends & followers boosting.

5 years agoURI escape file upload URLs
Shadowfacts [Mon, 14 Jan 2019 16:31:44 +0000 (11:31 -0500)]
URI escape file upload URLs

5 years agoMerge branch 'feature/add-oembed-parser' into 'develop'
kaniini [Mon, 14 Jan 2019 07:28:04 +0000 (07:28 +0000)]
Merge branch 'feature/add-oembed-parser' into 'develop'

Add OEmbed parser

See merge request pleroma/pleroma!661

5 years agoMerge branch 'activitypub-likes' into 'develop'
kaniini [Mon, 14 Jan 2019 07:27:05 +0000 (07:27 +0000)]
Merge branch 'activitypub-likes' into 'develop'

Activitypub c2s likes

See merge request pleroma/pleroma!658

5 years agoMerge branch 'fix-nginx-caching' into 'develop'
kaniini [Mon, 14 Jan 2019 07:25:08 +0000 (07:25 +0000)]
Merge branch 'fix-nginx-caching' into 'develop'

Fix nginx caching issues

See merge request pleroma/pleroma!654

5 years agoMerge branch 'feature/mrf-no-placeholder-text-policy' into 'develop'
kaniini [Mon, 14 Jan 2019 07:23:33 +0000 (07:23 +0000)]
Merge branch 'feature/mrf-no-placeholder-text-policy' into 'develop'

mrf: add no placeholder-text policy, strips pointless "." content from posts with images

See merge request pleroma/pleroma!662

5 years agomrf: add no placeholder-text policy, strips pointless "." content from posts with...
William Pitcock [Mon, 14 Jan 2019 05:31:57 +0000 (05:31 +0000)]
mrf: add no placeholder-text policy, strips pointless "." content from posts with images

5 years agoMerge branch 'bugfix/favourites-link-header' into 'develop'
lambda [Sun, 13 Jan 2019 16:01:15 +0000 (16:01 +0000)]
Merge branch 'bugfix/favourites-link-header' into 'develop'

Add link headers and honour parameters on Mastodon API /favourites

See merge request pleroma/pleroma!659

5 years agoAdd test for mastodon API /favourites endpoint
Sadposter [Sun, 13 Jan 2019 15:17:47 +0000 (15:17 +0000)]
Add test for mastodon API /favourites endpoint

5 years agoAdd OEmbed parser
Maxim Filippov [Sun, 13 Jan 2019 00:06:50 +0000 (02:06 +0200)]
Add OEmbed parser

5 years agoAdd likes to activitypub object representation
sxsdv1 [Wed, 9 Jan 2019 08:22:00 +0000 (09:22 +0100)]
Add likes to activitypub object representation

Top level of the likes OrderedCollection is inlined to get immediate
access to totalItems. Because the count can be returned without scanning
the database for like activities the extra query is saved when the
client only wants to display the total.

5 years agoAdd route to get object like activities
sxsdv1 [Fri, 11 Jan 2019 22:34:32 +0000 (23:34 +0100)]
Add route to get object like activities

5 years agoHandle client submitted activitypub like activity
sxsdv1 [Tue, 8 Jan 2019 18:22:26 +0000 (19:22 +0100)]
Handle client submitted activitypub like activity

5 years agoPrepare all types objects before serialising
sxsdv1 [Sat, 12 Jan 2019 16:52:30 +0000 (17:52 +0100)]
Prepare all types objects before serialising

Activities returned from inbox can include other types of objects like
Article

5 years agoHonour parameters on MastoAPI /favourites
Sadposter [Sat, 12 Jan 2019 14:42:52 +0000 (14:42 +0000)]
Honour parameters on MastoAPI /favourites

5 years agoAdd link headers to MastoAPI /favourites
Sadposter [Sat, 12 Jan 2019 14:03:35 +0000 (14:03 +0000)]
Add link headers to MastoAPI /favourites

As documented at https://docs.joinmastodon.org/api/rest/favourites/

5 years agoMerge branch 'bugfix/pinned-statuses' into 'develop'
kaniini [Fri, 11 Jan 2019 23:09:41 +0000 (23:09 +0000)]
Merge branch 'bugfix/pinned-statuses' into 'develop'

Unpin when deleting a status

See merge request pleroma/pleroma!655

5 years agoMerge branch 'fix-spellign' into 'develop'
scarlett [Fri, 11 Jan 2019 10:02:25 +0000 (10:02 +0000)]
Merge branch 'fix-spellign' into 'develop'

Fix spellign.

See merge request pleroma/pleroma!656

5 years agoFix spellign.
scarlett [Fri, 11 Jan 2019 09:55:33 +0000 (09:55 +0000)]
Fix spellign.

5 years agotypo
Egor Kislitsyn [Fri, 11 Jan 2019 05:47:44 +0000 (12:47 +0700)]
typo

5 years agounpin when deleting a status
Egor Kislitsyn [Fri, 11 Jan 2019 05:31:31 +0000 (12:31 +0700)]
unpin when deleting a status

5 years agoFix nginx caching issues
Mark Felder [Thu, 10 Jan 2019 21:29:05 +0000 (21:29 +0000)]
Fix nginx caching issues

Nginx is currently not caching data because proxy_buffering needs to be
enabled for caching to work at all, and we are receiving a Cache-Control
header from Pleroma that states "max-age=0, private, must-revalidate"

Even disregarding the Cache-Control header that should actually be set
to "public, max-age=1209600" as defined in the reverse_proxy code, we
don't want to obey this header at all as it overrides our Nginx caching
rules.

5 years agoMerge branch 'fix-varnish-chunked' into 'develop'
kaniini [Thu, 10 Jan 2019 18:49:00 +0000 (18:49 +0000)]
Merge branch 'fix-varnish-chunked' into 'develop'

Fix varnish chunked and general improvements

See merge request pleroma/pleroma!653

5 years agoMerge branch 'activitypub-dereference-activity-id' into 'develop'
kaniini [Thu, 10 Jan 2019 18:42:36 +0000 (18:42 +0000)]
Merge branch 'activitypub-dereference-activity-id' into 'develop'

Support activity+json request for activity

See merge request pleroma/pleroma!641

5 years agoConsistent intentation
Mark Felder [Thu, 10 Jan 2019 18:29:36 +0000 (18:29 +0000)]
Consistent intentation

5 years agoCache partial objects for 10 minutes
Mark Felder [Thu, 10 Jan 2019 18:28:14 +0000 (18:28 +0000)]
Cache partial objects for 10 minutes
This enables caching/streaming of chunked responses