sjw
/
pleroma
mirror of https://git.pleroma.social/sjw/pleroma.git
1
0
Fork 0
Code Issues Releases Wiki Activity
15,632 Commits 136 Branches 24 Tags 254 MiB
Commit Graph

15632 Commits

Author SHA1 Message Date
Haelwenn 81a13b4b9e Merge branch 'api-docs' into 'develop' 
Update API docs for my changes

See merge request pleroma/pleroma!4033
 2024-01-18 02:19:58 +00:00
marcin mikołajczak b39403a48f Update API docs for my changes 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-01-17 17:13:21 +01:00
Haelwenn 4c20713ecd Merge branch 'otp26' into 'develop' 
OTP26 support

See merge request pleroma/pleroma!4025
 2024-01-17 09:51:56 +00:00
Haelwenn 355487041a We are unsure if OTP27 will bring more breaking changes 2024-01-16 11:22:34 -05:00
Mark Felder e44f6a2ab3 Skip tests on MacOS/Darwin that have always failed 2024-01-15 20:18:43 -05:00
Mark Felder 012ab87605 Pleroma.Web.MastodonAPI.SubscriptionControllerTest: disable async and use on_exit/1 to ensure web push config gets restored 2024-01-16 00:59:44 +00:00
Mark Felder ad363c62c3 Fix StatusController test by using the get_query_parameter/2 helper to reliably retrieve the max_id value 2024-01-15 17:32:57 -05:00
Mark Felder 8bd8ee03c2 Add Pleroma.Test.Helpers.get_query_parameter/2 to retrieve specific query parameter values 2024-01-15 17:32:15 -05:00
Mark Felder 4cbf11d32c Fix ChatController tests validating prev/next URLs by sorting the query parameters before comparison 2024-01-15 17:12:06 -05:00
Mark Felder e7c6410192 Add Pleroma.Support.Helpers.uri_query_sort/1 for easy sorting of a URL's query parameters 2024-01-15 17:08:24 -05:00
Haelwenn 9b39bc6aa8 Merge branch 'mrf-regex-error' into 'develop' 
MRF: Log sensible regex error for subdomain_match

See merge request pleroma/pleroma!4026
 2024-01-15 08:24:54 +00:00
Haelwenn c29430b018 Merge branch 'mrf-steal-emoji-extname' into 'develop' 
MRF.StealEmojiPolicy: Properly add fallback extension to filenames missing one

See merge request pleroma/pleroma!4029
 2024-01-15 08:24:24 +00:00
tusooa d3a4f5b7d7 Merge branch 'nil-contentMap' into 'develop' 
Support objects with a nil contentMap (firefish)

Closes #3231

See merge request pleroma/pleroma!4030
 2024-01-13 22:23:21 +00:00
feld 9cc46c5538 Merge branch 'qtfaststart-fix' into 'develop' 
Fix MediaProxy crashing on some videos

See merge request pleroma/pleroma!4024
 2024-01-13 04:35:32 +00:00
feld d4b889783c Merge branch 'fix-duplicate-inbox-deliveries' into 'develop' 
Fix duplicate inbox deliveries

See merge request pleroma/pleroma!4031
 2024-01-11 20:21:57 +00:00
Mint 379d7fafd5 Merge branch 'use-shared-inbox-test' of pleromergit:pleroma/pleroma into fix-duplicate-inbox-deliveries 2024-01-11 23:10:40 +03:00
Mark Felder dcb2b1413b Add test to validate shared inboxes are used when multiple recipients from the same instance are recipients 2024-01-11 15:05:15 -05:00
Mint 3c30eadd5e Fix duplicate inbox deliveries 2024-01-11 20:48:35 +03:00
Haelwenn (lanodan) Monnier 7651198508 Support objects with a nil contentMap (firefish) 
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/3231
 2024-01-11 07:16:45 +01:00
tusooa 8bc59e9743 Merge branch 'emoji-use-v1-api' into 'develop' 
Make remote emoji packs API use specifically the V1 URL

See merge request pleroma/pleroma!4028
 2024-01-10 01:26:46 +00:00
Haelwenn (lanodan) Monnier 4ca65c6182 MRF.StealEmojiPolicy: Properly add fallback extension to filenames missing one 2024-01-07 19:37:35 +01:00
Ekaterina Vaartis 6a55b680a3 Fix tests 2024-01-07 17:49:08 +03:00
Ekaterina Vaartis 29158681f9 Fetch count before downloading the pack and use that as page size 2024-01-07 17:07:50 +03:00
Ekaterina Vaartis 69e4ebbb8e Make remote emoji packs API use specifically the V1 URL 
Akkoma does not understand it without V1, and it works either way with
normal pleroma, so no reason to not do this
 2024-01-07 15:30:52 +03:00
Haelwenn 67a5542a73 Merge branch 'fix-account-auth-check' into 'develop' 
Fix authentication check on account rendering when bio is defined

See merge request pleroma/pleroma!4027
 2024-01-05 00:45:29 +00:00
Alexander Tumin 32d8e0d496 Fix authentication check on account rendering when bio is defined 2024-01-04 16:57:48 +03:00
Haelwenn (lanodan) Monnier 6af49270a9 MRF: Log sensible error for subdomains_regex 2024-01-02 15:37:41 +01:00
Lain Soykaf fc910f9bb9 Linting 2023-12-30 11:45:16 +04:00
Lain Soykaf 8883fa326a Mix: Update http_signatures version 2023-12-30 11:44:23 +04:00
Mark Felder c6acd2abb3 Revert grammar leak from bad merge 2023-12-29 23:31:48 -05:00
Mark Felder 63a74f7b6d Support for Erlang OTP 26 2023-12-29 23:22:31 -05:00
Mark Felder 04366492b2 ConfigDB export to file does not have a consistent order. 
Just test a few values to prove it was written
 2023-12-29 23:18:45 -05:00
Mark Felder 1b5168ae02 Phoenix detects the webfinger requests with content-type application/jrd+json as "jrd" now 2023-12-29 23:18:45 -05:00
Mark Felder 347e5f33c7 Fix regex string match due to OTP26 key order change 
OTP25:
"<http://localhost:4001/api/v1/favourites?limit=1&max_id=Ad1FhzPIS7gcHjUcoC&offset=0>; rel=\"next\""

OTP26:
"<http://localhost:4001/api/v1/favourites?offset=0&limit=1&max_id=Ad1FmOIAXiSNgygflA>; rel=\"next\""
 2023-12-29 23:18:45 -05:00
Mark Felder 0820c23988 Fix Chat controller tests failing due to OTP26 key order change 2023-12-29 23:18:45 -05:00
Mark Felder d4dd21303a Remove call to Pleroma.Web.Endpoint.config_change/2 
This is not necessary for the tests to pass and breaks other tests as this change doesn't get cleanly reverted causing the hostname to stay set this way and leak into other test causing failures with "sub.example.com" not matching "localhost"
 2023-12-29 22:51:40 -05:00
Mark Felder 36b3867787 Fix test "transforms config to tuples" 
This should have never worked. The default empty values for the other MRF Simple options will always be there.
 2023-12-29 22:50:26 -05:00
Mark Felder b51ba39dd1 Update Floki to get the :attributes_as_maps feature to allow us to compare equality of parsed documents without issues of key ordering 2023-12-29 22:50:26 -05:00
Mark Felder e121e06214 Implement a custom uri_equal?/2 to fix comparisons of URLs with unordered query parameters 2023-12-29 22:50:26 -05:00
Mark Felder e7d6b835ae Fix tests by leveraging Keyword.equal?/2 2023-12-29 22:50:26 -05:00
Haelwenn f74f5e0a56 Merge branch 'publisher' into 'develop' 
Discard some failed publisher jobs

See merge request pleroma/pleroma!4022
 2023-12-29 23:18:34 +00:00
Mark Felder 50edef5bc1 Change QTFastStart to recover gracefully if it encounters an error during bitstring matching 
This fixes issues with internal errors when trying to serve the video
 2023-12-29 14:12:44 -05:00
Mark Felder 833117f573 Fix tests 
Need to handle the edge case of no valid HTTP response which has no status code
 2023-12-29 13:04:06 -05:00
feld 8ac4458630 Merge branch 'finch-redirects' into 'develop' 
Fix following redirects with Finch

See merge request pleroma/pleroma!4023
 2023-12-29 17:00:58 +00:00
lain a6fc97ffec Merge branch 'bugfix/chat-attachment-empty-array' into 'develop' 
ChatMessage: Tolerate attachment field set to an empty array

Closes #3224

See merge request pleroma/pleroma!4020
 2023-12-29 08:12:27 +00:00
Mark Felder 4afe211e50 Return the full tuple from Tesla 2023-12-29 01:04:05 -05:00
Mark Felder 2950397d47 Fix following redirects with Finch 2023-12-29 00:50:50 -05:00
Mark Felder 141702538b Discard on a 404 as well 2023-12-29 00:31:05 -05:00
Mark Felder 7ebca7ecfa Activity publishing failures will prevent the job from retrying if the publishing request returns a 403 or 410 2023-12-29 00:25:33 -05:00
Mark Felder 77949d4590 Make the Publisher log error less noisy 2023-12-29 00:25:11 -05:00