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

9641 commits

Author SHA1 Message Date
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
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
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
Mark Felder
1b82fd95d4
Remove unwanted code specific to MIX_ENV=test 2023-02-20 12:24:38 -05:00
Mark Felder
88ce0e8b24
Fix rel="me" 
Cachex for this was not started
 2023-02-20 12:24:32 -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
Dmytro Poltavchenko
e8fca8882a
Added SVG to formats not compatible with exiftool 2023-02-20 12:21:04 -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
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
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
silverpill
c7dc5ce85c TagValidator: Allow unrecognized Tag types 2022-12-29 14:21:20 +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
tusooa
179efd9467
Make backup parameters configurable 2022-12-24 00:20:25 -05:00
tusooa
7d3e4eaeb9
Log errors more extensively 2022-12-24 00:04:51 -05:00
tusooa
070fbb89e1
Lint 2022-12-24 00:04:51 -05:00
tusooa
a1b95922c5
Fix compile error 2022-12-24 00:04:50 -05:00
tusooa
46ab97d721
Simplify backup update clause 2022-12-24 00:04:50 -05:00
tusooa
bdd63d2a3a
Expose backup status via Pleroma API 2022-12-24 00:04:50 -05:00
tusooa
e4ac2a7cd6
Detail backup states 2022-12-24 00:04:32 -05: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
Ekaterina Vaartis
398141da68 Merge remote-tracking branch 'upstream/develop' into meilisearch 2022-12-20 21:00:07 +03: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
marcin mikołajczak
7510688bb1 Use correct domain for fqn and InstanceView 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-22 23:34:23 +01:00
marcin mikołajczak
eca1f581d0 Merge branch 'privacy-policy-api' into 'develop' 
/api/v1/instance/domain_blocks endpoint

See merge request soapbox-pub/rebased!212
 2022-11-21 21:01:40 +00:00
marcin mikołajczak
db050332cb Do not verify links in bio 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-21 20:36:34 +01:00
marcin mikołajczak
0a3f523329 fix tests 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-21 16:28:12 +01:00
Haelwenn
7f0b3161ea Merge branch 'akoma/deactivated-users' into 'develop' 
Timeline query performance improvements

See merge request pleroma/pleroma!3779
 2022-11-20 23:40:58 +00:00
marcin mikołajczak
86d1358b4f fix 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-20 23:48:05 +01:00
marcin mikołajczak
b001a2c2c8 Verify link ownership with rel="me" 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-20 23:19:52 +01: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
HJ
a31d3589ed Update http_security_plug.ex 2022-11-17 12:03:01 -05:00
HJ
79bd363a68 Update lib/pleroma/web/plugs/http_security_plug.ex 2022-11-17 12:03:01 -05:00
Henry Jameson
db76ea578a try to fix ruffle on chrome 2022-11-17 12:03:01 -05:00
marcin mikołajczak
2e7a713e58 Merge remote-tracking branch 'soapbox/develop' into pleroma-events 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-16 00:06:25 +01:00
marcin mikołajczak
b7879d58f3 Merge remote-tracking branch 'pleroma/develop' into HEAD 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-15 23:27:58 +01:00
marcin mikołajczak
1175127549 Only keep domain_blocks for now 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-14 19:41:40 +01:00
marcin mikołajczak
9126ba7695 Add domain_blocks and extended_description endpoints 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-14 16:31:53 +01:00
feld
a9d991d31e Merge branch 'develop' into 'akoma/deactivated-users' 
# Conflicts:
#   CHANGELOG.md
 2022-11-14 14:03:11 +00:00
marcin mikołajczak
f9dfe64ba4 Privacy policy API 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-14 14:28:58 +01: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
Mark Felder
47b9847edd Deletes do not generate notifications of any kind, so skip trying 2022-11-13 12:25:52 -05:00
Haelwenn (lanodan) Monnier
b2713357b9 Object.Fetcher: Set reachable on successful fetch 2022-11-13 16:51:12 +01:00
Mark Felder
edaf0a05f8 Add same optimized join for excluding invisible users 2022-11-12 18:06:28 -05:00
Mark Felder
749445dd50 Fix reports which do not have a user 
The check for deactivated users was being applied to report activities.
 2022-11-12 17:54:11 -05:00
FloatingGhost
4d321be05c Extract deactivated users query to a join 2022-11-12 17:52:28 -05:00
feld
3d1828f43b Merge branch 'oban-timeouts' into 'develop' 
Define sane Oban Worker timeouts

See merge request pleroma/pleroma!3777
 2022-11-12 22:13:28 +00:00
tusooa
1b0e47b79b Merge branch 'from/upstream-develop/tusooa/no-strip-report' into 'develop' 
Give admin the choice to not strip reported statuses

Closes #2887

See merge request pleroma/pleroma!3773
 2022-11-12 17:55:50 +00:00
Mark Felder
8be7f87e1f Define sane Oban Worker timeouts 2022-11-11 13:46:27 -05:00
Mark Felder
6b87b3f2ea Remove Quack logging backend 2022-11-11 12:36:29 -05:00
marcin mikołajczak
e675fed7e9 Fix instance view 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-10 22:15:49 +01:00
tusooa
717c5901f8
Render a generated reported activity properly 2022-11-09 23:02:27 -05:00
tusooa
6f047cc308
Do not strip reported statuses when configured not to 2022-11-09 22:36:57 -05:00
marcin mikołajczak
8661703c16 Merge remote-tracking branch 'soapbox/develop' into pleroma-events 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-09 17:08:18 +01:00
Alex Gleason
6dc55531db
mix format 2022-11-08 17:47:17 -06:00
Alex Gleason
f844c4ba13
ActivityDraft: detect language from content_html so it can strip links 2022-11-08 17:23:41 -06:00
Alex Gleason
728643b623
LanguageDetector: strip non-language text to (hopefully) improve accuracy 2022-11-08 17:06:16 -06:00
marcin mikołajczak
c9e9f25f00 Merge remote-tracking branch 'soapbox/develop' into post-languages 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-08 23:11:05 +01:00
marcin mikołajczak
1553b651dc Add supported languages list to /api/v2/instance 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-08 23:09:42 +01:00
Haelwenn (lanodan) Monnier
648e012022 ObjectAgePolicy: Make strip_followers behavior for followers-only explicit 2022-11-07 14:58:47 +01:00
Alex Gleason
22edf882a5
MediaProxy: use SHA-256 2022-11-06 12:02:42 -06:00
Alex Gleason
28c8948765 Merge branch 'reject-anon-report' into 'develop' 
Add RemoteReportPolicy to reject reports without enough information

See merge request soapbox-pub/rebased!202
 2022-11-06 14:39:06 +00:00
Alex Gleason
ee58bcafc9
DeepL: endpoint to_string() 2022-11-06 08:29:03 -06:00
Alex Gleason
5e6bb2aed0
DeepL: fix endpoint 2022-11-06 08:24:54 -06:00
Alex Gleason
fc81e325e7 DeepL: not_empty_string 2022-11-06 14:16:56 +00:00
Alex Gleason
04fe485015 Merge branch 'remove-shout' into 'develop' 
Remove Shout feature

See merge request soapbox-pub/rebased!200
 2022-11-06 14:11:39 +00:00
marcin mikołajczak
6500fee83f Merge branch 'post-languages' into 'develop' 
Allow to specify post language, add content translations and language auto-detection

See merge request soapbox-pub/rebased!196
 2022-11-05 22:08:34 +00:00
marcin mikołajczak
4f042374d8 Deepl: use :base_url 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-05 21:41:58 +01:00
marcin mikołajczak
2c62043ef9 Merge remote-tracking branch 'soapbox/develop' into pleroma-events 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-05 21:08:08 +01:00
marcin mikołajczak
19885d9347 Fix fasttext for multiline posts 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-05 20:16:32 +01:00
Alex Gleason
3957167a9d
RemoteReportPolicy: add :reject_all option, fix tests 2022-11-05 14:07:37 -05:00
Alex Gleason
87e9bbf86c
Add RemoteReportPolicy to reject reports without enough information 2022-11-05 13:56:56 -05:00
marcin mikołajczak
0c1eaf2634 Add contact account to InstanceView 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-05 13:05:14 +01:00
marcin mikołajczak
6649eb84a2 Add all 639-1 languages to @supported_locales 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-04 21:54:20 +01:00
marcin mikołajczak
ade5796337 Improve getting language from context, add more tests 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-04 20:52:25 +01:00
Thomas Citharel
bdedc41cbc
Fix typo in CSP Report-To header name 
The header name was Report-To, not Reply-To.

In any case, that's now being changed to the Reporting-Endpoints HTTP
Response Header.
https://w3c.github.io/reporting/#header
https://github.com/w3c/reporting/issues/177

CanIUse says the Report-To header is still supported by current Chrome
and friends.
https://caniuse.com/mdn-http_headers_report-to

It doesn't have any data for the Reporting-Endpoints HTTP header, but
this article says Chrome 96 supports it.
https://web.dev/reporting-api/

(Even though that's come out one year ago, that's not compatible with
Network Error Logging which's still using the Report-To version of the
API)

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2022-11-04 09:43:13 +01:00
marcin mikołajczak
85105e0049 Detect language for incoming posts 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-03 23:33:22 +01:00
marcin mikołajczak
4442fc40e6 Add test 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-03 22:43:20 +01:00
Alex Gleason
39d7093ff5
Remove Shout feature 2022-11-03 13:29:52 -05:00
Alex Gleason
4576a5c440
ObjectValidators: fix validate_required on embeds_many fields 2022-11-03 11:56:20 -05:00
Mark Felder
7c64f705f6 Update to Phoenix 1.6 and chase dependencies 
Also bump minimum Elixir to 1.11
 2022-11-03 16:13:07 +00:00
Alexander Strizhakov
8407e26b0c rebase fix 2022-11-03 10:06:36 -04:00
Alexander Strizhakov
5a9ea98baf XML WebFinger user representation correct domain 2022-11-03 09:48:59 -04:00
Alexander Strizhakov
4121bca895 expanding WebFinger 2022-11-03 09:48:24 -04:00
marcin mikołajczak
4c1d0dbb69 Language detection 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-03 00:17:27 +01:00
Alex Gleason
920ba8ddec
Return an error if replying to a deleted status 
Fixes https://gitlab.com/soapbox-pub/rebased/-/issues/119
 2022-11-02 10:04:32 -05:00
marcin mikołajczak
d094cdf55b Rename 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-31 22:42:03 +01:00
marcin mikołajczak
9cdce15a42 Update description.exs 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-30 23:07:30 +01:00
marcin mikołajczak
68c00fa749 Fix get_language_from_context 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-30 21:59:48 +01:00
marcin mikołajczak
55cb9b29fe Do not translate non-public statuses 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-30 21:57:05 +01:00
marcin mikołajczak
c1f5138f73 Add tests 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-30 21:06:31 +01:00
marcin mikołajczak
25a9ff0f3d Expose translation service availability 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-30 18:53:29 +01:00
marcin mikołajczak
65fb5abc73 Merge remote-tracking branch 'soapbox/develop' into post-languages 2022-10-30 18:47:47 +01:00
marcin mikołajczak
8243be681b WIP Translation backends support 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-30 18:47:41 +01:00
marcin mikołajczak
972498cac4 Store remote post language information 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-30 10:41:09 +01:00
Haelwenn
da0ef154a6 Merge branch 'from/upstream-develop/tusooa/2930-get-or-fetch' into 'develop' 
Fix User.get_or_fetch/1 with usernames starting with http

Closes #2930

See merge request pleroma/pleroma!3751
 2022-10-30 00:38:21 +00:00
marcin mikołajczak
1b9b03b494 Add internal (not managable from API) webhooks 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-29 22:20:05 +02:00
marcin mikołajczak
6a8a8f2a2e StatusView: display language 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-29 19:49:52 +02:00
marcin mikołajczak
6778334542 Merge branch 'colors-override' into 'develop' 
Use color overrides from frontend configuration

See merge request soapbox-pub/rebased!191
 2022-10-29 14:38:31 +00:00
marcin mikołajczak
ff35b13b52 Allow to specify post language 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-29 16:22:57 +02:00
marcin mikołajczak
0ff7f6d03c Do not use contentMap if content is not empty 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-29 15:01:17 +02:00
Alex Gleason
74c360e4d6 Merge branch 'feature/add-prom_ex' into 'develop' 
Add PromEx

See merge request soapbox-pub/rebased!193
 2022-10-28 20:58:56 +00:00
marcin mikołajczak
dea3110ef5 Merge remote-tracking branch 'soapbox/develop' into instance-v2 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-28 20:12:29 +02:00
marcin mikołajczak
a77a7a3620 Add /api/v2/instance route 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-28 20:10:10 +02:00
Josh Adams
7edf9d4990 Replace deprecated @view_module 
See https://gist.github.com/chrismccord/e53e79ef8b34adf5d8122a47db44d22f#update-your-layouts
 2022-10-27 21:03:06 -05:00
Josh Adams
36dc0fee1e Don't use a fake ecto feature 
See https://github.com/elixir-ecto/ecto/issues/3889
 2022-10-27 20:14:55 -05:00
Josh Adams
ec4dc4adac Remove unnecessary newline 
L I N T E R S
 2022-10-27 20:03:45 -05:00
Josh Adams
ec6ee11ea7 Add most (all?) the promex setup 2022-10-27 19:47:37 -05:00
Alex Gleason
bddd4375bf
Expose favicon URL in instance API 2022-10-27 13:51:25 -05:00
Alex Gleason
35f16d9c47
Render title and favicon on all pages that serve index.html 2022-10-27 13:29:36 -05:00
Alex Gleason
f303a02e86
Let favicon be configurable 2022-10-27 13:15:15 -05:00
tusooa
9fbf01f7a9 Merge branch 'push-updates' into 'develop' 
Push.Impl: support edits

See merge request pleroma/pleroma!3760
 2022-10-27 12:51:29 +00:00
marcin mikołajczak
27fb0c80ba Use color overrides from frontend configuration 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-27 00:12:39 +02:00
feld
7a519b6a66 Merge branch 'fix-deprecation-text' into 'develop' 
Fix deprecation warning for Gun timeout

See merge request pleroma/pleroma!3759
 2022-10-24 14:22:49 +00:00
Haelwenn (lanodan) Monnier
16b06160ac CommonAPI: generate ModerationLog for all admin/moderator deletes 
As a side-effect it also changes the ChatMessage delete ID to an
Activity.id rather than MessageReference.id

Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2958
 2022-10-14 18:51:08 +02:00
marcin mikołajczak
5f54228e38 Send event updates to participants 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-12 23:57:05 +02:00
marcin mikołajczak
8221504ecb Merge remote-tracking branch 'soapbox/develop' into pleroma-events 2022-10-12 21:52:36 +02:00
Ekaterina Vaartis
5a39866388 Specifically strip mentions for search indexing 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
6256822afd Check for updateId, not uid 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
5ac6763238 Make add_to_index and remove_from_index report errors 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
102ebb42bd Make search a callback 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
119b2b847b Instead of checking string length, explicitly check for "" and "." 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
e20f74c71b Remove duplicate function call 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
84608be87e Change updateId to uid because apparently that's the new name 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
1e23f527e3 Change the meilisearch key auth to conform to 0.25.0 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
3387935e83 Don't try removing deleted users and such from index as posts 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
d89dc5518b Fix meilisearch tests and jobs for oban 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
2bc21c6f18 Use oban for search indexing 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
6f2f457751 Add a search backend behaviour 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
571533ae26 Don't support meilisearch < 0.24.0, since it breaks things 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
3179ed0921 Make chunk size configurable 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
a12f63bc81 Implement suggestions from the Meilisearch MR 
- Index unlisted posts
- Move version check outside of the streaming and only do it once
- Use a PUT request instead of checking manually if there is need to insert
- Add error handling, sort of
 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
a6946048fb Rename Activity.Search to Search.DatabaseSearch 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
0fae71f88d Rename search.ex to database_search.ex and add search/2 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
39e596a5b5 Style fixes 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
7009ef5672 Move the search.ex file so credo doesn't complain 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
9c1a930707 Support reindexing meilisearch >=0.24.0 
It has has a different error code key
 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
e928e307f3 Add a reindex option 
Signed-off-by: Ekaterina Vaartis <vaartis@kotobank.ch>
 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
4445421297 Only add local posts to index in activity_pub 
Remote ones are already added in another place
 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
0b4fd0d342 Set content-type to application/json 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
e4b7a3f51f Modify some meilisearch variables 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
cf558208c2 Use proper deleted object for removing from index 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
95cb2bb694 Don't try removing from index again in common_api 
It's already removed in the side effects of the pipeline
 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
6beef2d117 Move add_to_index / remove_from_index to Pleroma.Actitivy.Search 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
40280cc273 Reorder ranking rules for (maybe) better results 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
d9ef7e0758 Fix activity being passed to objec_to_search_data 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
09a1ae1b6e Add the meilisearch.stats command 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
a67f9da5cc Add a message with a count of posts to index 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
2c7d973af7 Implement meilisearch auth 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
410c8cb765 Make indexing logs rewrite themselves 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
35e9192ced Rework task indexing to share code with the main module 
The code in the main module now scrubs new posts too
 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
3dedadf192 Adjust content indexing to skip more unneeded stuff 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
9f16ca80e0 Mark only content as searchable for meilisearch 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
2b2e409ad7 Also index incoming federated posts 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
e35d87ea54 Make the chunk size smaller 2022-10-10 20:19:09 +03:00
Ekaterina Vaartis
00c48a33ac Use content instead of source and scrub it 2022-10-10 20:19:08 +03:00
Ekaterina Vaartis
9beaebd97e Tweak search ordering to hopefully return newer results 2022-10-10 20:19:08 +03:00
Ekaterina Vaartis
38996f551a Make meilisearch sort on publish date converted to unix time 2022-10-10 20:19:08 +03:00
Ekaterina Vaartis
ea6a6a1287 Make the indexing batch differently and more, show number indexed 2022-10-10 20:19:08 +03:00
Ekaterina Vaartis
365024abec Ensure only indexing public posts and implement clearing and delete 2022-10-10 20:19:08 +03:00
Ekaterina Vaartis
0318e9a599 Add logging to milisiearch index and make it use desc(id) 2022-10-10 20:19:08 +03:00
Ekaterina Vaartis
e154ebbf79 Initial meilisearch implementation, doesn't delete posts yet 2022-10-10 20:19:08 +03:00
Alex Gleason
0447197378 Merge branch 'merge-pleroma' into 'develop' 
Merge Pleroma

See merge request soapbox-pub/rebased!184
 2022-10-10 01:22:54 +00:00
Alex Gleason
0ee413400f
FEP-e232: support Link mediaType "application/activity+json" 2022-10-09 15:25:34 -05:00
Alex Gleason
ddaeb09e54
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 2022-10-09 13:46:48 -05:00
Alex Gleason
11dfc2589a
Add support for FEP-e232 quotes without quoteUrl 2022-10-09 13:27:16 -05:00
Tusooa Zhu
dd82fd234f
Merge branch 'release/2.4.4' into mergeback/2.4.4 2022-10-08 22:15:09 -04:00
marcin mikołajczak
678b6ce17c Add more tests 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-06 00:06:34 +02:00
marcin mikołajczak
e187aff5dd Add some tests 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-03 23:10:02 +02:00
marcin mikołajczak
c45612badd Update spec, fix tests 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-03 20:13:44 +02:00
marcin mikołajczak
73e7549d94 Update scheduled notitfications on edit 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-02 16:32:34 +02:00
Alex Gleason
0cd15c997c
TagValidator: allow Link tags, don't go nuclear for unrecognized Tag types 2022-10-01 19:56:11 -05:00
marcin mikołajczak
1b238a4fad Push.Impl: support edits 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-01 23:28:02 +02:00
marcin mikołajczak
0612c32c6e Add notifications for updates in events you joined 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-01 22:26:35 +02:00
marcin mikołajczak
9ff0eb5c4b Fix event updates 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-01 18:01:52 +02:00
marcin mikołajczak
58e0ca0d68 Merge remote-tracking branch 'soapbox/develop' into pleroma-events 2022-09-30 20:04:29 +02:00
Mark Felder
1958f23fe7 Fix deprecation warning for Gun timeout 2022-09-30 12:22:06 -04:00
Alex Gleason
544be36c80
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 2022-09-28 17:29:53 -05:00
marcin mikołajczak
c6fddd6e0a Add migration cooldown period 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-28 23:48:45 +02:00
Haelwenn
3f1c31b7cd Merge branch 'fix/exclude-deactivated-in-search' into 'develop' 
User: search: exclude inactive users from user search

See merge request pleroma/pleroma!3755
 2022-09-27 23:58:45 +00:00
marcin mikołajczak
f7d9f42243 event editing? 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-27 23:56:20 +02:00
Haelwenn
5d7d623390 Merge branch 'bugfix/elixir-1.14' into 'develop' 
Bugfix: Elixir 1.14

See merge request pleroma/pleroma!3740
 2022-09-27 21:46:03 +00:00
marcin mikołajczak
daccdc179c Only allow event author to accept/reject joins 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-27 21:01:48 +02:00
marcin mikołajczak
31d2f9a255 Store internal location data 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-25 23:19:08 +02:00
marcin mikołajczak
ba9fe4c6f2 Fix participation requests query 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-25 22:01:34 +02:00