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

10,595 commits

Author SHA1 Message Date
nicole mikołajczyk
6bbfba7f6e Merge pull request 'Allow fine-grained announce visibilities (ported from Akkoma)' (#7832) from mkljczk/pleroma:boost-visibilities into develop 
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7832
 2026-03-21 20:45:30 +00:00
nicole mikołajczyk
23cc812366 Restore embed route 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
Assisted-by: your mother
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-03-19 15:26:29 +01:00
nicole mikołajczyk
d0ef58a59d Merge pull request 'Normalize Hubzilla alsoKnownAs from string to array' (#7821) from phnt/pleroma:normalize-alsoKnownAs into develop 
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7821
 2026-03-10 12:05:22 +00:00
nicole mikołajczyk
37cb2f9273 Merge pull request 'Avoid code duplication in UserView' (#7817) from mkljczk/pleroma:user-view-repeat into develop 
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7817
 2026-03-10 12:04:43 +00:00
nicole mikołajczyk
d1787966a6 Merge branch 'develop' into exclusive-lists 2026-03-10 12:03:13 +00:00
Phantasm
a0131ff733
 		credo: fix ordering of aliases missed in pleroma/pleroma!7841 2026-03-08 21:19:49 +01:00
shibao
4e1ba489ec fix 404s for missing static files 2026-03-08 11:28:21 +00:00
Phantasm
d95d7f6eba Merge pull request 'Gopher: Fix crash on (re)boot when ConfigDB is enabled' (#7826) from fix-gopher-crash into develop 
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7826
 2026-03-08 08:46:54 +00:00
nicole mikołajczyk
40bc79e5ce Merge pull request 'Various bookmark folders-related improvements' (#7829) from mkljczk/pleroma:bookmark-folders into develop 
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7829
 2026-03-06 16:50:30 +00:00
nicole mikołajczyk
87b4e3f3ff Avoid code duplication in UserView 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-03-06 17:50:15 +01:00
nicole mikołajczyk
a1bb81bddb Merge pull request 'Don't use the confusing TwitterAPI namespace' (#7841) from mkljczk/pleroma:twitter-api-removal into develop 
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7841
 2026-03-06 16:24:33 +00:00
nicole mikołajczyk
499b2ed118 remove unused alias 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-03-06 17:23:54 +01:00
Phantasm
3760480813 lint 2026-03-05 20:21:19 +00:00
Phantasm
5f321b0b5b Favicon Plug: Halt Plug pipeline when favicon not found 2026-03-05 20:21:19 +00:00
Phantasm
662c9f36ac Favicon Plug: Update moduledoc and rename to adhere to convention 2026-03-05 20:21:19 +00:00
Phantasm
d03ae43ee0 Favicon Plug: Simplify and pass when not requesting favicon 2026-03-05 20:21:19 +00:00
Yonle
8975129680 webplug(favicon): remove check on url path. 2026-03-05 20:21:19 +00:00
Yonle
96f252023e constants: remove favicon.png from static_only_files 2026-03-05 20:21:19 +00:00
Yonle
0879dd3950 endpoint: reorder: handle favicon plug first 2026-03-05 20:21:19 +00:00
Yonle
8abd25950a endpoint: use favicon plug 2026-03-05 20:21:19 +00:00
Yonle
970e0f9044 endpoint: set cache control for favicon.png 
Signed-off-by: Yonle <yonle@proton.me>
 2026-03-05 20:21:19 +00:00
Yonle
848b3f5d5b reverse_proxy,endpoint,uploaded_media: add immutable cache-control flag 2026-03-05 20:21:19 +00:00
nicole mikołajczyk
19025563e2 fixes 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-03-03 17:32:32 +01:00
nicole mikołajczyk
65c7d0c7b9 Merge pull request 'Update comment for prepare_object, rename prepare_outgoing' (#7818) from mkljczk/pleroma:update-comment into develop 
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7818
 2026-03-03 12:49:50 +00:00
nicole mikołajczyk
490cd33bc9 Support lists exclusive param 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-03-03 12:48:37 +00:00
Oneric
b645643cfb Merge pull request 'Allow fine-grained announce visibilities' (#941) from Oneric/akkoma:announce-visibility into develop 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/941
Reviewed-by: floatingghost <hannah@coffee-and-dreams.uk>
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-03-03 12:48:12 +00:00
nicole mikołajczyk
1b182b07dc is this what i was meant to do? 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-03-03 00:23:14 +01:00
nicole mikołajczyk
2086561fbd Various bookmark folders-related improvements 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-03-02 23:41:46 +01:00
nicole mikołajczyk
c3b779036d Merge branch 'develop' into pleroma-database-config-whitelist 2026-03-01 22:44:08 +00:00
nicole mikołajczyk
6405a2e682 Merge pull request 'Move avatar_description and header_description fields to the account object' (#7828) from mkljczk/pleroma:avatar-description-mastodon-api into develop 
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7828
 2026-03-01 22:40:01 +00:00
nicole mikołajczyk
120719f28c Don't use the confusing TwitterAPI namespace 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-02-27 19:53:25 +01:00
nicole mikołajczyk
a9b5a28c26 Do not use Enum.map for side-effects 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-02-27 16:24:10 +01:00
Phantasm
e32ab8aef2 DB prune: Check if user follows hashtag with no objects before deletion 2026-02-22 21:46:41 +00:00
Phantasm
95c8b4732f
 		ReverseProxy Hackney: Add redirect handling logging 2026-02-22 11:27:03 +01:00
Phantasm
23a4d68c97 ReverseProxy: Follow redirects recursively until redirect_limit 
Test post: https://possum.city/notes/ahqdvbhu3wug0at2
 2026-02-22 10:05:50 +00:00
Phantasm
699a7e57e8
 		Fix LiveDashboard redirect not working when user added a path segment 
/phoenix/live_dashboard -> /pleroma/live_dashboard would work

/phoenix/live_dashboard/ecto_stats -> /pleroma/live_dashboard/ecto_stats
would not work and instead reply with FE.
 2026-02-17 21:10:56 +01:00
nicole mikołajczyk
3d9ac413af Move avatar_description and header_description fields to the account object 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-02-17 14:00:21 +01:00
Phantasm
eed4f4bba8
 		Gopher: Fix crash on (re)boot when ConfigDB is enabled 
Ranch listener wasn't being properly stopped when the Gopher GenServer
received a shutdown message due Restarter rebooting Pleroma to apply
ConfigDB configuration (originating from
Config.TransferTask.load_and_update_env/2) when ConfigDB is enabled.

Handle by trapping exits in the GenServer, which causes the terminate/2
function to be called and the Ranch listener to be stopped from there.

23:22:29.871 [error] GenServer Restarter.Pleroma terminating
** (MatchError) no match of right hand side value:

    {:error,
     {{:shutdown,
       {:failed_to_start_child, Pleroma.Gopher.Server,
        {{:badmatch, {:error, {:already_started, #PID<0.4801.0>}}},
         [
           {Pleroma.Gopher.Server, :init, 1,
            [file: ~c"lib/pleroma/gopher/server.ex", line: 25]},
           {:gen_server, :init_it, 2, [file: ~c"gen_server.erl", line: 2276]},
           {:gen_server, :init_it, 6, [file: ~c"gen_server.erl", line: 2236]},
           {:proc_lib, :init_p_do_apply, 3, [file: ~c"proc_lib.erl", line: 333]}
         ]}}}, {Pleroma.Application, :start, [:normal, []]}}}

    (restarter 0.1.0) lib/pleroma.ex:104: Restarter.Pleroma.do_restart/1
    (restarter 0.1.0) lib/pleroma.ex:96: Restarter.Pleroma.handle_cast/2
    (stdlib 7.2) gen_server.erl:2460: :gen_server.try_handle_cast/3
    (stdlib 7.2) gen_server.erl:2418: :gen_server.handle_msg/3
    (stdlib 7.2) proc_lib.erl:333: :proc_lib.init_p_do_apply/3
Last message: {:"$gen_cast", {:after_boot, :dev}}
State: %{rebooted: false, need_reboot: false, after_boot: false}
 2026-02-17 00:47:57 +01:00
Phantasm
f80c5744b1
 		Normalize Hubzilla alsoKnownAs from string to array 2026-02-12 18:47:22 +01:00
nicole mikołajczyk
2e80c786bb Update comment for prepare_object, rename prepare_outgoing 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-02-10 14:37:30 +01:00
nicole mikołajczyk
cb78699a3b Merge branch 'instance-profile-fields' into 'develop' 
Add /api/v2/instance profile fields limits info used by Mastodon

See merge request pleroma/pleroma!4434
 2026-01-30 23:04:49 +01:00
nicole mikołajczyk
833e9829ba Merge branch 'relationship-expires-at' into 'develop' 
MastoAPI AccountView: Add mute/block expiry to the relationship object (simplified)

See merge request pleroma/pleroma!4433
 2026-01-30 07:08:21 +01:00
nicole mikołajczyk
bd30d461b0 Add /api/v2/instance profile fields limits info used by Mastodon 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-30 07:05:45 +01:00
nicole mikołajczyk
bc0c7fb310 Fix tests, relationship should always define _expires_at 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-28 13:58:33 +01:00
nicole mikołajczyk
6fac6ff7f1 MastoAPI AccountView: Add mute/block expiry to the relationship object 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-28 13:49:34 +01:00
nicole mikołajczyk
80ede85f75 Allow assigning users to reports 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-28 10:35:19 +01:00
Haelwenn (lanodan) Monnier
6f86883cca
 		Web: remove legacy :set_put_layout plug 
Phoenix 1.8 requires a View module with put_layout so can't set it that early.

It was introduced in 2019 with
commit 1097ce6d9f
but nothing seems to provide app.html (anymore?) and it would likely
better be set by something like OAuthController / OAuthView.
 2026-01-18 10:40:10 +01:00
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