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 |
|
|
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
|
1636cc5b7e
|
Removed users.info and remaining usages.
|
2019-11-23 14:06:19 +03: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
|
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 |
|
|
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 |
|
|
lain
|
8521553ad9
|
User: Don't let deactivated users authenticate.
|
2019-11-11 12:37:38 +01:00 |
|
|
Ivan Tashkinov
|
3db988250b
|
[#1335] User: refactored :blocks field into :blocked_users relation.
Introduced UserBlock.
|
2019-11-10 16:30:21 +03:00 |
|
|
lain
|
1bd1f62af5
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
|
2019-11-05 15:21:00 +01:00 |
|
|
Maksim Pechnikov
|
4b7c11e3f9
|
excluded invisible actors from gets /api/v1/accounts/:id
|
2019-11-04 20:44:24 +03:00 |
|
|
kPherox
|
d1ae51b02a
|
Update test for get_recipients_from_activity
|
2019-10-30 20:14:16 +09:00 |
|
|
Egor Kislitsyn
|
4c1dd55c48
|
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
|
2019-10-24 14:55:36 +07: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
|
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
|
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
|
48059c03c9
|
fix up some tests
|
2019-10-18 14:50:09 +00:00 |
|
|
Ariadne Conill
|
4f82e42e4e
|
websub: remove entirely
|
2019-10-18 14:50:09 +00: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 |
|
|
lain
|
6e4f52f8a2
|
Introduce new ingestion pipeline structure, implement internal Likes with it.
|
2019-10-16 16:16:39 +02:00 |
|
|
Egor Kislitsyn
|
1d46944fbd
|
Do not add follower_address to following for non local users
|
2019-10-14 13:50:43 +07:00 |
|
|
Egor Kislitsyn
|
059005ff82
|
Replace user.following with Pleroma.FollowingRelationship
|
2019-10-11 02:35:32 +07:00 |
|
|
Sergey Suprunenko
|
4b3f77a99f
|
Extract RSS Feed functionality from OStatus
|
2019-10-07 12:20:41 +00:00 |
|
|
rinpatch
|
fefbd31c6e
|
Move local keys out of user.info
|
2019-10-06 16:56:36 +03: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 |
|
|
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 |
|
|
kaniini
|
29dd8ab9c0
|
Merge branch 'feature/force-password-reset' into 'develop'
Admin API: Add ability to require password reset
See merge request pleroma/pleroma!1705
|
2019-09-23 22:42:34 +00:00 |
|
|
Maxim Filippov
|
6f25668215
|
Admin API: Add ability to force user's password reset
|
2019-09-22 16:08:07 +03:00 |
|
|
Egor Kislitsyn
|
95c948110c
|
Add rel="ugc" to hashtags and mentions
|
2019-09-19 14:56:10 +07:00 |
|
|
Haelwenn (lanodan) Monnier
|
447514dfa2
|
Bump copyright years of files changed in 2019
Done via the following command:
git diff 1e6c102bfc --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
|
2019-09-18 23:21:11 +02: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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
Sadposter
|
2975da284b
|
truncate remote user bio/display name
|
2019-09-04 15:45:40 +01:00 |
|
|
Sadposter
|
e73685834c
|
add mandatory fields for user update
|
2019-09-02 12:35:55 +01:00 |
|
|
Sadposter
|
05c935c396
|
mix format
|
2019-09-02 12:15:40 +01:00 |
|
|
Sadposter
|
35ef470d00
|
truncate fields for remote users instead
|
2019-09-02 12:15:21 +01: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 |
|
|
rinpatch
|
90c2dae9a4
|
Remove most of Pleroma.Web.TwitterAPI.TwitterAPI
|
2019-08-31 10:20:34 +03:00 |
|
|
Haelwenn (lanodan) Monnier
|
f3b1266273
|
user_test.exs: fix rel=me tests
|
2019-08-25 08:48:38 +02:00 |
|
|
Ivan Tashkinov
|
7101ba1a21
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
|
2019-08-22 21:01:28 +03: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 |
|
|
Maksim Pechnikov
|
85bd8a4e31
|
fixed clear config after test
|
2019-08-21 21:24:35 +03:00 |
|
|
lain
|
74f7f308f8
|
Merge branch 'fix/admin-api-user-deletion' into 'develop'
Fix deactivated user deletion
See merge request pleroma/pleroma!1546
|
2019-08-20 19:34:47 +00:00 |
|
|
Maksim
|
a320358703
|
added test helpers to clear config after tests
|
2019-08-19 15:34:29 +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
|
58c1391c4d
|
use commonAPI in tests
|
2019-08-18 22:54:40 +01: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 |
|
|
Maxim Filippov
|
ec969eec51
|
Merge branch 'develop' into 'fix/admin-api-user-deletion'
# Conflicts:
# CHANGELOG.md
|
2019-08-14 22:45:32 +00:00 |
|
|
Maxim Filippov
|
2b94ae3b39
|
Do not check if actor is active when deleting a user
|
2019-08-15 01:35:29 +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 |
|
|
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 |
|
|
Maxim Filippov
|
dfae61c25c
|
Fix deactivated user deletion
|
2019-08-09 23:05:28 +03:00 |
|
|
Ivan Tashkinov
|
267262491e
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
|
2019-08-09 20:09:56 +03:00 |
|
|
Ivan Tashkinov
|
b7fad8d395
|
[#1149] Oban jobs implementation for :federator_incoming and :federator_outgoing queues.
|
2019-08-09 20:08:01 +03:00 |
|
|
Roman Chvanikov
|
9d4f34fbcb
|
Merge branch 'develop' into feature/digest-email
|
2019-08-02 18:16:04 +03:00 |
|
|
Ivan Tashkinov
|
23d279e03e
|
[#1149] Replaced RetryQueue with oban-based retries.
|
2019-08-01 17:28:00 +03: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
|
6a4b8b2681
|
fixed User.update_and_set_cache for stale user
|
2019-07-28 20:29:26 +00:00 |
|
|
Roman Chvanikov
|
d2da3d30f3
|
Merge branch 'develop' into feature/digest-email
|
2019-07-24 16:37:52 +03:00 |
|
|
Alexander Strizhakov
|
b70e659304
|
Feature/1087 wildcard option for blocks
|
2019-07-22 14:33:58 +00: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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
Sergey Suprunenko
|
2c63c67512
|
Rework user deletion
|
2019-06-24 18:59:12 +00:00 |
|
|
Maksim
|
ee4ed87fb4
|
[#948] /api/v1/account_search added optional parameters (limit, offset, following)
|
2019-06-14 11:39:57 +00:00 |
|
|
Egor Kislitsyn
|
6f29865d43
|
Add option to restrict all users to local content
|
2019-06-11 21:25:53 +07:00 |
|
|
Roman Chvanikov
|
01fe5abad1
|
Resolve conflicts
|
2019-06-07 01:20:50 +03:00 |
|
|
Egor
|
f82382de22
|
[#943] Make the unauthenticated users limitation optional
|
2019-06-06 12:17:49 +00: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 |
|
|
lain
|
076c9ae40e
|
User: Remove superfluous maybe_follow.
|
2019-06-05 14:24:31 +02:00 |
|
|
Egor Kislitsyn
|
5b04f07a1e
|
Limit search for unauthenticated users to local users only
|
2019-06-05 16:51:04 +07:00 |
|
|
lain
|
2b664b048e
|
User: Add function to get AP ids from nicknames.
|
2019-06-03 18:16:11 +02: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 |
|