hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
17,756 commits 2 branches 0 tags 241 MiB
Commit graph

17,756 commits

This branch
This branch
All branches
Author SHA1 Message Date
Phantasm
f4a8c426df MastoAPI AccountView: Readd block/mute expiry outside the relationship 2026-01-26 20:51:36 +02:00
Phantasm
6439a5b334 MastoAPI AccountView: Add mute/block expiry to the relationship key 2026-01-26 20:51:36 +02:00
Lain Soykaf
0b813b9c4a 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-26 20:51:36 +02:00
Lain Soykaf
029994aa75 InstanceView: Omit comment if it's empty 2026-01-26 20:51:36 +02:00
Lain Soykaf
820a4cd97c Fix OAuth registration redirect_uris array support 2026-01-26 20:51:36 +02:00
MediaFormat
ad5bb02bd6 fix tests 2026-01-26 20:51:36 +02:00
MediaFormat
cb389e788d fix field type, fix formatting 2026-01-26 20:51:36 +02:00
MediaFormat
ba280b2d0f add changelog.d entry 2026-01-26 20:51:36 +02:00
MediaFormat
861a9f9365 Change redirect_uris to accept array of strings 2026-01-26 20:51:36 +02:00
Haelwenn (lanodan) Monnier
519ef4be5e mix: upgrade vix from "~> 0.26.0" to "~> 0.36" 
Dropping the last zero should allow to get 0.x updates rather
than only 0.36.x updates.

Fixes: https://git.pleroma.social/pleroma/pleroma/-/issues/3393
 2026-01-26 20:51:36 +02:00
Phantasm
f6c410b06c Move LiveDashboard to /pleroma/live_dashboard 2026-01-26 20:51:35 +02:00
Phantasm
f16dad2879 Docs: Add admin documentation for LiveDashboard and Oban Web 2026-01-26 20:51:35 +02:00
Phantasm
421187dbfa 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-26 20:51:35 +02:00
Phantasm
ac6ec02725 changelog 2026-01-26 20:51:35 +02:00
Phantasm
af4bed50e6 Add Oban Web and upgrade LiveView, plug 2026-01-26 20:51:35 +02:00
Lain Soykaf
033083d1d1 Streamer: Fix Marker streaming bug, fix caching in tests. 2026-01-26 20:51:35 +02:00
Lain Soykaf
343e42126a Add changelog 2026-01-26 20:51:35 +02:00
Lain Soykaf
b2be7d48bc Mix: Silence migrations 2026-01-26 20:51:35 +02:00
Lain Soykaf
02185ec711 StripLocation, ReadDescription: Silence noisy errors. 2026-01-26 20:51:35 +02:00
Lain Soykaf
7283d4f9be Config: Make streaming in tests actually synchronous 2026-01-26 20:51:35 +02:00
Lain Soykaf
6a81e4fe00 Tests: Syncify tests that mutate global state. 2026-01-26 20:51:35 +02:00
nicole mikołajczyk
520bac27dc Add changelog entry 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-26 20:51:35 +02:00
nicole mikołajczyk
5068e31583 optimize follow_request_count for own account view 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-26 20:51:35 +02:00
floatingghost
c07506ab6e 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-26 20:51:35 +02:00
Lain Soykaf
3d7d119782 Linting 2026-01-26 20:51:35 +02:00
Lain Soykaf
b013ec9123 Emoji, AccountView, UtilController: Handle encoding of emoji 2026-01-26 20:51:35 +02:00
Lain Soykaf
7ce7d4d319 Linting 2026-01-26 20:51:35 +02:00
Lain Soykaf
33b8ccf21f Emoji: Handle more edge cases for local emoji with strange filenames. 2026-01-26 20:51:35 +02:00
Lain Soykaf
b552c25039 Add changelog 2026-01-26 20:51:35 +02:00
Lain Soykaf
72fea0c901 Emoji: Unify tag building, fix tests. 2026-01-26 20:51:35 +02:00
Lain Soykaf
1085f6d7cd TransmogrifierTest: Add failing test for EmojiReact url encoding 2026-01-26 20:51:35 +02:00
Lain Soykaf
89ac0b8f0a Add changelog 2026-01-26 20:51:35 +02:00
Lain Soykaf
65456aed12 Release-to-Docker: Add unzip / curl to make updates work 2026-01-26 20:51:35 +02:00
Lain Soykaf
5600634574 Installation: Add Release-Via-Docker option 2026-01-26 20:51:35 +02:00
nicole mikołajczyk
e40bedc601 Add v1/instance/domain_blocks endpoint 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-26 20:51:35 +02:00
Lain Soykaf
8936066427 test(http): cover reverse proxy redirects via CONNECT proxy 
Exercises Pleroma.ReverseProxy.Client.Hackney with follow_redirect enabled behind an HTTPS CONNECT proxy, ensuring the client follows a relative redirect and can stream the final body.
 2026-01-26 20:51:35 +02:00
Mark Felder
71a4b8d0f2 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-26 20:51:35 +02:00
Lain Soykaf
f2ad6100f2 test(http): reproduce hackney follow_redirect crash via CONNECT proxy 
Hackney 1.25 crashes when follow_redirect is enabled behind an HTTPS CONNECT proxy and the Location header is relative (hackney_http_connect transport).
This test demonstrates the failure and verifies Tesla-level redirects work when hackney redirects are disabled.
 2026-01-26 20:51:35 +02:00
Lain Soykaf
500340fc82 test(http): cover pooled redirect with hackney 
Reproduces the Hackney 1.25 pooled redirect cleanup issue which can surface as :req_not_found when the adapter returns a Ref and the body is later fetched.
 2026-01-26 20:51:35 +02:00
Lain Soykaf
b85507c764 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-26 20:51:35 +02:00
lain
01d94a0135 Revert "Merge branch 'revert-cdd6df06' into 'develop'" 
This reverts merge request !4411
 2026-01-26 20:51:35 +02:00
Henry Jameson
8d82808d7a Merge remote-tracking branch 'origin/develop' into shigusegubu 2026-01-03 02:01:33 +02:00
lain
3d42219f12 Merge branch '2.10-mergeback' into 'develop' 
Stable mergeback

See merge request pleroma/pleroma!4414
 2025-12-31 14:56:45 +00:00
lain
3b99bbd955 Merge branch 'release/2.10' into 'stable' 
Release/2.10

See merge request pleroma/pleroma!4413
 2025-12-31 08:27:19 +00:00
Lain Soykaf
856bd7622e GitlabCI: Fix. 2025-12-31 11:40:27 +04:00
Lain Soykaf
e1e16656ce Merge in stable 2025-12-31 11:05:47 +04:00
Lain Soykaf
a5da6ce58e Changelog: Update changelog 2025-12-31 10:49:28 +04:00
Lain Soykaf
92fc8f0012 Merge branch 'release/2.10' into release/2.10-sec 2025-12-29 17:08:46 +04:00
Lain Soykaf
b9e333c307 Frontend: Actually use the correct build. 2025-12-29 17:08:20 +04:00
Lain Soykaf
e204bc150e Merge branch 'release/2.10' into release/2.10-sec 2025-12-29 09:49:53 +04:00