akkoma
4 years agoUpdate pleroma.nginx to support TLSv1.3
normandy [Fri, 12 Jun 2020 01:41:09 +0000 (01:41 +0000)]
Update pleroma.nginx to support TLSv1.3

Based on SSL config from https://ssl-config.mozilla.org/

4 years agoMerge branch 'fix/csp-mediaproxy-base-url' into 'develop'
feld [Thu, 11 Jun 2020 16:18:06 +0000 (16:18 +0000)]
Merge branch 'fix/csp-mediaproxy-base-url' into 'develop'

HTTP security plug: add media proxy base url host to csp

See merge request pleroma/pleroma!2638

4 years agoCheck for media proxy base_url, not Upload base_url
Mark Felder [Thu, 11 Jun 2020 16:05:22 +0000 (11:05 -0500)]
Check for media proxy base_url, not Upload base_url

4 years agoMerge branch 'develop' into fix/csp-mediaproxy-base-url
Mark Felder [Thu, 11 Jun 2020 15:25:00 +0000 (10:25 -0500)]
Merge branch 'develop' into fix/csp-mediaproxy-base-url

4 years agoMerge branch '1794-hashtags-construction-from-uri' into 'develop'
feld [Thu, 11 Jun 2020 14:04:51 +0000 (14:04 +0000)]
Merge branch '1794-hashtags-construction-from-uri' into 'develop'

[#1794] Hashtags search fix for URI as query string

Closes #1794

See merge request pleroma/pleroma!2641

4 years ago[#1794] Fixes URI query handling for hashtags extraction in search.
Ivan Tashkinov [Thu, 11 Jun 2020 13:05:14 +0000 (16:05 +0300)]
[#1794] Fixes URI query handling for hashtags extraction in search.

4 years agoHTTP security plug: add media proxy base url host to csp
rinpatch [Wed, 10 Jun 2020 17:09:16 +0000 (20:09 +0300)]
HTTP security plug: add media proxy base url host to csp

4 years agoMerge branch 'remake-remodel-dms' into 'develop'
rinpatch [Wed, 10 Jun 2020 12:05:45 +0000 (12:05 +0000)]
Merge branch 'remake-remodel-dms' into 'develop'

Chats / ChatMessages

See merge request pleroma/pleroma!2429

4 years agoMerge branch 'add-url-to-admin-account-view' into 'develop'
lain [Tue, 9 Jun 2020 12:59:14 +0000 (12:59 +0000)]
Merge branch 'add-url-to-admin-account-view' into 'develop'

Add `url` field to AdminAPI.AccountView

See merge request pleroma/pleroma!2633

4 years agoAdd `url` field to AdminAPI.AccountView
Egor Kislitsyn [Mon, 8 Jun 2020 18:08:57 +0000 (22:08 +0400)]
Add `url` field to AdminAPI.AccountView

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lain [Tue, 9 Jun 2020 07:36:07 +0000 (09:36 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms

4 years agoMerge branch 'features/mediatype-mime-valid' into 'develop'
lain [Tue, 9 Jun 2020 07:32:43 +0000 (07:32 +0000)]
Merge branch 'features/mediatype-mime-valid' into 'develop'

transmogrifier: MIME.valid?/1 for mediaType

See merge request pleroma/pleroma!2634

4 years agoMerge branch 'remake-remodel-dms' of git.pleroma.social:pleroma/pleroma into remake...
lain [Tue, 9 Jun 2020 07:21:44 +0000 (09:21 +0200)]
Merge branch 'remake-remodel-dms' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms

4 years agoMigrationHelper: Move notification backfilling to own module.
lain [Tue, 9 Jun 2020 07:20:55 +0000 (09:20 +0200)]
MigrationHelper: Move notification backfilling to own module.

4 years agoApply suggestion to lib/pleroma/notification.ex
lain [Mon, 8 Jun 2020 20:01:37 +0000 (20:01 +0000)]
Apply suggestion to lib/pleroma/notification.ex

4 years agotransmogrifier: MIME.valid?/1 for mediaType
Haelwenn (lanodan) Monnier [Mon, 8 Jun 2020 19:04:16 +0000 (21:04 +0200)]
transmogrifier: MIME.valid?/1 for mediaType

No issues with the rest of the network yet but this makes sure it will work
once https://git.pleroma.social/pleroma/pleroma/-/merge_requests/2429
is merged.

4 years agoMerge branch 'openapi/admin/relay' into 'develop'
lain [Mon, 8 Jun 2020 11:07:01 +0000 (11:07 +0000)]
Merge branch 'openapi/admin/relay' into 'develop'

Add OpenAPI spec for AdminAPI.RelayController

See merge request pleroma/pleroma!2579

4 years agoMerge branch 'feature/delete-follow-requests-on-user-deletion' into 'develop'
lain [Mon, 8 Jun 2020 10:54:43 +0000 (10:54 +0000)]
Merge branch 'feature/delete-follow-requests-on-user-deletion' into 'develop'

Delete outgoing pending follow requests on user deletion

See merge request pleroma/pleroma!2631

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lain [Mon, 8 Jun 2020 09:19:18 +0000 (11:19 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms

4 years agoMerge branch 'activity-pub-use-atoms-as-keys' into 'develop'
lain [Mon, 8 Jun 2020 09:11:55 +0000 (09:11 +0000)]
Merge branch 'activity-pub-use-atoms-as-keys' into 'develop'

Use atoms as keys in `ActivityPub.fetch_*` options

See merge request pleroma/pleroma!2629

4 years agoChatController: Remove nonsensical pagination.
lain [Mon, 8 Jun 2020 09:09:53 +0000 (11:09 +0200)]
ChatController: Remove nonsensical pagination.

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lain [Mon, 8 Jun 2020 08:18:10 +0000 (10:18 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms

4 years agoDocs: Document new mandatory parameter.
lain [Sun, 7 Jun 2020 18:23:17 +0000 (20:23 +0200)]
Docs: Document new mandatory parameter.

4 years agoChatController: Make last_read_id mandatory.
lain [Sun, 7 Jun 2020 18:22:08 +0000 (20:22 +0200)]
ChatController: Make last_read_id mandatory.

4 years agoDelete pending follow requests on user deletion
Sergey Suprunenko [Sun, 7 Jun 2020 15:31:37 +0000 (17:31 +0200)]
Delete pending follow requests on user deletion

4 years agoDocs: Update docs on mark as read.
lain [Sun, 7 Jun 2020 13:41:46 +0000 (15:41 +0200)]
Docs: Update docs on mark as read.

4 years agoChatController: Add `last_read_id` option to mark_as_read.
lain [Sun, 7 Jun 2020 13:38:33 +0000 (15:38 +0200)]
ChatController: Add `last_read_id` option to mark_as_read.

4 years agoSideEffects: Move streaming of chats to after the transaction.
lain [Sun, 7 Jun 2020 12:52:56 +0000 (14:52 +0200)]
SideEffects: Move streaming of chats to after the transaction.

4 years agoChats: Change id to flake id.
lain [Sun, 7 Jun 2020 12:25:30 +0000 (14:25 +0200)]
Chats: Change id to flake id.

4 years agoAttachmentValidator: Check if the mime type is valid.
lain [Sun, 7 Jun 2020 07:19:00 +0000 (09:19 +0200)]
AttachmentValidator: Check if the mime type is valid.

4 years agoNotfication: Add validation of notification types
lain [Sat, 6 Jun 2020 14:59:08 +0000 (16:59 +0200)]
Notfication: Add validation of notification types

4 years agoChatController: Use new oauth scope *:chats.
lain [Sat, 6 Jun 2020 14:48:02 +0000 (16:48 +0200)]
ChatController: Use new oauth scope *:chats.

4 years agoCredo fixes.
lain [Sat, 6 Jun 2020 13:51:08 +0000 (15:51 +0200)]
Credo fixes.

4 years agoMigrations: Move Notification migration code to helper
lain [Sat, 6 Jun 2020 13:33:02 +0000 (15:33 +0200)]
Migrations: Move Notification migration code to helper

4 years agoNotification: Change type of `type` to an enum.
lain [Sat, 6 Jun 2020 11:08:45 +0000 (13:08 +0200)]
Notification: Change type of `type` to an enum.

4 years agoChatMessageReference -> Chat.MessageReference
lain [Sat, 6 Jun 2020 09:51:10 +0000 (11:51 +0200)]
ChatMessageReference -> Chat.MessageReference

4 years agoChatMessageReference: Use FlakeId.Ecto.Type
lain [Sat, 6 Jun 2020 08:42:24 +0000 (10:42 +0200)]
ChatMessageReference: Use FlakeId.Ecto.Type

No need for compat because this is brand new.

4 years agoChat: creation_cng -> changeset
lain [Sat, 6 Jun 2020 08:38:45 +0000 (10:38 +0200)]
Chat: creation_cng -> changeset

Make our usage of this more uniform.

4 years agoDocs: Unify parameters in examples.
lain [Sat, 6 Jun 2020 08:35:38 +0000 (10:35 +0200)]
Docs: Unify parameters in examples.

4 years agoWebPush: Don't break on contentless chat messages.
lain [Sat, 6 Jun 2020 07:46:07 +0000 (09:46 +0200)]
WebPush: Don't break on contentless chat messages.

4 years agoFix pagination
Egor Kislitsyn [Fri, 5 Jun 2020 19:18:29 +0000 (23:18 +0400)]
Fix pagination

4 years agoMerge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys
Egor Kislitsyn [Fri, 5 Jun 2020 19:15:10 +0000 (23:15 +0400)]
Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys

4 years agoCredo fixes
lain [Fri, 5 Jun 2020 15:18:48 +0000 (17:18 +0200)]
Credo fixes

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lain [Fri, 5 Jun 2020 14:53:56 +0000 (16:53 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms

4 years agoMerge branch 'features/apc2s-pagination' into 'develop'
Haelwenn [Fri, 5 Jun 2020 14:52:09 +0000 (14:52 +0000)]
Merge branch 'features/apc2s-pagination' into 'develop'

Fix AP C2S pagination

Closes #866 and #751

See merge request pleroma/pleroma!2491

4 years agoMerge branch 'features/put_if_present' into 'develop'
Haelwenn [Fri, 5 Jun 2020 14:48:02 +0000 (14:48 +0000)]
Merge branch 'features/put_if_present' into 'develop'

Create Pleroma.Maps.put_if_present(map, key, value, value_function // &{:ok, &1}) :: map

See merge request pleroma/pleroma!2436

4 years agoCreate Pleroma.Maps.put_if_present(map, key, value, value_fun // &{:ok, &1})
Haelwenn [Fri, 5 Jun 2020 14:48:02 +0000 (14:48 +0000)]
Create Pleroma.Maps.put_if_present(map, key, value, value_fun // &{:ok, &1})

Unifies all the similar functions to one and simplify some blocks with it.

4 years agoPipeline: Add a side effects step after the transaction finishes
lain [Fri, 5 Jun 2020 14:47:02 +0000 (16:47 +0200)]
Pipeline: Add a side effects step after the transaction finishes

This is to run things like streaming notifications out, which will
sometimes need data that is created by the transaction, but is
streamed out asynchronously.

4 years agoIf Credo fixes is so good, why is there no Credo fixes 2?
lain [Fri, 5 Jun 2020 11:10:48 +0000 (13:10 +0200)]
If Credo fixes is so good, why is there no Credo fixes 2?

4 years agoCredo fixes.
lain [Fri, 5 Jun 2020 10:45:25 +0000 (12:45 +0200)]
Credo fixes.

4 years agoTransmogrifier: For follows, create notifications last.
lain [Fri, 5 Jun 2020 10:26:07 +0000 (12:26 +0200)]
Transmogrifier: For follows, create notifications last.

As the notification type changes depending on the follow state,
the notification should not be created and streamed out before the
state settles. For this reason, the notification creation has been
delayed until it's clear if the user has been followed or not.

This is a bit hacky but it will be properly rewritten using the
pipeline soon.

4 years agoSideEffects / ChatView: Add an unread cache.
lain [Fri, 5 Jun 2020 10:01:33 +0000 (12:01 +0200)]
SideEffects / ChatView: Add an unread cache.

This is to prevent wrong values in the stream.

4 years agoNotification: Don't break on figuring out the type of old EmojiReactions
lain [Thu, 4 Jun 2020 18:40:46 +0000 (20:40 +0200)]
Notification: Don't break on figuring out the type of old EmojiReactions

4 years agoSubscriptionOperation: Let chat mentions through.
lain [Thu, 4 Jun 2020 18:28:33 +0000 (20:28 +0200)]
SubscriptionOperation: Let chat mentions through.

4 years agoUse atoms as keys in `ActivityPub.fetch_*` functions options
Egor Kislitsyn [Thu, 4 Jun 2020 17:33:16 +0000 (21:33 +0400)]
Use atoms as keys in `ActivityPub.fetch_*` functions options

4 years agoMerge branch 'remake-remodel-dms' of git.pleroma.social:pleroma/pleroma into remake...
lain [Thu, 4 Jun 2020 17:24:07 +0000 (19:24 +0200)]
Merge branch 'remake-remodel-dms' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms

4 years agoTransmogrifier: Update notification after accepting.
lain [Thu, 4 Jun 2020 17:22:49 +0000 (19:22 +0200)]
Transmogrifier: Update notification after accepting.

4 years agoApply suggestion to test/chat_message_reference_test.exs
lain [Thu, 4 Jun 2020 15:16:15 +0000 (15:16 +0000)]
Apply suggestion to test/chat_message_reference_test.exs

4 years agoApply suggestion to test/web/activity_pub/transmogrifier/chat_message_test.exs
lain [Thu, 4 Jun 2020 15:16:10 +0000 (15:16 +0000)]
Apply suggestion to test/web/activity_pub/transmogrifier/chat_message_test.exs

4 years agoChatMessageReferences: Change seen -> unread
lain [Thu, 4 Jun 2020 15:14:42 +0000 (17:14 +0200)]
ChatMessageReferences: Change seen -> unread

4 years agoMerge branch 'develop' into 'openapi/admin/relay'
minibikini [Thu, 4 Jun 2020 13:29:32 +0000 (13:29 +0000)]
Merge branch 'develop' into 'openapi/admin/relay'

# Conflicts:
#   lib/pleroma/web/admin_api/controllers/admin_api_controller.ex

4 years agoMerge branch 'openapi/admin/config' into 'develop'
lain [Thu, 4 Jun 2020 13:00:13 +0000 (13:00 +0000)]
Merge branch 'openapi/admin/config' into 'develop'

Add OpenAPI spec to AdminAPI.ConfigController

See merge request pleroma/pleroma!2606

4 years agoDocs: Document WebPush changes.
lain [Thu, 4 Jun 2020 12:49:36 +0000 (14:49 +0200)]
Docs: Document WebPush changes.

4 years agoWebPush: Push out chat message notications.
lain [Thu, 4 Jun 2020 12:49:10 +0000 (14:49 +0200)]
WebPush: Push out chat message notications.

4 years agoSideEffectsTest: More tests.
lain [Thu, 4 Jun 2020 12:46:41 +0000 (14:46 +0200)]
SideEffectsTest: More tests.

4 years agoFix credo
Egor Kislitsyn [Thu, 4 Jun 2020 09:46:13 +0000 (13:46 +0400)]
Fix credo

4 years agoMerge branch 'develop' into openapi/admin/relay
Egor Kislitsyn [Thu, 4 Jun 2020 09:30:14 +0000 (13:30 +0400)]
Merge branch 'develop' into openapi/admin/relay

4 years agoMerge branch 'develop' into openapi/admin/config
Egor Kislitsyn [Thu, 4 Jun 2020 09:28:00 +0000 (13:28 +0400)]
Merge branch 'develop' into openapi/admin/config

4 years agoNotification: Fix notifications backfill for compacted activities
lain [Wed, 3 Jun 2020 18:51:59 +0000 (20:51 +0200)]
Notification: Fix notifications backfill for compacted activities

4 years agoChangelog: Add chats to changelog.
lain [Wed, 3 Jun 2020 17:25:57 +0000 (19:25 +0200)]
Changelog: Add chats to changelog.

4 years agoDocs: Add `mark_message_as_read` to docs
lain [Wed, 3 Jun 2020 17:24:37 +0000 (19:24 +0200)]
Docs: Add `mark_message_as_read` to docs

4 years agoChatController: Add function to mark single message as read.
lain [Wed, 3 Jun 2020 17:21:23 +0000 (19:21 +0200)]
ChatController: Add function to mark single message as read.

4 years agoMerge branch 'openapi/admin/reports' into 'develop'
lain [Wed, 3 Jun 2020 17:00:59 +0000 (17:00 +0000)]
Merge branch 'openapi/admin/reports' into 'develop'

Add OpenAPI spec for AdminAPI.ReportController

See merge request pleroma/pleroma!2628

4 years agoChatMessageReferenceView: Return read status as `unread`.
lain [Wed, 3 Jun 2020 16:58:58 +0000 (18:58 +0200)]
ChatMessageReferenceView: Return read status as `unread`.

4 years agoAdd OpenAPI spec for AdminAPI.ReportController
Egor Kislitsyn [Wed, 3 Jun 2020 15:10:11 +0000 (19:10 +0400)]
Add OpenAPI spec for AdminAPI.ReportController

4 years agoMove report actions to AdminAPI.ReportController
Egor Kislitsyn [Thu, 21 May 2020 15:43:56 +0000 (19:43 +0400)]
Move report actions to AdminAPI.ReportController

4 years agoStreamer, SideEffects: Stream out ChatMessageReferences
lain [Wed, 3 Jun 2020 14:45:04 +0000 (16:45 +0200)]
Streamer, SideEffects: Stream out ChatMessageReferences

Saves us a few calles to fetch things from the DB that we already
have.

4 years agoMerge branch 'openapi/update-admin-api/status' into 'develop'
Haelwenn [Wed, 3 Jun 2020 14:04:12 +0000 (14:04 +0000)]
Merge branch 'openapi/update-admin-api/status' into 'develop'

Update OpenAPI spec for AdminAPI.StatusController

See merge request pleroma/pleroma!2624

4 years agoFollowingRelationship: Remove meaningless change
lain [Wed, 3 Jun 2020 12:40:44 +0000 (14:40 +0200)]
FollowingRelationship: Remove meaningless change

4 years agoMigrations: Add chat_id, seen index to ChatMessageReferences
lain [Wed, 3 Jun 2020 12:32:19 +0000 (14:32 +0200)]
Migrations: Add chat_id, seen index to ChatMessageReferences

This ensures fast count of unseen messages

4 years agoMigrations: Fix migration module name
lain [Wed, 3 Jun 2020 12:27:54 +0000 (14:27 +0200)]
Migrations: Fix migration module name

4 years agoChats: Remove `unread` from the db, calculate from unseen messages.
lain [Wed, 3 Jun 2020 12:26:50 +0000 (14:26 +0200)]
Chats: Remove `unread` from the db, calculate from unseen messages.

4 years agoMerge branch 'admin-api/account-view' into 'develop'
lain [Wed, 3 Jun 2020 11:28:56 +0000 (11:28 +0000)]
Merge branch 'admin-api/account-view' into 'develop'

Use AdminAPI.StatusView in api/admin/users

Closes #1836

See merge request pleroma/pleroma!2627

4 years agoMigration: Remove superfluous imports
lain [Wed, 3 Jun 2020 11:19:38 +0000 (13:19 +0200)]
Migration: Remove superfluous imports

4 years agoCredo fixes.
lain [Wed, 3 Jun 2020 11:17:29 +0000 (13:17 +0200)]
Credo fixes.

4 years agoMigrations: Add unique index to ChatMessageReferences.
lain [Wed, 3 Jun 2020 11:13:44 +0000 (13:13 +0200)]
Migrations: Add unique index to ChatMessageReferences.

4 years agoChatMessageReferences: Move tests
lain [Wed, 3 Jun 2020 10:56:39 +0000 (12:56 +0200)]
ChatMessageReferences: Move tests

4 years agoUse AdminAPI.StatusView in api/admin/users
Egor Kislitsyn [Wed, 3 Jun 2020 10:53:46 +0000 (14:53 +0400)]
Use AdminAPI.StatusView in api/admin/users

4 years agoChatMessageReferences: Adjust views
lain [Wed, 3 Jun 2020 10:49:53 +0000 (12:49 +0200)]
ChatMessageReferences: Adjust views

4 years agoChatMessageReference: Introduce and switch in chat controller.
lain [Wed, 3 Jun 2020 10:30:12 +0000 (12:30 +0200)]
ChatMessageReference: Introduce and switch in chat controller.

4 years agoMerge branch 'patch-3' into 'develop'
lain [Wed, 3 Jun 2020 07:18:32 +0000 (07:18 +0000)]
Merge branch 'patch-3' into 'develop'

docs: clients.md: Add Husky

See merge request pleroma/pleroma!2626

4 years agodocs: clients.md: Add Husky
Alibek Omarov [Wed, 3 Jun 2020 04:36:09 +0000 (04:36 +0000)]
docs: clients.md: Add Husky

4 years agoMerge branch 'fix/1794-hashtag-search-results' into 'develop'
feld [Tue, 2 Jun 2020 16:30:03 +0000 (16:30 +0000)]
Merge branch 'fix/1794-hashtag-search-results' into 'develop'

[#1794] Improvements to hashtags extraction from search query

Closes #1794

See merge request pleroma/pleroma!2611

4 years agoUpdate OpenAPI spec for AdminAPI.StatusController
Egor Kislitsyn [Tue, 2 Jun 2020 15:07:17 +0000 (19:07 +0400)]
Update OpenAPI spec for AdminAPI.StatusController

4 years agoMerge branch 'develop' into openapi/admin/relay
Egor Kislitsyn [Tue, 2 Jun 2020 14:50:37 +0000 (18:50 +0400)]
Merge branch 'develop' into openapi/admin/relay

4 years agoMerge branch 'replies-domain-block' into 'develop'
lain [Tue, 2 Jun 2020 14:14:23 +0000 (14:14 +0000)]
Merge branch 'replies-domain-block' into 'develop'

Replies domain block

Closes #1650

See merge request pleroma/pleroma!2622

4 years agoMerge branch 'openapi/admin/oauth-apps' into 'develop'
lain [Tue, 2 Jun 2020 14:13:24 +0000 (14:13 +0000)]
Merge branch 'openapi/admin/oauth-apps' into 'develop'

Add OpenAPI spec for AdminAPI.OAuthAppContoller

See merge request pleroma/pleroma!2582

4 years agoMerge branch 'tagline' into 'develop'
lain [Tue, 2 Jun 2020 14:10:53 +0000 (14:10 +0000)]
Merge branch 'tagline' into 'develop'

Update default instance description

See merge request pleroma/pleroma!2600

4 years agoMerge branch 'openapi/admin/invites' into 'develop'
lain [Tue, 2 Jun 2020 14:10:21 +0000 (14:10 +0000)]
Merge branch 'openapi/admin/invites' into 'develop'

Add OpenAPI spec for AdminAPI.InviteController

See merge request pleroma/pleroma!2585

4 years agoMerge branch 'feature/embeddable-posts' into 'develop'
lain [Tue, 2 Jun 2020 14:04:34 +0000 (14:04 +0000)]
Merge branch 'feature/embeddable-posts' into 'develop'

Add embeddable posts

Closes #1288

See merge request pleroma/pleroma!2319