Commit graph

323 commits

Author SHA1 Message Date
Alex Gleason
6ebec50df6
Refactor User.confirm/1, add more tests 2020-10-12 16:32:34 -05:00
Alex Gleason
521e965884
Registration tests 2020-10-11 21:38:01 -05:00
Alex Gleason
3104367931
Merge remote-tracking branch 'upstream/develop' into email-fix-develop 2020-09-22 13:37:02 -05:00
Alex Gleason
0b728ccc44
Pass hackney tls config into email tests, #2101 2020-09-21 15:26:10 -05:00
Haelwenn
0465bdbd49 Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'
Ensure we only apply media_nsfw simple policy on parsable objects

Closes #2133

See merge request pleroma/pleroma!2992
2020-09-17 19:50:23 +03:00
Maksim Pechnikov
b867f9d7ae Merge branch 'develop' into issue/2099 2020-09-17 08:41:35 +03:00
lain
7a88b726bf User: Remote users don't need to be confirmed or approved 2020-09-16 17:29:16 +02:00
Mark Felder
d31f0393bf Validate Welcome Chat message works with Simple policy applied to local instance 2020-09-14 12:06:08 -05:00
Maksim Pechnikov
5ae56aafb2 added import mutes 2020-09-06 21:42:51 +03:00
rinpatch
126461942b User table: ensure bio is always a string
Gets rid of '|| ""' in multiple places and fixes #2067
2020-09-01 10:45:42 +03:00
Alex Gleason
dcc8926ff1
Test purging a user with User.delete/1 2020-08-18 00:10:09 -05:00
lain
28584bb224 Merge branch 'email-blacklist' into 'develop'
Add email blacklist, fixes #1404

Closes #1404

See merge request pleroma/pleroma!2837
2020-08-04 11:00:30 +00:00
Alex Gleason
dc88b6f091
Add email blacklist, fixes #1404 2020-08-02 14:53:42 -05:00
Ilja
f671d7e68c Add welcome chatmessages
* I added the option in config/config.exs
* created a new module lib/pleroma/user/welcome_chat_message.ex
* Added it to the registration flow
* added to the cheatsheet
* added to the config/description.ex
* added to the Changelog.md
2020-08-02 15:54:59 +02:00
lain
d9bf2c58df Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users-on-registration 2020-07-29 14:42:09 +02:00
lain
c25c21dd22 AccountController: Don't explicitly ask to keep users unconfirmed.
Confirmation is set in User.register_changeset based on the config
settings.
2020-07-29 11:47:03 +02:00
Alex Gleason
f43518eb74
Lint, fix test 2020-07-27 19:22:31 -05:00
Alex Gleason
6f44a0ee84
Add configurable registration_reason limit 2020-07-27 15:13:34 -05:00
Alex Gleason
6747bf2e16
Merge remote-tracking branch 'upstream/develop' into by-approval 2020-07-27 12:29:18 -05:00
Alex Gleason
6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval 2020-07-26 15:46:14 -05:00
Maksim Pechnikov
67ab9a7928 Merge branch 'develop' into issue/1934-welcome-email 2020-07-23 16:36:27 +03:00
Maksim Pechnikov
5879d36854 fix sender for welcome email 2020-07-22 15:34:47 +03:00
Maksim Pechnikov
3edaecae96 added welcome email 2020-07-21 09:25:53 +03:00
Alex Gleason
5756843736
Fully delete users with status :approval_pending 2020-07-17 12:19:41 -05:00
Alex Gleason
fab44f6970
Test User with confirmation_pending: true, approval_pending: true 2020-07-14 18:46:57 -05:00
Alex Gleason
20d24741af
AdminAPI: Add PATCH /api/pleroma/admin/users/approve endpoint 2020-07-14 18:02:44 -05:00
Alex Gleason
bcfd38c8f3
Make a user unapproved when registering with account_approval_required on 2020-07-12 22:55:37 -05:00
Alex Gleason
a62f17da17
Add approval_pending field to User 2020-07-12 20:27:14 -05:00
Maksim Pechnikov
62fc8eab0d fix reset confirmation email in admin section 2020-07-11 07:20:35 +03:00
lain
98bfdba108 User: On registration, set accepts_chat_messages to true. 2020-07-03 12:47:05 +02:00
lain
fedfe8f7d6 ActivityPub: Handle clashing nicknames for the same ap id
If we get a new user (identified by ap_id) that would have the same
nickname as an existing user, give the existing user a nickname that
is prepended with the user id, as this will never clash.

This can happen when a user switches server software and that soft-
ware generates ap ids in a different way.
2020-07-01 12:26:07 +02:00
Mark Felder
67ab580553 Filter outstanding follower requests from deactivated accounts 2020-06-24 17:18:53 -05:00
lain
59bdef0c33 Merge branch 'feature/1739-account-endpoints' into 'develop'
account visibility in masto api

Closes #1739

See merge request pleroma/pleroma!2488
2020-06-22 12:37:10 +00:00
lain
c450b248cc Merge branch 'feature/delete-follow-requests-on-user-deletion' into 'develop'
Delete outgoing pending follow requests on user deletion

See merge request pleroma/pleroma!2631
2020-06-08 10:54:43 +00:00
Sergey Suprunenko
8d9e586887
Delete pending follow requests on user deletion 2020-06-07 17:31:37 +02:00
Egor Kislitsyn
317e2b8d61
Use atoms as keys in ActivityPub.fetch_* functions options 2020-06-04 21:36:26 +04:00
Roman Chvanikov
b973d0b2f0 Fix config setting to not affect other tests 2020-05-30 16:47:09 +03:00
lain
0c970a9d44 UserTest: Add test for user refreshing. 2020-05-25 12:49:38 +02:00
Haelwenn
7b02bfca51 Merge branch 'announce-validator' into 'develop'
Announce validator

See merge request pleroma/pleroma!2567
2020-05-22 05:47:53 +00:00
lain
23e248694d Announcements: Fix all tests. 2020-05-21 13:16:21 +02:00
eugenijm
b7fc61e17b Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE 2020-05-21 04:41:42 +03:00
lain
423ea497bb Merge branch 'feature/1734-user-deletion' into 'develop'
User deletion

Closes #1734

See merge request pleroma/pleroma!2493
2020-05-20 11:43:49 +00:00
lain
2328eff09c UserTest: Hide warning in tests. 2020-05-19 14:36:13 +02:00
Alexander Strizhakov
1671864d88
return :visible instead of boolean 2020-05-18 10:34:50 +03:00
Alexander Strizhakov
e7bc2f980c
account visibility 2020-05-18 10:34:49 +03:00
Egor Kislitsyn
7803a85d2c
Add OpenAPI spec for StatusController 2020-05-13 00:25:21 +04:00
Alexander Strizhakov
287f781808
user deletion 2020-05-08 17:11:17 +03:00
lain
6fb96f64c1 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator 2020-05-03 12:55:29 +02:00
rinpatch
e55876409b Deactivate local users on deletion instead of deleting the record
Prevents the possibility of re-registration, which allowed to read
DMs of the deleted account.

Also includes a migration that tries to find any already deleted
accounts and insert skeletons for them.

Closes pleroma/pleroma#1687
2020-05-02 19:05:13 +03:00
lain
5da08c2b73 SideEffects: Fix comment 2020-04-30 19:53:30 +02:00