Haelwenn
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
kPherox
83c7415803
fix: append field values to bio before parsing
2023-03-15 23:55:24 +09:00
tusooa
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
Alexander Tumin
2c2ea16b50
Allow custom emoji reactions: Add pleroma_custom_emoji_reactions feature, review changes
2023-03-12 11:39:17 +03:00
Haelwenn (lanodan) Monnier
ea07ec51ef
Add support for Image objects
2023-03-09 14:21:12 +01:00
Haelwenn
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
Haelwenn
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
faried nawaz
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
faried nawaz
86ee4b72f3
modify Utils.scrub_html_and_truncate to take omission parameter
2023-03-06 02:30:52 +05:00
Haelwenn
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
Haelwenn (lanodan) Monnier
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
Alexander Tumin
8d3b29aaba
Allow custom emoji reactions: add test for mixed emoji react, fix credo errors
2023-03-02 11:18:16 +03:00
Alexander Tumin
4b85d1c617
Allow custom emoji reactions: Fix tests, mixed custom and unicode reactions
2023-03-02 11:18:16 +03:00
floatingghost
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
tusooa
a0ec66ce7e
Make clear the test names
2023-03-01 21:14:52 -05:00
tusooa
bec4e5ac31
Fix FederatorTest
2023-03-01 21:04:19 -05:00
tusooa
1babd0798f
Stop oban from retrying if validating errors occur when processing incoming data
2023-03-01 21:03:30 -05:00
tusooa
f33401f54b
Merge remote-tracking branch 'upstream/stable' into mergeback/2.5.1
2023-03-01 20:09:50 -05:00
tusooa
e4925f813a
Sanitize filenames when uploading
2023-03-01 18:40:02 -05:00
tusooa
d83f16fe44
Allow with_relationships param for blocks
2023-02-28 22:16:01 -05:00
silverpill
98b9c1bcb1
Merge branch 'develop' into accept-tags-2.5
2023-02-27 23:10:36 +00:00
silverpill
5cfb0578a6
TagValidator: Drop unrecognized tags
2023-02-27 23:09:46 +00:00
tusooa
410d50afe5
Ignores in exiftool read descriptions
2023-02-20 12:30:36 -05:00
tusooa
f2ed05191c
Test double dot link
2023-02-20 12:28:42 -05:00
tusooa
0e89a9ad15
Test that zwnj is treated as word char in hashtags
2023-02-20 12:28:41 -05:00
Alexander Tumin
c3a0703564
Require related object for notifications to filter on content
2023-02-20 12:27:50 -05:00
tusooa
8e8a0f005c
Fix inproper content being cached in report content
2023-02-20 12:26:16 -05:00
tusooa
1c225bfd6e
Allow customizing instance languages
2023-02-20 12:25:00 -05:00
tusooa
3ab3404817
Fix block_from_stranger setting
2023-02-20 12:21:27 -05:00
Lain Soykaf
d5125e6ce7
B StripLocation: Add test, work for all svgs.
2023-02-20 12:21:04 -05:00
tusooa
259905a893
Bump earmark to 1.4.22
2023-02-20 12:20:29 -05:00
kPherox
d5d7648789
feat: build rel me tags with profile fields
2023-02-18 17:57:41 +09:00
tusooa
024bb27fc7
Ignores in exiftool read descriptions
2023-02-11 00:30:52 -05:00
lain
d0b781ab69
Merge branch 'from/upstream-develop/tusooa/2974-zwnj' into 'develop'
...
Bump linkify - Fix zwnj in tags and double-dot links
Closes #2974 and #3022
See merge request pleroma/pleroma!3830
2023-02-09 21:25:15 +00:00
lain
7abb248ceb
Merge branch 'notification-content-filtering-noobj' into 'develop'
...
Require related object for content-filtering on notification
See merge request pleroma/pleroma!3837
2023-02-09 19:54:59 +00:00
lain
00b39dea5d
Merge branch 'tusooa/3059-report-fake-create-render' into 'develop'
...
Fix inproper content being cached in report content
Closes #3059
See merge request pleroma/pleroma!3836
2023-02-09 19:52:01 +00:00
lain
724bf7c647
Merge branch 'tusooa/3055-instance-languages' into 'develop'
...
Allow customizing instance languages
Closes #3055
See merge request pleroma/pleroma!3835
2023-02-09 19:23:29 +00:00
lain
4d3c2fb21b
Merge branch 'tusooa/notif-setting' into 'develop'
...
Fix block_from_stranger setting
See merge request pleroma/pleroma!3833
2023-02-09 19:09:23 +00:00
Lain Soykaf
e412363ff8
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into test-warnings
2023-02-09 12:28:02 -05:00
Alexander Tumin
55a8aa9787
Require related object for notifications to filter on content
2023-02-08 13:07:34 +03:00
tusooa
08132002d2
Fix inproper content being cached in report content
2023-02-03 16:00:39 -05:00
tusooa
bc7ec43179
Allow customizing instance languages
2023-01-26 20:17:13 -05:00
tusooa
7467b24730
Fix block_from_stranger setting
2023-01-18 18:36:52 -05:00
tusooa
09ed8f4f8a
Test double dot link
2023-01-06 14:11:56 -05:00
tusooa
686fef59db
Test that zwnj is treated as word char in hashtags
2023-01-06 14:01:42 -05:00
Lain Soykaf
fe00fbfd54
B StripLocation: Add test, work for all svgs.
2023-01-05 11:29:06 -05:00
Lain Soykaf
b3a1cfaa7a
Tests: Capture logs to clean up the test output.
2023-01-03 15:39:14 -05:00
Lain Soykaf
72b3ec35f8
Fix warnings in tests, treat warnings as errors in CI.
...
The warnings revealed two bad tests, the code still worked but the test
didn't actually test for it. Activating this for CI to prevent issues
like these in the future.
2023-01-03 14:59:14 -05:00
lain
e853cfe7c3
Revert "Merge branch 'copyright-bump' into 'develop'"
...
This reverts merge request !3825
2023-01-02 20:38:50 +00:00
marcin mikołajczak
10886eeaa2
Bump copyright year
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-01-01 12:13:06 +01:00
silverpill
45646ff52c
TagValidator: Add test for Link tag
2022-12-30 20:55:02 +00:00
tusooa
4b66f2b7f1
Bump earmark to 1.4.22
2022-12-28 11:57:29 -05:00
Haelwenn (lanodan) Monnier
5ce7db455c
Git merge is not my favorite tool
2022-12-23 17:07:26 +01:00
Haelwenn (lanodan) Monnier
3fbd42061c
Revert "Delete report notifs when demoting from superuser"
...
This reverts commit 4504c81080
.
2022-12-23 17:06:09 +01:00
Haelwenn (lanodan) Monnier
7d68d64d63
Merge back 2.4.5
2022-12-23 17:05:05 +01:00
Sean King
e07fb6e7dc
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_grained_moderation_privileges
2022-12-19 22:02:44 -07:00
lain
0840ce5671
Merge branch 'deletion-resilience' into 'develop'
...
Deletion resilience
See merge request pleroma/pleroma!3237
2022-12-20 03:07:59 +00:00
Sean King
d5d4c7c11d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_grained_moderation_privileges
2022-12-19 18:48:26 -07:00
lain
c6dff687c0
Merge branch 'from/upstream/develop/tusooa/mrf-updates' into 'develop'
...
MRFs with Updates
See merge request pleroma/pleroma!3808
2022-12-20 00:51:41 +00:00
Sean King
1d95012758
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_grained_moderation_privileges
2022-12-19 17:48:11 -07:00
lain
3dfa009ec3
Merge branch 'develop' into 'fix/2980-rss-feed-generation'
...
# Conflicts:
# CHANGELOG.md
2022-12-19 23:43:23 +00:00
Mark Felder
72d4d1b392
Fix TwitterCard meta tags
...
TwitterCard meta tags are supposed to use the attributes "name" and "content".
OpenGraph tags use the attributes "property" and "content".
Twitter itself is smart enough to detect broken meta tags and discover the TwitterCard
using "property" and "content", but other platforms that only implement parsing of TwitterCards
and not OpenGraph may fail to correctly detect the tags as they're under the wrong attributes.
> "Open Graph protocol also specifies the use of property and content attributes for markup while
> Twitter cards use name and content. Twitter’s parser will fall back to using property and content,
> so there is no need to modify existing Open Graph protocol markup if it already exists." [0]
[0] https://developer.twitter.com/en/docs/twitter-for-websites/cards/guides/getting-started
2022-12-19 17:23:12 -05:00
Sean King
60df2d8a97
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_grained_moderation_privileges
2022-12-18 22:03:48 -07:00
faried nawaz
fce2998481
use to_rfc2822 instead of pub_date in tests, too
2022-12-19 01:44:47 +05:00
faried nawaz
c49316faee
modify user feed controller test to expect summary for title
2022-12-19 01:44:47 +05:00
faried nawaz
f597b1b3e6
remove ap_id test -- the element makes the feed break
2022-12-19 01:44:46 +05:00
tusooa
a3985aac91
Merge branch 'fix-2856' into 'develop'
...
Uploading an avatar media exceeding max size returns a 413
Closes #2856
See merge request pleroma/pleroma!3804
2022-12-16 16:15:36 +00:00
lain
301eb86b35
Merge branch 'update-deps' into 'develop'
...
Update to Phoenix 1.6, Elixir 1.11, and chase dependencies
See merge request pleroma/pleroma!3766
2022-12-16 00:36:59 +00:00
Lain Soykaf
bb27e4134b
AudioVideoValidator: Fix embedded attachment requirements
2022-12-15 18:06:28 -05:00
Lain Soykaf
9838790a7d
AttachmentValidator: Actually require url
2022-12-15 17:46:20 -05:00
tusooa
2554028097
Make SimplePolicy Update-aware
...
This is inspired by d5828f1c5e
2022-12-15 11:57:45 -05:00
tusooa
dc7efcd08b
Make TagPolicy Update-aware
...
This is inspired by d5828f1c5e
2022-12-15 11:08:24 -05:00
tusooa
62c27e0164
Fix failure when registering a user with no email when approval required
2022-12-14 01:04:42 -05:00
duponin
9876742358
Return 413 when an actor's banner or background exceeds the size limit
2022-12-11 23:15:08 +01:00
duponin
452595baed
Uploading an avatar media exceeding max size returns a 413
...
Until now it was returning a 500 because the upload plug were going
through the changeset and ending in the JSON encoder, which raised
because struct has to @derive the encoder.
2022-12-11 22:54:47 +01:00
Haelwenn
204fd6faae
Merge branch 'from/upstream-develop/tusooa/report-fake' into 'develop'
...
Report an Object, not a Create Activity
Closes #2986
See merge request pleroma/pleroma!3788
2022-12-09 14:25:24 +00:00
tusooa
da0c684344
Add tests for flagging non-Create activities
2022-12-08 20:51:08 -05:00
Haelwenn
3394394e0f
Merge branch 'develop' into 'develop'
...
Change follow_operation schema to use type BooleanLike
Closes #2999
See merge request pleroma/pleroma!3787
2022-11-28 00:13:35 +00:00
ave
0f88c2bca4
Change follow_operation schema to use type BooleanLike
2022-11-28 00:13:34 +00:00
Haelwenn
36789986c0
Merge branch 'mergeback/2.4.5' into 'develop'
...
Mergeback: 2.4.5
See merge request pleroma/pleroma!3794
2022-11-27 21:24:44 +00:00
Hélène
542bb17258
ArticleNotePageValidator: fix replies fixing
...
Some software, like GoToSocial, expose replies as ActivityPub
Collections, but do not expose any item array directly in the object,
causing validation to fail via the ObjectID validator. Now, Pleroma will
drop that field in this situation too.
2022-11-27 04:54:19 +01:00
FloatingGhost
747311f623
fix resolution of GTS user keys
2022-11-27 04:54:18 +01:00
Tusooa Zhu
11d5ad24c5
Make local-only posts stream in local timeline
2022-11-27 04:39:32 +01:00
Tusooa Zhu
e46c3a0595
Do not stream out Create of ChatMessage
2022-11-27 04:39:32 +01:00
Haelwenn (lanodan) Monnier
f2221d539c
script_test: Fix %ErlangError for Elixir 1.14
2022-11-27 04:25:48 +01:00
Haelwenn (lanodan) Monnier
f12ddcd697
timeline_controller_test: Fix test name for elixir 1.14
2022-11-27 04:25:48 +01:00
Tusooa Zhu
09ab51eebb
Make mutes and blocks behave the same as other lists
2022-11-27 04:21:58 +01:00
Haelwenn (lanodan) Monnier
8640d217b1
AttachmentValidator: Use custom ecto type and regex for "mediaType"
2022-11-27 04:21:31 +01:00
Ilja
4504c81080
Delete report notifs when demoting from superuser
...
When someone isn't a superuser any more, they shouldn't see the reporsts any more either.
Here we delete the report notifications from a user when that user gets updated from being a superuser to a non-superuser.
2022-11-27 04:20:11 +01:00
Jeremy Huffman
f531099d2d
Skip two unicode/kanji tests that can't pass on Mac.
2022-11-27 03:12:34 +00:00
Haelwenn (lanodan) Monnier
508b438b53
scrubbers: Scrub img class attribute
...
Closes: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3790
2022-11-27 04:04:17 +01:00
Haelwenn (lanodan) Monnier
8f3e750530
scrubbers: Scrub img class attribute
...
Closes: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3790
2022-11-27 03:40:21 +01:00
tusooa
afe4bb2307
Fix UtilsTest
2022-11-20 01:06:21 -05:00
tusooa
9d99e76a3a
Fix unit tests
2022-11-20 00:57:04 -05:00
tusooa
0e0c316c76
Fix report api
2022-11-20 00:35:52 -05:00
tusooa
a69e9ae2ef
Flag an Object, not an Activity
2022-11-19 23:51:43 -05:00
lain
0e1356ef9c
Merge branch 'akkoma/delete-improvements' into 'develop'
...
Alter priority of Delete activities to be lowest
See merge request pleroma/pleroma!3782
2022-11-14 07:24:46 +00:00
lain
76ed0da09f
Merge branch 'bugfix/reset-unreachable-on-fetch' into 'develop'
...
Object.Fetcher: Set reachable on successful fetch
See merge request pleroma/pleroma!3780
2022-11-14 07:22:33 +00:00
Mark Felder
2e0089dd5c
Alter priority of Delete activities to be lowest
...
This will prevent a user with a large number of posts from negatively affecting performance of the outgoing federation queue if they delete their account.
2022-11-13 14:11:48 -05:00
Haelwenn
a2db64b12b
Merge branch 'fix-typo-in-csp-report-to-header-name' into 'develop'
...
Fix typo in CSP Report-To header name
See merge request pleroma/pleroma!3768
2022-11-13 18:53:59 +00:00