bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15685 commits 1 branch 0 tags 292 MiB
Commit graph

9362 commits

Author SHA1 Message Date
lain
755279e253 Merge branch 'tusooa/api-spec-property-map' into 'develop' 
OpenApiSpex: overhaul

See merge request pleroma/pleroma!3832
 2023-02-09 19:50:59 +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
50abb54d15 Merge branch 'fix-relme' into 'develop' 
Fix rel="me"

See merge request pleroma/pleroma!3824
 2023-02-09 19:09:54 +00:00
Alexander Tumin
55a8aa9787 Require related object for notifications to filter on content 2023-02-08 13:07:34 +03:00
marcin mikołajczak
c6c724cea1 Merge branch 'merge-pleroma' into 'develop' 
merge pleroma

See merge request soapbox-pub/rebased!229
 2023-02-04 22:39:35 +00:00
tusooa
08132002d2
Fix inproper content being cached in report content 2023-02-03 16:00:39 -05:00
marcin mikołajczak
83bdebcaea Do not expose privileges for other users 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2023-02-02 21:30:38 +01:00
tusooa
bc7ec43179
Allow customizing instance languages 2023-01-26 20:17:13 -05:00
Alex Gleason
e8f414b3d0
Use WhatsApp user-agent for rich media by default 
Related https://gitlab.com/soapbox-pub/rebased/-/issues/180
 2023-01-21 18:05:53 -06:00
tusooa
7467b24730
Fix block_from_stranger setting 2023-01-18 18:36:52 -05:00
tusooa
97f947deaf
Fix tests 2023-01-15 21:39:05 -05:00
tusooa
5af9ce4a01
Fix type of admin_account.is_confirmed 2023-01-15 18:41:36 -05:00
tusooa
3b4b84b74c
Force spec for every operation to have a listed tag 2023-01-15 18:31:37 -05:00
tusooa
bddcb3ed68
Add names to additionalProperties 2023-01-15 17:28:32 -05:00
marcin mikołajczak
9e3468c833 Merge branch 'develop' into 'internal-webhooks' 
# Conflicts:
#   lib/pleroma/webhook.ex
 2023-01-11 09:58:50 +00:00
marcin mikołajczak
a9e3ff9af9 Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 2023-01-10 13:39:39 +01:00
Lain Soykaf
fe00fbfd54 B StripLocation: Add test, work for all svgs. 2023-01-05 11:29:06 -05:00
Dmytro Poltavchenko
5b4962165e Added SVG to formats not compatible with exiftool 2023-01-05 11:26:57 -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
Mark Felder
39e4b788ad Remove unwanted code specific to MIX_ENV=test 2022-12-30 15:36:21 -05:00
marcin mikołajczak
0b91bfc047 Merge remote-tracking branch 'soapbox/develop' into merge-pleroma 2022-12-30 21:16:10 +01:00
Atsuko Karagi
08db6765c8 Respect restrict_unauthenticated in /api/v1/accounts/lookup 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-29 23:30:04 +01:00
Mark Felder
bea43aba33 Fix rel="me" 
Cachex for this was not started
 2022-12-29 19:42:14 +00:00
marcin mikołajczak
9a3369f724 Actually fix CSP 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-25 10:04:29 +01:00
Alex Gleason
7796bd4037
Bump version to v3.0 2022-12-24 16:59:22 -06:00
marcin mikołajczak
91f311c33f Try to use the new privileges system for mastodon admin api 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-23 19:49:43 +01:00
marcin mikołajczak
e3970f730c Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-23 19:45:55 +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
marcin mikołajczak
7ee63904ec Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-22 19:20:52 +01:00
Sean King
90681c720d
Make lint happy 2022-12-21 23:40:39 -07:00
Sean King
351b5a9df4
Use crazy hack to finally get pleroma:report notifications not visible after revoking privileges 2022-12-21 23:35:39 -07: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
marcin mikołajczak
1f981686cd Allow to enable translations for unauthenticated or disable translating remote content 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-19 23:55:09 +01: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
c58eb873dd
Fix CommonAPI delete function to use User.privileged? instead of User.superuser? 2022-12-18 22:05:07 -07: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
0f67eab384
remove pub_date() -- use to_rfc2822 instead 
_tag_activity.xml.eex used activity_content() instead
of activity_description(), and did not escape html properly.
 2022-12-19 01:44:46 +05:00
faried nawaz
3f63caee2a
fix: add xmlns:thr for in-reply-to refs 2022-12-19 01:44:46 +05:00
faried nawaz
8d500977a6
fix: feed item title was escaped twice 2022-12-19 01:44:46 +05:00
Mark Felder
f3253c0c6a
Implement RFC2822 timestamp formatting 2022-12-19 01:44:46 +05:00
faried nawaz
3f0783c0a5
fix atom and rss feeds for users and tags 
Changes:
  - make the XML closer to spec (RSS does not pass w3c's validator, but works)
  - fix dates (RFC3339 for Atom, doc says RFC822 for RSS but RFC1123 is closer)
  - fix attachment/enclosure links (but see below)
  - set feed item title to post's "summary" if present
  - pruned several elements that validators did not like
    - examples: ap_enabled, user banner urls.

Specs:
  - https://www.rssboard.org/rss-specification
  - https://validator.w3.org/feed/docs/atom.html
  - https://www.intertwingly.net/wiki/pie/Rss20AndAtom10Compared

Validators:
  - https://validator.w3.org/feed/
  - https://rssatom.com/feedvalidator.php

Attachment/enclosure links should have a "length" field (mandatory
according to the spec).  This is not present in the object's data
map.
 2022-12-19 01:44:41 +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
marcin mikołajczak
214e8d7172 Include unspecified variants in target languages list for DeepL 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-16 15:55:28 +01: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
4a32b584e1 StatusView: Fix warning 2022-12-15 18:02:33 -05:00
Lain Soykaf
9838790a7d AttachmentValidator: Actually require url 2022-12-15 17:46:20 -05:00
Lain Soykaf
63d00f8123 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-deps 2022-12-15 17:19:36 -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
Alex Gleason
63757fd1fa
Approve & confirm users created through the CLI 2022-12-13 17:07:53 -06: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
marcin mikołajczak
a30ac650bc Merge remote-tracking branch 'soapbox/develop' into post-languages 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-10 23:17:44 +01:00
marcin mikołajczak
8447fbfba2 InstanceView: Move supported languages to pleroma.metadata 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-10 21:21:38 +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
Alex Gleason
ab2d8817a9
Merge remote-tracking branch 'pleroma/2061-chat-deletion' into delete-chat 2022-12-08 11:06:12 -06:00
marcin mikołajczak
c100dc84da Update http_security_plug.ex 2022-12-08 15:38:42 +00:00
marcin mikołajczak
bacf0ddfd5 Add OSM tile server to CSP 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-08 16:25:57 +01:00
marcin mikołajczak
ecffbdc321 Allow exporting events to ics when unauthenticated 2022-12-06 19:48:06 +00:00
marcin mikołajczak
61e069df72 Merge remote-tracking branch 'soapbox/develop' into pleroma-events 2022-12-02 23:18:19 +01:00
marcin mikołajczak
a9da110ac6 Add rate limiting for events actions 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-02 23:11:28 +01:00
marcin mikołajczak
9fc7362240 Merge branch 'fix-rel-me' into 'develop' 
Add missing rel_me cache

See merge request soapbox-pub/rebased!220
 2022-12-02 21:24:08 +00:00
Alex Gleason
642c322388 Merge branch 'fix-remote-follow-redirect' into 'develop' 
Fix remote follow redirect

See merge request soapbox-pub/rebased!217
 2022-12-02 16:43:58 +00:00
marcin mikołajczak
d4904b392a Actually fix verified_at 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-02 17:41:38 +01:00
marcin mikołajczak
0ab061f375 Add missing rel_me cache 2022-12-02 11:20:48 +00:00
marcin mikołajczak
f21ec80ea2 Fix race condition, update tests 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-01 00:34:39 +01:00
marcin mikołajczak
60a51cd047 Auto join own events 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-30 23:36:40 +01:00
marcin mikołajczak
e4b568b963 Use origin URL for remote_url 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-30 11:24:34 +01:00
marcin mikołajczak
c2f6a4c452 Add events to features 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-29 19:59:40 +01:00
ave
0f88c2bca4 Change follow_operation schema to use type BooleanLike 2022-11-28 00:13:34 +00:00
marcin mikołajczak
ec4b8ab4f6 Merge remote-tracking branch 'soapbox/develop' into pleroma-events 2022-11-27 23:34:12 +01:00
Alex Gleason
f2a1acf1a8
Fix closing a report where the reporter is deactivated 
Fixes https://gitlab.com/soapbox-pub/rebased/-/issues/133
 2022-11-27 12:10:03 -06:00
marcin mikołajczak
7fa342bd76 Cleanup, language detection 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-27 19:08:50 +01:00
marcin mikołajczak
0424697a2e mix format 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-27 15:28:29 +01:00
marcin mikołajczak
58c70c88c2 Only allow valid content types, again 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-27 14:08:58 +01: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
Tusooa Zhu
09ab51eebb Make mutes and blocks behave the same as other lists 2022-11-27 04:21:58 +01:00
Haelwenn (lanodan) Monnier
7ec3469bea Transmogrifier: Use validating regex for "mediaType" 2022-11-27 04:21:31 +01:00
Haelwenn (lanodan) Monnier
8640d217b1 AttachmentValidator: Use custom ecto type and regex for "mediaType" 2022-11-27 04:21:31 +01:00
Haelwenn (lanodan) Monnier
da71092003 EctoType: Add MIME validator 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
Alex Gleason
2899feb4d9
Fix remote follow redirect 2022-11-26 13:57:08 -06:00
marcin mikołajczak
7b165deb05 api/v1/pleroma/events/joined_events 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-23 23:38:00 +01:00
marcin mikołajczak
e9a83d03fc Add only_events param to timelines 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-23 20:03:42 +01:00
marcin mikołajczak
92716dd605 Merge remote-tracking branch 'soapbox/develop' into pleroma-events 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-23 20:01:51 +01:00
marcin mikołajczak
adfbd3d756 Merge remote-tracking branch 'soapbox/develop' into pleroma-events 2022-11-23 19:50:09 +01:00
marcin mikołajczak
13c61e59e7 Merge branch 'merge-pleroma' into 'develop' 
Merge pleroma/develop

See merge request soapbox-pub/rebased!216
 2022-11-23 16:08:38 +00:00
marcin mikołajczak
32bcd7fdf6 Merge branch 'link-verification' into 'develop' 
Verify link ownership with rel="me"

See merge request soapbox-pub/rebased!214
 2022-11-23 16:08:36 +00:00
marcin mikołajczak
052d5e768a don't use restrict_filtered twice 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-23 15:34:59 +01:00
marcin mikołajczak
1d6b91c071 Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-23 15:33:54 +01:00