aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/user
AgeCommit message (Collapse)Author
2020-06-08Merge branch 'recipients-query-speedup' into 'develop'rinpatch
Greatly speed up recipients query See merge request pleroma/pleroma!2558
2020-05-01Merge branch 'following-relationships-optimizations' into 'develop'rinpatch
FollowingRelationship storage & performance optimizations See merge request pleroma/pleroma!2332
2020-03-03Update CopyrightsMark Felder
2020-03-02Bump copyright years of files changed after 2020-01-07Haelwenn (lanodan) Monnier
Done via the following command: git diff fcd5dd259a1700a045be902b43391b0d1bd58a5b --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
2020-02-25Fix Dialyzer warningsEgor Kislitsyn
2019-12-08Merge branch 'develop' into issue/1342Maksim Pechnikov
2019-11-28added privacy option to push notificationsMaksim Pechnikov
2019-11-28added User.NotificationSetting structMaksim Pechnikov
2019-11-21Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations # Conflicts: # lib/pleroma/user/search.ex # test/user_test.exs
2019-11-18[#1335] Refactored UserMute and UserBlock into UserRelationship, introduced ↵Ivan Tashkinov
EctoEnum.
2019-11-11[#1335] Applied code review suggestions.Ivan Tashkinov
2019-11-10[#1335] User: refactored :blocks field into :blocked_users relation.Ivan Tashkinov
Introduced UserBlock.
2019-11-05excluded invisible users from search resultsMaksim Pechnikov
2019-11-04User Search: Remove superfluous setweight and random test.lain
The test tested for a behavior that isn't actually enforced anymore.
2019-10-30Fix duplicate recipientskPherox
2019-10-24Merge remote-tracking branch 'upstream/develop' into ↵Egor Kislitsyn
refactor/following-relationships
2019-10-21Merge branch 'develop' into refactor/following-relationshipsEgor Kislitsyn
2019-10-20Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
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[#1304] Moved remaining fields from User.Info to User.Ivan Tashkinov
Misc. fixes / improvements.
2019-10-18remove Salmon moduleAriadne Conill
2019-10-16[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.Ivan Tashkinov
2019-10-16Order fts results by trigramrinpatch
2019-10-16User search: Remove trigram and refactor the modulerinpatch
- Remove trigram as it tends to rank garbage results highly, resulting in it prioritized above fts, which gives actually decent results. ACKed by kaniini and lain on irc. - Remove a test for handling misspelled requests, since we no longer have trigram - Remove a test for searching users with `nil` display names, because it is unrealistic, we don't accept usernames that are not >1 char strings - Make rank boosting for followers/followees sane again, previous values resulted in garbage matches getting on top just because the users are followers/followees
2019-10-11Replace `user.following` with Pleroma.FollowingRelationshipEgor Kislitsyn
2019-10-05Mastodon API: Add `pleroma.unread_conversation_count` to the Account entityeugenijm
2019-10-05Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"kaniini
This reverts merge request !1737
2019-10-04Mastodon API: Add `pleroma.unread_conversation_count` to the Account entityeugenijm
2019-09-26Merge branch 'develop' into feature/moderation-log-filtersMaxim Filippov
2019-09-26Merge branch 'refactor/user' into 'develop'kaniini
Simplify updating user's `info` See merge request pleroma/pleroma!1712
2019-09-26Revert "add _discoverable_ keyword into ActivityPub @context"Hakaba Hitoyo
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
2019-09-24Add User.change_info/2 and User.update_info/2Egor Kislitsyn
2019-09-22FormatMaxim Filippov
2019-09-22Admin API: Add ability to force user's password resetMaxim Filippov
2019-09-18Merge branch 'chores/bump-copyright-year' into 'develop'rinpatch
Bump copyright years of files changed in 2019 See merge request pleroma/pleroma!1698
2019-09-18Bump copyright years of files changed in 2019Haelwenn (lanodan) Monnier
Done via the following command: git diff 1e6c102bfcfe0e4835a48f2483f2376f9bf86a20 --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
2019-09-17Mastodon API: Add a setting to hide follow/follower count from the user view ↵eugenijm
(`hide_follows_count` and `hide_followers_count`)
2019-09-16Merge branch 'develop' into feature/moderation-log-filtersMaxim Filippov
2019-09-02use atom key for fieldsSadposter
2019-09-02mix formatSadposter
2019-09-02truncate fields for remote users insteadSadposter
2019-08-27Filter logs by dateMaxim Filippov
2019-08-25Change to use attachment only when fields do not existkPherox
2019-08-14Limit custom fields for old remote usersEgor Kislitsyn
2019-08-14Add `:max_remote_account_fields` config optionEgor Kislitsyn
2019-08-14Use info.fields instead of source_data for remote usersEgor Kislitsyn
2019-08-14Add configurable account field name length limitEgor Kislitsyn
2019-08-14Add configurable account field value length limitEgor Kislitsyn
2019-08-14Add custom fields to TwitterAPI.UserViewEgor Kislitsyn
2019-08-14Add custom profile fieldsEgor Kislitsyn
2019-08-08Merge branch 'feature/digest-email' into 'develop'lain
Feature/digest email See merge request pleroma/pleroma!1078