Commit graph

7,296 commits

Author SHA1 Message Date
mkljczk
63afd9a22d Fix condition for moderation log force_password_reset action 2025-05-07 17:29:27 +02:00
lain
1775a4db08 Merge branch 'siteinfo-baseurls' into 'develop'
Provide media proxy and upload base urls in siteinfo

See merge request pleroma/pleroma!4349
2025-04-02 13:00:42 +00:00
Moon Man
93aa563cfe implemented 2025-04-02 07:00:45 -04:00
Nicole Mikołajczyk
4d4174c339 fix a few typos
Signed-off-by: Nicole Mikołajczyk <git@mkljczk.pl>
2025-03-28 18:47:00 +01:00
lain
254b31bf1c Merge branch 'more-emoji-likes' into 'develop'
More emoji likes

Closes #3364

See merge request pleroma/pleroma!4342
2025-03-20 09:12:09 +00:00
lain
81960dccf2 Merge branch 'translate-posts' into 'develop'
Support translation providers (DeepL, LibreTranslate)

See merge request pleroma/pleroma!4102
2025-03-20 09:11:57 +00:00
Mark Felder
7763b9a87f Truncate the length of Rich Media title and description fields
Some sites like Instagram are serving obnoxiously long metadata fields
2025-03-19 10:29:45 -07:00
mkljczk
25a3ee2256 InstanceView: do not repeat information
Signed-off-by: mkljczk <git@mkljczk.pl>
2025-03-19 17:59:42 +01:00
mkljczk
08de5f94e3 Merge remote-tracking branch 'origin/develop' into translate-posts
Signed-off-by: mkljczk <git@mkljczk.pl>
2025-03-19 17:59:24 +01:00
Lain Soykaf
f9bff8f5e5 Transmogrifier: Keep likes as likes if the content is obviously wrong 2025-03-19 16:00:27 +04:00
Lain Soykaf
e19ca7606d Transmogrifier: Also accept mitra emoji likes. 2025-03-18 15:53:27 +04:00
Lain Soykaf
fc7ca2ccf4 Federator: More specific logging for rejections 2025-03-18 15:25:54 +04:00
mkljczk
fa76bb66f9 Merge remote-tracking branch 'origin/develop' into language-detection
Signed-off-by: mkljczk <git@mkljczk.pl>
2025-03-11 20:38:56 +01:00
Lain Soykaf
577b7cb061 StealEmojiPolicy: Sanitise emoji names. 2025-03-11 14:59:06 +04:00
Lain Soykaf
d9ae9b676c InstanceStatic: Extra-sanitize emoji 2025-03-11 14:09:31 +04:00
Lain Soykaf
b1309bdb40 More fixes for InstanceStatic 2025-03-10 18:44:17 +04:00
Lain Soykaf
1dd9ba5d6f Sanitize media uploads. 2025-03-10 17:23:21 +04:00
Lain Soykaf
b469b9d9d3 . 2025-03-10 16:48:54 +04:00
Lain Soykaf
32acdf0936 Merge branch 'security-2.9' into release/2.9.0 2025-03-01 17:45:28 +04:00
Lain Soykaf
88ee385302 Transmogrifier: Strip internal fields 2025-03-01 17:13:47 +04:00
Lain Soykaf
4604f2944e Merge branch 'pleroma-ensure-authorized-fetch' into security-2.9 2025-03-01 14:07:02 +04:00
feld
a8e863e0d6 Merge branch 'rich-media-ordering' into 'develop'
Rich Media Parser should use first image found

Closes #3356

See merge request pleroma/pleroma!4329
2025-03-01 02:01:22 +00:00
Mark Felder
ac0882e348 Filter the parsed OpenGraph/Twittercard tags and only retain the ones we intend to use. 2025-02-28 17:24:23 -08:00
Mark Felder
2c9d071aad Retire MRFs DNSRBL, FODirectReply, and QuietReply
DNSRBL was a neat experiment which should live out of tree. It works and could be used to coordinate rules across different servers, but Simple Policy will always be better

FODirectReply and QuietReply have reliability issues as implemented in an MRF. If we want to expose this functionality to admins it should be a setting that overrides the chosen scope during CommonAPI.post instead of trying to rewrite the recipients with an MRF.
2025-02-28 16:43:28 -08:00
Mark Felder
cb073a9cd0 Rich Media Parser should use first og:image 2025-02-28 15:12:49 -08:00
Mark Felder
7bdeb9a1e5 Fix OpenGraph/TwitterCard meta tag ordering for posts with multiple attachments 2025-02-28 13:36:00 -08:00
mkljczk
3b74d13147 Do not call LanguageDetector when not language is provided
Signed-off-by: mkljczk <git@mkljczk.pl>
2025-02-22 18:31:26 +01:00
mkljczk
d7f9d30b2c Merge downstream changes
Signed-off-by: mkljczk <git@mkljczk.pl>
2025-02-22 18:14:35 +01:00
mkljczk
013c60e13a Merge remote-tracking branch 'origin/develop' into translate-posts 2025-02-22 14:07:23 +01:00
mkljczk
2b1ef1bbdf Merge remote-tracking branch 'origin/develop' into language-detection 2025-02-22 14:05:53 +01:00
lain
6f48ade417 Merge branch 'post-languages' into 'develop'
Allow to specify post language

See merge request pleroma/pleroma!3940
2025-02-22 12:42:42 +00:00
lain
801a2256f4 Merge branch 'follow-hashtags' into 'develop'
Hashtag following (from Akkoma)

See merge request pleroma/pleroma!4307
2025-02-22 12:26:18 +00:00
Mark Felder
f26509bf16 Fix missing check for domain presence in rich media ignore_host configuration 2025-02-21 17:38:55 -08:00
mkljczk
04af8bfd9c credo
Signed-off-by: mkljczk <git@mkljczk.pl>
2025-02-17 18:26:24 +01:00
mkljczk
120fbbc97e Include contentMap in outgoing posts
Signed-off-by: mkljczk <git@mkljczk.pl>
2025-02-17 17:55:03 +01:00
mkljczk
ea01b5934f Merge remote-tracking branch 'origin/develop' into post-languages 2025-02-17 17:36:02 +01:00
mkljczk
8cd7716872 Fix Mastodon incoming edits with inlined "likes"
Signed-off-by: mkljczk <git@mkljczk.pl>
2025-01-28 22:47:42 +01:00
mkljczk
f2c612d4ae Merge branch 'actor-published' into 'develop'
Include "published" in actor view

See merge request pleroma/pleroma!4312
2025-01-21 13:03:35 +00:00
Lain Soykaf
2226171890 MediaProxyController: Use 301 for permanent redirects 2025-01-21 12:24:56 +04:00
mkljczk
38b17933e1 Include "published" in actor view
Signed-off-by: mkljczk <git@mkljczk.pl>
2025-01-19 16:26:46 +01:00
mkljczk
36b71733a0 fix alias ordering
Signed-off-by: mkljczk <git@mkljczk.pl>
2024-12-30 21:01:41 +01:00
mkljczk
d818a3d762 Merge remote-tracking branch 'origin/develop' into translate-posts 2024-12-30 18:17:50 +01:00
mkljczk
f565cf2b5b update spec
Signed-off-by: mkljczk <git@mkljczk.pl>
2024-12-30 18:11:21 +01:00
FloatingGhost
bdb9f888d7 Add /api/v1/followed_tags
Signed-off-by: mkljczk <git@mkljczk.pl>
2024-12-30 17:57:57 +01:00
floatingghost
c94c6eac22 Remerge of hashtag following (#341)
this time with less idiot

Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/341
Signed-off-by: mkljczk <git@mkljczk.pl>
2024-12-30 17:56:18 +01:00
tusooa
b51f5a84eb Verify a local Update sent through AP C2S so users can only update their own objects 2024-12-09 12:43:08 +04:00
lain
dcb0c47773 Merge branch 'mastodon-websocket-fix' into 'develop'
Fix Mastodon WebSocket authentication

See merge request pleroma/pleroma!4206
2024-11-13 08:22:44 +00:00
lain
62bbed1e58 Merge branch 'token-view-scopes' into 'develop'
Include session scopes in TokenView

See merge request pleroma/pleroma!4273
2024-11-12 11:18:10 +00:00
lain
4626a9280a Merge branch 'activity-pub-metadata' into 'develop'
Add metadata provider for ActivityPub alternate links

See merge request pleroma/pleroma!4286
2024-11-12 10:49:36 +00:00
Lain Soykaf
2baa9b0072 Merge branch 'develop' into pleroma-token-view-scopes 2024-11-12 14:33:30 +04:00