bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
13871 commits 1 branch 0 tags 292 MiB
Commit graph

8395 commits

Author SHA1 Message Date
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
Alex Gleason
04ab689653
Merge remote-tracking branch 'origin/develop' into nsfw-api-mrf 2021-06-17 15:32:59 -05:00
Alex Gleason
a704d5499c
NsfwApiPolicy: Fall back more generously when functions don't match 2021-06-17 15:32:42 -05:00
Alex Gleason
b293c14a1b
NsfwApiPolicy: add describe/0 and config_description/0 2021-06-17 14:52:07 -05:00
Alex Gleason
2b3dfbb42f
NsfwApiPolicy: add tests 2021-06-17 14:36:51 -05:00
Alex Gleason
f15d419062
NsfwApiPolicy: raise if can't fetch user 2021-06-16 22:35:09 -05:00
Alex Gleason
718e8e1edb
Create NsfwApiPolicy 2021-06-16 22:35:04 -05:00
Alex Gleason
307f03b97b Merge branch 'frontend-enable' into 'develop' 
Refactor Pleroma.Frontend, enable a frontend through the CLI, fixes #16

Closes #16

See merge request soapbox-pub/soapbox!34
 2021-06-16 16:21:05 +00:00
Alex Gleason
a39ada9bbf
Merge remote-tracking branch 'origin/develop' into email-list 2021-06-15 13:21:40 -05:00
Alex Gleason
31a510d6a4
EmailList: ensure that deactivated, unapproved, and unconfirmed users aren't subscribers 2021-06-15 13:19:24 -05:00
Alex Gleason
8c62cc95e6
EmailList: add combined.csv view to display all candidates with subscription status 2021-06-15 12:27:34 -05:00
Alex Gleason
73ed23e2fd
EmailList: add Subscribed? column 2021-06-15 12:16:14 -05:00
Alex Gleason
385d432ce7
EmailList: export user nickname 2021-06-15 12:09:50 -05:00
Alex Gleason
53796b6344
Return email_list as a nodeinfo feature 2021-06-15 11:48:42 -05:00
Alex Gleason
723fd67b26
Merge remote-tracking branch 'origin/develop' into frontend-enable 2021-06-14 21:26:43 -05:00
Alex Gleason
6e7b220549
EmailList: add unsubscribers csv, fix query 2021-06-14 21:07:12 -05:00
Alex Gleason
98502836f5
EmailList: ApiSpec typofix 2021-06-14 20:23:25 -05:00
Alex Gleason
2f40a92647
accepts_newsletter --> accepts_email_list 2021-06-14 20:20:08 -05:00
Alex Gleason
9ec3865725
MailingList --> EmailList 2021-06-14 20:18:57 -05:00
Alex Gleason
90df530dec
AdminAPI: get email list subscribers 2021-06-14 20:08:13 -05:00
Alex Gleason
784b8b5f83
Build CSV from subscriber list 2021-06-14 19:24:41 -05:00
Alex Gleason
6109532083
Return accepts_newsletter to account owner only 2021-06-14 19:24:41 -05:00
Alex Gleason
a0f2cba0d8
Add accepts_newsletter field to User, set during registration or account updates 2021-06-14 19:24:36 -05:00
Alex Gleason
811dcc1928
Fix FrontendController 2021-06-14 19:02:13 -05:00
Alex Gleason
8527faecf5
Enable a frontend automatically with --primary arg 2021-06-14 17:55:21 -05:00
Alex Gleason
9a768429a3
Frontend: enable CLI task 2021-06-14 17:27:29 -05:00
Alex Gleason
a9106e4f13
Frontends: refactor with %Frontend{} struct 2021-06-14 15:00:00 -05:00
feld
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
Mark Felder
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
Mark Felder
6aa7fc15df Formatting of the comment 2021-06-09 11:58:51 -05:00
Mark Felder
5f7901cc48 Credo 2021-06-09 11:09:14 -05:00
Mark Felder
2a47156b87 Lint 2021-06-09 11:06:53 -05:00
Mark Felder
86bcb87e6c Fix incorrectly ordered arguments to the function and not properly merging lists. 2021-06-09 11:05:24 -05:00
Mark Felder
2cf648d419 Add a video thumbnail to the OpenGraph metadata if Media Preview Proxy is enabled. 2021-06-09 10:02:41 -05:00
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.
 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
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
 2021-06-08 17:14:30 -05:00
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
 2021-06-08 22:08:37 +00:00
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
 2021-06-08 22:07:25 +00:00
Mark Felder
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
Mark Felder
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
Mark Felder
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
Mark Felder
5de65ce3e8 Set the correct height/width if the data is available when generating twittercard metadata 2021-06-08 15:59:55 -05:00
feld
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
feld
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
Mark Felder
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
feld
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
Mark Felder
264458531a Formatting 2021-06-07 15:47:50 -05:00
feld
b553bfd745 Merge branch 'fix/prune-hashtags' into 'develop' 
get prune_objects to work again

See merge request pleroma/pleroma!3397
 2021-06-07 20:11:45 +00:00
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
 2021-06-07 20:10:20 +00:00
feld
84f42b92f0 Merge branch 'develop' into 'fix/prune-hashtags' 
# Conflicts:
#   CHANGELOG.md
 2021-06-07 20:06:36 +00:00
feld
bc51dea425 Update lib/mix/tasks/pleroma/database.ex 2021-06-07 20:02:28 +00:00
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
 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
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
feld
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
Mark Felder
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
854b6ce816
Merge remote-tracking branch 'origin/develop' into cycles-phase-2 2021-06-02 16:12:45 -05:00
Alex Gleason
15c00f51be
Merge commit '10dfe814795f16d6c32f5b6a7421e3e7c597f1ad' into cycles-phase-2 2021-06-02 14:45:21 -05:00
Alex Gleason
ce7bc185a1
Merge commit '721c966842c2f9b4f4d6f227ecf3de69d2e66346'; commit 'a744c47e9a43a751438973a66b7201b006c6b944'; commit '8a5ceb7e53f1817f83a72b997f6b9daa7070972b'; commit '9879c18548c1b9f37df724259f65d5cd098f44c5' into cycles-phase-2 2021-06-02 14:44:22 -05: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
feld
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
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.
 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
Mark Felder
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
Mark Felder
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