hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
18,163 commits 2 branches 0 tags 250 MiB
Commit graph

10,652 commits

Author SHA1 Message Date
Haelwenn (lanodan) Monnier
be327ca982
 		Switch Phoenix back to upstream 
See <https://github.com/phoenixframework/phoenix/pull/6094>
for `:sec_websocket_protocol` -> `:sec_websocket_headers`
 2026-01-18 10:40:10 +01:00
Lain Soykaf
a4fb651fac ConfigController: Don't allow whitelist modification. 2026-01-17 13:30:07 +04:00
Lain Soykaf
117b0bd79e Config: Don't crash on falsy whitelist config 2026-01-17 13:03:02 +04:00
Lain Soykaf
3b3e369f83 AP ingest: fill missing attributedTo from activity 2026-01-17 02:46:59 +04:00
Lain Soykaf
e7d2d9bd89 mrf(media_proxy_warming): avoid adapter-level redirects 
Drop follow_redirect/force_redirect from the HTTP options used when warming MediaProxy, relying on Tesla middleware instead (Hackney redirect handling can crash behind CONNECT proxies).

Also add a regression assertion in the policy test and document the upstream Hackney issues in ReverseProxy redirect handling.
 2026-01-17 02:24:07 +04:00
Lain Soykaf
9912a9f603 AP ingest: accept Emoji icon variants 2026-01-17 01:33:21 +04:00
nicole mikołajczyk
b66b93a94a Add task for filtering non-whitelisted configs 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-16 21:35:22 +01:00
nicole mikołajczyk
1af8997462 do not ever allow setting database_config_whitelist to database 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-16 21:32:35 +01:00
Lain Soykaf
e9e3d255e5 AP ingest: infer tag type when missing 2026-01-17 00:12:48 +04:00
Lain Soykaf
e781a7ef9b AP ingest: harden attachment parsing 2026-01-17 00:08:19 +04:00
Lain Soykaf
bff67650e1 AP ingest: normalize inReplyTo shapes 2026-01-16 23:57:01 +04:00
Lain Soykaf
6701f61990 AP ingest: normalize quoteUrl fields 2026-01-16 23:27:06 +04:00
Lain Soykaf
39817fa547 AP ingest: normalize object url list 2026-01-16 23:25:07 +04:00
Lain Soykaf
0feb23a308 AP ingest: accept object type as list 2026-01-16 23:16:51 +04:00
Lain Soykaf
346014b897 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into revert-d6888e24 2026-01-16 22:43:10 +04:00
Mark Felder
9b1941366f In-house redirect handler for mediaproxy with Hackney adapter 
Also ensure we always pass an absolute URL to Hackney when parsing a redirect response

(cherry picked from commit 00ac6bce8d244eec7e2460358296619e5cacba6b)
 2026-01-16 22:14:27 +04:00
Lain Soykaf
ef0f04ca48 http(hackney): disable adapter redirects by default 
Hackney 1.25.x has redirect handling issues behind CONNECT proxies and with pools.
Disable hackney-level redirects and rely on Tesla.Middleware.FollowRedirects instead.
Also default to with_body: true so redirects can be followed reliably.
 2026-01-16 21:17:40 +04:00
Lain Soykaf
e91bb2144d InstanceView: Omit comment if it's empty 2026-01-16 16:17:21 +04:00
Lain Soykaf
656c4368d3 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-instance-domain-blocks 2026-01-16 14:24:14 +04:00
lain
09aad75b33 Merge branch 'fix-oauth-app-registration' into 'develop' 
Change redirect_uris to accept array of strings

See merge request pleroma/pleroma!4423
 2026-01-16 10:21:41 +00:00
Lain Soykaf
4df7f93a23 Fix OAuth registration redirect_uris array support 2026-01-16 12:10:21 +04:00
lain
9fcf918e1c Merge branch 'phnt/oban-web' into 'develop' 
Add Oban Web and upgrade LiveView, plug

See merge request pleroma/pleroma!4422
 2026-01-11 05:40:47 +00:00
lain
c945a8a467 Merge branch 'less-flaky-tests' into 'develop' 
Less flaky tests

See merge request pleroma/pleroma!4421
 2026-01-11 05:38:17 +00:00
MediaFormat
87f3459f8c fix field type, fix formatting 2026-01-11 05:34:17 +00:00
MediaFormat
aa95855a7f Change redirect_uris to accept array of strings 2026-01-11 01:12:42 +00:00
Phantasm
5e114931f5
 		Move LiveDashboard to /pleroma/live_dashboard 2026-01-09 11:55:16 +01:00
Haelwenn
792d473778 Merge branch 'paginate-follow-requests' into 'develop' 
Paginate follow requests (adapted from Akkoma)

See merge request pleroma/pleroma!4420
 2026-01-08 10:25:45 +00:00
Lain Soykaf
4984aaa183 Streamer: Fix Marker streaming bug, fix caching in tests. 2026-01-08 14:06:24 +04:00
Lain Soykaf
3ecc861fa7 StripLocation, ReadDescription: Silence noisy errors. 2026-01-08 13:40:25 +04:00
Phantasm
619ff5b9e3
 		Remove /pleroma/oban and /phoenix/live_dashboard from API routes 
This is needed to prevent admin frontend overrides from misbehaving when
overriding AdminFE located at /pleroma/admin, since API routes are
interpreted as the first portion of their full path, ie:
/api/v1/pleroma/admin -> /api
 2026-01-08 00:33:18 +01:00
Phantasm
e671ca2554
 		Add Oban Web and upgrade LiveView, plug 2026-01-07 20:41:56 +01:00
nicole mikołajczyk
b2469404a9 Add changelog entry 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-07 16:07:45 +01:00
nicole mikołajczyk
7b134e7aa5 optimize follow_request_count for own account view 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-07 15:32:18 +01:00
floatingghost
0ec0ad8559 paginate follow requests (#460) 
matches https://docs.joinmastodon.org/methods/follow_requests/#get mostly

Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/460
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-07 15:32:16 +01:00
Lain Soykaf
9ed6d78cb5 Linting 2026-01-07 11:14:45 +04:00
Lain Soykaf
3ef98652f7 Emoji, AccountView, UtilController: Handle encoding of emoji 2026-01-07 10:40:45 +04:00
Lain Soykaf
bd61916270 ConfigDB, RateLimiter, RateLimit: Use new type to parse and cast rate limits. 2026-01-06 16:34:17 +04:00
Lain Soykaf
958a4581d6 RateLimiter: Ensure that the rate limiter doesn't crash on bad values 2026-01-06 15:54:06 +04:00
Lain Soykaf
ee19d14b06 Linting 2026-01-06 15:38:15 +04:00
Lain Soykaf
19f3e2050e Emoji: Handle more edge cases for local emoji with strange filenames. 2026-01-06 15:12:49 +04:00
Lain Soykaf
bac607c7c0 Emoji: Unify tag building, fix tests. 2026-01-05 11:57:38 +04:00
Lain Soykaf
ee17d6413d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into better-user-search 2026-01-01 10:03:14 +04:00
Lain Soykaf
71f5a493f3 Search: Better sorting for user searches. 2026-01-01 10:02:37 +04:00
Lain Soykaf
6c73ebe484 Merge branch 'phnt/mastoapi-misattribution-3381' into release/2.10-sec 2025-12-29 09:47:54 +04:00
lain
1a313fa30c Merge branch 'replies_collection' into 'develop' 
Provide full replies collection in ActivityPub objects (ported from akkoma)

See merge request pleroma/pleroma!4370
 2025-12-25 10:22:53 +00:00
Lain Soykaf
916c8c0581 ActivityPubController: Don't crash on unknown params 2025-12-25 13:04:09 +04:00
Lain Soykaf
e07b3d2442 ObjectView: Make the first reply collection a page, so it shows the actual items. 2025-12-25 12:54:09 +04:00
Lain Soykaf
8e94c5ca38 UserView: Followers != Follows 2025-12-25 12:53:36 +04:00
Lain Soykaf
fc15c25889 Transmogrifier: Only set replies on objects, not activities. 2025-12-25 12:50:55 +04:00
Phantasm
df375662d6
 		AP: simplify visible_for_user? conditions. 
`true or true` returns `true`
 2025-12-23 17:04:08 +01:00