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
df0b56576a
Fix other quotation mark conversion tests
2023-10-16 21:35:37 -04:00
b748efe66a
Fix mentioning punycode domains when using Markdown
2023-10-16 21:35:25 -04:00
a348c2e4dd
Use pleroma: instead of pleroma. for ws events
2023-10-15 17:20:25 -04:00
7d005e8c93
Return stream attribute in server-sent events
2023-10-15 17:20:23 -04:00
2b5636bf12
Allow unified streaming endpoint
2023-10-15 17:19:40 -04:00
2f6fc6a7ab
TwitterAPI: Return proper error when healthcheck is disabled
2023-09-24 23:32:17 +02:00
08608afca5
Fix quote_visible attribute
2023-09-13 19:20:33 -04:00
a8b2f9205d
Expose quote_id parameter on the api
2023-09-13 19:20:32 -04:00
875b46d97d
Do not mention original poster when quoting
2023-09-13 19:20:32 -04:00
8596f92654
Fix TransmogrifierTest
2023-09-13 19:20:32 -04:00
e349e92a44
Add mrf to force link tag of quoting posts
2023-09-13 19:20:30 -04:00
479a6f11db
Keep incoming Link tag
2023-09-13 19:19:44 -04:00
e9cd004ba1
Parse object link as quoteUrl
2023-09-13 19:19:42 -04:00
163e563733
Allow more flexibility in InlineQuotePolicy
2023-09-13 19:19:05 -04:00
762794eed9
Fix CommonAPITest
2023-09-13 19:19:05 -04:00
9bcec87aba
Allow local quote and private self-quote
2023-09-13 19:19:05 -04:00
f9697e68c2
InlineQuotePolicy: skip objects which already have an .inline-quote span
2023-09-13 19:19:05 -04:00
79fca39faf
Actually, don't send _misskey_quote anymore
2023-09-13 19:19:05 -04:00
4075eecca0
InlineQuotePolicy: improve the way Markdown quotes are displayed by other software
2023-09-13 19:19:05 -04:00
817e308c0d
Handle Fedibird's new quoteUri field
2023-09-13 19:19:05 -04:00
3c8319fe9f
Transmogrifier: federate quotes with _misskey_quote field
2023-09-13 19:19:04 -04:00
cf8e425883
StatusView: return quote post inside a reblog
2023-09-13 19:19:04 -04:00
bee7e41959
InlineQuotePolicy: don't add line breaks to markdown posts
2023-09-13 19:19:04 -04:00
74e0a4555f
StatusView: add `quote_visible` param
2023-09-13 19:19:04 -04:00
6f11f11519
StatusView: fix quote visibility
2023-09-13 19:19:04 -04:00
59326247aa
CommonAPI: disallow quoting private posts through the API
2023-09-13 19:19:04 -04:00
57ef1d1211
Add InlineQuotePolicy to force quote URLs inline
2023-09-13 19:19:04 -04:00
1f19dd76f6
ActivityDraft: mix format, defensive actor ID
2023-09-13 19:19:04 -04:00
54a9897938
ActivityDraft: mention the OP of a quoted post
2023-09-13 19:19:04 -04:00
80ab2572a4
Return quote_url through the API, don't render quotes more than 1 level deep
2023-09-13 19:19:04 -04:00
f4ccdfd503
Fix typos
2023-09-13 19:19:03 -04:00
cbd1760efa
TransmogrifierTest: prepare an outgoing quote post
2023-09-13 19:19:03 -04:00
3a8b5d90df
StatusControllerTest: test creating a quote post
2023-09-13 19:19:03 -04:00
c20e90e898
BuilderTest: build quote post
2023-09-13 19:19:03 -04:00
d4fea8b559
ActivityDraft: allow quoting
2023-09-13 19:19:03 -04:00
0d9c443e51
StatusView: render the whole quoted status
2023-09-13 19:19:03 -04:00
b022d6635d
Transmogrifier: fetch quoted post
2023-09-13 19:19:03 -04:00
795736af16
ObjectValidators: improve quoteUrl compatibility
2023-09-13 19:19:03 -04:00
1afde067b1
CommonAPI: Prevent users from accessing media of other users
2023-09-03 10:41:37 +02:00
9effa24f30
Implement api/v2/instance route
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-08-11 00:08:05 +02:00
48b1e9bdc7
Completely disable xml entity resolution
2023-08-05 14:17:04 +02:00
307692cee8
Add unit test for external entity loading
2023-08-05 08:14:27 +02:00
819fccb7d1
Merge branch 'tusooa/3154-attachment-type-check' into 'develop'
...
Restrict attachments to only uploaded files only
Closes #3154
See merge request pleroma/pleroma!3923
2023-08-03 10:01:32 +00:00
dc4de79d43
status context: perform visibility check on activities around a status
...
issue #2927
2023-07-28 18:45:59 +05:00
ea4225a646
Restrict attachments to only uploaded files only
2023-07-18 18:39:59 -04:00
1459d64508
Make regex-to-string descriptor reusable
2023-07-07 07:09:35 -04:00
ba3aa4f86d
Fix edge cases
2023-07-07 06:58:32 -04:00
d670dbdbd3
Test that unicode emoji reactions are not affected
2023-07-07 06:58:32 -04:00
ef8a6c539a
Make EmojiPolicy aware of custom emoji reactions
2023-07-07 06:58:31 -04:00
7eb8abf7bb
EmojiPolicy: Implement delist
2023-07-07 06:58:31 -04:00
80ce6482f6
EmojiPolicy: implement remove by shortcode
2023-07-07 06:58:31 -04:00
28ff828caa
Add emoji policy to remove emojis matching certain urls
...
https://git.pleroma.social/pleroma/pleroma/-/issues/2775
2023-07-07 06:58:22 -04:00
a31a4c522f
Merge branch 'tusooa/3131-handle-report-from-deactivated-user' into 'develop'
...
Fix handling report from a deactivated user
Closes #3131
See merge request pleroma/pleroma!3915
2023-07-02 21:27:15 +00:00
6e4de2383f
Fix handling report from a deactivated user
2023-07-02 11:15:34 -04:00
a1621839cc
Fix user fetch completely broken if featured collection is not in a supported form
2023-07-02 11:03:09 -04:00
48e490cd58
Merge branch 'bugfix/full-revert-media-host-validation' into 'develop'
...
Merge Revert "Merge branch 'validate-host' into 'develop'"
Closes #3136
See merge request pleroma/pleroma!3909
2023-07-01 21:54:18 +00:00
ae0ca49451
Merge branch 'tusooa/3119-bio-update' into 'develop'
...
Show more informative errors when profile exceeds char limits
Closes #3119
See merge request pleroma/pleroma!3886
2023-06-27 18:49:43 +00:00
41f2ee69a8
Merge branch 'from/upstream-develop/tusooa/backup-status' into 'develop'
...
Detail backup states
Closes #3024
See merge request pleroma/pleroma!3809
2023-06-27 12:08:11 +00:00
dd9f8150fc
Merge Revert "Merge branch 'validate-host' into 'develop'"
...
This reverts commit d998a114e2da6b4003ac
2023-06-22 21:28:25 +02:00
4e6ea7cc91
Merge branch 'tusooa/3054-banned-delete' into 'develop'
...
Fix deleting banned users' statuses
See merge request pleroma/pleroma!3889
2023-06-11 13:17:12 +00:00
6611c6ce4e
B ForceMentionsInContent: Fix test, refactor.
2023-06-11 16:45:31 +04:00
55dd8ef1c7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-double_mentions
2023-06-11 16:31:20 +04:00
16313af7eb
Merge branch 'fix/metadata-tags' into 'develop'
...
static frontend: fix meta tags
See merge request pleroma/pleroma!3885
2023-06-11 11:57:16 +00:00
1f4618d64b
Merge branch 'cleanup/ostatus-user-upgrade' into 'develop'
...
Cleanup OStatus-era user upgrades and ap_enabled indicator
See merge request pleroma/pleroma!3880
2023-06-11 11:13:57 +00:00
fadcd7f1a9
Revert MediaProxy Host header validation
...
Something is going wrong here even though the tests are correct.
2023-06-07 09:19:22 -04:00
86b38dd14b
Merge branch 'develop' into 'phoenix1.7'
...
# Conflicts:
# mix.exs
2023-06-02 15:41:40 +00:00
ba988a9abc
Fix test warnings
...
warning: the URI path used in plug tests must start with "/"
2023-05-31 16:30:31 -04:00
e3110cb34e
Fix deprecated calls to get_flash/2
2023-05-31 13:36:21 -04:00
46c799f528
Use Phoenix.ConnTest.redirected_to/2
2023-05-31 09:54:37 -04:00
b3c3bd99c3
Switch from serving a 400 to a 302
2023-05-30 16:56:09 -04:00
a60dd0d92d
Validate Host header matches expected value before allowing access to Uploads
2023-05-29 14:16:03 -04:00
843fcca5b4
Validate Host header matches expected value before allowing access to MediaProxy
2023-05-29 13:59:51 -04:00
4c91c0d1ba
oops, forgot the test cases
2023-05-29 02:52:50 +05:00
869f0d24a6
Merge branch 'release/2.5.2' into mergeback/2.5.2
2023-05-26 23:47:50 +02:00
4505bc1e58
Filter OEmbed HTML tags
2023-05-26 19:56:36 +02:00
0d68804aa7
Filter OEmbed HTML tags
2023-05-26 19:54:24 +02:00
d0c2e0830b
Enforce unauth restrictions for public streaming endpoints
2023-05-26 19:24:08 +02:00
b36263e5ff
Merge branch 'issue/3126' into 'develop'
...
MediaProxyController: Apply CSP sandbox
See merge request pleroma/pleroma!3890
2023-05-26 19:24:08 +02:00
38bcf6b19e
MediaProxyController: Apply CSP sandbox
2023-05-26 12:34:01 -04:00
279fd47b48
ForceMentionsInContent: fix double mentions for Mastodon/Misskey posts
...
The code checked for duplicates using "ap_id", but in Mastodon and Misskey the look like that:
Mastodon: https://mastodon.example.com/users/roger
Misskey: https:///misskey.example.com/users/104ab42f11
The fix is to also check for "uri", which is what will be in the "explicitly_mentioned_uris" list:
Mastodon: https://mastodon.example.com/@roger
Misskey: https://misskey.example.com/@roger
2023-05-26 12:30:19 -04:00
1fa196d8f7
Fix deleting banned users' statuses
2023-05-25 19:00:38 -04:00
2c66f584b5
Show more informative errors when profile exceeds char limits
2023-05-25 08:22:33 -04:00
0524e66a05
Merge branch 'accept-tags-2.5' into 'develop'
...
TagValidator: Drop unrecognized Tag types
Closes #2952
See merge request pleroma/pleroma!3823
2023-05-17 19:04:51 +00:00
ce1c0f75cd
Merge branch 'tusooa/3065-scopes' into 'develop'
...
OAuth scopes descriptions
Closes #3065
See merge request pleroma/pleroma!3848
2023-05-17 18:51:26 +00:00
143676f58c
Merge branch 'tusooa/allow-lang' into 'develop'
...
Allow lang attribute
See merge request pleroma/pleroma!3882
2023-05-17 15:28:32 +00:00
163e82bab1
Allow lang attribute
2023-05-09 19:27:32 -04:00
fcd49e3985
User: Remove ap_enabled field
2023-05-05 11:11:26 +02:00
2ee483ba41
Transmogrifier: Remove upgrade_user_from_ap_id
2023-05-05 11:11:26 +02:00
85bdbb102e
Add extraction process for oauth scopes
2023-05-02 16:32:10 -04:00
248f914e6e
Merge branch 'list-installed-frontends' into 'develop'
...
List installed frontend refs in admin API
See merge request pleroma/pleroma!3862
2023-04-27 02:56:19 +00:00
ddf57596be
Merge branch 'bugfix/content-disposition' into 'develop'
...
UploadedMedia: Add missing disposition_type to Content-Disposition
Closes #3114
See merge request pleroma/pleroma!3873
2023-04-26 15:39:20 +00:00
b2dc9ad9d8
fix test after removing esshd/SSH feature
2023-04-23 10:47:17 +02:00
0231a09310
Remove SSH/BBS feature from core
...
And link to sshocial, the replacement client for this removed feature
2023-04-23 10:47:07 +02:00
2148ef5e2f
UploadedMedia: Increase readability via ~s sigil
2023-04-18 00:12:42 +02:00
8f0f58e28b
UploadedMedia: Add missing disposition_type to Content-Disposition
...
Set it to `inline` because the vast majority of what's sent is multimedia
content while `attachment` would have the side-effect of triggering a
download dialog.
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/3114
2023-04-18 00:09:19 +02:00
3867b52aef
Merge branch 'tusooa/3027-dedupe-poll' into 'develop'
...
Dedupe poll options
Closes #3027
See merge request pleroma/pleroma!3860
2023-04-13 08:40:04 +00:00
6a63dced4a
Fix tests for frontend installation
2023-03-30 19:25:35 +03:00
40f14fd31c
Merge branch 'remove-crypt' into 'develop'
...
Remove crypt(3) support
Closes #3030 and #3062
See merge request pleroma/pleroma!3847
2023-03-30 12:47:36 +02:00
937df7e465
Merge branch 'fix/tag-feed-crashes' into 'develop'
...
fix: atom/rss feed issues
Closes #3045
See merge request pleroma/pleroma!3851
2023-03-30 12:46:35 +02:00
22b72cd6b8
Merge branch 'tusooa/oban-common-pipeline' into 'develop'
...
Stop oban from retrying if validating errors occur when processing incoming data
See merge request pleroma/pleroma!3844
2023-03-30 12:43:58 +02:00
c5d946bc92
Fix emoji reactions for legacy 2-tuple formats
2023-03-26 15:12:40 -04:00
67d1897c6e
Fix existing tests
2023-03-26 11:19:44 -04:00
10930f7507
Dedupe poll options
2023-03-25 23:20:07 -04:00
6d0cc8fa2a
Merge branch 'features/image-object' into 'develop'
...
Add support for Image objects
Closes #1581
See merge request pleroma/pleroma!3145
2023-03-25 06:35:55 +00:00
353538d16c
Merge branch 'pleroma-akkoma-emoji-port' into 'develop'
...
Custom emoji reactions support
See merge request pleroma/pleroma!3845
2023-03-16 08:00:00 +00:00
c3600b6104
Merge branch 'feat/fields-rel-me-tag' into 'develop'
...
feat: build rel me tags with profile fields
See merge request pleroma/pleroma!3850
2023-03-16 07:53:27 +00:00
83c7415803
fix: append field values to bio before parsing
2023-03-15 23:55:24 +09:00
9145fd04f2
Merge branch 'remove-crypt' into 'develop'
...
Remove crypt(3) support
Closes #3030 and #3062
See merge request pleroma/pleroma!3847
2023-03-12 16:06:00 +00:00
2c2ea16b50
Allow custom emoji reactions: Add pleroma_custom_emoji_reactions feature, review changes
2023-03-12 11:39:17 +03:00
ea07ec51ef
Add support for Image objects
2023-03-09 14:21:12 +01:00
f5c6e44731
Merge branch 'tusooa/block-rel' into 'develop'
...
Allow with_relationships param for blocks
See merge request pleroma/pleroma!3843
2023-03-09 13:13:14 +00:00
5cc23dc382
Merge branch 'fix/tag-feed-crashes' into 'develop'
...
fix: atom/rss feed issues
Closes #3045
See merge request pleroma/pleroma!3851
2023-03-06 22:55:24 +00:00
141146d1f1
use scrub_html_and_truncate instead of scrub_html for feed item title
...
Sometimes this truncated properly encoded HTML entities in the
wrong place. The new flow calls scrub_html, removes emojis,
decodes entities (a second time), truncates, and then re-encodes.
Fixes #3045 .
2023-03-06 02:38:02 +05:00
86ee4b72f3
modify Utils.scrub_html_and_truncate to take omission parameter
2023-03-06 02:30:52 +05:00
c00a19f371
Merge branch 'tusooa/oban-common-pipeline' into 'develop'
...
Stop oban from retrying if validating errors occur when processing incoming data
See merge request pleroma/pleroma!3844
2023-03-05 06:37:59 +00:00
5716654d12
Remove crypt(3) support
...
This was used to support migration from GNU Social, which was used by at least
shitposter.club, should be entirely irrelevant now.
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/3030
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/3062
2023-03-05 01:37:57 +01:00
8d3b29aaba
Allow custom emoji reactions: add test for mixed emoji react, fix credo errors
2023-03-02 11:18:16 +03:00
4b85d1c617
Allow custom emoji reactions: Fix tests, mixed custom and unicode reactions
2023-03-02 11:18:16 +03:00
787e30c5fd
Allow reacting with remote emoji when they exist on the post ( #200 )
...
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/200
2023-03-02 11:18:16 +03:00
bec4e5ac31
Fix FederatorTest
2023-03-01 21:04:19 -05:00
f33401f54b
Merge remote-tracking branch 'upstream/stable' into mergeback/2.5.1
2023-03-01 20:09:50 -05:00
Lain Soykaf