Commit graph

5662 commits

Author SHA1 Message Date
Ilja
4a9ed319b8 Change test pictures
The previous pictures were labeled as public domain, but are actually a collage of pictures under other licenses.

I now replaced them with a jpeg of simply a white pixel.
2022-07-01 12:15:02 +02:00
Ilja
81afaee374 Better way of getting keys
I used keyword_list[:key], but if the key doesn't exist, it will return nil. I actually expect a list and further down the code I use that list.
I believe the key should always be present, but in case it's not, it's better to return an empty list instead of nil. That way the code wont fail further down the line.
2022-07-01 12:15:02 +02:00
Ilja
d0d48a9e88 Add deprecation warnings 2022-07-01 12:15:02 +02:00
Ilja
8303af84ce Rename the Exiftool module
No migrations or checks yet
2022-07-01 12:15:02 +02:00
Ilja
551721e41a Rename the new module 2022-07-01 12:13:46 +02:00
Ilja
cd316d7269 Use EXIF data of image to prefill image description
During attachment upload Pleroma returns a "description" field. Pleroma-fe has an MR to use that to pre-fill the image description field, <https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1399>

* This MR allows Pleroma to read the EXIF data during upload and return the description to the FE
    * If a description is already present (e.g. because a previous module added it), it will use that
    * Otherwise it will read from the EXIF data. First it will check -ImageDescription, if that's empty, it will check -iptc:Caption-Abstract
    * If no description is found, it will simply return nil, just like before
* When people set up a new instance, they will be asked if they want to read metadata and this module will be activated if so

This was taken from an MR i did on Pleroma and isn't finished yet.
2022-07-01 12:13:46 +02:00
Hélène
11f9f2ef27
EmojiReactValidator: fix emoji qualification
Tries fully-qualifying emoji when receiving them, by adding the emoji
variation sequence to the received reaction emoji.

This issue arises when other instance software, such as Misskey, tries
reacting with emoji that have unqualified or minimally qualified
variants, like a red heart. Pleroma only accepts fully qualified emoji
in emoji reactions, and refused those emoji. Now, Pleroma will attempt
to properly qualify them first, and reject them if checks still fail.
2022-06-28 21:33:57 +02:00
409fd1d9a3 Allow to unset birthday
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-06-25 23:57:43 +02:00
4a57a65695 Mastodon-compatible webhooks
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-06-25 23:26:42 +02:00
Tusooa Zhu
b096fbba1a
Fix long report notes giving errors on creation 2022-06-02 01:28:39 -04:00
Pierre-Louis Bonicoli
6f23fc8e08
Add tlsv1.3 to suggestions 2022-05-31 00:51:48 +02:00
0fbe33b4aa Add tests
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-05-27 15:45:42 +02:00
Hélène
a74ce2d77a
StealEmojiPolicy: fix String rejected_shortcodes
* rejected_shortcodes is defined as a list of strings in the
  configuration description. As such, database-based configuration was
  led to handle those settings as strings, and not as the actually
  expected type, Regex.
* This caused each message passing through this MRF, if a rejected
  shortcode was set and the emoji did not exist already on the instance,
  to fail federating, as an exception was raised, swiftly caught and
  mostly silenced.
* This commit fixes the issue by introducing new behavior: strings are
  now handled as perfect matches for an emoji shortcode (meaning that if
  the emoji-to-be-pulled's shortcode is in the blacklist, it will be
  rejected), while still supporting Regex types as before.
2022-05-18 21:25:10 +02:00
Alex Gleason
e13f64bd8e
Merge remote-tracking branch 'pleroma/develop' into merge-upstream 2022-05-17 11:19:29 -05:00
Tusooa Zhu
6e5ef7f2eb
Test local-only in ap c2s outbox
Ref: fix-local-public
2022-05-09 18:53:32 -04:00
Tusooa Zhu
38444aa92a
Allow authenticated users to access local-only posts in MastoAPI
Ref: fix-local-public
2022-05-09 18:53:18 -04:00
Haelwenn
4605efe272 Merge branch 'improve_anti_followbot_policy' into 'develop'
Also use actor_type to determine if an account is a bot in antiFollowbotPolicy

Closes #2561

See merge request pleroma/pleroma!3498
2022-05-08 18:10:40 +00:00
Ilja
a8093732bd Also use actor_type to determine if an account is a bot in antiFollowbotPolicy 2022-05-08 18:10:40 +00:00
Tusooa Zhu
221cb3fb81
Allow users to create backups without providing email address
Ref: backup-without-email
2022-05-07 00:23:55 -04:00
Tusooa Zhu
fe933b9bf2
Prevent remote access of local-only posts via /objects
Ref: fix-local-public
2022-05-06 13:54:21 -04:00
Tusooa Zhu
466568ae36
Lint
Ref: fix-local-public
2022-05-06 13:54:13 -04:00
Tusooa Zhu
826deb7375
Make local-only statuses searchable
Ref: fix-local-public
2022-05-06 13:54:13 -04:00
Tusooa Zhu
38af42968d
Test that anonymous users cannot see local-only posts
Ref: fix-local-public
2022-05-06 13:54:12 -04:00
Tusooa Zhu
c48be59f58
Show local-only statuses in public timeline for authenticated users
Ref: fix-local-public
2022-05-06 13:54:02 -04:00
Tusooa Zhu
57c030a0a7 Skip cache when /objects or /activities is authenticated
Ref: fix-local-public
2022-05-06 10:23:26 +02:00
Tusooa Zhu
e2d24eda57 Allow to skip cache in Cache plug
Ref: fix-local-public
2022-05-06 10:23:26 +02:00
Tusooa Zhu
be08d9305b
Fix incorrect fallback when English is set to first language 2022-04-17 22:39:52 -04:00
a0eb48b785 Merge remote-tracking branch 'soapbox/develop' into status-notification-type 2022-04-14 20:15:21 +02:00
Ilja
5f37db330f Fix eratic test for POST /api/pleroma/admin/reports/:id/notes
It retrieved two ReportNotes and then checked one of them. But the order isn't guaranteed, while the test tested on the content of the first ReportNote.

I made the test on the content more generic
2022-04-05 13:21:09 +02:00
Tusooa Zhu
7d1dae3bef
Restrict mastodon api announcements to logged-in users only 2022-04-02 02:25:13 -04:00
Alex Gleason
fc25b626da Merge branch 'merge-upstream' into 'develop'
Merge upstream

See merge request soapbox-pub/soapbox-be!108
2022-03-23 20:37:40 +00:00
7bc95acca0 Add "status" notification type
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-03-22 20:29:28 +01:00
Haelwenn
d7c53da77a Merge branch 'from/upstream-develop/tusooa/translate-pages' into 'develop'
Translate backend-rendered pages

See merge request pleroma/pleroma!3634
2022-03-20 18:14:37 +00:00
Haelwenn
b76340511d Merge branch 'delete_report_notifs_when_demoting_from_superuser' into 'develop'
Delete report notifs when demoting from superuser

Closes #2840

See merge request pleroma/pleroma!3642
2022-03-20 18:13:19 +00:00
Tusooa Zhu
0c78ab4a88
Use utc_datetime in db schema 2022-03-18 11:17:22 -04:00
Haelwenn (lanodan) Monnier
030183b35f AttachmentValidator: Use custom ecto type and regex for "mediaType" 2022-03-17 22:37:26 +01:00
Alex Gleason
d7cbaedc86 Merge branch 'fix-attachments' into 'develop'
StatusController: deleting a status returns the original media IDs

See merge request soapbox-pub/soapbox-be!114
2022-03-17 18:58:19 +00:00
Alex Gleason
552525e954 Merge branch 'notification-types' into 'develop'
MastoAPI: Use `types` for filtering notifications

See merge request soapbox-pub/soapbox-be!113
2022-03-17 18:57:49 +00:00
Alex Gleason
a6598128ca
StatusController: deleting a status returns the original media IDs 2022-03-16 18:13:35 -05:00
f572a416e7 Use types for filtering notifications
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-03-16 21:16:03 +01:00
31ff467eff Use types for filtering notifications
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-03-16 21:15:44 +01:00
eb35a54ab8 Use reject_follow_request
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-03-16 19:15:58 +01:00
8157013f0b POST /api/v1/accounts/:id/remove_from_followers
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-03-16 16:52:09 +01:00
4c56e0fceb Support account location field
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-03-14 22:41:33 +01:00
212080c3e8 Store status content mime type in the object
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-03-13 20:20:39 +01:00
Alex Gleason
b56b0fb4e9
Merge remote-tracking branch 'pleroma/develop' into merge-upstream 2022-03-09 16:34:57 -06:00
Tusooa Zhu
ebcda5265b
Format announcements into html 2022-03-08 23:00:51 -05:00
Tusooa Zhu
eb1a29640f
Add pagination to AdminAPI.AnnouncementController.index 2022-03-08 21:26:05 -05:00
Tusooa Zhu
11a1996bf5
Implement update announcement admin api 2022-03-08 20:55:41 -05:00
Tusooa Zhu
881179ec72
Remove GET /api/v1/announcements/:id 2022-03-08 19:22:28 -05:00
Tusooa Zhu
d569694ae9
Show only visible announcements in MastodonAPI 2022-03-08 19:20:29 -05:00
Tusooa Zhu
cf8334dbc1
Add starts_at, ends_at and all_day parameters 2022-03-08 19:12:01 -05:00
Tusooa Zhu
fcf3c9057e
Implement visibility filtering for announcements 2022-03-08 18:21:20 -05:00
Tusooa Zhu
2b39b36e49
Implement POST /api/v1/announcements/:id/dismiss 2022-03-08 16:59:20 -05:00
Tusooa Zhu
aa1fff279e
Implement GET /api/v1/announcements/:id 2022-03-08 16:19:35 -05:00
Tusooa Zhu
5169ad8f14
Implement announcement read relationships 2022-03-08 13:09:49 -05:00
Tusooa Zhu
d7af67012f
Implement first pass of announcement admin api
CCBUG: https://git.pleroma.social/pleroma/pleroma/-/issues/2836
CCBUG: https://git.pleroma.social/pleroma/pleroma/-/issues/1470
2022-03-08 01:01:27 -05:00
Haelwenn
4458db3201 Merge branch 'fix_test_get_user_apps' into 'develop'
Fix test get_user_apps/1

See merge request pleroma/pleroma!3636
2022-03-06 18:40:49 +00:00
Tusooa Zhu
79ccb6b999
Support fallbacking to other languages 2022-03-06 11:43:31 -05:00
Ilja
89667189b8 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-03-06 17:36:30 +01:00
Tusooa Zhu
cd42e2bed0
Lint 2022-03-03 09:49:55 -05:00
Tusooa Zhu
aca11fb70e
Support multiple locales from userLanguage cookie 2022-03-03 02:31:36 -05:00
Tusooa Zhu
7ea330b4fe
Support multiple locales formally
elixir gettext current does not fully support fallback to another language [0].
But it might in the future. We adapt it so that all languages in Accept-Language
headers are received by Pleroma.Web.Gettext. User.languages is now a comma-separated
list.

[0]: https://github.com/elixir-gettext/gettext/issues/303
2022-03-03 02:03:44 -05:00
Tusooa Zhu
bc59da96c5
Add test for fallbacking to a general language 2022-03-02 20:04:30 -05:00
Tusooa Zhu
8de573b047
Fallback to a variant if the language in general is not supported
For an example, here, zh is not supported, but zh_Hans and zh_Hant
are. If the user asks for zh, we should choose a variant for them
instead of fallbacking to default.

Some browsers (e.g. Firefox) does not allow users to customize
their language codes. For example, there is no zh-Hans, but only
zh, zh-CN, zh-TW, zh-HK, etc. This provides a workaround for
those users suffering from bad design decisions.
2022-03-02 19:59:11 -05:00
dcdb6a9f97 Merge remote-tracking branch 'soapbox/develop' into report-assign-account
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-03-02 16:34:13 +01:00
266ed48d93 add tests
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-03-02 15:25:00 +01:00
Tusooa Zhu
e644f8dea5
Allow user to register with custom language 2022-03-02 01:41:13 -05:00
Tusooa Zhu
0149ea4538
Send emails i18n'd using backend-stored user language 2022-03-01 22:19:13 -05:00
Tusooa Zhu
8b0c2890f9
Fix digest test 2022-03-01 20:27:45 -05:00
Alex Gleason
c34b232d80 Merge branch 'report-rules' into 'develop'
Allow submitting an array of rule_ids to /api/v1/reports

See merge request soapbox-pub/soapbox-be!101
2022-03-01 23:04:24 +00:00
4ab4903186 Add tests
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-03-01 23:50:09 +01:00
Alex Gleason
1db95a1677
SideEffects: don't stream Create/ChatMessage in an 'update' event 2022-02-28 14:56:20 -06:00
HJ
ee05abe052 Merge branch 'revert/notice-routes' into 'develop'
Revert notice compatibility routes merge request

See merge request pleroma/pleroma!3576
2022-02-26 16:24:49 +00:00
Sean King
17aa3644be
Copyright bump for 2022 2022-02-25 23:11:42 -07:00
Alex Gleason
4bdd365b6f Merge branch 'merge-upstream' into 'develop'
Add unicode 14 support

See merge request soapbox-pub/soapbox-be!102
2022-02-24 17:42:46 +00:00
Alex Gleason
16745b8e91
Merge remote-tracking branch 'pleroma/develop' into merge-upstream 2022-02-24 12:28:23 -05:00
Ilja
6ba93c2cb3 Fix test get_user_apps/1
For some reason I had a test who suddenly failed, mix test test/pleroma/web/o_auth/app_test.exs:54. A user has a list of applications and this test adds them and then sees if the list it gets back is the same as the apps it added.

When I ran mix test a day before I didn't have this problem and when I pushed code today in a different MR, the pipeline succeeded (see https://git.pleroma.social/ilja/pleroma/-/jobs/205827), yet locally it failed. So it seems the test can sometimes succeed and sometimes fail, which makes it untrustworthy.

The failure I see is because the returned list is in reverse order. I assume that's not per sé wrong. You just want to know if the apps you added are actually there. I fixed the test by first ordering the lists before comparing.

AFAICT (and as far as that's relevant) the test got introduced in commit cb2a072e62
2022-02-22 18:56:26 +01:00
Tusooa Zhu
0fd3695b9c
Prefer userLanguage cookie over Accept-Language header in detecting locale
https://git.pleroma.social/pleroma/pleroma-meta/-/issues/60
2022-02-21 18:02:19 -05:00
Sam Therapy
061cb749cd
Add unicode 14 support
and add a test with a unicode 14 emoji
2022-02-21 12:28:33 -06:00
644b7e614e Allow submitting an array of rule_ids to /api/v1/reports
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-21 13:37:13 +01:00
9747233375 Add mastodon admin API routes for report assigning
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-18 18:06:24 +01:00
db77571319 Merge remote-tracking branch 'soapbox/develop' into report-assign-account 2022-02-18 17:25:52 +01:00
05fb8229b9 Allow assigning users to reports
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-18 17:23:57 +01:00
e4677e212c Merge remote-tracking branch 'soapbox/develop' into mastodon-admin-api
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-17 15:28:25 +01:00
Alex Gleason
0a6c52fecb Merge branch 'configuration' into 'develop'
Add `configuration` field to /api/v1/instance

See merge request soapbox-pub/soapbox-be!98
2022-02-16 20:24:48 +00:00
892f75e9d7 InstanceControllerTest: Add configuration test
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-16 20:41:36 +01:00
fbb159dd47 Merge remote-tracking branch 'tusooa/from/develop/tusooa/emit-move' into emit-move
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-13 23:18:55 +01:00
5a4a7e775b some cleanup, reports
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-13 17:58:24 +01:00
ca5ee8f0bf MastoAPI: /api/v1/admin/reports
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-12 21:52:21 +01:00
48e87be7de Merge remote-tracking branch 'soapbox/develop' into mastodon-admin-api 2022-02-11 22:53:22 +01:00
6836361398 MastoAPI: /api/v1/admin/accounts
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-11 22:36:00 +01:00
marcin mikołajczak
a80852ba05 Merge branch 'instance-rules' into 'develop'
Instance rules

See merge request soapbox-pub/soapbox!93
2022-02-08 19:20:44 +00:00
1f9317100e Instance rules: Duplicate rule_controller_test, hope nobody notices
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-08 20:06:32 +01:00
Alex Gleason
502b63d8ea
Merge remote-tracking branch 'pleroma/develop' into merge-upstream 2022-02-06 12:31:53 -06:00
e473bcf7a0 Max media attachment count
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-06 17:41:15 +01:00
6d18e6595c Instance rules
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-05 18:07:04 +01:00
Alex Gleason
cc18296627
Merge remote-tracking branch 'pleroma/develop' into merge-upstream 2022-02-02 13:57:47 -06:00
Alex Gleason
64b136e11e
Merge remote-tracking branch 'pleroma/quote-post' into merge-upstream 2022-02-02 13:57:43 -06:00
Alex Gleason
7c044a1841
FilterControllerTest: tag erratic test 2022-02-02 13:10:39 -06:00