ab3f03a04a
Merge branch 'develop' into 'public-polls'
...
# Conflicts:
# docs/development/API/differences_in_mastoapi_responses.md
2024-01-21 12:03:29 +00:00
3c65a2899d
Merge branch 'handle_object_fetch_failures' into 'develop'
...
Handle object fetch failures gracefully
See merge request pleroma/pleroma!4015
2024-01-19 18:43:00 +00:00
4c20713ecd
Merge branch 'otp26' into 'develop'
...
OTP26 support
See merge request pleroma/pleroma!4025
2024-01-17 09:51:56 +00:00
e44f6a2ab3
Skip tests on MacOS/Darwin that have always failed
2024-01-15 20:18:43 -05:00
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
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
4cbf11d32c
Fix ChatController tests validating prev/next URLs by sorting the query parameters before comparison
2024-01-15 17:12:06 -05:00
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
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
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
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
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
4ca65c6182
MRF.StealEmojiPolicy: Properly add fallback extension to filenames missing one
2024-01-07 19:37:35 +01:00
6a55b680a3
Fix tests
2024-01-07 17:49:08 +03:00
6af49270a9
MRF: Log sensible error for subdomains_regex
2024-01-02 15:37:41 +01:00
fc910f9bb9
Linting
2023-12-30 11:45:16 +04:00
c6acd2abb3
Revert grammar leak from bad merge
2023-12-29 23:31:48 -05:00
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
0820c23988
Fix Chat controller tests failing due to OTP26 key order change
2023-12-29 23:18:45 -05:00
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
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
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
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
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
39dc6c65ef
ChatMessage: Tolerate attachment field set to an empty array
...
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/3224
2023-12-29 05:32:47 +01:00
3acfdb6f8a
Retire the Pleroma.Web.Federator.Publisher module
2023-12-28 14:53:09 -05:00
ddc321a094
Merge branch 'tusooa/3205-group-actor' into 'develop'
...
Implement group actors
See merge request pleroma/pleroma!3969
2023-12-28 10:46:53 +00:00
a2708f7fe3
Leverage existing atoms as return errors for the object fetcher
2023-12-27 22:01:59 -05:00
becb070603
Conslidate log messages for object fetcher failures and leverage Logger.metadata
2023-12-27 21:22:51 -05:00
017e35fbf1
Fix some more typos
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-12-28 00:17:04 +01:00
e34a975dd9
Do not boost if group is blocking poster
2023-12-27 12:28:10 -05:00
5f5533b88a
Test group actor behaviour in SideEffects
2023-12-27 12:28:10 -05:00
5459bbc1ef
Allow group actors to boost posts
2023-12-27 12:28:04 -05:00
7a58ddfa48
Allow local user to have group actor type
...
https://git.pleroma.social/pleroma/pleroma/-/issues/3205
2023-12-27 12:27:37 -05:00
6051715a99
Merge remote-tracking branch 'origin/develop' into instance_rules
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-12-22 14:34:30 +01:00
9fc6676d8c
Merge remote-tracking branch 'origin/develop' into instance-contact-account
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-12-22 13:54:44 +01:00
5f1d707367
Merge branch 'bad_inbox_request' into 'develop'
...
Return a 400 from a bad delivery attempt to the inbox
Closes #2884
See merge request pleroma/pleroma!4009
2023-12-22 11:04:25 +00:00
bd50892c25
Merge branch 'instance-v2' into 'develop'
...
Implement api/v2/instance route
See merge request pleroma/pleroma!3939
2023-12-21 21:14:46 +00:00
f43f33e307
Return a 400 from a bad delivery attempt to the inbox
...
This stops the backend from generating 500 errors from these events.
2023-12-19 13:56:17 -05:00
3fbc80eb58
B ActivityPub.Publisher: Prioritize direct mentions
2023-12-16 20:26:08 +04:00
766011544a
UserViewTest: Add basice service actor test.
2023-12-15 10:01:31 +04:00
40fa1099bf
StatusViewTest: Fix tests.
2023-12-13 11:19:08 +04:00
29d202e1df
Merge branch 'add-opengraph-rich-media-proxy' into 'develop'
...
Add media proxy to opengraph rich media cards
See merge request pleroma/pleroma!3997
2023-12-13 06:23:16 +00:00
a989b793de
Revert "Tests: fix more tests"
...
This reverts commit 05352330bb
2023-12-12 19:35:08 +04:00
e7af2addd8
Add media proxy to opengraph rich media cards
2023-12-12 18:32:02 +03:00
05352330bb
Tests: fix more tests
2023-12-12 19:08:57 +04:00
b13820dcd0
Tests: Remove `skip_on_mac` tag
2023-12-12 14:09:22 +04:00
190120fd79
Tests: More test fixes
2023-12-12 14:03:46 +04:00
00def0875b
RichMediaTest: Use mocked config
2023-12-12 13:28:11 +04:00
650edb60dc
ScheduledActivityControllerTest: Fix tests, make async.
2023-12-12 12:56:07 +04:00
4ba03aa29b
MastodonAPITest: Fix tests
2023-12-12 12:55:53 +04:00
18ab36d70c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into no-async-clear-config
2023-12-12 10:55:19 +04:00
41c02b3d16
Merge branch 'authorize-interaction' into 'develop'
...
Support /authorize-interaction route used by Mastodon
See merge request pleroma/pleroma!3957
2023-12-11 09:31:18 +00:00
d62b17eb60
UploadMediaPlugTest: Fix tests
2023-12-11 11:06:07 +04:00
dd0cf0371a
AttachmentValidatorTest: Fix tests
2023-12-11 11:02:33 +04:00
54c0510d1f
Push.ImplTest: Fix tests
2023-12-11 11:01:07 +04:00
dec524e7da
BackupViewTest: Fix Tests
2023-12-11 10:54:11 +04:00
82beb4987a
MascotControllerTest: Fix tests
2023-12-11 10:49:22 +04:00
f5a2337b37
CommonAPITest: Fix tests
2023-12-11 10:46:26 +04:00
6e448ef239
ActivityPubTest: Fix tests
2023-12-11 10:44:31 +04:00
d19f5d18e9
UpdateCredentialsTest: Fix tests
2023-12-11 10:41:27 +04:00
6a738720ec
ChatControllerTest: Fix tests
2023-12-11 10:39:03 +04:00
e8e74146e8
MastodonAPI.AccountViewTest: Fix tests
2023-12-11 10:33:33 +04:00
50c31cb31b
RemoteFollowControllerTest: Fix test
2023-12-11 10:24:44 +04:00
8c0b1fd1d9
MediaProxyControllerTest: Fix tests
2023-12-11 10:16:29 +04:00
b9f135eaf3
FrontendStaticPlugTest: Fix test
2023-12-11 10:07:39 +04:00
60800c0b2b
ChatMessageReferenceView: Fix test
2023-12-11 10:05:47 +04:00
42c11466cc
MediaProxyWarmingPolicyTest: Fix tests
2023-12-11 10:04:01 +04:00
305c76470f
OpenGraphTest: Fix test
2023-12-11 10:01:55 +04:00
5530c7dca4
MediaProxyTest: Fix test
2023-12-11 10:00:15 +04:00
5a95847c5d
MediaProxyCacheControllerTest: Fix tests.
2023-12-11 09:54:31 +04:00
2c10843bc4
MediaControllerTest: Fix test.
2023-12-11 09:51:59 +04:00
3cce929eec
ChatValidationTest: Fix tests.
2023-12-11 09:43:49 +04:00
0d83b6d177
Linting
2023-12-10 19:59:02 +04:00
6e3267d1bd
Tests: Fix all the tests.
2023-12-10 19:19:56 +04:00
20b76acc08
ActivityPubTest: Swallow log
2023-12-10 17:20:39 +04:00
075222525c
TransmogrifierTest: Capture the log
2023-12-10 17:06:13 +04:00
221f18dc33
Tests: Don't run tests that use clear_config asynchronously.
2023-12-10 16:27:23 +04:00
ef8a2134bc
AccountView: Add test, refactor
2023-12-07 11:25:18 +04:00
6a6a631c81
Merge branch 'neetzsche/add_url_to_scrobbles' into 'develop'
...
Add optional URL value for scrobbles
See merge request pleroma/pleroma!3977
2023-11-29 15:59:19 +00:00
e216603477
Change url to externalLink as requested by hj here: https://shigusegubu.club/notice/AcIjZjackKAt6e522a
2023-11-29 07:55:44 -07:00
ef7bda61ad
Merge branch 'promex' into 'develop'
...
Switch to PromEx for prometheus metrics
See merge request pleroma/pleroma!3967
2023-11-28 07:50:16 +00:00
4ef56c5b65
ActivityPub.Utils: Only treat object ids as valid while stripping
2023-11-27 18:44:11 +04:00
5a3b81d92e
ActivityPub.UtilsTest: Add failing test for strip_report_status_data
2023-11-27 17:55:16 +04:00
510a7b64f1
Add optional URL value for scrobbles
2023-11-23 04:51:51 -07:00
4ebfc011fc
Merge branch 'favicon' into 'develop'
...
Make favicon configurable, embed favicon and manifest in server-generated meta
See merge request pleroma/pleroma!3963
2023-11-19 08:52:37 +00:00
2a58596aef
Fix tests for Add support for configuring a favicon and embed PWA manifest in server-generated-meta
2023-11-15 09:12:25 +01:00
66f5ae0c5a
router: Make /federation_status publicly available
2023-11-14 10:48:30 +01:00
bf2d6abaf2
Merge branch 'healthcheck-disabled-error' into 'develop'
...
TwitterAPI: Return proper error when healthcheck is disabled
See merge request pleroma/pleroma!3953
2023-11-14 09:41:26 +00:00
66cb3294ed
Switch to PromEx for prometheus metrics
...
Recommending use of the separate HTTP server for exposing the metrics
and securing it externally on your firewall or reverse proxy. It will
listen on port 4021 by default.
2023-11-13 15:34:59 -05:00
752bc168f6
Merge branch 'quotes-count' into 'develop'
...
Count and display post quotes
See merge request pleroma/pleroma!3956
2023-11-12 13:38:09 +00:00
9a063deacc
Count and display post quotes
2023-11-12 13:38:08 +00:00
5f19fbc5a9
Merge branch 'phoenix1.7' into 'develop'
...
Update to Phoenix 1.7
See merge request pleroma/pleroma!3900
2023-11-12 13:34:27 +00:00
5996bef7cd
Fix most tests that call SearchIndexWorker.
2023-11-12 15:54:16 +04:00
1e9333a9aa
Merge remote-tracking branch 'origin/develop' into instance-v2
2023-11-08 20:46:57 +01:00
a0e08c6ec2
Merge branch 'develop' into phoenix1.7
2023-11-07 16:05:04 -05:00
c62696c8e7
Support /authorize-interaction route used by Mastodon
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-11-02 13:47:23 +01:00
50e7706b26
Verify link ownership with rel="me"
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-11-02 13:30:46 +01:00
e5bd1ee801
Add entry to @context, tests
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-10-29 00:02:17 +02:00
6b8c5e12df
Add contact account to InstanceView
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-10-26 23:32:08 +02:00
Haelwenn