Alex Gleason [Tue, 18 May 2021 22:11:25 +0000 (17:11 -0500)]
Switch to aliasing `Router.Helpers` instead of importing
lain [Tue, 2 Mar 2021 19:54:30 +0000 (19:54 +0000)]
Merge branch 'release/2.3.0' into 'stable'
Release/2.3.0
See merge request pleroma/pleroma!3354
lain [Tue, 2 Mar 2021 16:03:14 +0000 (17:03 +0100)]
Mix: Update linkify.
lain [Tue, 2 Mar 2021 14:03:16 +0000 (15:03 +0100)]
Linting.
lain [Tue, 2 Mar 2021 13:42:11 +0000 (14:42 +0100)]
Changelog: Remove application support line.
lain [Tue, 2 Mar 2021 13:40:47 +0000 (14:40 +0100)]
StatusController: Deactivate application support for now.
Some more things to discuss about, so we'll remove it from 2.3.0
lain [Mon, 1 Mar 2021 20:13:43 +0000 (21:13 +0100)]
Mix: Update version number
lain [Mon, 1 Mar 2021 20:12:26 +0000 (21:12 +0100)]
Update changelog
Mark Felder [Mon, 22 Feb 2021 22:19:08 +0000 (16:19 -0600)]
Document user agent leak fix
Alex Gleason [Thu, 25 Feb 2021 03:37:30 +0000 (21:37 -0600)]
user_agent_mock --> request_mock
Alex Gleason [Mon, 22 Feb 2021 20:46:59 +0000 (14:46 -0600)]
Never forward the client's user-agent through the media proxy
lain [Mon, 1 Mar 2021 19:21:52 +0000 (19:21 +0000)]
Merge branch 'update-frontend-2021-03-01' into 'develop'
Update frontend
See merge request pleroma/pleroma!3353
lain [Mon, 1 Mar 2021 19:04:53 +0000 (20:04 +0100)]
Update frontend
Haelwenn [Mon, 1 Mar 2021 17:51:15 +0000 (17:51 +0000)]
Merge branch 'application-to-generator' into 'develop'
ActvitityStreams application field should be called "generator"
See merge request pleroma/pleroma!3352
Mark Felder [Mon, 1 Mar 2021 17:29:10 +0000 (11:29 -0600)]
Store application details in the object under the generator key, not application key
feld [Sun, 28 Feb 2021 19:01:01 +0000 (19:01 +0000)]
Merge branch 'feld-develop-patch-26755' into 'develop'
Update CHANGELOG.md
See merge request pleroma/pleroma!3351
feld [Sun, 28 Feb 2021 18:46:03 +0000 (18:46 +0000)]
Update CHANGELOG.md
lain [Sun, 28 Feb 2021 16:53:05 +0000 (16:53 +0000)]
Merge branch 'fix/warning-in-test' into 'develop'
warning fix
See merge request pleroma/pleroma!3350
lain [Sun, 28 Feb 2021 16:45:15 +0000 (16:45 +0000)]
Merge branch 'features/reports-enhancements' into 'develop'
Enhance reports in Pleroma API: index, show
See merge request pleroma/pleroma!3280
Alexander Strizhakov [Sun, 28 Feb 2021 16:41:25 +0000 (19:41 +0300)]
warning fix
lain [Sun, 28 Feb 2021 16:22:22 +0000 (16:22 +0000)]
Merge branch 'admin-api-versioning' into 'develop'
Pleroma APIs versioning
Closes #2509
See merge request pleroma/pleroma!3335
lain [Sun, 28 Feb 2021 16:18:23 +0000 (16:18 +0000)]
Merge branch 'bugfix/peertube-mpegURL-object' into 'develop'
Video: Handle peertube videos only stashing attachments in x-mpegURL
Closes #2372 and #2535
See merge request pleroma/pleroma!3336
lain [Sun, 28 Feb 2021 16:17:34 +0000 (16:17 +0000)]
Merge branch 'feat/client_app_details' into 'develop'
Support application field
See merge request pleroma/pleroma!3311
Mark Felder [Sun, 28 Feb 2021 15:04:29 +0000 (09:04 -0600)]
Simplify migration
lain [Sat, 27 Feb 2021 19:40:38 +0000 (19:40 +0000)]
Merge branch 'frontendstatic-ignore-api-calls' into 'develop'
Filter out API calls from FrontendStatic plug
Closes #2261
See merge request pleroma/pleroma!3346
lain [Sat, 27 Feb 2021 19:37:08 +0000 (19:37 +0000)]
Merge branch 'fix/repo-terminate' into 'develop'
don't use continue in Stats init for test env
See merge request pleroma/pleroma!3349
Alexander Strizhakov [Sat, 27 Feb 2021 06:39:15 +0000 (09:39 +0300)]
don't use continue in Stats init for test env
Mark Felder [Sat, 27 Feb 2021 00:14:57 +0000 (18:14 -0600)]
Store the client application data in ActivityStreams format
feld [Fri, 26 Feb 2021 16:49:11 +0000 (16:49 +0000)]
Merge branch 'fix/2498-expires_in-scheduled-posts' into 'develop'
expires_in in scheduled status params
Closes #2498
See merge request pleroma/pleroma!3315
feld [Fri, 26 Feb 2021 16:47:53 +0000 (16:47 +0000)]
Merge branch 'ecto-rollback-in-test-env' into 'develop'
Possibility to run rollback in test env
See merge request pleroma/pleroma!3212
rinpatch [Fri, 26 Feb 2021 09:21:15 +0000 (09:21 +0000)]
Merge branch 'PestToast-develop-patch-66930' into 'develop'
Removed a command that references "pleroma.env". This file does not seem to be...
See merge request pleroma/pleroma!3347
PestToast [Fri, 26 Feb 2021 01:01:29 +0000 (01:01 +0000)]
Removed a command that references "pleroma.env". This file does not seem to be generated at any point during the install, and not having it does not stop the instance from working, as far as I can tell.
Mark Felder [Thu, 25 Feb 2021 19:08:36 +0000 (13:08 -0600)]
Note our upgrade path for this functionality
Mark Felder [Thu, 25 Feb 2021 19:06:43 +0000 (13:06 -0600)]
Leave a note for future explorers
Mark Felder [Thu, 25 Feb 2021 19:04:08 +0000 (13:04 -0600)]
No need to filter out Mix.env() from the API routes.
Mark Felder [Thu, 25 Feb 2021 16:07:29 +0000 (10:07 -0600)]
Improved recursion through the api route list
Mark Felder [Thu, 25 Feb 2021 15:23:10 +0000 (09:23 -0600)]
Filter out MIX_ENV from route list and add a test
Mark Felder [Thu, 25 Feb 2021 15:06:56 +0000 (09:06 -0600)]
Enum instead of Stream
Mark Felder [Wed, 24 Feb 2021 21:23:45 +0000 (15:23 -0600)]
Attempt to filter out API calls from FrontendStatic plug
Haelwenn [Wed, 24 Feb 2021 18:32:55 +0000 (18:32 +0000)]
Merge branch 'gitignore' into 'develop'
gitignore: Vi and emacs temp files
See merge request pleroma/pleroma!3345
Mark Felder [Wed, 24 Feb 2021 18:11:50 +0000 (12:11 -0600)]
Vi and emacs temp files
Haelwenn [Wed, 24 Feb 2021 17:26:26 +0000 (17:26 +0000)]
Merge branch 'docfix/chat-token' into 'develop'
Update terminology in differences_in_mastoapi_responses.md
See merge request pleroma/pleroma!3344
zonk [Wed, 24 Feb 2021 14:23:56 +0000 (14:23 +0000)]
Update terminology in differences_in_mastoapi_responses.md
feld [Tue, 23 Feb 2021 14:17:06 +0000 (14:17 +0000)]
Merge branch 'fix/whalebird-url' into 'develop'
Fix URL of Whalebird in docs
See merge request pleroma/pleroma!3339
lain [Tue, 23 Feb 2021 13:53:59 +0000 (13:53 +0000)]
Merge branch 'chore/no-activitypub-sleeps' into 'develop'
Avoid unnecessary 500ms sleeps from CommonAPI.follow when the target user is remote
See merge request pleroma/pleroma!3330
AkiraFukushima [Tue, 23 Feb 2021 12:31:06 +0000 (21:31 +0900)]
Fix URL of Whalebird in docs
rinpatch [Tue, 23 Feb 2021 10:01:09 +0000 (10:01 +0000)]
Merge branch '2534-pleroma-endpoint-earlier-init' into 'develop'
[#2534] Earlier init of Pleroma.Web.Endpoint (must be started prior to Pleroma.Web.Streamer)
Closes #2534
See merge request pleroma/pleroma!3338
Ivan Tashkinov [Mon, 22 Feb 2021 20:09:41 +0000 (23:09 +0300)]
[#2534] Earlier init of Pleroma.Web.Endpoint (must be started prior to Pleroma.Web.Streamer).
eugenijm [Mon, 22 Feb 2021 01:26:56 +0000 (04:26 +0300)]
Update the documentation to use make it use /api/v1/pleroma instead of /api/pleroma
Haelwenn (lanodan) Monnier [Sun, 21 Feb 2021 22:41:13 +0000 (23:41 +0100)]
Video: Handle peertube videos only stashing attachments in x-mpegURL
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2535
eugenijm [Thu, 18 Feb 2021 21:59:06 +0000 (00:59 +0300)]
Reroute /api/pleroma to /api/v1/pleroma
feld [Sat, 20 Feb 2021 23:18:43 +0000 (23:18 +0000)]
Merge branch 'revert/changelog' into 'develop'
Revert changelog entry that leaked from another branch.
See merge request pleroma/pleroma!3334
Mark Felder [Sat, 20 Feb 2021 23:07:12 +0000 (17:07 -0600)]
Revert changelog entry that leaked from another branch.
Haelwenn [Sat, 20 Feb 2021 21:18:04 +0000 (21:18 +0000)]
Merge branch 'fix/filters' into 'develop'
Minor fixes to upload filters
See merge request pleroma/pleroma!3332
Mark Felder [Sat, 20 Feb 2021 20:32:14 +0000 (14:32 -0600)]
Document HeifToJpeg and its requirement of libheif's heic-convert tool
Mark Felder [Sat, 20 Feb 2021 20:28:21 +0000 (14:28 -0600)]
Exiftool also cannot strip from heic files.
Mark Felder [Sat, 20 Feb 2021 20:26:59 +0000 (14:26 -0600)]
Show a proper error. A failure doesn't always mean the command isn't available, and we check for it on startup
Mark Felder [Sat, 20 Feb 2021 00:37:37 +0000 (18:37 -0600)]
Avoid unnecessary 500ms sleeps from CommonAPI.follow when the target user is remote
Mark Felder [Thu, 18 Feb 2021 23:50:46 +0000 (17:50 -0600)]
Permit :disclose_client in changesets
Mark Felder [Thu, 18 Feb 2021 23:23:17 +0000 (17:23 -0600)]
Tests to validate client disclosure obeys user setting
Mark Felder [Thu, 18 Feb 2021 22:43:41 +0000 (16:43 -0600)]
Add field to user schema for controlling disclosure of client details
Mark Felder [Thu, 18 Feb 2021 22:35:03 +0000 (16:35 -0600)]
Mastodon makes this field null when posting with MastoFE or if you choose to not disclose it, so it's safe to be null by default
Alexander Strizhakov [Thu, 11 Feb 2021 10:01:48 +0000 (13:01 +0300)]
expires_in in scheduled status params
rinpatch [Thu, 18 Feb 2021 09:54:59 +0000 (09:54 +0000)]
Merge branch 'fix/chats-no-unread-in-openapi' into 'develop'
ChatMessage schema: Add `unread` property
See merge request pleroma/pleroma!3323
Haelwenn [Wed, 17 Feb 2021 22:31:11 +0000 (22:31 +0000)]
Merge branch 'feat/enforce-admin-scope-unconditionally' into 'develop'
Remove `:auth, :enforce_oauth_admin_scope_usage`
See merge request pleroma/pleroma!3327
rinpatch [Wed, 17 Feb 2021 18:37:23 +0000 (21:37 +0300)]
OAuthScopesPlug: remove transform_scopes in favor of explicit admin scope definitions
Transforming scopes is no longer necessary since we are dropping
support for accessing admin api without `admin:` prefix in scopes.
rinpatch [Wed, 17 Feb 2021 17:56:13 +0000 (20:56 +0300)]
OpenAPI: Add `admin:` scope prefix to admin operations
Also splits "Emoji packs" to two categories: "Emoji pack administration"
and "Emoji packs"
rinpatch [Wed, 17 Feb 2021 17:47:38 +0000 (20:47 +0300)]
Remove `:auth, :enforce_oauth_admin_scope_usage`
`admin` scope has been required by default for more than a year now
and all apps that use the API seems to request a proper scope by now.
Haelwenn (lanodan) Monnier [Mon, 25 Jan 2021 19:15:33 +0000 (20:15 +0100)]
Enhance reports in Pleroma API: index, show
rinpatch [Wed, 17 Feb 2021 17:09:24 +0000 (17:09 +0000)]
Merge branch 'test-docker-images' into 'develop'
Generate custom docker images for testing
See merge request pleroma/pleroma!3326
Mark Felder [Wed, 17 Feb 2021 16:24:37 +0000 (10:24 -0600)]
Do not want these interfering with develop builds
Mark Felder [Wed, 17 Feb 2021 16:08:12 +0000 (10:08 -0600)]
Make it possible to generate custom docker images by prefixing the branch name with "build-docker"
Haelwenn [Wed, 17 Feb 2021 15:57:11 +0000 (15:57 +0000)]
Merge branch 'chore/documentation-relicensing' into 'develop'
Relicense documentation under CC-BY-4.0
See merge request pleroma/pleroma!3322
Haelwenn [Wed, 17 Feb 2021 15:36:59 +0000 (15:36 +0000)]
Merge branch 'feat/chat-list-pagination' into 'develop'
Chats: Introduce /api/v2/pleroma/chats which implements pagination
Closes #2140
See merge request pleroma/pleroma!3325
rinpatch [Wed, 17 Feb 2021 15:14:27 +0000 (15:14 +0000)]
Merge branch 'remove-conversation-api' into 'develop'
Add API endpoint to remove a conversation
Closes #2488
See merge request pleroma/pleroma!3321
rinpatch [Wed, 17 Feb 2021 13:08:51 +0000 (13:08 +0000)]
Merge branch '2510-oauth-app-tokens-further-support' into 'develop'
[#2510] Improved support for app-bound OAuth tokens
Closes #2510
See merge request pleroma/pleroma!3316
rinpatch [Wed, 17 Feb 2021 12:58:33 +0000 (15:58 +0300)]
Chats: Introduce /api/v2/pleroma/chats which implements pagination
Also removes incorrect claim that /api/v1/pleroma/chats supports
pagination and deprecates it.
Closes #2140
rinpatch [Wed, 17 Feb 2021 09:48:42 +0000 (09:48 +0000)]
Merge branch 'update-default-avatar' into 'develop'
Update the default avatar to look nicer
See merge request pleroma/pleroma!3320
rinpatch [Tue, 16 Feb 2021 19:41:06 +0000 (22:41 +0300)]
ChatMessage schema: Add `unread` property
It is present in the code, but was not documented.
rinpatch [Tue, 16 Feb 2021 10:11:41 +0000 (10:11 +0000)]
Merge branch '2053-notifications-actor-is-active-refactoring' into 'develop'
[#2053] `Notification.for_user_query/2` timeout fix
Closes #2053
See merge request pleroma/pleroma!3318
rinpatch [Tue, 16 Feb 2021 10:08:08 +0000 (13:08 +0300)]
Relicense documentation under CC-BY-4.0
All contributors whose contributions were still being used
at the moment of relicensing have agreed to it.
See https://git.pleroma.social/pleroma/pleroma/-/issues/2146 .
Egor Kislitsyn [Mon, 15 Feb 2021 17:48:13 +0000 (21:48 +0400)]
Add API endpoint to remove a conversation
Shpuld Shpuldson [Mon, 15 Feb 2021 13:52:36 +0000 (15:52 +0200)]
update changelog to mention change of avatar
Shpuld Shpuldson [Mon, 15 Feb 2021 13:44:27 +0000 (15:44 +0200)]
replace avi.png
rinpatch [Mon, 15 Feb 2021 10:30:29 +0000 (10:30 +0000)]
Merge branch 'chore/mailmap' into 'develop'
Add myself to .mailmap
See merge request pleroma/pleroma!3319
rinpatch [Mon, 15 Feb 2021 10:19:44 +0000 (13:19 +0300)]
Add myself to .mailmap
I changed my email to rin@patch.cx
Ivan Tashkinov [Mon, 15 Feb 2021 06:08:04 +0000 (09:08 +0300)]
[#2053] Changed `Notification/for_user_query/2` to use join to filter out inactive actors instead of subselect of _all_ inactive AP ids from `users`.
Mark Felder [Fri, 12 Feb 2021 19:15:33 +0000 (13:15 -0600)]
Additional validation so we don't get caught off guard with a nil response
if CommonAPI ever prevents us from injecting this data
Mark Felder [Fri, 12 Feb 2021 19:05:12 +0000 (13:05 -0600)]
Inject fake application metadata and validate it is stripped by transmogrifier
Mark Felder [Fri, 12 Feb 2021 18:44:45 +0000 (12:44 -0600)]
App is already preloaded into the token, so avoid an extra query
rinpatch [Fri, 12 Feb 2021 08:52:04 +0000 (08:52 +0000)]
Merge branch 'not-used-mock' into 'develop'
Not used mock
See merge request pleroma/pleroma!3313
rinpatch [Fri, 12 Feb 2021 08:48:51 +0000 (08:48 +0000)]
Merge branch 'bugfix/answer-outbox' into 'develop'
Add test for Answer presence into an authenticated /outbox
See merge request pleroma/pleroma!3269
Mark Felder [Thu, 11 Feb 2021 21:53:10 +0000 (15:53 -0600)]
Use a custom oauth token so we can predict and validate the client_name and website
Mark Felder [Thu, 11 Feb 2021 21:10:53 +0000 (15:10 -0600)]
Document the application metadata is now retained as part of the post.
Mark Felder [Thu, 11 Feb 2021 21:07:21 +0000 (15:07 -0600)]
Validate client application metadata is retained in the object
Mark Felder [Thu, 11 Feb 2021 20:27:52 +0000 (14:27 -0600)]
Consistency
Mark Felder [Thu, 11 Feb 2021 20:22:58 +0000 (14:22 -0600)]
Revert to original formatting for these function defs
Mark Felder [Thu, 11 Feb 2021 20:19:53 +0000 (14:19 -0600)]
Prefer naming this put_application because we're putting it into the params map
Mark Felder [Thu, 11 Feb 2021 20:15:25 +0000 (14:15 -0600)]
%Token{} may not be in the conn, so avoid breaking the ability to post statuses in that scenario.
Ivan Tashkinov [Thu, 11 Feb 2021 12:02:50 +0000 (15:02 +0300)]
[#2510] Improved support for app-bound OAuth tokens. Auth-related refactoring.