Ivan Tashkinov
112101ca52
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
...
# Conflicts:
# lib/pleroma/thread_mute.ex
2020-03-26 09:43:58 +03:00
Ivan Tashkinov
460e41585c
Further preloading (more endpoints), refactoring, tests.
2020-03-25 20:33:34 +03:00
Ivan Tashkinov
be5e2c4dbb
Applied relationships preloading to GET /api/v1/accounts/relationships. Refactoring (User.binary_id/1).
2020-03-25 17:01:45 +03:00
Ivan Tashkinov
012d428e1f
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
2020-03-25 09:05:17 +03:00
Ivan Tashkinov
e743c22329
Fixed incorrect usage of "relations" as a short form of "relationships".
2020-03-25 09:04:00 +03:00
Ivan Tashkinov
8f1d622b8d
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
2020-03-24 22:15:37 +03:00
lain
1d75d0ed7a
Merge branch 'admin-api-change-password' into 'develop'
...
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`
See merge request pleroma/pleroma!2149
2020-03-24 17:34:13 +00:00
Ivan Tashkinov
3c78e5f327
Preloading of follow relations for timeline/statuses rendering (performance improvement). Refactoring.
2020-03-23 12:01:11 +03:00
Ivan Tashkinov
c2e415143b
WIP: preloading of user relations for timeline/statuses rendering (performance improvement).
2020-03-22 21:51:44 +03:00
rinpatch
981e015f1b
Mastodon API Account view: Remove an outdated hack
...
The hack with caching the follow relationship was introduced
when we still were storing it inside the follow activity, resulting in
slow queries. Now we store follow state in `FollowRelationship` table,
so this is no longer necessary.
2020-03-22 17:10:37 +03:00
Alexander Strizhakov
fe15f0ba15
restrict_unauthenticated setting
2020-03-20 16:36:20 +03:00
eugenijm
13cce9c0de
Admin API: `PATCH /api/pleroma/admin/users/:nickname/credentials`, `GET /api/pleroma/admin/users/:nickname/credentials`.
2020-03-16 20:42:37 +03:00
Ivan Tashkinov
0e07c5ef57
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
2020-03-16 17:58:42 +03:00
Haelwenn (lanodan) Monnier
8176ca9e40
static_fe: Sanitize HTML in users
2020-03-15 20:44:04 +01:00
Ivan Tashkinov
7c8003c3fc
[ #1364 ] Improved control over generation / sending of notifications. Fixed blocking / muting users notifications issue. Added tests.
2020-03-15 21:00:12 +03:00
rinpatch
e87a32bcd7
rip out fetch_initial_posts
...
Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.
idea acked by lain and feld on irc
Closes #1595 #1422
2020-03-15 15:59:17 +03:00
Egor Kislitsyn
4a45b96a91
Merge branch 'develop' into fix/signup-without-email
2020-03-02 15:35:49 +04:00
Haelwenn
764a50f8a6
Merge branch 'feature/1482-activity_pub_transactions' into 'develop'
...
ActivityPub actions & side-effects in transaction
Closes #1482
See merge request pleroma/pleroma!2089
2020-03-02 07:58:01 +00:00
Haelwenn (lanodan) Monnier
6da6540036
Bump copyright years of files changed after 2020-01-07
...
Done via the following command:
git diff fcd5dd259a
--stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
2020-03-02 06:08:45 +01:00
Alexander Strizhakov
32d1e04817
ActivityPub actions & side-effects in transaction
2020-03-01 12:01:39 +03:00
Egor Kislitsyn
f446744a6a
Allow account registration without an email
2020-02-26 20:13:53 +04:00
Egor Kislitsyn
22018adae6
Fix Dialyzer warnings
2020-02-25 18:34:56 +04:00
Egor Kislitsyn
bc2e98b200
Add User.get_follow_state/2
2020-02-07 16:17:34 +04:00
Egor Kislitsyn
8c71f7e11a
Add support for cancellation of a follow request
2020-02-05 20:22:15 +04:00
Maksim Pechnikov
02c3dd2e3d
update ecto
2020-01-28 10:43:47 +03:00
Maksim Pechnikov
108a39c876
updated error messages for authentication process
2020-01-17 15:01:37 +03:00
Ivan Tashkinov
39ce894a07
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
...
# Conflicts:
# lib/pleroma/user.ex
2020-01-10 16:18:32 +03:00
lain
05ca420c09
Merge branch 'issue/1490' into 'develop'
...
[#1490 ] fixed create service user (relay, internal.fetch)
See merge request pleroma/pleroma!2092
2020-01-10 13:14:20 +00:00
Ivan Tashkinov
6c94b7498b
[ #1478 ] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.
2020-01-10 10:52:21 +03:00
Maksim Pechnikov
70410dfafd
fix create service actor
2020-01-08 16:40:49 +03:00
Ivan Tashkinov
7973cbdb9f
OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
2019-12-15 22:32:42 +03:00
Sadposter
457821adb0
Apply suggestion to lib/pleroma/user.ex
2019-12-10 18:49:41 +00:00
Sadposter
8cfaab8f04
Merge branch 'develop' into 'domain-block-precedence'
...
# Conflicts:
# lib/pleroma/user.ex
2019-12-10 16:54:25 +00:00
Sadposter
19d228cc58
modify SQL to include followed-but-domain-blocked activities
2019-12-10 16:40:12 +00:00
lain
1ae976ac51
Merge branch 'develop' into '1427-oauth-admin-scopes'
...
# Conflicts:
# CHANGELOG.md
2019-12-10 13:34:54 +00:00
Hakaba Hitoyo
701815e64c
[ActivityPub] Configurable ActivityPub actor type
2019-12-10 13:19:26 +00:00
Ivan Tashkinov
835ac2157c
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
...
# Conflicts:
# CHANGELOG.md
2019-12-10 08:55:14 +03:00
Maksim Pechnikov
95e6a2acd9
Merge branch 'develop' into issue/1342
2019-12-08 21:25:26 +03:00
Ivan Tashkinov
1770602747
[ #1427 ] Extra check that admin OAuth scope is used by admin. Adjusted tests.
2019-12-07 17:49:53 +03:00
Ivan Tashkinov
13926537b6
Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
2019-12-06 00:26:31 +03:00
Ivan Tashkinov
af42c00cff
[ #1427 ] Reworked admin scopes support.
...
Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).
2019-12-06 00:25:44 +03:00
Maksim Pechnikov
3fe7a1fd35
Merge branch 'develop' into issue/1342
2019-12-05 15:46:27 +03:00
Ivan Tashkinov
d3bce89edd
[ #1335 ] Merge issue fix.
2019-12-04 19:41:14 +03:00
Ivan Tashkinov
30caf3e51e
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user.ex
2019-12-04 18:56:31 +03:00
lain
7722e5a67a
Merge branch 'feature/move-activity' into 'develop'
...
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
2019-12-02 16:26:19 +00:00
rinpatch
0d24ab04c5
Merge branch 'remove-info-from-users' into 'develop'
...
Removed users.info field
See merge request pleroma/pleroma!2006
2019-11-30 10:42:51 +00:00
Ivan Tashkinov
52cc7de82c
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# mix.lock
2019-11-29 10:17:59 +03:00
Maksim Pechnikov
a52da55eb9
added User.NotificationSetting struct
2019-11-28 22:08:30 +03:00
Sadposter
c7cc80a9ee
obligatory format commit
2019-11-28 10:40:50 +00:00
Sadposter
fa97eddf8a
make follows take precedence over domain blocks
2019-11-28 10:38:38 +00:00
Egor Kislitsyn
f595cfe623
Remove User.user_info/2
2019-11-27 19:43:47 +07:00
Ivan Tashkinov
c8d3c3bfec
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
2019-11-26 10:42:36 +03:00
Ivan Tashkinov
1636cc5b7e
Removed users.info and remaining usages.
2019-11-23 14:06:19 +03:00
lain
bd62946020
Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'
...
AdminAPI: Confirm user account, resend confirmation email
See merge request pleroma/pleroma!1994
2019-11-22 15:39:19 +00:00
Maxim Filippov
b64c7b35d4
Swap map with each
2019-11-22 09:11:36 +09:00
Ivan Tashkinov
cad9b325e5
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user/search.ex
# test/user_test.exs
2019-11-21 16:47:52 +03:00
lain
8feb5dcb42
Merge branch 'issue/1348' into 'develop'
...
[#1348 ] excluded invisible actors from gets /api/v1/accounts/:id
See merge request pleroma/pleroma!1937
2019-11-21 13:13:14 +00:00
Egor Kislitsyn
d38ab4bb89
Fix user.following_count
2019-11-21 16:31:13 +07:00
Ivan Tashkinov
de892d2fe1
[ #1335 ] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
2019-11-20 15:46:11 +03:00
Ivan Tashkinov
555edd01ab
[ #1335 ] User AP ID relations fetching performance optimizations.
2019-11-20 12:19:07 +03:00
Ivan Tashkinov
ba5cc30165
[ #1335 ] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.
2019-11-19 23:22:10 +03:00
Maxim Filippov
46eb160135
AdminAPI: Confirm user account, resend confirmation email
2019-11-19 20:14:02 +09:00
Ivan Tashkinov
aad6576130
[ #1335 ] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.
2019-11-18 20:38:56 +03:00
Ivan Tashkinov
01d9c093c3
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
2019-11-15 21:40:14 +03:00
Ivan Tashkinov
c31ddce51e
[ #1335 ] Reorganized `users.mutes` as relation to UserMute entity.
2019-11-15 21:38:54 +03:00
Egor Kislitsyn
3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
2019-11-14 16:39:45 +07:00
Egor Kislitsyn
e6d7e27bd6
Add `allow_following_move` setting to User
2019-11-12 18:45:28 +07:00
lain
8521553ad9
User: Don't let deactivated users authenticate.
2019-11-11 12:37:38 +01:00
Ivan Tashkinov
5cf2c7422b
[ #1335 ] Applied code review suggestions.
2019-11-11 14:16:57 +03:00
Ivan Tashkinov
3db988250b
[ #1335 ] User: refactored :blocks field into :blocked_users relation.
...
Introduced UserBlock.
2019-11-10 16:30:21 +03:00
Maksim Pechnikov
4b7c11e3f9
excluded invisible actors from gets /api/v1/accounts/:id
2019-11-04 20:44:24 +03:00
lain
0c31258616
User: Don't pull remote users follower count immediately after deactivating.
...
The other instance doesn't necessarily know that anything changed yet, and it
will be fixed up at the next user pull anyway.
Closes #1369
2019-11-04 14:36:54 +01:00
Egor Kislitsyn
4270861085
Merge branch 'develop' into feature/move-activity
2019-10-28 15:10:47 +07:00
lain
2480200759
Merge branch 'refactor/following-relationships' into 'develop'
...
Move following relationships to a separate table
Closes #1233
See merge request pleroma/pleroma!1814
2019-10-28 07:27:45 +00:00
eugenijm
0580654485
Mark the conversations with the blocked user as read and update the blocking user's `unread_conversation_count`.
...
Since the conversations with the blocked user are invisible, they are excluded
from the blocking user's `unread_conversation_count`.
2019-10-26 02:29:18 +03:00
Egor Kislitsyn
b777083f3f
Add `also_known_as` field to Pleroma.User
2019-10-25 19:14:18 +07:00
Egor Kislitsyn
dbee53c2df
Remove unused Pleroma.User.info_fields/0
2019-10-25 16:48:01 +07:00
Egor Kislitsyn
4c1dd55c48
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
2019-10-24 14:55:36 +07:00
Ivan Tashkinov
11cd994425
[ #1304 ] Fixed null::jsonb handling in User.Info migration.
2019-10-23 17:15:48 +03:00
Ivan Tashkinov
7c7f90bc4f
[ #1304 ] Merged `develop`, handled User.Info.invisible.
2019-10-21 11:58:22 +03:00
Ivan Tashkinov
a11a7176d5
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/activity_pub/transmogrifier.ex
2019-10-21 11:05:09 +03:00
Egor Kislitsyn
4ea1a61b00
Merge branch 'develop' into refactor/following-relationships
2019-10-21 14:19:15 +07:00
Ivan Tashkinov
ee04fbc35a
[ #1304 ]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
2019-10-20 22:29:56 +03:00
Ivan Tashkinov
c6fdfbc4f1
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
2019-10-20 20:43:18 +03:00
Ivan Tashkinov
b4cbf0568b
[ #1304 ] Analysis issue fix.
2019-10-20 13:58:27 +03:00
Ivan Tashkinov
e8843974cb
[ #1304 ] Moved remaining fields from User.Info to User.
...
Misc. fixes / improvements.
2019-10-20 13:42:42 +03:00
Ariadne Conill
95871cb462
user: implement User.invisible?/1
2019-10-19 23:21:37 +00:00
Ariadne Conill
d379b48769
kill almost all of the OStatus module
2019-10-18 14:50:09 +00:00
Ariadne Conill
4f82e42e4e
websub: remove entirely
2019-10-18 14:50:09 +00:00
rinpatch
39e996528c
Fix a migration wiping user info of users that don't have any mutes
...
And introduce safe_jsonb_set
2019-10-18 15:22:07 +03:00
Ivan Tashkinov
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
2019-10-16 21:59:21 +03:00
feld
21f0757b0d
Merge branch 'feature/multiple-users-activation-permissions' into 'develop'
...
Ability to toggle activation status, permission group & delete multiple users
Closes admin-fe#39
See merge request pleroma/pleroma!1825
2019-10-16 12:14:47 +00:00
Maxim Filippov
da0e4879bc
DELETE /api/pleroma/admin/users now accepts nicknames array
2019-10-15 17:33:29 +02:00
Egor Kislitsyn
059005ff82
Replace `user.following` with Pleroma.FollowingRelationship
2019-10-11 02:35:32 +07:00
lain
c54ae662dc
Merge remote-tracking branch 'origin/develop' into benchmark-finishing
2019-10-10 14:40:59 +02:00
Maxim Filippov
ad42837244
Ability to toggle activation status and permission group for a group of users
2019-10-09 17:03:54 +03:00
rinpatch
fefbd31c6e
Move local keys out of `user.info`
2019-10-06 16:56:36 +03:00
eugenijm
8249924485
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
2019-10-05 20:12:00 +03:00
kaniini
e07e9cb75e
Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
...
This reverts merge request !1737
2019-10-05 10:00:05 +00:00
kaniini
5c04e81724
Merge branch 'user-info-unread-direct-conversation' into 'develop'
...
Add the `unread_conversation_count` field to the user info
See merge request pleroma/pleroma!1737
2019-10-04 17:33:18 +00:00
rinpatch
8217292085
Fix get_cached_by_nickname_or_id not allowing to get local users by
...
nickname
Closes #1293
2019-10-04 14:44:09 +03:00
eugenijm
06d9df79c5
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
2019-10-04 00:53:23 +03:00
Maksim Pechnikov
3d722dc200
Merge branch 'develop' into tests/mastodon_api_controller.ex
2019-09-26 16:16:30 +03:00
kaniini
48a82c4609
Merge branch 'refactor/user' into 'develop'
...
Simplify updating user's `info`
See merge request pleroma/pleroma!1712
2019-09-26 03:00:38 +00:00
kaniini
3ff57f1fd3
Merge branch 'hex-flake-id' into 'develop'
...
Replace `Pleroma.FlakeId` with `flake_id` hex package
See merge request pleroma/pleroma!1692
2019-09-26 02:51:54 +00:00
Egor Kislitsyn
b5dfe83433
Replace `Pleroma.FlakeId` with `flake_id` hex package
2019-09-25 17:14:31 +07:00
Egor Kislitsyn
1bea67cb5e
Cleanup Pleroma.User
2019-09-24 19:50:09 +07:00
Egor Kislitsyn
209395c7e6
Add User.change_info/2 and User.update_info/2
2019-09-24 19:50:07 +07:00
Egor Kislitsyn
79b25be4e1
Do not return tuple when unneeded
2019-09-24 15:03:20 +07:00
Maksim Pechnikov
d75d0ae134
Merge branch 'develop' into tests/mastodon_api_controller.ex
2019-09-24 08:06:04 +03:00
Maksim Pechnikov
179fa32dd5
Merge branch 'develop' into tests/mastodon_api_controller.ex
2019-09-23 21:41:57 +03:00
Maxim Filippov
6f25668215
Admin API: Add ability to force user's password reset
2019-09-22 16:08:07 +03:00
rinpatch
95a4a19417
Merge branch 'support/tests' into 'develop'
...
add tests for activity_pub/utils.ex
See merge request pleroma/pleroma!1627
2019-09-17 14:47:26 +00:00
kaniini
17142a3720
Merge branch 'feature/delivery-tracking' into 'develop'
...
Track signed fetches of objects and use them for delete federation
See merge request pleroma/pleroma!1661
2019-09-16 07:39:58 +00:00
Maksim Pechnikov
8751809e1e
Merge branch 'develop' into support/tests
2019-09-15 14:22:15 +03:00
Ivan Tashkinov
610236d6be
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
2019-09-15 10:12:24 +03:00
rinpatch
62bbba80f3
Merge branch 'fix/truncate-remote-user-fields' into 'develop'
...
Truncate remote user fields
See merge request pleroma/pleroma!1619
2019-09-14 16:39:42 +00:00
Ivan Tashkinov
6bcedb693c
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
# mix.lock
2019-09-14 16:11:44 +03:00
rinpatch
ba70a8cae6
Merge branch 'develop' into feature/delivery-tracking
2019-09-13 19:42:53 +03:00
lain
53a3ad6043
Merge branch 'cleanup-activity' into 'develop'
...
Cleanup `Pleroma.Activity` and add more tests
See merge request pleroma/pleroma!1623
2019-09-13 14:48:00 +00:00
rinpatch
ce23529d91
Use delivery info when federating deletes
2019-09-13 11:38:17 +03:00
Egor Kislitsyn
25d8216804
Add email change endpoint
2019-09-13 13:09:35 +07:00
Egor Kislitsyn
39dc9b470c
Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils
2019-09-13 12:44:59 +07:00
rinpatch
769fb778d4
Track object/create activity fetches
2019-09-12 21:37:36 +03:00
Maksim Pechnikov
39f99dc6cd
Merge branch 'develop' into support/tests
2019-09-07 22:13:43 +03:00
Maksim Pechnikov
ab2f21e470
tests for mastodon_api_controller.ex
2019-09-06 21:50:00 +03:00
Alex S
b3f6f6a409
generating remote users
2019-09-06 20:14:02 +03:00
Ivan Tashkinov
ca1ba1e272
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# test/web/twitter_api/twitter_api_controller_test.exs
2019-09-06 13:26:05 +03:00
rinpatch
26fe6f70c9
Move checking for restrict_local to User.get_cached_by_id_or_nickname
2019-09-05 15:39:10 +03:00
Sadposter
cb99cfcc65
don't try to truncate non-strings
2019-09-04 15:57:42 +01:00
Sadposter
2975da284b
truncate remote user bio/display name
2019-09-04 15:45:40 +01:00
Maksim Pechnikov
8cbad5500c
add tests for activity_pub/utils.ex
2019-09-04 15:25:12 +03:00
rinpatch
cc1d1ee406
Mastdon API: Add ability to get a remote account by nickname to
...
`/api/v1/accounts/:id`
2019-09-03 19:26:10 +03:00
Ivan Tashkinov
dd017c65a4
[ #1149 ] Refactored Oban workers API (introduced `enqueue/3`).
2019-08-31 21:58:42 +03:00
Ivan Tashkinov
a90ea8ba15
[ #1149 ] Addressed code review comments (code style, jobs pruning etc.).
2019-08-31 19:08:56 +03:00
Ivan Tashkinov
e890ea7e82
[ #1149 ] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# config/config.exs
2019-08-31 14:25:43 +03:00
lain
90986667ce
Merge branch 'admin-create-users' into 'develop'
...
user creation admin api will create multiple users
See merge request pleroma/pleroma!1170
2019-08-24 16:04:19 +00:00
Ivan Tashkinov
256ff09aa8
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/scheduled_activity_worker.ex
# lib/pleroma/web/federator/retry_queue.ex
# lib/pleroma/web/oauth/token/clean_worker.ex
# test/user_test.exs
# test/web/federator_test.exs
2019-08-22 20:59:58 +03:00
lain
ef43016b2c
Merge branch 'feature/custom-fields' into 'develop'
...
Add custom profile fields
See merge request pleroma/pleroma!1488
2019-08-20 12:44:14 +00:00
lain
49ae3191df
Merge branch 'hotfix/user_unfollow' into 'develop'
...
[#1177 ] fixed User.unfollow with synchronization external user
See merge request pleroma/pleroma!1579
2019-08-19 14:36:10 +00:00
Sadposter
94e336d9d5
clear follow requests when blocking a user
2019-08-18 20:30:57 +01:00
Maksim Pechnikov
3315a2a1c3
fixed User.unfollow with synchronization external user
2019-08-16 15:58:42 +03:00
lain
7ab2dbbdb6
Merge branch 'pleroma-conversations' into 'develop'
...
Extended Pleroma Conversations
See merge request pleroma/pleroma!1535
2019-08-16 12:55:33 +00:00
rinpatch
bd5ad0af78
Cache follow state
2019-08-15 00:47:30 +03:00
Ivan Tashkinov
8778c16dac
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-08-14 21:44:50 +03:00
lain
560dbad538
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
2019-08-14 15:30:40 +02:00
Egor Kislitsyn
e457fcc479
Add `:max_remote_account_fields` config option
2019-08-14 14:58:06 +07:00
rinpatch
83a3de8cc4
Merge branch 'length-limit-bio' into 'develop'
...
Add configurable length limits for `User.bio` and `User.name`
See merge request pleroma/pleroma!1515
2019-08-13 22:40:13 +00:00
Ivan Tashkinov
0e1c481a94
[ #1149 ] Added more oban workers. Refactoring.
2019-08-13 20:20:26 +03:00
lain
a2b98f6d58
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
2019-08-08 16:04:20 +02:00
Roman Chvanikov
9d4f34fbcb
Merge branch 'develop' into feature/digest-email
2019-08-02 18:16:04 +03:00
lain
5ff8f07ca9
Merge branch 'feature/hide-follows-remote' into 'develop'
...
Refactor Follows/Followers counter syncronization and set hide_followers/hide_follows for remote users
See merge request pleroma/pleroma!1411
2019-08-02 11:23:07 +00:00
lain
f88560accd
Conversations: Add recipient list to conversation participation.
...
This enables to address the same group of people every time.
2019-08-02 11:55:41 +02:00
Egor Kislitsyn
9ca4506355
Add configurable length limits for `User.bio` and `User.name`
2019-08-01 15:53:37 +07:00
rinpatch
301ea0dc04
Add tests for counters being updated on follow
2019-07-31 21:09:13 +03:00
Maksim
58443d0cd6
tests for TwitterApi/UtilController
2019-07-31 15:14:36 +00:00
rinpatch
f42719506c
Fix credo issues
2019-07-31 14:20:34 +03:00
rinpatch
c88a5d3251
Merge branch 'develop' into feature/hide-follows-remote
2019-07-31 14:12:29 +03:00
Maksim
6a4b8b2681
fixed User.update_and_set_cache for stale user
2019-07-28 20:29:26 +00:00
rinpatch
41e0304757
Merge branch 'develop' into feature/hide-follows-remote
2019-07-25 18:43:30 +03:00
Eugenij
4504135894
Add `domain_blocking` to the relationship API (GET /api/v1/accounts/relationships)
2019-07-24 15:12:27 +00:00
Roman Chvanikov
d2da3d30f3
Merge branch 'develop' into feature/digest-email
2019-07-24 16:37:52 +03:00
Maksim
c49a09ed88
tests for Pleroma.Web.ActivityPub.Publisher
2019-07-23 19:15:48 +00:00
Sadposter
54a161cb7a
move unauth'd user blocks?/2 check
2019-07-23 19:44:47 +01:00
Alexander Strizhakov
b70e659304
Feature/1087 wildcard option for blocks
2019-07-22 14:33:58 +00:00
rinpatch
196cad46f3
Resolve merge conflicts
2019-07-20 22:04:47 +03:00
rinpatch
d4ee76ab63
Apply suggestion to lib/pleroma/user.ex
2019-07-20 18:52:41 +00:00
Roman Chvanikov
8292331b35
Merge branch 'develop' into feature/digest-email
2019-07-20 16:41:58 +03:00
Ivan Tashkinov
d0198fe215
[ #1112 ] Preserving `id` on user insert conflict on order not to violate conversation_partipations_user_id_fkey constraint.
2019-07-20 13:03:34 +03:00
Roman Chvanikov
36049f08ef
Merge develop
2019-07-20 01:03:25 +03:00
Ariadne Conill
62e5ff624e
user: add is_internal_user? helper function
2019-07-17 17:12:42 +00:00
Ariadne Conill
4885473be2
user: refactor get_or_create_instance_user() into get_or_create_service_actor_by_id()
2019-07-17 16:03:05 +00:00
Roman Chvanikov
9bca70b10a
Merge develop
2019-07-16 16:19:19 +03:00
Maksim
c32384c1ea
tests for Pleroma.Signature
2019-07-15 13:01:22 +00:00
Roman Chvanikov
c729883936
Merge branch 'develop' into feature/digest-email
2019-07-14 21:43:30 +03:00
Alexander Strizhakov
e7c39b7ac8
Feature/1072 muting notifications
2019-07-14 13:29:31 +00:00
rinpatch
0c2dcb4c69
Add follow information refetching after following/unfollowing
2019-07-14 01:58:39 +03:00
rinpatch
e8fa477793
Refactor Follows/Followers counter syncronization
...
- Actually sync counters in the database instead of info cache (which got
overriden after user update was finished anyway)
- Add following count field to user info
- Set hide_followers/hide_follows for remote users based on http status
codes for the first collection page
2019-07-13 19:27:49 +03:00
Roman Chvanikov
eae991b06a
merge develop
2019-07-12 18:08:27 +03:00
Alex S
beba7bbc85
removing synchronization worker
2019-07-10 17:42:18 +03:00
Alex S
f8786fa6f2
adding following_address field to user
2019-07-10 17:42:18 +03:00
Sergey Suprunenko
2d2b50ccca
Send and handle "Delete" activity for deleted users
2019-07-10 05:16:08 +00:00
Roman Chvanikov
371d39e160
Merge develop
2019-07-09 21:21:09 +03:00
Alexander Strizhakov
d6b0fce6e9
Fix/1019 correct count remote users
2019-07-09 17:36:35 +00:00
Maksim
6dadf5d6f4
[ #1043 ] fix search accounts.
2019-07-05 04:22:08 +00:00
Roman Chvanikov
657277ffc0
Resolve conflicts
2019-06-29 00:52:50 +03:00
Maksim
a0c4ebb4d7
[ #184 ] small refactoring reset password
2019-06-24 19:01:56 +00:00
Sergey Suprunenko
2c63c67512
Rework user deletion
2019-06-24 18:59:12 +00:00
Alexander Strizhakov
c2ca1f22a2
it is changed in compile time
...
we can't change module attributes and endpoint settings in runtime
2019-06-14 15:45:05 +00:00
Roman Chvanikov
01fe5abad1
Resolve conflicts
2019-06-07 01:20:50 +03:00
kaniini
3f6da9c45a
Merge branch 'bugfix/377-stuck-follow-request' into 'develop'
...
Bugfix/377 stuck follow request
Closes #377
See merge request pleroma/pleroma!1250
2019-06-05 15:52:40 +00:00
kaniini
a511d2f900
Merge branch 'improve-search' into 'develop'
...
[#943 ] Contain search for unauthenticated users
See merge request pleroma/pleroma!1220
2019-06-05 15:51:32 +00:00
lain
076c9ae40e
User: Remove superfluous `maybe_follow`.
2019-06-05 14:24:31 +02:00
lain
024dfdc39c
Typo + Linting.
2019-06-05 12:45:28 +02:00
lain
8b9a0dd4a7
User: Don't error out when following a user that's already followed.
...
This leads to a few situations where it is impossible to follow a user.
2019-06-05 12:06:45 +02:00
Egor Kislitsyn
1cb245c982
Fix formatting
2019-06-05 16:55:17 +07:00
Egor Kislitsyn
5b04f07a1e
Limit search for unauthenticated users to local users only
2019-06-05 16:51:04 +07:00
Mark Felder
6ef145b4fc
Merge branch 'develop' into feature/digest-email
2019-06-03 15:29:53 -05:00
lain
2b664b048e
User: Add function to get AP ids from nicknames.
2019-06-03 18:16:11 +02:00
Sachin Joshi
ad5263c647
Merge remote-tracking branch 'upstream/develop' into admin-create-users
2019-06-01 11:42:37 +05:45
Sachin Joshi
5534d4c676
make bulk user creation from admin works as a transaction
2019-06-01 11:17:53 +05:45
feld
6872c5f88f
Mastodon API search default value for "resolve" is false
...
https://docs.joinmastodon.org/api/rest/accounts/
https://docs.joinmastodon.org/api/rest/search/
2019-05-31 18:46:57 +00:00
Egor Kislitsyn
99f70c7e20
Use Pleroma.Config everywhere
2019-05-30 15:33:58 +07:00
Roman Chvanikov
ce47017c89
Merge develop
2019-05-29 18:18:22 +03:00
William Pitcock
045803346d
move key generation functions into Pleroma.Keys module
2019-05-22 03:58:15 +00:00
Sadposter
daeae8e2e7
Move default mascot configuration to `config/`
2019-05-20 16:12:55 +01:00
lain
249b31ffe5
Fix specs.
2019-05-17 11:49:13 +02:00
Alexander Strizhakov
7ed682213f
Fix/902 random compile failing
2019-05-17 07:25:20 +00:00
Sergey Suprunenko
2c303afc8b
Remove duplicated entries in users' following lists
2019-05-16 20:04:08 +00:00
Alexander Strizhakov
73ae58fdfa
Feature/896 toggling confirmation
2019-05-16 13:23:41 +00:00
Mark Felder
1caa6331ea
Group def perform() together to fix the build
2019-05-14 12:33:03 -05:00
lambda
692919c7d2
Merge branch 'refactor/use-job-queue-everywhere' into 'develop'
...
use job queue everywhere
Closes #862
See merge request pleroma/pleroma!1142
2019-05-14 15:27:34 +00:00
William Pitcock
ac3a3abf6b
clean up follow/block imports a little
2019-05-14 15:07:38 +00:00
Egor Kislitsyn
b92c004ea8
Reuse query from User.restrict_deactivated/1
2019-05-14 18:29:10 +07:00
Egor Kislitsyn
5e2b491276
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-05-14 18:15:56 +07:00
William Pitcock
69a9e0563c
user: migrate follow/blocks import to job queue
2019-05-13 19:36:00 +00:00
William Pitcock
32d4630c9c
user: move initial post fetching to job queue
2019-05-13 19:36:00 +00:00
Alexander Strizhakov
a2be420f94
differences_in_mastoapi_responses.md: fullname & bio are optionnal
...
[ci skip]
2019-05-13 18:35:45 +00:00
Roman Chvanikov
f1f7a11222
Merge develop
2019-05-11 14:45:54 +07:00
Alexander Strizhakov
bfeb33e951
Merge develop
...
Merge conflict in lib/pleroma/activity.ex
2019-05-08 14:34:36 +00:00
Roman Chvanikov
b6b5b16ba4
Merge develop
2019-05-08 17:08:06 +07:00
rinpatch
06947c9147
Remove bookmarks assoc
2019-05-07 19:33:22 +00:00
Egor Kislitsyn
1557b99beb
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-05-07 16:51:11 +07:00
Alexander Strizhakov
ce6ca0fefe
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
2019-05-06 16:45:22 +00:00
Haelwenn (lanodan) Monnier
d70af32127
Pleroma.User: remove emojify on parse_bio
2019-05-03 16:27:50 +02:00
Alex S
f11e7037c2
test fixes
2019-05-01 16:09:53 +07:00
Alex S
bdfa3a6fa8
Merging with develop
...
Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex
2019-05-01 12:29:33 +07:00
Roman Chvanikov
0f0cc2703b
Merge develop
2019-04-30 20:17:52 +07:00
Alex S
229ce6abbc
migration without using old field name
...
removing old field from db, after bookmarks migration
2019-04-25 13:42:10 +07:00
Egor Kislitsyn
c157e27a00
Merge branch 'develop' into feature/disable-account
2019-04-25 13:41:10 +07:00
Alex S
324c9c8ab5
migrate user.bookmarks to separate table
2019-04-25 13:38:24 +07:00
Alex S
73d01857e3
bookmarks in separate table
2019-04-25 13:38:24 +07:00
Egor
b9cdf6d3b9
Use `User.get_cached*` everywhere
2019-04-22 07:20:43 +00:00
Egor Kislitsyn
e8c2f9a73a
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-04-22 13:08:30 +07:00
Roman Chvanikov
64a2c6a041
Digest emails
2019-04-20 19:42:19 +07:00
Roman Chvanikov
bc7862106d
Fix tests
2019-04-19 23:26:41 +07:00
Roman Chvanikov
8add119444
Add User.list_inactive_users_query/1
2019-04-19 22:19:00 +07:00
Roman Chvanikov
2f0203a4a1
Resolve conflicts
2019-04-17 16:59:05 +07:00
Sadposter
e513504e88
Revert "Assert on the success of enqueue before returning"
...
This reverts commit 16d8c8b33b
.
Because it breaks everything
2019-04-14 16:12:54 +01:00
Sadposter
16d8c8b33b
Assert on the success of enqueue before returning
2019-04-14 16:05:26 +01:00
Sadposter
5e45557751
Always return {atom, _} from try_send_confirmation
2019-04-14 16:01:48 +01:00
Sadposter
ec42b639a3
fix pattern match on user registration
...
deliver_async will return a single atom
2019-04-14 15:46:54 +01:00
lambda
184ae60b21
Merge branch 'bugfix/pleroma-email-naming' into 'develop'
...
Make the filename and module name of Pleroma.Emails.* orthogonal
See merge request pleroma/pleroma!1029
2019-04-12 10:41:09 +00:00
Egor Kislitsyn
dd097a406b
add tests
2019-04-12 16:38:32 +07:00
Egor Kislitsyn
46bd5c1d87
fix format
2019-04-11 17:28:12 +07:00
Egor Kislitsyn
db4badc6aa
move user disable into deactivation
2019-04-11 17:22:42 +07:00
Egor Kislitsyn
0f2f7d2cec
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-04-11 15:51:52 +07:00
Sadposter
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions
2019-04-10 10:44:54 +01:00
Haelwenn (lanodan) Monnier
9c1b36856b
s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/
2019-04-10 06:33:20 +02:00
Haelwenn (lanodan) Monnier
1791ee8ec4
s/Pleroma.Mailer/Pleroma.Emails.Mailer/
2019-04-10 06:33:19 +02:00
kaniini
97395e013e
Merge branch 'notification-pleroma-settings' into 'develop'
...
Notification controls
Closes #738
See merge request pleroma/pleroma!988
2019-04-10 02:10:31 +00:00
lambda
0a02ed7a2f
Merge branch 'bugfix/follower_count' into 'develop'
...
update the follower count when a follower is blocked
See merge request pleroma/pleroma!1033
2019-04-09 07:30:38 +00:00
Sachin Joshi
07afb9b537
update the follower count when a follower is blocked
2019-04-09 09:15:45 +05:45
Sadposter
589629cf3e
Used cached user resources in subscriptions
2019-04-08 15:56:14 +01:00
Sadposter
87a01f9ee0
Use Pleroma.Config instead of Application.get_env
2019-04-08 13:04:30 +01:00
Sadposter
13ff312c48
Sever subscription in case of block
2019-04-08 12:46:12 +01:00
Sadposter
9ca91cbb87
Change relationship direction of subscriptions
2019-04-05 17:02:07 +01:00
Sadposter
d56866c824
Add subscribed status to user view
...
Added in pleroma extensions, but can be moved whenever
2019-04-05 15:30:31 +01:00
Sadposter
316fe20d86
Make subscriptions the same direction as blocks
...
That being, user - subscribes to -> users, rather than
user - has subscribers -> users
2019-04-05 15:30:26 +01:00
Sadposter
007762e767
Add notification checks
2019-04-05 15:30:23 +01:00
Sadposter
79910ce5cc
Add API endpoints and user column for subscription
2019-04-05 15:30:18 +01:00
Ivan Tashkinov
45765918c3
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
2019-04-04 23:43:08 +03:00
lambda
ce9284b36f
Merge branch 'remove-user-activities' into 'develop'
...
[#757 ] Add mix task to delete user's activities
See merge request pleroma/pleroma!1008
2019-04-02 12:45:29 +00:00
Ivan Tashkinov
37925cbe78
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# lib/pleroma/web/oauth/oauth_controller.ex
# lib/pleroma/web/router.ex
2019-04-02 14:05:34 +03:00
Egor Kislitsyn
1b3d921921
change `Repo.get(User, id)` => `User.get_by_id(id)`
2019-04-02 17:01:26 +07:00
Egor Kislitsyn
a14742f495
add `user delete_activities` mix task
2019-04-02 16:30:11 +07:00
Egor Kislitsyn
a1869f5272
Merge remote-tracking branch 'pleroma/develop' into remove-user-activities
2019-04-02 15:41:30 +07:00
Ivan Tashkinov
baffdcc480
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
2019-04-01 08:49:32 +03:00
eugenijm
cd90695a34
Add PUT /api/pleroma/notification_settings endpoint
2019-03-28 18:55:16 +03:00
Ivan Tashkinov
20e0f36605
Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
2019-03-27 15:41:40 +03:00
lambda
926bf114b7
Merge branch 'feature/more-user-filters' into 'develop'
...
Add more user filters + move search to its own module
See merge request pleroma/pleroma!982
2019-03-27 11:33:13 +00:00
Maxim Filippov
3cf7539bca
Add more user filters + move search to its own module
2019-03-27 03:51:59 +05:00
lambda
ff3b09f6b3
Merge branch 'fix/ap-icon' into 'develop'
...
Do not federate instance avatar
Closes #759
See merge request pleroma/pleroma!977
2019-03-26 16:12:50 +00:00
lain
10a7a4a868
AP UserView: Refactor banner / avatar display code, add test.
2019-03-26 16:59:28 +01:00
Ivan Tashkinov
263ca3dea2
Mastodon-based auth error messages. Defaulted User#auth_active?/1 to `true`.
2019-03-26 15:09:06 +03:00
Mark Felder
6f090f981b
Attempt to fix incorrect federation of default instance avatars
2019-03-25 18:47:04 -05:00
William Pitcock
332dc1371b
user: use preloads when deleting accounts
2019-03-23 03:06:00 +00:00
rinpatch
3229c7a1d6
Ensure fts is prefered over trigram and use union_all instead of union in user search query
2019-03-22 08:39:49 +03:00
rinpatch
88096c65a5
Move gluing search results from application to database and get mutuals
...
a higher score multiplier
2019-03-21 23:16:32 +03:00
rinpatch
b92a16aa00
Merge branch 'ecto-3-migration' into 'develop'
...
Ecto 3.0.7 (ecto_sql 3.0.5) migration
See merge request pleroma/pleroma!957
2019-03-21 16:24:57 +00:00
rinpatch
9a7b817c9a
Ecto 3.0.5 migration
...
kms
2019-03-20 15:59:54 +03:00
Maxim Filippov
7ac9fff437
Format
2019-03-20 01:40:50 +03:00
Maxim Filippov
ed8a2935f5
Use ILIKE to search users
2019-03-20 01:37:40 +03:00
William Pitcock
67ff8d9311
user: properly cope with actors which do not declare a followers collection
2019-03-19 18:23:06 +00:00
kaniini
43bd7f47db
Merge branch 'feature/order-users-by-nickname-admin-api' into 'develop'
...
Order users by nickname
See merge request pleroma/pleroma!945
2019-03-18 23:08:31 +00:00
Ekaterina Vaartis
a1aacc08a4
Check if the user has indeed not been federated with
...
Just updating the user triggered post fetching too, now it
shouldn't. It only happened in the AP user fetching since that's
what's used to update users
2019-03-18 20:16:31 +03:00
Ivan Tashkinov
8d21859717
[ #923 ] External User registration refactoring, password randomization.
2019-03-18 18:09:53 +03:00
Zachary Dunn
97b35e00b0
Fix with expression always matching
2019-03-18 14:59:52 +00:00
Zachary Dunn
e572786dad
Run
2019-03-18 14:53:30 +00:00
Zachary Dunn
af4338da0c
Use better error message
2019-03-18 14:52:24 +00:00
Ivan Tashkinov
26b6354095
[ #923 ] Support for multiple (external) registrations per user via Registration.
2019-03-18 17:23:38 +03:00
Zachary Dunn
a2e03d4f3c
Initial attempt at updating return type
2019-03-18 13:56:59 +00:00
Ivan Tashkinov
2a96283efb
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# config/config.exs
# lib/pleroma/web/auth/pleroma_authenticator.ex
2019-03-18 10:26:41 +03:00
Maxim Filippov
93291c3d7a
Order users by nickname
2019-03-17 13:23:31 +03:00
Ivan Tashkinov
2739057442
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
2019-03-15 17:11:00 +03:00
Ivan Tashkinov
aacbf0f570
[ #923 ] OAuth: prototype of sign in / sign up with Twitter.
2019-03-15 17:08:03 +03:00
Karen Konou
da53c079db
Refactor to store user ap_id, add tests
2019-03-15 14:20:08 +01:00
Karen Konou
c8f31e0bc2
Implement mastodon's reblog hiding feature
2019-03-15 14:18:21 +01:00
Haelwenn (lanodan) Monnier
c42d34b2ec
[Credo] fix Credo.Check.Readability.MaxLineLength
2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier
8cd3eada7d
[Credo] write large numbers with underscore separation
2019-03-13 04:26:56 +01:00