sadposter
2519d4eb1a
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
3 years ago
Alex Gleason
7f23dd6cc8
Merge remote-tracking branch 'pleroma/develop' into object-tombstone-visibility
3 years ago
Alex Gleason
9cc8642b80
Visibility: check Tombstone objects in visible_for_user?/2
3 years ago
sadposter
de69585eaa
:Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
3 years ago
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
3 years ago
Alex Gleason
62bf6d67e3
Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes
3 years ago
Alex Gleason
70f1496eb8
Poll notification: only notify local users
3 years ago
Alex Gleason
0b1c05ca1e
Poll notification: trigger PollWorker through common_pipeline
3 years ago
Alex Gleason
6a6e42c9bf
PollWorker defensive checks
3 years ago
Alex Gleason
cbd1a10c16
Poll notification: notify for polls even when block_from_strangers is set
3 years ago
Alex Gleason
0114754db2
MastodonAPI: Support poll notification
3 years ago
Alex Gleason
3674179b26
Merge remote-tracking branch 'pleroma/develop' into instance-deletion
3 years ago
Alex Gleason
bad79f79e6
AdminAPI.InstanceController: clean up tests, rename actions
3 years ago
Alex Gleason
54dbcfe02a
AdminAPI: add DELETE /instances/:instance to delete all content from a remote instance
3 years ago
Alex Gleason
f67d00d12b
Add Instance.delete_users_and_activities/1 to delete all content from a remote instance
3 years ago
Alex Gleason
25676c84be
Create AdminAPI.InstanceController
3 years ago
feld
3f58213646
Merge branch 'admin-api-users-sort' into 'develop'
...
AdminAPI: sort new users at the top
Closes #2709
See merge request pleroma/pleroma!3481
3 years ago
Alex Gleason
1a2fe96d56
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-date
3 years ago
Alex Gleason
167e14416b
AdminAPI: add date to users
3 years ago
Alex Gleason
deb3f91136
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-sort
3 years ago
Alex Gleason
5e88796784
AdminAPI: sort user results by ID descending
3 years ago
Alex Gleason
1f093cb216
Moderators: reorganize :admin_api pipeline in Router
3 years ago
Alex Gleason
9bc1e79c56
Moderators: add UserIsStaffPlug
3 years ago
Alex Gleason
e40b58fd56
Merge remote-tracking branch 'pleroma/develop' into fix-object-deletion-timeout
3 years ago
Alex Gleason
9a0cb34c8c
Fix Activity.delete_all_by_object_ap_id/1 timeout so users can be deleted
3 years ago
Haelwenn
173e977e28
Merge branch 'features/ingestion-page' into 'develop'
...
Pipeline Ingestion: Page
See merge request pleroma/pleroma!3097
3 years ago
Haelwenn (lanodan) Monnier
6dc78f5f6f
AP C2S: Remove restrictions and make it go through pipeline
3 years ago
Sean King
5d279a22b1
Merge develop branch upstream
3 years ago
marcin mikołajczak
6ef8e1776d
fix the fucking list timelines on mastofe/soapbox-fe
3 years ago
Alex Gleason
310ef6b70d
Deletions: change User.purge/1 to defp, add CHANGELOG entry
3 years ago
Alex Gleason
99cc26bb02
Merge remote-tracking branch 'pleroma/develop' into remote-deletions
3 years ago
Alex Gleason
beb1c98ab5
Deletions: don't purge keys so Delete/Undo activities can be signed
3 years ago
Alex Gleason
43800d83f4
Deletions: allow deactivated users to be deleted
3 years ago
Alex Gleason
a7929c4d89
Deletions: preserve account status fields during purge, fix checks
3 years ago
Alex Gleason
01c2d2a296
Also purge the user in User.perform/2
3 years ago
Alex Gleason
c6d4133727
Deletions: purge the user immediately
3 years ago
Alex Gleason
be2da95c36
Correctly purge a remote user
3 years ago
sadposter
f191021f52
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
3 years ago
sadposter
e56c319e8f
merge
3 years ago
Alex Gleason
281806de75
Activity deletion: fix FunctionClauseError #2686
3 years ago
feld
f97f305d00
Merge branch 'ecto-upgrade' into 'develop'
...
Upgrade Ecto to v3.6.2, remove deprecated ecto_explain
See merge request pleroma/pleroma!3473
3 years ago
Alex Gleason
54af527759
Upgrade Ecto to v3.6.2, remove deprecated ecto_explain
3 years ago
Haelwenn (lanodan) Monnier
fc6ab78a84
Add test on changing [:instance, :upload_limit]
3 years ago
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
.
3 years ago
feld
406dadb56b
Merge branch 'fix/twittercard-video-dimensions' into 'develop'
...
Generate Twittercard/OGP metadata with correct dimensions
See merge request pleroma/pleroma!3456
3 years ago
Mark Felder
202ee5fd77
Add note about video thumbnails for code spelunkers unfamiliar with Media Preview Proxy
3 years ago
Alex Gleason
15e2aaa9f6
Fix compile cycle in Pleroma.Tests.AuthTestController
3 years ago
Mark Felder
6aa7fc15df
Formatting of the comment
3 years ago
Mark Felder
5f7901cc48
Credo
3 years ago
Mark Felder
2a47156b87
Lint
3 years ago
Mark Felder
86bcb87e6c
Fix incorrectly ordered arguments to the function and not properly merging lists.
3 years ago
Mark Felder
2cf648d419
Add a video thumbnail to the OpenGraph metadata if Media Preview Proxy is enabled.
3 years ago
Mark Felder
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.
3 years ago
Haelwenn (lanodan) Monnier
c839078a75
ObjectValidators.{Announce,EmojiReact,Like}: Fix context, actor & addressing
3 years ago
Haelwenn
53cf801c30
Merge branch 'cycles-plug-deps' into 'develop'
...
Refactor skipped plugs into Pleroma.Web functions
See merge request pleroma/pleroma!3463
3 years ago
Haelwenn
eba3c7b42f
Merge branch 'cycles-side-effects' into 'develop'
...
Recompilation speedup: Switch to runtime deps in ActivityPub.SideEffects
See merge request pleroma/pleroma!3460
3 years ago
Alex Gleason
45b7325b9e
Refactor skipped plugs into Pleroma.Web functions
...
Speeds up recompilation by reducing compile cycles
3 years ago
Alex Gleason
67ec0e6c18
Switch to runtime deps in ActivityPub.SideEffects
...
Speeds up recompilation by reducing compile cycles
3 years ago
Alex Gleason
45ab24f2d9
Switch to runtime deps in Pleroma.Instances
...
Speeds up recompilation by limiting compile cycles
3 years ago
Mark Felder
9cb8960284
Switch OGP default type from "website" to "article"
...
This is what Mastodon uses and might fix some link preview bugs I've encountered
3 years ago
feld
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
3 years ago
feld
4de2bd3b79
Merge branch 'cycles-user-view' into 'develop'
...
Recompilation speedup: Create AdminAPI.UserView to avoid compile-time dep
See merge request pleroma/pleroma!3457
3 years ago
Mark Felder
d70db63084
Set the correct height/width if the data is available when generating opengraph metadata
3 years ago
Alex Gleason
4faeec2c44
Create AdminAPI.UserView to avoid compile-time dep
...
Speeds up recompilation
3 years ago
Mark Felder
aa8cc4e86e
Only use fallback for videos and only add this metadata for images if we really have it.
3 years ago
Mark Felder
d4ac9445cd
Twittercard metadata for images should also include dimensions if available
3 years ago
Alex Gleason
1be14cc45f
Ignore runtime deps in Pleroma.Config.Loader with Module.concat/1
...
Speeds up recompilation
3 years ago
Mark Felder
5de65ce3e8
Set the correct height/width if the data is available when generating twittercard metadata
3 years ago
feld
1175023687
Merge branch 'metadata-for-all' into 'develop'
...
Support metadata for video files too
See merge request pleroma/pleroma!3441
3 years ago
feld
939b3bfe43
Merge branch 'improve-og-embed' into 'develop'
...
Improve opengraph embeds
See merge request pleroma/pleroma!3442
3 years ago
Mark Felder
5c27578bce
Support metadata for video files too
3 years ago
Alex Gleason
b99f60615c
Fix order of Pleroma.Web.Utils.Params aliases
3 years ago
Alex Gleason
ec65b7ae29
Pleroma.Web.Params --> Pleroma.Web.Utils.Params
3 years ago
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
3 years ago
feld
99f8605582
Merge branch 'cycles-uploads' into 'develop'
...
Recompilation speedup: use generic types in @spec in Upload.Filter
See merge request pleroma/pleroma!3453
3 years ago
Alex Gleason
1399b82f7b
Create WrapperAuthenticator and simplify Authenticator behaviour
...
Speeds up recompilation by reducing compile-time cycles
3 years ago
Alex Gleason
bdaa1d4512
Upload.Filter: use generic types in @spec
...
Speeds up recompilation by reducing compile-time deps
3 years ago
Alex Gleason
d87dfcb5f0
Put custom guards in Web.Utils.Guards
...
Speeds up recompilation by removing a compile-time cycle on AdminAPI.Search
3 years ago
Mark Felder
264458531a
Formatting
3 years ago
feld
b553bfd745
Merge branch 'fix/prune-hashtags' into 'develop'
...
get prune_objects to work again
See merge request pleroma/pleroma!3397
3 years ago
feld
676c3c96dc
Merge branch 'cycles-mrf-policy' into 'develop'
...
Recompilation speedup: create MRF.Policy behaviour separate from MRF module
See merge request pleroma/pleroma!3450
3 years ago
feld
84f42b92f0
Merge branch 'develop' into 'fix/prune-hashtags'
...
# Conflicts:
# CHANGELOG.md
3 years ago
feld
bc51dea425
Update lib/mix/tasks/pleroma/database.ex
3 years ago
feld
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
3 years ago
Alex Gleason
6fcfa33e4e
Fix MRF.config_descriptions/0
3 years ago
Alex Gleason
fe4c4a7178
MRF: create MRF.Policy behaviour separate from MRF module
...
Speeds up recompilation by reducing compile-time deps
3 years ago
Alex Gleason
3be08e7c2e
Merge remote-tracking branch 'pleroma/develop' into cycles-reverse-proxy
3 years ago
Alex Gleason
1c3fe43d23
ReverseProxy: create Client.Wrapper to call client from config
...
Speeds up recompilation by reducing compile-time cycles
3 years ago
Sean King
26d2c677b7
Removing trailing space on empty line in OAuth controller
3 years ago
Sean King
2e310b3ec8
Fix more build errors
3 years ago
Sean King
839c2c6a12
Fix code mistake in OAuth controller
3 years ago
Sean King
dc4814f0cd
Fix merge conflicts with upstream
3 years ago
Haelwenn
0c56f9de0d
Merge branch 'tests/openapi-everywhere' into 'develop'
...
Put OpenAPI ~everywhere in tests
See merge request pleroma/pleroma!3324
3 years ago
Haelwenn (lanodan) Monnier
eb7313b0d3
Pipeline Ingestion: Page
3 years ago
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.
3 years ago
feld
a07310888f
Merge branch 'fix/missing-deprecation' into 'develop'
...
Add missing deprecation warning left out of !2842
See merge request pleroma/pleroma!3444
3 years ago
Mark Felder
f58928cf1c
Add missing deprecation warning left out of !2842
3 years ago
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.
3 years ago
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
3 years ago
Haelwenn (lanodan) Monnier
ab32ea44f0
mix.exs: Apply OTP24 fixes to web_push_encryption
3 years ago
Haelwenn (lanodan) Monnier
168687eef2
media_proxy: switch from :crypto.hmac to :crypto.mac
3 years ago
Haelwenn
a5dce42c85
Merge branch 'chore/rename-chat' into 'develop'
...
Rename the non-federating Chat feature to Shout
See merge request pleroma/pleroma!2842
3 years ago
Alex Gleason
028017711c
Merge remote-tracking branch 'pleroma/develop' into cycles-email
3 years ago
Alex Gleason
9879c18548
Avoid `use Phoenix.Swoosh` to prevent recompiling the Endpoint
...
Speeds up recompilation by fixing cycles in UserEmail
3 years ago
feld
3fe6ada6fc
Merge branch 'cycles-streaming' into 'develop'
...
Recompilation speedup: Remove deps from Streaming/Persisting behaviors
See merge request pleroma/pleroma!3434
3 years ago
Mark Felder
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.
3 years ago
Alex Gleason
f6d2bd738d
Merge remote-tracking branch 'pleroma/develop' into cycles-uploader
3 years ago
Alex Gleason
8a5ceb7e53
Remove deps from Uploader behaviour
...
Speeds up recompilation by limiting compile-time deps
3 years ago
Alex Gleason
708210b994
Merge remote-tracking branch 'pleroma/develop' into cycles-streaming
3 years ago
Alex Gleason
a744c47e9a
Remove deps from Streaming/Persisting behaviors
...
Speeds up recompilation by limiting compile-time deps
3 years ago
Mark Felder
2743c66693
Add "chat" back as a feature for backwards compat.
...
Legacy PleromaFE uses this to identify if ShoutBox is available.
3 years ago
Mark Felder
48a0ea2fc3
Wire up join requests to the old "chat:public" channel into the new "shout:public" channel
3 years ago
Mark Felder
d6432a65da
Move shout configuration from :instance, update docs and changelog
3 years ago
Mark Felder
4a181982c3
More confusingly named legacy chat code renamed to shout
3 years ago
Mark Felder
a3cff59659
Ensure we actually start ShoutChannel
3 years ago
Mark Felder
ff00b354fa
Rename the non-federating Chat feature to Shout
3 years ago
Alex Gleason
c435de426d
Merge remote-tracking branch 'pleroma/develop' into cycles-constants
3 years ago
feld
75b94a2f35
Merge branch 'cycles-frontend-static' into 'develop'
...
Recompilation speedup: make Router a runtime dep of FrontendStatic
See merge request pleroma/pleroma!3429
3 years ago
feld
0ddf492c5d
Merge branch 'cycles-base-url' into 'develop'
...
Deprecate Pleroma.Web.base_url/0
See merge request pleroma/pleroma!3432
3 years ago
Haelwenn
c4b4258374
Merge branch 'features/validators-note' into 'develop'
...
Pipeline Ingestion: Note
Closes #290
See merge request pleroma/pleroma!2984
3 years ago
Alex Gleason
f2134e605b
Merge remote-tracking branch 'pleroma/develop' into cycles-base-url
3 years ago
Alex Gleason
51a9f97e87
Deprecate Pleroma.Web.base_url/0
...
Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles.
3 years ago
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
3 years ago
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
3 years ago
Alex Gleason
595bca24ad
Merge remote-tracking branch 'pleroma/develop' into cycles-frontend-static
3 years ago
Alex Gleason
721c966842
FrontendStatic: make Router a runtime dep
...
Speeds up recompilation by removing compile-time cycles
3 years ago
feld
5d40ffe429
Merge branch 'cycles-views' into 'develop'
...
Recompilation speedup: Create real Views for all Controllers
See merge request pleroma/pleroma!3425
3 years ago
feld
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
3 years ago
feld
317fe240a8
Merge branch 'cycles-gun' into 'develop'
...
Recompilation speedup: use runtime deps in Pleroma.Gun
See merge request pleroma/pleroma!3422
3 years ago
feld
b2f5f48750
Merge branch 'cycles-config' into 'develop'
...
Recompilation speedup: use runtime deps in Pleroma.Config
See merge request pleroma/pleroma!3424
3 years ago
Alex Gleason
0de6716f06
Merge remote-tracking branch 'pleroma/develop' into cycles-pipeline
3 years ago
Alex Gleason
fa543a9361
ActivityPub.Pipeline: switch to runtime deps
...
Speed up recompilation by breaking compile-time cycles
3 years ago
Alex Gleason
1a69f59221
Merge remote-tracking branch 'pleroma/develop' into cycles-html
3 years ago
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
3 years ago
Alex Gleason
7c96c82b5b
Merge remote-tracking branch 'pleroma/develop' into cycles-views
3 years ago
Alex Gleason
c9e4200ed2
Create real Views for all Controllers
...
This makes views depend on each other at runtime instead of compile-time
3 years ago
Alex Gleason
cc9e456c0a
Merge remote-tracking branch 'pleroma/develop' into cycles-plugs
3 years ago
Alex Gleason
32d263cb90
Config: use runtime deps instead of module attributes
...
Speeds up recompilation time by breaking compile-time cycles
3 years ago
Alex Gleason
e2ba852bfe
Merge remote-tracking branch 'pleroma/develop' into cycles-gun
3 years ago
Alex Gleason
0ada3fe823
Gun: use runtime deps in ConnectionPool
...
Speed up recompilation time by breaking compile-time cycles
3 years ago
Alex Gleason
3ebede4b51
Gun: make Gun.API a runtime dep
...
Speed up recompilation by breaking a compile-time cycle
3 years ago
feld
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
3 years ago
feld
359ded086c
Merge branch 'simplepolicy-announce-leak' into 'develop'
...
SimplePolicy: filter nested objects, fixes #2582
Closes #2582
See merge request pleroma/pleroma!3376
3 years ago
feld
edcdd15e01
Merge branch 'alias-router-helpers' into 'develop'
...
Switch to aliasing `Router.Helpers` instead of importing
See merge request pleroma/pleroma!3409
3 years ago
Alex Gleason
39127f15eb
Merge remote-tracking branch 'pleroma/develop' into cycles-router-api-routes
3 years ago
Alex Gleason
c23b81e399
Pleroma.Web.get_api_routes/0 --> Pleroma.Web.Router.get_api_routes/0
...
Reduce recompilation time by breaking compile-time cycles
3 years ago
feld
7ad87571bd
Merge branch 'cycles-router' into 'develop'
...
Recompilation speedup: move StaticFEPlug to a pipeline
See merge request pleroma/pleroma!3417
3 years ago
feld
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
3 years ago
Alex Gleason
bf2ee12fdb
Merge remote-tracking branch 'pleroma/develop' into cycles-router-mediaproxy
3 years ago
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
3 years ago