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

1,593 commits

Author SHA1 Message Date
Phantasm
dd2f0a32d8 lint 2026-03-25 19:35:46 +00:00
Phantasm
3c7cd8b043 Elixir 1.19: Fix Mastodon StatusControllerTest DateTime difference 2026-03-25 19:35:46 +00:00
Phantasm
cbacc0f146 Elixir 1.19: Fix MRFTest regex tests 
It is no longer possible to match regexes. Instead at least match that
the sources of the regexes (regexes themselves) are the same.

Notice the +1 Reference number below.

2) test subdomain_match/2 wildcard domains with one subdomain (Pleroma.Web.ActivityPub.MRFTest)
   test/pleroma/web/activity_pub/mrf_test.exs:36
   Assertion with == failed
   code:  assert regexes == [~r/^(.*\.)*unsafe.tld$/i]
   left:  [%Regex{opts: [:caseless], re_pattern: {:re_pattern, 1, 0, 0, #Reference<0.378940835.3277193222.129648>}, source: "^(.*\\.)*unsafe.tld$"}]
   right: [%Regex{opts: [:caseless], re_pattern: {:re_pattern, 1, 0, 0, #Reference<0.378940835.3277193222.129649>}, source: "^(.*\\.)*unsafe.tld$"}]
   stacktrace:
     test/pleroma/web/activity_pub/mrf_test.exs:39: (test)
 2026-03-25 19:35:46 +00:00
Phantasm
349d858fda Elixir 1.19: Fix typing violation in MediaControllerTest 
warning: a struct for Plug.Upload is expected on struct update:

         %Plug.Upload{image | filename: "../../../../../nested/file.jpg"}

     but got type:

         dynamic()

     where "image" was given the type:

         # type: dynamic()
         # from: test/pleroma/web/mastodon_api/controllers/media_controller_test.exs:132:42
         %{conn: conn, image: image}

     when defining the variable "image", you must also pattern match on "%Plug.Upload{}".

     hint: given pattern matching is enough to catch typing errors, you may optionally convert the struct update into a map update. For example, instead of:

         user = some_function()
         %User{user | name: "John Doe"}

     it is enough to write:

         %User{} = user = some_function()
         %{user | name: "John Doe"}

     typing violation found at:
     │
 133 │       image = %Plug.Upload{
     │               ~
     │
     └─ test/pleroma/web/mastodon_api/controllers/media_controller_test.exs:133:15: Pleroma.Web.MastodonAPI.MediaControllerTest."test Upload media Do not allow nested filename"/1
 2026-03-25 19:35:46 +00:00
Phantasm
9040434886 Elixir 1.19: Fix typing violations in ActivityPubTest 2026-03-25 19:35:46 +00:00
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
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
d1787966a6 Merge branch 'develop' into exclusive-lists 2026-03-10 12:03:13 +00:00
nicole mikołajczyk
0592f111f6 update tests 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-03-06 18:10:07 +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
Phantasm
ca38217898
 		Fix AccountController Plug warning 
the URI path used in plug tests must start with "/", got: "api/v1/blocks"
  (plug 1.19.1) lib/plug/adapters/test/conn.ex:14: Plug.Adapters.Test.Conn.conn/4
  (phoenix 1.7.14) lib/phoenix/test/conn_test.ex:236: Phoenix.ConnTest.dispatch_endpoint/5
  (phoenix 1.7.14) lib/phoenix/test/conn_test.ex:225: Phoenix.ConnTest.dispatch/5
  test/pleroma/web/mastodon_api/controllers/account_controller_test.exs:2099: Pleroma.Web.MastodonAPI.AccountControllerTest."test getting a list of blocks"/1
  (ex_unit 1.19.5) lib/ex_unit/runner.ex:528: ExUnit.Runner.exec_test/2
  (ex_unit 1.19.5) lib/ex_unit/capture_log.ex:121: ExUnit.CaptureLog.with_log/2
  (ex_unit 1.19.5) lib/ex_unit/runner.ex:477: anonymous fn/3 in ExUnit.Runner.maybe_capture_log/3
  (stdlib 7.2) timer.erl:599: :timer.tc/2
  (ex_unit 1.19.5) lib/ex_unit/runner.ex:450: anonymous fn/6 in ExUnit.Runner.spawn_test_monitor/4
 2026-03-03 23:11:39 +01: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
c3b779036d Merge branch 'develop' into pleroma-database-config-whitelist 2026-03-01 22:44:08 +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
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
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
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
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
Phantasm
c1e33bfadb MastoAPI AccountView AccountController: Add more block/mute expiry tests 2026-01-28 13:50:34 +01:00
Phantasm
e7a4d5ea66 MastoAPI AccountView: Add mute/block expiry to the relationship key 2026-01-28 13:50:23 +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
Lain Soykaf
0b871ff1f2 ConfigController: Don't allow updating the whitelist 2026-01-17 12:32:10 +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
nicole mikołajczyk
49985b1614 Update tests 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-16 21:37:02 +01:00
nicole mikołajczyk
f0669997d3 Add test for default whitelist config 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-16 21:34:06 +01: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
MediaFormat
12002830bc fix tests 2026-01-11 17:47:27 +00: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
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
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
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
227c7fafa0 Tests: Syncify tests that mutate global state. 2026-01-07 17:59:37 +04:00
Lain Soykaf
3ef98652f7 Emoji, AccountView, UtilController: Handle encoding of emoji 2026-01-07 10:40:45 +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
033618b25e TransmogrifierTest: Add failing test for EmojiReact url encoding 2026-01-05 11:57:02 +04:00
Lain Soykaf
6c73ebe484 Merge branch 'phnt/mastoapi-misattribution-3381' into release/2.10-sec 2025-12-29 09:47:54 +04:00
Phantasm
38b3bff4e8
 		MastoAPI: Add more post attribution tests when fetched by Activity ID 
Types returning 404:
- Accept
- Reject
- Delete
- Flag
- Follow
- Undo

Types returning posts:
- Create
- Update
- Like
- Announce
- EmojiReact
- Add/Remove
 2025-12-25 20:40:21 +01: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
4c537534ad NoteHandlingTest: Replies go on an object, not an activity. 2025-12-24 13:33:03 +04:00