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

10,379 commits

Author SHA1 Message Date
Phantasm
56b3db71ff
 		MastoAPI AccountView: Readd block/mute expiry outside the relationship 2026-01-24 21:33:49 +01:00
Phantasm
ddc1a86f40
 		MastoAPI AccountView: Add mute/block expiry to the relationship key 2026-01-24 21:32:42 +01: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
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
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
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
lain
2f48544937 Merge branch 'akkoma-fixes-1014-1018' into 'develop' 
Status visibility checks for post interactions, stop leaking internal Activity representation (Akkoma PR 1014 and 1018)

Closes #3383

See merge request pleroma/pleroma!4400
 2025-12-23 13:55:18 +00:00
Phantasm
01ffaba3d2
 		MastoAPI: Fix unauth visibility checks when fetching by Activity FlakeID 
- Adds another Pleroma.ActivityPub.Visibility.visible_for_user?/2 func
- Modifies existing tests to include a local Activity referencing a
  remote Object
- Changes Announce Activity test factory to reference Objects instead of
  Activities and use a different Actor for the Announce
- Changes ap_id of remote user in Announce test factory to match Objects
- Adds `object_local` option to Note factories that explicitly changes
  the domain in the URL to not match the endpoint URL in the test env
  to properly work with the new visibility func, since we don't store
  locality of Object unlike Activities
 2025-12-23 00:07:16 +01:00
Phantasm
c2b40659e7
 		MastoAPI: Fix misattribution when fetching status by Activity FlakeID 2025-12-22 23:33:00 +01:00
lain
1d366c0138 Merge branch 'transmogrifier/handle-as-public' into 'develop' 
Transmogrifier: convert "as:Public" to full w3 URL

See merge request pleroma/pleroma!4394
 2025-12-22 07:39:44 +00:00
lain
d19b992417 Merge branch 'webfinger-actual-fix' into 'develop' 
Fix WebFinger for split-domain setups

See merge request pleroma/pleroma!4405
 2025-12-22 07:38:55 +00:00
Lain Soykaf
e9d9724637 WebFinger: Tighten the requirements. 2025-12-21 17:46:39 +04:00
Lain Soykaf
ec58b6a4cc CommonFixes, Transmogrifier: Fix tests. 2025-12-21 15:19:38 +04:00
Lain Soykaf
98f300c5ae Transmogrifier: Handle user updates. 2025-12-21 14:16:57 +04:00
nicole mikołajczyk
e0ab2c9c9c Merge remote-tracking branch 'origin/develop' into mastodon-quote-id-api 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2025-12-17 13:43:45 +01:00
nicole mikołajczyk
c06fcc7f5d Merge branch 'order-favourites-reblogs' into 'develop' 
Order favourites and reblogs list from newest to oldest

See merge request pleroma/pleroma!4399
 2025-12-16 23:49:01 +01:00
nicole mikołajczyk
d41e2fbaaf Merge branch 'preferred-frontend' into 'develop' 
Port Akkoma frontend preference code

See merge request pleroma/pleroma!4398
 2025-12-16 20:54:00 +01:00
nicole mikołajczyk
c6298be9f0 Merge branch 'scrobbles-scope' into 'develop' 
Add `write:scrobbles` and `read:scrobbles` scope for scrobbling

See merge request pleroma/pleroma!4379
 2025-12-16 20:53:32 +01:00
nicole mikołajczyk
45af48520b this shouldn't be available outside the module 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2025-12-15 18:10:00 +01:00
nicole mikołajczyk
3e2573f1c4 Fix WebFinger for split-domain set ups 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2025-12-15 17:01:53 +01:00
Phantasm
4985902b02
 		Add Actor images normalization from array of urls to string 2025-12-15 00:00:57 +01:00