lain [Thu, 4 Jun 2020 15:14:42 +0000 (17:14 +0200)]
ChatMessageReferences: Change seen -> unread
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
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
lain [Thu, 4 Jun 2020 12:49:36 +0000 (14:49 +0200)]
Docs: Document WebPush changes.
lain [Thu, 4 Jun 2020 12:49:10 +0000 (14:49 +0200)]
WebPush: Push out chat message notications.
lain [Thu, 4 Jun 2020 12:46:41 +0000 (14:46 +0200)]
SideEffectsTest: More tests.
Egor Kislitsyn [Thu, 4 Jun 2020 09:46:13 +0000 (13:46 +0400)]
Fix credo
Egor Kislitsyn [Thu, 4 Jun 2020 09:30:14 +0000 (13:30 +0400)]
Merge branch 'develop' into openapi/admin/relay
Egor Kislitsyn [Thu, 4 Jun 2020 09:28:00 +0000 (13:28 +0400)]
Merge branch 'develop' into openapi/admin/config
lain [Wed, 3 Jun 2020 18:51:59 +0000 (20:51 +0200)]
Notification: Fix notifications backfill for compacted activities
lain [Wed, 3 Jun 2020 17:25:57 +0000 (19:25 +0200)]
Changelog: Add chats to changelog.
lain [Wed, 3 Jun 2020 17:24:37 +0000 (19:24 +0200)]
Docs: Add `mark_message_as_read` to docs
lain [Wed, 3 Jun 2020 17:21:23 +0000 (19:21 +0200)]
ChatController: Add function to mark single message as read.
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
lain [Wed, 3 Jun 2020 16:58:58 +0000 (18:58 +0200)]
ChatMessageReferenceView: Return read status as `unread`.
Egor Kislitsyn [Wed, 3 Jun 2020 15:10:11 +0000 (19:10 +0400)]
Add OpenAPI spec for AdminAPI.ReportController
Egor Kislitsyn [Thu, 21 May 2020 15:43:56 +0000 (19:43 +0400)]
Move report actions to AdminAPI.ReportController
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.
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
lain [Wed, 3 Jun 2020 12:40:44 +0000 (14:40 +0200)]
FollowingRelationship: Remove meaningless change
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
lain [Wed, 3 Jun 2020 12:27:54 +0000 (14:27 +0200)]
Migrations: Fix migration module name
lain [Wed, 3 Jun 2020 12:26:50 +0000 (14:26 +0200)]
Chats: Remove `unread` from the db, calculate from unseen messages.
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
lain [Wed, 3 Jun 2020 11:19:38 +0000 (13:19 +0200)]
Migration: Remove superfluous imports
lain [Wed, 3 Jun 2020 11:17:29 +0000 (13:17 +0200)]
Credo fixes.
lain [Wed, 3 Jun 2020 11:13:44 +0000 (13:13 +0200)]
Migrations: Add unique index to ChatMessageReferences.
lain [Wed, 3 Jun 2020 10:56:39 +0000 (12:56 +0200)]
ChatMessageReferences: Move tests
Egor Kislitsyn [Wed, 3 Jun 2020 10:53:46 +0000 (14:53 +0400)]
Use AdminAPI.StatusView in api/admin/users
lain [Wed, 3 Jun 2020 10:49:53 +0000 (12:49 +0200)]
ChatMessageReferences: Adjust views
lain [Wed, 3 Jun 2020 10:30:12 +0000 (12:30 +0200)]
ChatMessageReference: Introduce and switch in chat controller.
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
Alibek Omarov [Wed, 3 Jun 2020 04:36:09 +0000 (04:36 +0000)]
docs: clients.md: Add Husky
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
Egor Kislitsyn [Tue, 2 Jun 2020 15:07:17 +0000 (19:07 +0400)]
Update OpenAPI spec for AdminAPI.StatusController
Egor Kislitsyn [Tue, 2 Jun 2020 14:50:37 +0000 (18:50 +0400)]
Merge branch 'develop' into openapi/admin/relay
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
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
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
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
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
lain [Tue, 2 Jun 2020 13:14:52 +0000 (15:14 +0200)]
Credo fixes
lain [Tue, 2 Jun 2020 13:13:19 +0000 (15:13 +0200)]
Migrations: Add a migration to backfill notification types.
lain [Tue, 2 Jun 2020 12:49:56 +0000 (14:49 +0200)]
Notification: Add function to backfill notification types
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
lain [Tue, 2 Jun 2020 12:22:16 +0000 (14:22 +0200)]
Activity: Remove notifications-related functions.
lain [Tue, 2 Jun 2020 12:05:53 +0000 (14:05 +0200)]
NotificationController: Don't return chat_mentions by default.
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
lain [Tue, 2 Jun 2020 11:24:34 +0000 (13:24 +0200)]
Notifications: Make notifications save their type.
rinpatch [Mon, 1 Jun 2020 19:18:20 +0000 (22:18 +0300)]
Do not include activities of invisible users unless explicitly requested
Closes #1833
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
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/
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
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
Alexander Strizhakov [Tue, 2 Jun 2020 05:50:24 +0000 (08:50 +0300)]
replies filtering for blocked domains
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
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
Alexander Strizhakov [Wed, 20 May 2020 14:45:06 +0000 (17:45 +0300)]
exclude replies on blocked domains
Egor Kislitsyn [Mon, 1 Jun 2020 13:38:57 +0000 (17:38 +0400)]
Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts
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
lain [Mon, 1 Jun 2020 13:14:22 +0000 (15:14 +0200)]
CommonAPI: Newlines -> br for chat messages.
Egor Kislitsyn [Mon, 1 Jun 2020 11:48:51 +0000 (15:48 +0400)]
Merge remote-tracking branch 'origin/develop' into global-status-expiration
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.
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
lain [Mon, 1 Jun 2020 11:17:56 +0000 (13:17 +0200)]
TimelineController: Only return `Create` in public timelines.
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.
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
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
Roman Chvanikov [Sat, 30 May 2020 13:47:09 +0000 (16:47 +0300)]
Fix config setting to not affect other tests
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
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
lain [Sat, 30 May 2020 10:30:31 +0000 (12:30 +0200)]
CommonAPI: Linkify chat messages.
lain [Sat, 30 May 2020 10:17:18 +0000 (12:17 +0200)]
SafeText: Let through basic html.
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
Steven Fuchs [Sat, 30 May 2020 10:02:37 +0000 (10:02 +0000)]
Conversation pagination
Ivan Tashkinov [Sat, 30 May 2020 07:29:08 +0000 (10:29 +0300)]
[#1794] Fixed search query splitting regex to deal with Unicode. Adjusted a test.
Ivan Tashkinov [Sat, 30 May 2020 05:51:38 +0000 (08:51 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into fix/1794-hashtag-search-results
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
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
rinpatch [Fri, 29 May 2020 21:18:17 +0000 (00:18 +0300)]
mix.lock: update hackney to 1.16.0
Closes #1612
rinpatch [Fri, 29 May 2020 21:15:07 +0000 (21:15 +0000)]
Apply suggestion to lib/pleroma/plugs/http_security_plug.ex
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
Roman Chvanikov [Fri, 29 May 2020 20:05:03 +0000 (23:05 +0300)]
fix unused var warning
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
Ivan Tashkinov [Fri, 29 May 2020 19:03:14 +0000 (22:03 +0300)]
[#1794] Improvements to hashtags extraction from search query.
Alex Gleason [Fri, 29 May 2020 15:33:31 +0000 (10:33 -0500)]
Add blob: to connect-src CSP
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
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
kPherox [Fri, 29 May 2020 12:08:09 +0000 (21:08 +0900)]
Add test for stream boosts of mastodon user
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.
Haelwenn (lanodan) Monnier [Fri, 29 May 2020 15:17:02 +0000 (17:17 +0200)]
http_security_plug.ex: Fix non-proxied media
Mark Felder [Fri, 29 May 2020 15:17:06 +0000 (10:17 -0500)]
Document new database vacuum tasks
Haelwenn (lanodan) Monnier [Fri, 8 May 2020 01:05:56 +0000 (03:05 +0200)]
AP C2S: allow limit & order on outbox & read_inbox
Haelwenn (lanodan) Monnier [Fri, 8 May 2020 01:08:11 +0000 (03:08 +0200)]
Bugfix: router: allow basic_auth for outbox
Haelwenn (lanodan) Monnier [Thu, 7 May 2020 19:52:45 +0000 (21:52 +0200)]
Bugfix: Reuse Controller.Helper pagination for APC2S
lain [Fri, 29 May 2020 14:07:40 +0000 (16:07 +0200)]
Docs: Also add the streaming docs to the Chat api doc.
lain [Fri, 29 May 2020 14:05:02 +0000 (16:05 +0200)]
SideEffects: Ensure a chat is present before streaming something out.
lain [Fri, 29 May 2020 14:03:55 +0000 (16:03 +0200)]
Docs: Document streaming differences
lain [Fri, 29 May 2020 14:02:45 +0000 (16:02 +0200)]
StreamerView: Actually send Chats, not ChatMessages.
lain [Fri, 29 May 2020 13:44:03 +0000 (15:44 +0200)]
SideEffects: Stream out chat messages.
projects / akkoma / log