Ilja
c0489f9fac
Fixed deprecation warning checks
...
When a setting was deprecated, the code would stop checking for the rest of the possible deprications. This also meant that the settings weren't rewritten to the new settings for deprecated settings besides the first one.
2021-08-06 07:59:53 +02:00
Ilja
3c5a497b19
Deprecate transparency_exclusions
...
* Give deprecation message
* Rewrite configs
2021-08-06 07:59:52 +02:00
Ilja
dfeb3862da
config :mrf, :transparency_exclusions works with tumples now
2021-08-06 07:59:52 +02:00
Ilja
e0c7d77197
Deprecate and rewrite settings for quarentine settings
...
* This is for the settings, not yet a DB migration
2021-08-06 07:59:52 +02:00
Ilja
27fe7b0274
Make quarentine work with list of tuples instead of strings
2021-08-06 07:59:52 +02:00
Ilja
4ba0beb60c
Make mrfSimple work with tuples
...
* Changed SimplePolicy
* I also grepped in test/ for ':mrf_simple' to see what other things could be affected
2021-08-06 07:58:58 +02:00
Ilja
647087d7fd
Deprectate strings for SimplePolicy
...
When strings are detected in the simplepolicy, a warning will be given and the config will be changed to use tuples instead
2021-08-06 05:01:44 +02:00
Alex Gleason
b83758bd96
Merge remote-tracking branch 'pleroma/develop' into moderators
2021-08-05 11:11:24 -05:00
Alex Gleason
44ede0657f
Merge remote-tracking branch 'pleroma/develop' into staff-plug
2021-08-04 11:48:57 -05:00
Alex Gleason
7f23dd6cc8
Merge remote-tracking branch 'pleroma/develop' into object-tombstone-visibility
2021-07-27 08:54:26 -05:00
Alex Gleason
9cc8642b80
Visibility: check Tombstone objects in visible_for_user?/2
2021-07-27 08:54:01 -05:00
Haelwenn
7acdab1f30
Merge branch 'mkljczk-develop-patch-60115' into 'develop'
...
MastodonAPI: Fix list timelines
Closes mastofe#89 and #2693
See merge request pleroma/pleroma!3477
2021-07-22 18:41:11 +00:00
Alex Gleason
62bf6d67e3
Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes
2021-07-18 11:49:22 -05:00
Alex Gleason
70f1496eb8
Poll notification: only notify local users
2021-07-18 11:10:23 -05:00
Alex Gleason
0b1c05ca1e
Poll notification: trigger PollWorker through common_pipeline
2021-07-18 11:10:23 -05:00
Alex Gleason
6a6e42c9bf
PollWorker defensive checks
2021-07-18 11:10:22 -05:00
Alex Gleason
cbd1a10c16
Poll notification: notify for polls even when block_from_strangers is set
2021-07-18 11:10:04 -05:00
Alex Gleason
0114754db2
MastodonAPI: Support poll notification
2021-07-17 22:19:38 -05:00
Alex Gleason
3674179b26
Merge remote-tracking branch 'pleroma/develop' into instance-deletion
2021-07-17 15:03:43 -05:00
Alex Gleason
bad79f79e6
AdminAPI.InstanceController: clean up tests, rename actions
2021-07-17 15:00:15 -05:00
Alex Gleason
54dbcfe02a
AdminAPI: add DELETE /instances/:instance to delete all content from a remote instance
2021-07-17 14:55:05 -05:00
Alex Gleason
f67d00d12b
Add Instance.delete_users_and_activities/1 to delete all content from a remote instance
2021-07-17 14:06:35 -05:00
Alex Gleason
25676c84be
Create AdminAPI.InstanceController
2021-07-17 13:05:25 -05:00
3f58213646
Merge branch 'admin-api-users-sort' into 'develop'
...
AdminAPI: sort new users at the top
Closes #2709
See merge request pleroma/pleroma!3481
2021-07-14 14:39:14 +00:00
Alex Gleason
1a2fe96d56
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-date
2021-07-14 09:02:55 -05:00
Alex Gleason
167e14416b
AdminAPI: add date to users
2021-07-14 08:54:59 -05:00
Alex Gleason
deb3f91136
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-sort
2021-07-13 22:47:47 -05:00
Alex Gleason
5e88796784
AdminAPI: sort user results by ID descending
2021-07-13 22:47:02 -05:00
Alex Gleason
2b3d7794b2
AdminAPI: let moderators actually do things
2021-07-12 22:26:04 -05:00
Alex Gleason
4fe9a758f9
Let moderators manage custom emojis
2021-07-12 22:11:38 -05:00
Alex Gleason
1f093cb216
Moderators: reorganize :admin_api pipeline in Router
2021-07-12 22:11:32 -05:00
Alex Gleason
9bc1e79c56
Moderators: add UserIsStaffPlug
2021-07-12 21:57:52 -05:00
Alex Gleason
e40b58fd56
Merge remote-tracking branch 'pleroma/develop' into fix-object-deletion-timeout
2021-07-12 16:23:06 -05:00
Alex Gleason
9a0cb34c8c
Fix Activity.delete_all_by_object_ap_id/1 timeout so users can be deleted
2021-07-12 16:20:15 -05:00
Haelwenn
173e977e28
Merge branch 'features/ingestion-page' into 'develop'
...
Pipeline Ingestion: Page
See merge request pleroma/pleroma!3097
2021-07-12 05:05:49 +00:00
Haelwenn (lanodan) Monnier
6dc78f5f6f
AP C2S: Remove restrictions and make it go through pipeline
2021-07-12 06:49:41 +02:00
Sean King
5d279a22b1
Merge develop branch upstream
2021-07-10 11:04:16 -06:00
marcin mikołajczak
6ef8e1776d
fix the fucking list timelines on mastofe/soapbox-fe
2021-07-02 13:03:41 +00:00
Alex Gleason
310ef6b70d
Deletions: change User.purge/1 to defp, add CHANGELOG entry
2021-06-30 12:25:20 -05:00
Alex Gleason
99cc26bb02
Merge remote-tracking branch 'pleroma/develop' into remote-deletions
2021-06-30 02:02:30 -05:00
Alex Gleason
beb1c98ab5
Deletions: don't purge keys so Delete/Undo activities can be signed
2021-06-30 02:02:24 -05:00
Alex Gleason
43800d83f4
Deletions: allow deactivated users to be deleted
2021-06-30 01:32:28 -05:00
Alex Gleason
a7929c4d89
Deletions: preserve account status fields during purge, fix checks
2021-06-29 23:56:19 -05:00
Alex Gleason
01c2d2a296
Also purge the user in User.perform/2
2021-06-29 22:53:33 -05:00
Alex Gleason
c6d4133727
Deletions: purge the user immediately
2021-06-29 22:30:48 -05:00
Alex Gleason
be2da95c36
Correctly purge a remote user
2021-06-29 21:45:38 -05:00
Alex Gleason
281806de75
Activity deletion: fix FunctionClauseError #2686
2021-06-24 21:03:31 -05:00
f97f305d00
Merge branch 'ecto-upgrade' into 'develop'
...
Upgrade Ecto to v3.6.2, remove deprecated ecto_explain
See merge request pleroma/pleroma!3473
2021-06-23 20:17:01 +00:00
Alex Gleason
54af527759
Upgrade Ecto to v3.6.2, remove deprecated ecto_explain
2021-06-23 13:22:32 -05:00
Haelwenn (lanodan) Monnier
fc6ab78a84
Add test on changing [:instance, :upload_limit]
2021-06-22 12:25:25 +02:00
Haelwenn (lanodan) Monnier
a851a24036
Downgrade Plug to 1.10.x, revert upload_limit tuple to function change
...
This should fix setting the upload limit in the database as found in:
https://queer.hacktivis.me/notice/A8XUZp74Cg7eYNEMxU
This reverts commit 7d350b73f5
2021-06-22 11:19:13 +02:00
406dadb56b
Merge branch 'fix/twittercard-video-dimensions' into 'develop'
...
Generate Twittercard/OGP metadata with correct dimensions
See merge request pleroma/pleroma!3456
2021-06-10 15:03:58 +00:00
202ee5fd77
Add note about video thumbnails for code spelunkers unfamiliar with Media Preview Proxy
2021-06-10 09:56:43 -05:00
Alex Gleason
15e2aaa9f6
Fix compile cycle in Pleroma.Tests.AuthTestController
2021-06-09 13:30:19 -05:00
6aa7fc15df
Formatting of the comment
2021-06-09 11:58:51 -05:00
5f7901cc48
Credo
2021-06-09 11:09:14 -05:00
2a47156b87
Lint
2021-06-09 11:06:53 -05:00
86bcb87e6c
Fix incorrectly ordered arguments to the function and not properly merging lists.
2021-06-09 11:05:24 -05:00
2cf648d419
Add a video thumbnail to the OpenGraph metadata if Media Preview Proxy is enabled.
2021-06-09 10:02:41 -05:00
19a49dd757
Remove Metadata.Utils.attachment_url/1
...
This was a wasteful shortcut to MediaProxy.preview_url/1 and we don't
always want the preview_url in the metadata anyway.
2021-06-09 09:58:29 -05:00
Haelwenn (lanodan) Monnier
c839078a75
ObjectValidators.{Announce,EmojiReact,Like}: Fix context, actor & addressing
2021-06-09 04:23:02 +02:00
Haelwenn
53cf801c30
Merge branch 'cycles-plug-deps' into 'develop'
...
Refactor skipped plugs into Pleroma.Web functions
See merge request pleroma/pleroma!3463
2021-06-09 02:20:00 +00:00
Haelwenn
eba3c7b42f
Merge branch 'cycles-side-effects' into 'develop'
...
Recompilation speedup: Switch to runtime deps in ActivityPub.SideEffects
See merge request pleroma/pleroma!3460
2021-06-09 01:54:38 +00:00
Alex Gleason
45b7325b9e
Refactor skipped plugs into Pleroma.Web functions
...
Speeds up recompilation by reducing compile cycles
2021-06-08 19:15:04 -05:00
Alex Gleason
67ec0e6c18
Switch to runtime deps in ActivityPub.SideEffects
...
Speeds up recompilation by reducing compile cycles
2021-06-08 18:18:25 -05:00
Alex Gleason
45ab24f2d9
Switch to runtime deps in Pleroma.Instances
...
Speeds up recompilation by limiting compile cycles
2021-06-08 18:03:34 -05:00
9cb8960284
Switch OGP default type from "website" to "article"
...
This is what Mastodon uses and might fix some link preview bugs I've encountered
2021-06-08 17:14:30 -05:00
d896e45faf
Merge branch 'cycles-config-loader-redux' into 'develop'
...
Recompilation speedup: Ignore runtime deps in Pleroma.Config.Loader with Module.concat/1
See merge request pleroma/pleroma!3458
2021-06-08 22:08:37 +00:00
4de2bd3b79
Merge branch 'cycles-user-view' into 'develop'
...
Recompilation speedup: Create AdminAPI.UserView to avoid compile-time dep
See merge request pleroma/pleroma!3457
2021-06-08 22:07:25 +00:00
d70db63084
Set the correct height/width if the data is available when generating opengraph metadata
2021-06-08 16:58:33 -05:00
Alex Gleason
4faeec2c44
Create AdminAPI.UserView to avoid compile-time dep
...
Speeds up recompilation
2021-06-08 16:34:06 -05:00
aa8cc4e86e
Only use fallback for videos and only add this metadata for images if we really have it.
2021-06-08 16:31:12 -05:00
d4ac9445cd
Twittercard metadata for images should also include dimensions if available
2021-06-08 16:19:12 -05:00
Alex Gleason
1be14cc45f
Ignore runtime deps in Pleroma.Config.Loader with Module.concat/1
...
Speeds up recompilation
2021-06-08 16:07:51 -05:00
5de65ce3e8
Set the correct height/width if the data is available when generating twittercard metadata
2021-06-08 15:59:55 -05:00
1175023687
Merge branch 'metadata-for-all' into 'develop'
...
Support metadata for video files too
See merge request pleroma/pleroma!3441
2021-06-08 20:30:55 +00:00
939b3bfe43
Merge branch 'improve-og-embed' into 'develop'
...
Improve opengraph embeds
See merge request pleroma/pleroma!3442
2021-06-08 19:26:17 +00:00
5c27578bce
Support metadata for video files too
2021-06-08 12:54:09 -05:00
Alex Gleason
b99f60615c
Fix order of Pleroma.Web.Utils.Params aliases
2021-06-08 12:50:47 -05:00
Alex Gleason
ec65b7ae29
Pleroma.Web.Params --> Pleroma.Web.Utils.Params
2021-06-08 12:50:47 -05:00
Alex Gleason
0877b120c3
Pleroma.Web.ControllerHelper.truthy_param?/1 --> Pleroma.Web.Params.truthy_param?/1
...
Breaks cycle in lib/pleroma/web/api_spec/operations/status_operation.ex
2021-06-08 12:50:47 -05:00
99f8605582
Merge branch 'cycles-uploads' into 'develop'
...
Recompilation speedup: use generic types in @spec in Upload.Filter
See merge request pleroma/pleroma!3453
2021-06-08 17:49:24 +00:00
Alex Gleason
1399b82f7b
Create WrapperAuthenticator and simplify Authenticator behaviour
...
Speeds up recompilation by reducing compile-time cycles
2021-06-07 18:18:39 -05:00
Alex Gleason
bdaa1d4512
Upload.Filter: use generic types in @spec
...
Speeds up recompilation by reducing compile-time deps
2021-06-07 17:11:17 -05:00
Alex Gleason
d87dfcb5f0
Put custom guards in Web.Utils.Guards
...
Speeds up recompilation by removing a compile-time cycle on AdminAPI.Search
2021-06-07 15:51:52 -05:00
264458531a
Formatting
2021-06-07 15:47:50 -05:00
676c3c96dc
Merge branch 'cycles-mrf-policy' into 'develop'
...
Recompilation speedup: create MRF.Policy behaviour separate from MRF module
See merge request pleroma/pleroma!3450
2021-06-07 20:10:20 +00:00
64bc0c69ed
Merge branch 'fix/plug_parser_multipart' into 'develop'
...
web endpoint: Use Config.get directly instead of a tuple
See merge request pleroma/pleroma!3445
2021-06-07 19:58:37 +00:00
Alex Gleason
6fcfa33e4e
Fix MRF.config_descriptions/0
2021-06-07 14:52:57 -05:00
Alex Gleason
fe4c4a7178
MRF: create MRF.Policy behaviour separate from MRF module
...
Speeds up recompilation by reducing compile-time deps
2021-06-07 14:22:08 -05:00
Alex Gleason
3be08e7c2e
Merge remote-tracking branch 'pleroma/develop' into cycles-reverse-proxy
2021-06-04 21:12:37 -05:00
Alex Gleason
1c3fe43d23
ReverseProxy: create Client.Wrapper to call client from config
...
Speeds up recompilation by reducing compile-time cycles
2021-06-04 21:12:24 -05:00
Sean King
26d2c677b7
Removing trailing space on empty line in OAuth controller
2021-06-04 15:50:57 -06:00
Sean King
2e310b3ec8
Fix more build errors
2021-06-04 15:06:55 -06:00
Sean King
839c2c6a12
Fix code mistake in OAuth controller
2021-06-04 14:50:16 -06:00
Sean King
dc4814f0cd
Fix merge conflicts with upstream
2021-06-04 14:42:44 -06:00
Haelwenn
0c56f9de0d
Merge branch 'tests/openapi-everywhere' into 'develop'
...
Put OpenAPI ~everywhere in tests
See merge request pleroma/pleroma!3324
2021-06-04 18:53:09 +00:00
Haelwenn (lanodan) Monnier
eb7313b0d3
Pipeline Ingestion: Page
2021-06-04 20:06:33 +02:00
Haelwenn (lanodan) Monnier
7d350b73f5
web endpoint: Use Config.get directly instead of a tuple
...
Fixes a lot of warnings like the following while running the testsuite:
warning: passing a {module, function, args} tuple to Plug.Parsers.MULTIPART is deprecated. Please see Plug.Parsers.MULTIPART module docs for better approaches to configuration
This might mean no more dynamic configuration but there seems to be the same limitation two lines underneath anyway.
2021-06-04 20:04:30 +02:00
a07310888f
Merge branch 'fix/missing-deprecation' into 'develop'
...
Add missing deprecation warning left out of !2842
See merge request pleroma/pleroma!3444
2021-06-04 17:37:30 +00:00
f58928cf1c
Add missing deprecation warning left out of !2842
2021-06-04 12:30:10 -05:00
io
2c401dafa1
Improve opengraph embeds
...
This brings them more in line with Mastodon.
- Deduplicates display name from the title and content
- Removes arbitrary limits on the size of the embedded image
- Removes angled double quotes from embed descriptions. These would normally just indicate that the content is a quote, but that is already implied by the content being in an embed.
2021-06-04 05:33:35 +00:00
Haelwenn (lanodan) Monnier
11844084d0
MIME.valid?(type) → is_bitstring(type) && MIME.extensions(type) != []
...
Since mime 1.6.0:
warning: MIME.valid?/1 is deprecated. Use MIME.extensions(type) != [] instead
As for the bitstring(type) part it's because MIME.extensions only expects a string.
https://github.com/elixir-plug/mime/issues/43
2021-06-03 19:11:17 +02:00
Haelwenn (lanodan) Monnier
ab32ea44f0
mix.exs: Apply OTP24 fixes to web_push_encryption
2021-06-03 19:11:16 +02:00
Haelwenn (lanodan) Monnier
168687eef2
media_proxy: switch from :crypto.hmac to :crypto.mac
2021-06-03 19:11:15 +02:00
Haelwenn
a5dce42c85
Merge branch 'chore/rename-chat' into 'develop'
...
Rename the non-federating Chat feature to Shout
See merge request pleroma/pleroma!2842
2021-06-03 15:52:16 +00:00
Alex Gleason
028017711c
Merge remote-tracking branch 'pleroma/develop' into cycles-email
2021-06-01 16:17:43 -05:00
Alex Gleason
9879c18548
Avoid use Phoenix.Swoosh to prevent recompiling the Endpoint
...
Speeds up recompilation by fixing cycles in UserEmail
2021-06-01 16:17:03 -05:00
3fe6ada6fc
Merge branch 'cycles-streaming' into 'develop'
...
Recompilation speedup: Remove deps from Streaming/Persisting behaviors
See merge request pleroma/pleroma!3434
2021-06-01 19:41:37 +00:00
0be7eada92
Keep original Shoutbox channel name as chat:public
...
There is no sane / high level workaround for merging users who join shout:public and chat:public.
2021-06-01 14:34:13 -05:00
Alex Gleason
f6d2bd738d
Merge remote-tracking branch 'pleroma/develop' into cycles-uploader
2021-06-01 14:20:31 -05:00
Alex Gleason
8a5ceb7e53
Remove deps from Uploader behaviour
...
Speeds up recompilation by limiting compile-time deps
2021-06-01 14:19:45 -05:00
Alex Gleason
708210b994
Merge remote-tracking branch 'pleroma/develop' into cycles-streaming
2021-06-01 13:56:40 -05:00
Alex Gleason
a744c47e9a
Remove deps from Streaming/Persisting behaviors
...
Speeds up recompilation by limiting compile-time deps
2021-06-01 13:55:07 -05:00
2743c66693
Add "chat" back as a feature for backwards compat.
...
Legacy PleromaFE uses this to identify if ShoutBox is available.
2021-06-01 13:17:50 -05:00
48a0ea2fc3
Wire up join requests to the old "chat:public" channel into the new "shout:public" channel
2021-06-01 11:56:51 -05:00
Mark Felder
d6432a65da
Move shout configuration from :instance, update docs and changelog
2021-06-01 11:49:46 -05:00
Mark Felder
4a181982c3
More confusingly named legacy chat code renamed to shout
2021-06-01 11:49:16 -05:00
Mark Felder
a3cff59659
Ensure we actually start ShoutChannel
2021-06-01 11:49:16 -05:00
Mark Felder
ff00b354fa
Rename the non-federating Chat feature to Shout
2021-06-01 11:49:14 -05:00
Alex Gleason
c435de426d
Merge remote-tracking branch 'pleroma/develop' into cycles-constants
2021-06-01 11:33:11 -05:00
75b94a2f35
Merge branch 'cycles-frontend-static' into 'develop'
...
Recompilation speedup: make Router a runtime dep of FrontendStatic
See merge request pleroma/pleroma!3429
2021-06-01 16:19:41 +00:00
0ddf492c5d
Merge branch 'cycles-base-url' into 'develop'
...
Deprecate Pleroma.Web.base_url/0
See merge request pleroma/pleroma!3432
2021-06-01 16:15:27 +00:00
Haelwenn
c4b4258374
Merge branch 'features/validators-note' into 'develop'
...
Pipeline Ingestion: Note
Closes #290
See merge request pleroma/pleroma!2984
2021-06-01 01:51:38 +00:00
Alex Gleason
f2134e605b
Merge remote-tracking branch 'pleroma/develop' into cycles-base-url
2021-05-31 16:49:46 -05:00
Alex Gleason
51a9f97e87
Deprecate Pleroma.Web.base_url/0
...
Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles.
2021-05-31 16:48:03 -05:00
Alex Gleason
10dfe81479
Pleroma.Constants.as_local_public/0 --> Pleroma.Web.ActivityPub.Utils.as_local_public/0
...
Move as_local_public/0 to stop making modules depend on Web at compile-time
2021-05-31 13:39:15 -05:00
Alex Gleason
2e682788a3
Merge commit '07fed0fda2473fc4e1e3b01e863217391fd2902f'; commit 'e3173a279dad89dfce6eae89368ad3ba180c0490'; commit '21787546c01069d1d1d8261f0bc37d13a73122a9'; commit 'fda34591cefad94277385311c6391d1ca2adb36c'; commit '0ada3fe823a3c2e6c5835431bdacfbdb8b3d02a7'; commit '32d263cb905dd7fffd43a4955295af0b2b378537'; commit 'c9e4200ed2167772294fceb4f282979b5ea04981'; commit '3ff9c5e2a67ab83c2abdb14cd246dea059079e75'; commit 'fa543a936124abee524f9a103c17d2601176dcd4'; commit 'c23b81e399d5be6fc30f4acb1d757d5eb291d8e1' into cycles-phase-1
2021-05-30 12:58:24 -05:00
Alex Gleason
595bca24ad
Merge remote-tracking branch 'pleroma/develop' into cycles-frontend-static
2021-05-30 12:12:58 -05:00
Alex Gleason
721c966842
FrontendStatic: make Router a runtime dep
...
Speeds up recompilation by removing compile-time cycles
2021-05-30 12:12:16 -05:00
5d40ffe429
Merge branch 'cycles-views' into 'develop'
...
Recompilation speedup: Create real Views for all Controllers
See merge request pleroma/pleroma!3425
2021-05-29 21:50:07 +00:00
b5f3a5c979
Merge branch 'cycles-html' into 'develop'
...
Recompilation speedup: Break out activity-specific HTML functions into Pleroma.Activity.HTML
See merge request pleroma/pleroma!3426
2021-05-29 21:19:25 +00:00
317fe240a8
Merge branch 'cycles-gun' into 'develop'
...
Recompilation speedup: use runtime deps in Pleroma.Gun
See merge request pleroma/pleroma!3422
2021-05-29 21:16:57 +00:00
b2f5f48750
Merge branch 'cycles-config' into 'develop'
...
Recompilation speedup: use runtime deps in Pleroma.Config
See merge request pleroma/pleroma!3424
2021-05-29 19:20:47 +00:00
Alex Gleason
0de6716f06
Merge remote-tracking branch 'pleroma/develop' into cycles-pipeline
2021-05-29 13:32:57 -05:00
Alex Gleason
fa543a9361
ActivityPub.Pipeline: switch to runtime deps
...
Speed up recompilation by breaking compile-time cycles
2021-05-29 13:25:11 -05:00
Alex Gleason
1a69f59221
Merge remote-tracking branch 'pleroma/develop' into cycles-html
2021-05-29 12:29:58 -05:00
Alex Gleason
3ff9c5e2a6
Break out activity-specific HTML functions into Pleroma.Activity.HTML
...
Fixes cycles in lib/pleroma/ecto_type/activity_pub/object_validators/safe_text.ex
2021-05-29 12:29:11 -05:00
Alex Gleason
7c96c82b5b
Merge remote-tracking branch 'pleroma/develop' into cycles-views
2021-05-29 12:17:24 -05:00
Alex Gleason
c9e4200ed2
Create real Views for all Controllers
...
This makes views depend on each other at runtime instead of compile-time
2021-05-29 12:15:57 -05:00
Alex Gleason
cc9e456c0a
Merge remote-tracking branch 'pleroma/develop' into cycles-plugs
2021-05-29 12:01:37 -05:00
Alex Gleason
32d263cb90
Config: use runtime deps instead of module attributes
...
Speeds up recompilation time by breaking compile-time cycles
2021-05-29 12:00:59 -05:00
Alex Gleason
e2ba852bfe
Merge remote-tracking branch 'pleroma/develop' into cycles-gun
2021-05-29 11:35:57 -05:00
Alex Gleason
0ada3fe823
Gun: use runtime deps in ConnectionPool
...
Speed up recompilation time by breaking compile-time cycles
2021-05-29 11:35:53 -05:00
Alex Gleason
3ebede4b51
Gun: make Gun.API a runtime dep
...
Speed up recompilation by breaking a compile-time cycle
2021-05-29 10:53:30 -05:00
8871ca5aa3
Merge branch 'cycles-router-api-routes' into 'develop'
...
Recompilation speedup: Pleroma.Web.get_api_routes/0 --> Pleroma.Web.Router.get_api_routes/0
See merge request pleroma/pleroma!3419
2021-05-28 19:06:49 +00:00
359ded086c
Merge branch 'simplepolicy-announce-leak' into 'develop'
...
SimplePolicy: filter nested objects, fixes #2582
Closes #2582
See merge request pleroma/pleroma!3376
2021-05-28 19:05:13 +00:00
edcdd15e01
Merge branch 'alias-router-helpers' into 'develop'
...
Switch to aliasing `Router.Helpers` instead of importing
See merge request pleroma/pleroma!3409
2021-05-28 19:01:47 +00:00
Alex Gleason
39127f15eb
Merge remote-tracking branch 'pleroma/develop' into cycles-router-api-routes
2021-05-28 13:51:21 -05:00
Alex Gleason
c23b81e399
Pleroma.Web.get_api_routes/0 --> Pleroma.Web.Router.get_api_routes/0
...
Reduce recompilation time by breaking compile-time cycles
2021-05-28 13:51:01 -05:00
7ad87571bd
Merge branch 'cycles-router' into 'develop'
...
Recompilation speedup: move StaticFEPlug to a pipeline
See merge request pleroma/pleroma!3417
2021-05-28 18:24:33 +00:00
9f386df83c
Merge branch 'cycles-router-mediaproxy' into 'develop'
...
Recompilation speedup: don't make MediaProxy be a compile-dep of Router
See merge request pleroma/pleroma!3418
2021-05-28 18:22:27 +00:00
Alex Gleason
bf2ee12fdb
Merge remote-tracking branch 'pleroma/develop' into cycles-router-mediaproxy
2021-05-28 13:08:23 -05:00
Alex Gleason
fda34591ce
Don't make MediaProxy be a compile-dep of Router
...
Speeds up recompilation by removing MediaProxy as a compile-time dep of Router
2021-05-28 13:07:34 -05:00
Alex Gleason
e885b49e35
Merge remote-tracking branch 'pleroma/develop' into cycles-router
2021-05-28 12:44:16 -05:00
Alex Gleason
21787546c0
Router: move StaticFEPlug to a pipeline
...
Speed up recompilation by breaking a cycle. Removes StaticFEPlug as a compile-time dep of Router.
2021-05-28 12:43:02 -05:00
4694853766
Provide totalItems field for featured collections
2021-05-27 12:17:31 -05:00
05d678c070
Expose user email address to user/owner; not publicly.
2021-05-20 12:50:43 -05:00
Alex Gleason
ad7d4ff8bc
Merge remote-tracking branch 'pleroma/develop' into alias-router-helpers
2021-05-19 12:49:00 -05:00
Alex Gleason
07fed0fda2
Switch to aliasing Router.Helpers instead of importing
2021-05-18 17:45:30 -05:00
c64cbee26c
Fixed checking for Upload Filter required commands
2021-05-18 16:28:21 -05:00
4ab3ef07d0
Check AnalyzeMetadata filter's required commands
...
eblurhash:magick uses "convert"
Fetching image metadata uses "mogrify"
2021-05-18 16:08:31 -05:00
9b6b5ac196
Rename upload filter to AnalyzeMetadata
2021-05-18 15:33:33 -05:00
Alex Gleason
bcf6efce15
Merge remote-tracking branch 'upstream/attachment-meta' into blurhash
2021-05-14 09:09:32 -05:00
Alex Gleason
543e9402d6
Support blurhash
2021-05-14 09:07:16 -05:00
Alex Gleason
ff02511057
Merge remote-tracking branch 'upstream/develop' into attachment-meta
2021-05-12 20:10:52 -05:00
Alex Gleason
6f0b42656d
Federate attachments as Links instead of Documents
2021-05-12 19:25:37 -05:00
Alex Gleason
02b9436494
Don't render media meta if nil
2021-05-12 16:16:10 -05:00
Alex Gleason
4c060ae733
Ingest remote attachment width/height
2021-05-12 15:38:49 -05:00
Alex Gleason
ab9eabdf20
Add SetMeta filter to store uploaded image sizes
2021-05-12 15:07:31 -05:00
Alex Gleason
cea44b6b3e
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak
2021-05-07 12:40:45 -05:00
Alex Gleason
1a45aa1278
Merge remote-tracking branch 'pleroma/develop' into notice-routes
2021-05-05 14:50:54 -05:00
Alex Gleason
50e3750758
Add notice compatibility routes for other frontends
...
Fixes: https://git.pleroma.social/pleroma/pleroma/-/issues/1785
2021-05-05 14:50:10 -05:00
745375bdcf
Merge branch 'dont-crash-email-settings' into 'develop'
...
Don't crash so hard when email settings are invalid
Closes #2606
See merge request pleroma/pleroma!3400
2021-05-04 13:30:00 +00:00
Alex Gleason
c186b059a7
Merge remote-tracking branch 'pleroma/develop' into dont-crash-email-settings
2021-05-03 14:43:28 -05:00
Alex Gleason
c80b1aaf51
Don't crash when email settings are invalid
...
Fixes: https://git.pleroma.social/pleroma/pleroma/-/issues/2606
Fixes: https://gitlab.com/soapbox-pub/soapbox/-/issues/4
2021-05-03 14:43:14 -05:00
Alex Gleason
926a233cc4
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak
2021-04-30 14:21:17 -05:00
Alex Gleason
c16c7fdb87
SimplePolicy: filter string Objects
2021-04-30 14:20:54 -05:00
Alex Gleason
3d742c3c1a
SimplePolicy: filter nested objects
2021-04-30 14:20:37 -05:00
Alex Gleason
52fc59f125
Merge remote-tracking branch 'upstream/develop' into earmark
2021-04-30 13:17:03 -05:00
Alex Gleason
6727a3659f
Remove Pleroma.Formatter.minify/2
2021-04-30 12:27:06 -05:00
Alex Gleason
e7ac15905e
Merge remote-tracking branch 'upstream/develop' into oauth-token-id
2021-04-29 12:19:10 -05:00
Alex Gleason
762be6ce10
Merge remote-tracking branch 'upstream/develop' into block-behavior
2021-04-29 11:14:32 -05:00
959dc6e6fc
Cleanup and ensure we obey custom Repo timeout
2021-04-22 10:15:50 -05:00
99fd9c5e38
OTP releases executing commands via pleroma_ctl show the parent of the process is :erl_eval
2021-04-22 10:15:50 -05:00
9f711ddcf8
Try to set query timeout intelligently
2021-04-22 10:15:50 -05:00
9bc69196d5
Add utility function to return infinite timeout for SQL transactions if we detect it was called from a Mix Task
2021-04-22 10:15:50 -05:00
0effcd2cfe
Set Repo.transaction/2 timeout to infinity. Fixes pleroma.user delete_activities mix task.
2021-04-22 10:15:50 -05:00
Haelwenn
f9bedf5597
Apply lanodan's suggestion(s) to 1 file(s)
2021-04-20 21:08:31 +00:00
Haelwenn
42185d8750
Apply lanodan's suggestion(s) to 1 file(s)
2021-04-20 21:06:45 +00:00
Haelwenn
e104829c2f
Apply lanodan's suggestion(s) to 1 file(s)
2021-04-20 21:06:39 +00:00
Haelwenn
30b1d50938
Apply lanodan's suggestion(s) to 1 file(s)
2021-04-20 21:06:32 +00:00
Sean King
d1eb1913e8
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/opt-out-of-google-floc
2021-04-19 15:42:38 -06:00
efed94a23e
Fix error response which was breaking tests related to pinned posts
2021-04-19 16:23:57 -05:00
Sean King
2b4f958b2a
Add opting out of Google FLoC to HTTPSecurityPlug headers
2021-04-18 14:00:18 -06:00
rinpatch
c6dcd863e2
Apply rinpatch's suggestion(s) to 1 file(s)
2021-04-16 09:59:50 +00:00
rinpatch
15f87cf658
Merge branch 'features/ingestion-ecto-tag' into 'develop'
...
TagValidator: New
See merge request pleroma/pleroma!3244
2021-04-16 09:55:55 +00:00
rinpatch
79376b4afb
Merge branch 'feature/521-pinned-post-federation' into 'develop'
...
Pinned posts federation
Closes #521
See merge request pleroma/pleroma!3312
2021-04-16 09:53:47 +00:00
rinpatch
0ababdc068
Merge branch 'fix/2593-reading-exported-config-file' into 'develop'
...
Reading the file, instead of config keyword in ReleaseRuntimeProvider
Closes #2593
See merge request pleroma/pleroma!3381
2021-04-16 09:50:26 +00:00
Sean King
ca79aab0bf
Remove MastoFE settings from users table
2021-04-15 23:33:24 -06:00
