akkoma
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 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 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 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 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 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 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 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 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 agoCredo fixes
lain [Tue, 2 Jun 2020 13:14:52 +0000 (15:14 +0200)]
Credo fixes

4 years agoMigrations: Add a migration to backfill notification types.
lain [Tue, 2 Jun 2020 13:13:19 +0000 (15:13 +0200)]
Migrations: Add a migration to backfill notification types.

4 years agoNotification: Add function to backfill notification types
lain [Tue, 2 Jun 2020 12:49:56 +0000 (14:49 +0200)]
Notification: Add function to backfill notification types

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lain [Tue, 2 Jun 2020 12:28:01 +0000 (14:28 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms

4 years agoActivity: Remove notifications-related functions.
lain [Tue, 2 Jun 2020 12:22:16 +0000 (14:22 +0200)]
Activity: Remove notifications-related functions.

4 years agoNotificationController: Don't return chat_mentions by default.
lain [Tue, 2 Jun 2020 12:05:53 +0000 (14:05 +0200)]
NotificationController: Don't return chat_mentions by default.

4 years agoMerge branch 'fix/invisible-repeats' into 'develop'
lain [Tue, 2 Jun 2020 11:32:03 +0000 (11:32 +0000)]
Merge branch 'fix/invisible-repeats' into 'develop'

Do not include activities of invisible users unless explicitly requested

Closes #1833

See merge request pleroma/pleroma!2620

4 years agoNotifications: Make notifications save their type.
lain [Tue, 2 Jun 2020 11:24:34 +0000 (13:24 +0200)]
Notifications: Make notifications save their type.

4 years agoDo not include activities of invisible users unless explicitly requested
rinpatch [Mon, 1 Jun 2020 19:18:20 +0000 (22:18 +0300)]
Do not include activities of invisible users unless explicitly requested

Closes #1833

4 years agoMerge branch 'weblate-pleroma-pleroma' into 'develop'
lain [Tue, 2 Jun 2020 09:15:56 +0000 (09:15 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'

Translations update from Weblate

See merge request pleroma/pleroma!2623

4 years agoTranslated using Weblate (Dutch)
Fristi [Mon, 1 Jun 2020 16:25:57 +0000 (16:25 +0000)]
Translated using Weblate (Dutch)

Currently translated at 29.2% (31 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/nl/

4 years agoMerge branch 'feature/status-by-id-account-view' into 'develop'
lain [Tue, 2 Jun 2020 08:49:24 +0000 (08:49 +0000)]
Merge branch 'feature/status-by-id-account-view' into 'develop'

another view for account in admin-fe status_show

Closes #1783

See merge request pleroma/pleroma!2543

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

4 years agoMerge branch 'user-updates' into 'develop'
rinpatch [Mon, 1 Jun 2020 20:48:11 +0000 (20:48 +0000)]
Merge branch 'user-updates' into 'develop'

AccountController: Federate user account changes.

Closes pleroma-support#33 and #1801

See merge request pleroma/pleroma!2617

4 years agoMerge branch 'only-creates-in-public-tl' into 'develop'
rinpatch [Mon, 1 Jun 2020 20:45:59 +0000 (20:45 +0000)]
Merge branch 'only-creates-in-public-tl' into 'develop'

TimelineController: Only return `Create` in public timelines.

Closes #1833 and #1821

See merge request pleroma/pleroma!2618

4 years agoMerge branch 'default-to-hackney-again' into 'develop'
lain [Mon, 1 Jun 2020 13:24:03 +0000 (13:24 +0000)]
Merge branch 'default-to-hackney-again' into 'develop'

Config: Default to Hackney again

See merge request pleroma/pleroma!2619

4 years agoCommonAPI: Newlines -> br for chat messages.
lain [Mon, 1 Jun 2020 13:14:22 +0000 (15:14 +0200)]
CommonAPI: Newlines -> br for chat messages.

4 years agoConfig: Default to Hackney again
lain [Mon, 1 Jun 2020 11:35:39 +0000 (13:35 +0200)]
Config: Default to Hackney again

Gun needs some server setting changes (files) and has problems with
OTP 23 (wildcards), so use Hackney as a default again for now.

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

4 years agoTimelineController: Only return `Create` in public timelines.
lain [Mon, 1 Jun 2020 11:17:56 +0000 (13:17 +0200)]
TimelineController: Only return `Create` in public timelines.

4 years agoAccountController: Federate user account changes.
lain [Mon, 1 Jun 2020 11:03:22 +0000 (13:03 +0200)]
AccountController: Federate user account changes.

Hotfixy commit, will be moved to the pipeline.

4 years agoMerge branch 'chore/bump-hackney' into 'develop'
Haelwenn [Sat, 30 May 2020 15:51:19 +0000 (15:51 +0000)]
Merge branch 'chore/bump-hackney' into 'develop'

mix.lock: update hackney to 1.16.0

Closes #1612

See merge request pleroma/pleroma!2614

4 years agoMerge branch 'test/fix-config-setting-in-user-test' into 'develop'
lain [Sat, 30 May 2020 14:03:43 +0000 (14:03 +0000)]
Merge branch 'test/fix-config-setting-in-user-test' into 'develop'

Fix config setting to not affect other tests

See merge request pleroma/pleroma!2615

4 years agoFix config setting to not affect other tests
Roman Chvanikov [Sat, 30 May 2020 13:47:09 +0000 (16:47 +0300)]
Fix config setting to not affect other tests

4 years agohackney adapter helper: support tlsv1.3 and remove custom opts
rinpatch [Sat, 30 May 2020 10:59:04 +0000 (13:59 +0300)]
hackney adapter helper: support tlsv1.3 and remove custom opts

- partitial_chain is no longer exported, but it seems to be the default anyway.
- The bug that caused sni to not be sent automatically seems to be fixed -
https://github.com/benoitc/hackney/issues/612

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lain [Sat, 30 May 2020 10:31:12 +0000 (12:31 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms

4 years agoCommonAPI: Linkify chat messages.
lain [Sat, 30 May 2020 10:30:31 +0000 (12:30 +0200)]
CommonAPI: Linkify chat messages.

4 years agoSafeText: Let through basic html.
lain [Sat, 30 May 2020 10:17:18 +0000 (12:17 +0200)]
SafeText: Let through basic html.

4 years agoMerge branch 'conversation-pagination' into 'develop'
lain [Sat, 30 May 2020 10:02:37 +0000 (10:02 +0000)]
Merge branch 'conversation-pagination' into 'develop'

Conversation pagination

See merge request pleroma/pleroma!2601

4 years agoConversation pagination
Steven Fuchs [Sat, 30 May 2020 10:02:37 +0000 (10:02 +0000)]
Conversation pagination

4 years agoMerge branch 'bugfix/csp-unproxied' into 'develop'
rinpatch [Fri, 29 May 2020 21:23:49 +0000 (21:23 +0000)]
Merge branch 'bugfix/csp-unproxied' into 'develop'

http_security_plug.ex: Fix non-proxied media

See merge request pleroma/pleroma!2610

4 years agoMerge branch 'media-docs' into 'develop'
rinpatch [Fri, 29 May 2020 21:20:36 +0000 (21:20 +0000)]
Merge branch 'media-docs' into 'develop'

Docs: Attachement limitations in MastoAPI differences

See merge request pleroma/pleroma!2607

4 years agomix.lock: update hackney to 1.16.0
rinpatch [Fri, 29 May 2020 21:18:17 +0000 (00:18 +0300)]
mix.lock: update hackney to 1.16.0

Closes #1612

4 years agoApply suggestion to lib/pleroma/plugs/http_security_plug.ex
rinpatch [Fri, 29 May 2020 21:15:07 +0000 (21:15 +0000)]
Apply suggestion to lib/pleroma/plugs/http_security_plug.ex

4 years agoMerge branch 'hotfix/streamer-test-unused-var-warning' into 'develop'
lain [Fri, 29 May 2020 20:31:07 +0000 (20:31 +0000)]
Merge branch 'hotfix/streamer-test-unused-var-warning' into 'develop'

fix unused var warning in streamer test

See merge request pleroma/pleroma!2612

4 years agofix unused var warning
Roman Chvanikov [Fri, 29 May 2020 20:05:03 +0000 (23:05 +0300)]
fix unused var warning

4 years agoMerge branch 'connect-src' into 'develop'
rinpatch [Fri, 29 May 2020 19:26:54 +0000 (19:26 +0000)]
Merge branch 'connect-src' into 'develop'

Add blob: to connect-src CSP, fixes #1827

Closes #1827

See merge request pleroma/pleroma!2608

4 years agoAdd blob: to connect-src CSP
Alex Gleason [Fri, 29 May 2020 15:33:31 +0000 (10:33 -0500)]
Add blob: to connect-src CSP

4 years agoMerge branch 'fix-streaming' into 'develop'
lain [Fri, 29 May 2020 15:42:43 +0000 (15:42 +0000)]
Merge branch 'fix-streaming' into 'develop'

Fix argument error in streamer

See merge request pleroma/pleroma!2609

4 years agoMerge branch 'mix/database-vacuum-options' into 'develop'
feld [Fri, 29 May 2020 15:33:35 +0000 (15:33 +0000)]
Merge branch 'mix/database-vacuum-options' into 'develop'

Database vacuum mix task

See merge request pleroma/pleroma!2599

4 years agoAdd test for stream boosts of mastodon user
kPherox [Fri, 29 May 2020 12:08:09 +0000 (21:08 +0900)]
Add test for stream boosts of mastodon user

4 years agoFix argument error in streamer
kPherox [Mon, 25 May 2020 14:21:43 +0000 (23:21 +0900)]
Fix argument error in streamer

`Repo.exists` can't use `nil` as it is unsafe.
Use parent object instead of activity because currently Announce activity's context is null.

4 years agohttp_security_plug.ex: Fix non-proxied media
Haelwenn (lanodan) Monnier [Fri, 29 May 2020 15:17:02 +0000 (17:17 +0200)]
http_security_plug.ex: Fix non-proxied media

4 years agoDocument new database vacuum tasks
Mark Felder [Fri, 29 May 2020 15:17:06 +0000 (10:17 -0500)]
Document new database vacuum tasks

4 years agoDocs: Also add the streaming docs to the Chat api doc.
lain [Fri, 29 May 2020 14:07:40 +0000 (16:07 +0200)]
Docs: Also add the streaming docs to the Chat api doc.

4 years agoSideEffects: Ensure a chat is present before streaming something out.
lain [Fri, 29 May 2020 14:05:02 +0000 (16:05 +0200)]
SideEffects: Ensure a chat is present before streaming something out.

4 years agoDocs: Document streaming differences
lain [Fri, 29 May 2020 14:03:55 +0000 (16:03 +0200)]
Docs: Document streaming differences

4 years agoStreamerView: Actually send Chats, not ChatMessages.
lain [Fri, 29 May 2020 14:02:45 +0000 (16:02 +0200)]
StreamerView: Actually send Chats, not ChatMessages.

4 years agoSideEffects: Stream out chat messages.
lain [Fri, 29 May 2020 13:44:03 +0000 (15:44 +0200)]
SideEffects: Stream out chat messages.

4 years agoStreamer: Add a chat message stream.
lain [Fri, 29 May 2020 13:24:41 +0000 (15:24 +0200)]
Streamer: Add a chat message stream.

4 years agoMerge branch 'fix-relay-repeat-notification' into 'develop'
lain [Fri, 29 May 2020 10:42:49 +0000 (10:42 +0000)]
Merge branch 'fix-relay-repeat-notification' into 'develop'

Fix relay repeat notification

See merge request pleroma/pleroma!2590

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lain [Fri, 29 May 2020 10:36:17 +0000 (12:36 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms

4 years agoUse `User.is_internal_user?` instead
kPherox [Wed, 27 May 2020 05:24:36 +0000 (05:24 +0000)]
Use `User.is_internal_user?` instead

4 years agoDon't make relay announce notification
kPherox [Tue, 26 May 2020 11:32:05 +0000 (11:32 +0000)]
Don't make relay announce notification

4 years agoMerge branch 'fix/mediaproxy-bypass-emoji' into 'develop'
rinpatch [Fri, 29 May 2020 09:46:31 +0000 (09:46 +0000)]
Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop'

Fix profile emojis bypassing mediaproxy and harden CSP

Closes #1810

See merge request pleroma/pleroma!2596

4 years agoHTTP Security plug: make starting csp string generation more readable
rinpatch [Fri, 29 May 2020 09:32:48 +0000 (12:32 +0300)]
HTTP Security plug: make starting csp string generation more readable

4 years agoDocs: Attachement limitations in MastoAPI differences
Alex Gleason [Thu, 28 May 2020 21:10:06 +0000 (16:10 -0500)]
Docs: Attachement limitations in MastoAPI differences

4 years agoMerge branch 'fix/1557-gets-local-pack' into 'develop'
lain [Thu, 28 May 2020 17:08:30 +0000 (17:08 +0000)]
Merge branch 'fix/1557-gets-local-pack' into 'develop'

get-packs for local generated pack

Closes #1557

See merge request pleroma/pleroma!2604

4 years agoMerge branch 'feature/1792-update-actor-type' into 'develop'
lain [Thu, 28 May 2020 16:58:28 +0000 (16:58 +0000)]
Merge branch 'feature/1792-update-actor-type' into 'develop'

Validate actor type

See merge request pleroma/pleroma!2593

4 years agoMerge branch 'update-install-guides' into 'develop'
lain [Thu, 28 May 2020 16:54:09 +0000 (16:54 +0000)]
Merge branch 'update-install-guides' into 'develop'

Update installation guides

See merge request pleroma/pleroma!2603

4 years agoget-packs for local generated pack
Alexander Strizhakov [Thu, 28 May 2020 16:41:34 +0000 (19:41 +0300)]
get-packs for local generated pack

4 years agoUpdate installation guides
Egor Kislitsyn [Thu, 28 May 2020 15:32:56 +0000 (19:32 +0400)]
Update installation guides

4 years agoMerge branch 'chore/fix-spelling' into 'develop'
rinpatch [Thu, 28 May 2020 11:38:35 +0000 (11:38 +0000)]
Merge branch 'chore/fix-spelling' into 'develop'

Fix minor spelling error

See merge request pleroma/pleroma!2598

4 years agoAlpha sort
Mark Felder [Wed, 27 May 2020 22:17:06 +0000 (17:17 -0500)]
Alpha sort

4 years agoAbstract out the database maintenance. I'd like to use this from AdminFE too.
Mark Felder [Wed, 27 May 2020 21:40:51 +0000 (16:40 -0500)]
Abstract out the database maintenance. I'd like to use this from AdminFE too.

4 years agoMake clearer that this is time and resource consuming
Mark Felder [Wed, 27 May 2020 21:31:37 +0000 (16:31 -0500)]
Make clearer that this is time and resource consuming

4 years agoMake it obvious a full vacuum can take a while
Mark Felder [Wed, 27 May 2020 21:27:29 +0000 (16:27 -0500)]
Make it obvious a full vacuum can take a while

4 years agoPermit easy access to vaccum full and analyze via a mix task
Mark Felder [Wed, 27 May 2020 21:27:07 +0000 (16:27 -0500)]
Permit easy access to vaccum full and analyze via a mix task

4 years agoFix minor spelling error
Mark Felder [Wed, 27 May 2020 19:34:37 +0000 (14:34 -0500)]
Fix minor spelling error

4 years agoMerge branch 'bundle/adminfe-20200527' into 'develop'
rinpatch [Wed, 27 May 2020 19:22:53 +0000 (19:22 +0000)]
Merge branch 'bundle/adminfe-20200527' into 'develop'

Update AdminFE build, re-enables emoji packs

See merge request pleroma/pleroma!2597

4 years agoUpdate AdminFE build, re-enables emoji packs
Mark Felder [Wed, 27 May 2020 18:50:24 +0000 (13:50 -0500)]
Update AdminFE build, re-enables emoji packs

4 years agoHTTP security plug: Harden img-src and media-src when MediaProxy is enabled
rinpatch [Wed, 27 May 2020 18:01:36 +0000 (21:01 +0300)]
HTTP security plug: Harden img-src and media-src when MediaProxy is enabled

4 years agoHTTP Security plug: rewrite &csp_string/0
rinpatch [Wed, 27 May 2020 17:27:30 +0000 (20:27 +0300)]
HTTP Security plug: rewrite &csp_string/0

- Directives are now separated with ";" instead of " ;",
according to https://www.w3.org/TR/CSP2/#policy-parsing
the space is optional
- Use an IO list, which at the end gets converted to a binary as
opposed to ++ing a bunch of arrays with binaries together and joining
them to a string. I doubt it gives any significant real world advantage,
but the code is cleaner and now I can sleep at night.
- The static part of csp is pre-joined to a single binary at compile time.
Same reasoning as the last point.

4 years agoAccountView: Use mediaproxy URLs for emojis
rinpatch [Wed, 27 May 2020 16:35:35 +0000 (19:35 +0300)]
AccountView: Use mediaproxy URLs for emojis

Also use atom keys in emoji maps instead of binaries

Closes #1810