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
Alex Gleason
6d710a0f7e
Merge remote-tracking branch 'origin/develop' into quote-post
2022-02-02 12:50:03 -06:00
Haelwenn (lanodan) Monnier
d1cc9e4eaf
Fix tests matching on "warn"
...
Moving it to "warning" would break tests on 1.12.x
2022-02-02 12:45:26 -06:00
Alex Gleason
bd81af731e
Tag erratic test
2022-02-02 12:29:53 -06:00
Alex Gleason
2d77976305
Add tests for mismatched context in replies
2022-02-02 12:19:35 -06:00
Alex Gleason
5a4e3aa715
Test that a Create/Note from Roadhouse validates
2022-02-02 11:02:23 -06:00
Alex Gleason
61dfeca1cc
Test that a Note from Roadhouse validates
2022-02-02 10:38:30 -06:00
Alex Gleason
93f5cd5c3b
Merge remote-tracking branch 'pleroma/quote-post' into merge-upstream
2022-01-30 10:58:18 -06:00
Alex Gleason
643f78cb22
InlineQuotePolicy: skip objects which already have an .inline-quote span
2022-01-30 10:57:29 -06:00
Alex Gleason
deff42f034
Merge remote-tracking branch 'origin/develop' into quote-post
2022-01-30 10:50:35 -06:00
Alex Gleason
dde02e9806
Merge remote-tracking branch 'pleroma/quote-post' into merge-upstream
2022-01-28 17:53:56 -06:00
Alex Gleason
4883b996ad
Actually, don't send _misskey_quote anymore
2022-01-28 17:53:19 -06:00
Alex Gleason
281ccab704
Merge remote-tracking branch 'pleroma/quote-post' into merge-upstream
2022-01-28 16:21:37 -06:00
Alex Gleason
108997b764
InlineQuotePolicy: improve the way Markdown quotes are displayed by other software
2022-01-28 16:07:17 -06:00
Alex Gleason
b73a53ec69
Handle Fedibird's new quoteUri field
2022-01-28 15:55:52 -06:00
Alex Gleason
ac3426cbca
Transmogrifier: federate quotes with _misskey_quote field
2022-01-28 14:06:32 -06:00
Alex Gleason
ac6b2fadcf
Merge remote-tracking branch 'pleroma/quote-post' into merge-upstream
2022-01-28 12:34:34 -06:00
Alex Gleason
5134e691f4
StatusView: return quote post inside a reblog
2022-01-28 12:33:55 -06:00
Alex Gleason
a4d8e2bef7
Merge remote-tracking branch 'pleroma/quote-post' into merge-upstream
2022-01-27 14:31:04 -06:00
Alex Gleason
8d2f370a51
Merge remote-tracking branch 'pleroma/mention-mrf-md' into merge-upstream
2022-01-27 14:30:57 -06:00
Alex Gleason
087e060d30
InlineQuotePolicy: don't add line breaks to markdown posts
2022-01-27 14:28:06 -06:00
Alex Gleason
3bf257171f
ForceMentionsInContent: improve display of Markdown posts
2022-01-27 14:15:06 -06:00
Alex Gleason
436f62781b
Merge remote-tracking branch 'pleroma/mentions-mrf-replies-only' into merge-upstream
2022-01-26 21:29:17 -06:00
Alex Gleason
27cb3d6273
ForceMentionsInContent: don't apply it to top-level posts
2022-01-26 21:24:26 -06:00
Alex Gleason
f73edd02f0
Merge remote-tracking branch 'pleroma/quote-post' into quote-visibility-fixes
2022-01-26 11:59:55 -06:00
Alex Gleason
91822c383c
StatusView: add quote_visible param
2022-01-26 11:52:50 -06:00
Alex Gleason
660490c2ec
StatusView: fix quote visibility
2022-01-26 11:49:31 -06:00
Alex Gleason
5a1fa6bca2
CommonAPI: disallow quoting private posts through the API
2022-01-26 11:21:49 -06:00
Alex Gleason
f0c22f9bd7
Merge remote-tracking branch 'pleroma/inline-mention-self' into inline-mention-self
2022-01-25 12:36:56 -06:00
Alex Gleason
0604b0dd09
ForceMentionsInContent: don't mention self
2022-01-25 12:33:47 -06:00
Alex Gleason
93a340668f
Merge remote-tracking branch 'origin/develop' into quote-post
2022-01-25 11:57:04 -06:00
Alex Gleason
0f4e0e667e
Merge branch 'recipients-inline' into 'develop'
...
ForceMentionsInContent: wrap mentions in a span, fix the formatting
See merge request pleroma/pleroma!3620
2022-01-25 17:43:39 +00:00
Alex Gleason
1e740bf6d3
Merge remote-tracking branch 'pleroma/recipients-inline' into merge-upstream
2022-01-25 11:02:07 -06:00
Alex Gleason
440754d526
Merge remote-tracking branch 'pleroma/develop' into merge-upstream
2022-01-25 11:01:59 -06:00
Alex Gleason
99e9c2c668
Merge branch 'birth-dates' into 'develop'
...
Fix show_birthday
See merge request pleroma/pleroma!3621
2022-01-25 16:59:07 +00:00
Alex Gleason
65b4d2ce84
ForceMentionsInContent: fix order of mentions
2022-01-25 10:42:34 -06:00
ab12a05a43
AccountView: Add test for show_birthday
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-25 17:34:36 +01:00
Alex Gleason
25786c804b
Merge remote-tracking branch 'pleroma/develop' into merge-upstream
2022-01-25 09:39:25 -06:00
Alex Gleason
dd7977bb68
Merge branch 'birth-dates' into 'develop'
...
Birth dates
See merge request pleroma/pleroma!3608
2022-01-25 15:35:47 +00:00
Alex Gleason
6bc109b31d
Merge remote-tracking branch 'pleroma/recipients-inline' into recipients-inline
2022-01-24 20:20:04 -06:00
Alex Gleason
267184b70e
ForceMentionsInContentTest: return mentions in a not terrible format
2022-01-24 20:03:43 -06:00
Alex Gleason
51dd5a6e21
Merge remote-tracking branch 'pleroma/quote-post' into quote-improvements
2022-01-24 17:18:30 -06:00
Alex Gleason
7f1d82a523
Merge remote-tracking branch 'pleroma/develop' into merge-upstream
2022-01-24 16:55:39 -06:00
Alex Gleason
1cb8326cfb
Merge remote-tracking branch 'origin/develop' into quote-post
2022-01-24 16:48:37 -06:00
Alex Gleason
0571f8f553
Add InlineQuotePolicy to force quote URLs inline
2022-01-24 16:44:35 -06:00
Alex Gleason
683f96da00
Merge remote-tracking branch 'pleroma/quote-post' into quote-post
2022-01-23 16:10:36 -06:00
Alex Gleason
c04241eb4a
ActivityDraft: mix format, defensive actor ID
2022-01-23 16:03:46 -06:00
Alex Gleason
d39ccd8372
ActivityDraft: mention the OP of a quoted post
2022-01-23 15:46:44 -06:00
Alex Gleason
d903a6b85d
Return quote_url through the API, don't render quotes more than 1 level deep
2022-01-23 13:55:25 -06:00
75c4fefb1c
Add a test
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-23 13:03:00 +01:00
e3d394eef6
Birthdays: Fix tests, add test for misskey
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-23 09:41:21 +01:00
0266bc3c96
Birthdays: hide_birthday -> show_birthday
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-23 09:13:33 +01:00
Alex Gleason
d293265b06
Fix typos
2022-01-22 23:02:44 -06:00
Alex Gleason
00b2dc7ecb
TransmogrifierTest: prepare an outgoing quote post
2022-01-22 22:41:57 -06:00
Alex Gleason
bbd3433f5a
StatusControllerTest: test creating a quote post
2022-01-22 22:35:08 -06:00
Alex Gleason
4b2fe550de
BuilderTest: build quote post
2022-01-22 22:29:13 -06:00
Alex Gleason
69cab8da89
ActivityDraft: allow quoting
2022-01-22 22:15:54 -06:00
Alex Gleason
62c27425d7
Merge remote-tracking branch 'pleroma/mrf-tuples-fix' into merge-upstream
2022-01-22 20:24:14 -06:00
Alex Gleason
06aa38447b
Merge remote-tracking branch 'pleroma/develop' into merge-upstream
2022-01-22 20:24:04 -06:00
Alex Gleason
d4e9cb600d
StatusView: render the whole quoted status
2022-01-22 20:05:58 -06:00
Alex Gleason
fbdfeb326d
Transmogrifier: fetch quoted post
2022-01-22 18:46:58 -06:00
Alex Gleason
0f34eb60d4
ObjectValidators: improve quoteUrl compatibility
2022-01-22 18:03:22 -06:00
Alex Gleason
0453713c70
Quote post: add fixtures
2022-01-22 17:30:49 -06:00
Alex Gleason
acfded5ae8
MRF reasons: normalize config for backwards compatibility
2022-01-22 15:53:08 -06:00
Alex Gleason
e72fd4ceb6
SimplePolicy reasons: handle legacy config
2022-01-22 14:32:55 -06:00
Alex Gleason
aaa9314f4c
Merge remote-tracking branch 'origin/develop' into birth-dates
2022-01-22 14:24:50 -06:00
Alex Gleason
f91e06367d
EmailListTest: tag erratic tests
2022-01-22 14:12:46 -06:00
Alex Gleason
66e8c6f90f
Birthdays: birth_date --> birthday
2022-01-22 13:21:55 -06:00
Alex Gleason
4ac36ad19d
Merge branch 'next' into 'develop'
...
Merge Pleroma's develop branch
See merge request soapbox-pub/soapbox!67
2022-01-22 19:08:14 +00:00
NEETzsche
7a015b1fe2
Make test less erratic by adding five second tolerance
2022-01-22 12:07:54 -07:00
Alex Gleason
04d12810bc
Merge remote-tracking branch 'pleroma/develop' into next
2022-01-22 12:32:54 -06:00
Alex Gleason
f5d4ef50b4
FilterTest: tag erratic test
2022-01-22 12:13:09 -06:00
Alex Gleason
cef7a9c181
Fix RichMedia.ParserTest
2022-01-22 11:52:28 -06:00
Alex Gleason
64f48c4239
Merge remote-tracking branch 'pleroma/develop' into next
2022-01-22 11:24:43 -06:00
Alex Gleason
6ffe43af70
Merge branch 'private-pins' into 'develop'
...
Support private pinned posts from Mastodon
See merge request pleroma/pleroma!3611
2022-01-20 23:18:24 +00:00
Alex Gleason
00523bdf5e
Test pinned private statuses in AccountController
2022-01-20 16:54:43 -06:00
88c21b9282
Support private pinned posts from Mastodon
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-20 12:35:32 +01:00
NEETzsche
508c718f7c
Block notification policy
2022-01-19 21:02:03 +00:00
rinpatch
a02cfd7f52
Add ForceMentionsInContentPolicy
...
Even though latest PleromaFE supports displaying these properly, mobile
apps still exist, so I think we should offer a workaround to those who
want it.
2022-01-19 21:04:57 +03:00
dfb2808535
Birth dates: Add tests
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-18 23:15:31 +01:00
397f67fef8
Format code, expose instance configuration related to birth dates
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-18 18:18:38 +01:00
Alex Gleason
39c5ebb1f6
mix format
2022-01-15 12:55:12 -06:00
Alex Gleason
31148c1857
FormatterTest: fix nesting in expected output
2022-01-15 12:31:36 -06:00
Alex Gleason
db90c9e3b0
Merge remote-tracking branch 'mkfain/test-for-breaking-markdown' into linkify-0.5.2
2022-01-15 12:27:42 -06:00
eedf551eed
Add more tests
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-12 22:41:34 +01:00
0f90fd5805
WIP account endorsements
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-12 18:15:10 +01:00
