Ivan Tashkinov
3d2989278c
[ #1892 ] Excluded bot actors (applications, services) from search results.
2020-06-30 21:26:39 +03:00
Mark Felder
69848d5c97
Rename notification "privacy_option" setting
2020-06-26 12:45:46 -05:00
Mark Felder
fd5e797379
Simplify notification filtering settings further
2020-06-26 11:24:28 -05:00
Mark Felder
433c01b370
Merge branch 'develop' into refactor/notification_settings
2020-06-25 14:26:21 -05:00
rinpatch
165a4b2a69
Do not include activities of invisible users unless explicitly requested
...
Closes #1833
2020-06-02 13:34:12 +03:00
Mark Felder
9eea800026
Refactor notification settings
2020-05-28 10:16:09 -05:00
lain
be322541c8
User.Query: Remove superfluous distinct
2020-05-19 14:36:34 +02:00
lain
a985bd57b4
User.Query: Speed up recipients query.
2020-05-19 14:11:32 +02:00
Egor Kislitsyn
7803a85d2c
Add OpenAPI spec for StatusController
2020-05-13 00:25:21 +04:00
Alexander Strizhakov
ecf37b46d2
pagination fix for service users filters
2020-05-01 14:31:24 +03:00
Alexander
6e625a427c
reply filtering
2020-04-24 15:43:49 +03:00
Ivan Tashkinov
be9d18461a
FollowingRelationship storage & performance optimizations (state turned ecto_enum
-driven integer, reorganized indices etc.).
2020-03-28 18:49:03 +03:00
Mark Felder
05da5f5cca
Update Copyrights
2020-03-03 16:44:49 -06: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
Egor Kislitsyn
22018adae6
Fix Dialyzer warnings
2020-02-25 18:34:56 +04:00
Maksim Pechnikov
95e6a2acd9
Merge branch 'develop' into issue/1342
2019-12-08 21:25:26 +03:00
Maksim Pechnikov
04a8ffbe84
added privacy option to push notifications
2019-11-28 22:13:11 +03:00
Maksim Pechnikov
a52da55eb9
added User.NotificationSetting struct
2019-11-28 22:08:30 +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
Ivan Tashkinov
aad6576130
[ #1335 ] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.
2019-11-18 20:38:56 +03: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
62bc0657e7
excluded invisible users from search results
2019-11-05 08:55:41 +03:00
lain
4e53520917
User Search: Remove superfluous setweight and random test.
...
The test tested for a behavior that isn't actually enforced anymore.
2019-11-04 16:57:41 +01:00
kPherox
363e76d4da
Fix duplicate recipients
2019-10-30 15:40:25 +09:00
Egor Kislitsyn
4c1dd55c48
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
2019-10-24 14:55:36 +07: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
835ad52378
remove Salmon module
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
rinpatch
0a5175ecbb
Order fts results by trigram
2019-10-16 13:49:33 +03:00
rinpatch
c10ce113d4
User search: Remove trigram and refactor the module
...
- 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-16 12:52:47 +03:00
Egor Kislitsyn
059005ff82
Replace user.following
with Pleroma.FollowingRelationship
2019-10-11 02:35:32 +07: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
eugenijm
06d9df79c5
Mastodon API: Add pleroma.unread_conversation_count
to the Account entity
2019-10-04 00:53:23 +03:00
Maxim Filippov
e7836adf21
Merge branch 'develop' into feature/moderation-log-filters
2019-09-26 19:01:54 +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
5fb72170a7
Revert "add _discoverable_ keyword into ActivityPub @context"
...
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
2019-09-26 02:57:41 +00:00
Egor Kislitsyn
209395c7e6
Add User.change_info/2 and User.update_info/2
2019-09-24 19:50:07 +07:00
Maxim Filippov
d72d4757a8
Format
2019-09-22 23:13:48 +03:00
Maxim Filippov
6f25668215
Admin API: Add ability to force user's password reset
2019-09-22 16:08:07 +03:00
rinpatch
b0ec82d24a
Merge branch 'chores/bump-copyright-year' into 'develop'
...
Bump copyright years of files changed in 2019
See merge request pleroma/pleroma!1698
2019-09-18 21:57:49 +00: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
eugenijm
450bf7a63c
Mastodon API: Add a setting to hide follow/follower count from the user view (hide_follows_count
and hide_followers_count
)
2019-09-17 14:45:47 +03:00
Maxim Filippov
df15ed13d1
Merge branch 'develop' into feature/moderation-log-filters
2019-09-16 19:44:06 +03:00
Sadposter
d0f07e55d2
use atom key for fields
2019-09-02 12:31:23 +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
Maxim Filippov
5e4fde1d3d
Filter logs by date
2019-08-27 20:48:16 +03:00
kPherox
3549cd9754
Change to use attachment only when fields do not exist
2019-08-25 01:28:38 +09:00
Egor Kislitsyn
672fcbc7b7
Limit custom fields for old remote users
2019-08-14 14:58:06 +07:00
Egor Kislitsyn
e457fcc479
Add :max_remote_account_fields
config option
2019-08-14 14:58:06 +07:00
Egor Kislitsyn
f7bbf99caa
Use info.fields instead of source_data for remote users
2019-08-14 14:52:54 +07:00
Egor Kislitsyn
2c35d4b0b0
Add configurable account field name length limit
2019-08-14 14:52:54 +07:00
Egor Kislitsyn
db3c05f6b4
Add configurable account field value length limit
2019-08-14 14:52:54 +07:00
Egor Kislitsyn
a22f540fc4
Add custom fields to TwitterAPI.UserView
2019-08-14 14:52:54 +07:00
Egor Kislitsyn
e0ac5c7a66
Add custom profile fields
2019-08-14 14:52:54 +07:00
lain
29807ef6a5
Merge branch 'feature/digest-email' into 'develop'
...
Feature/digest email
See merge request pleroma/pleroma!1078
2019-08-08 14:38:33 +00:00
Sergey Suprunenko
040347b248
Remove spaces from the domain search
2019-08-03 18:13:20 +00:00
Roman Chvanikov
9d4f34fbcb
Merge branch 'develop' into feature/digest-email
2019-08-02 18:16:04 +03:00
rinpatch
196cad46f3
Resolve merge conflicts
2019-07-20 22:04:47 +03:00
Roman Chvanikov
ae4fc58589
Remove flavour from userinfo
2019-07-20 01:24:01 +03: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
e5b850a991
Refactor fetching follow information to a separate function
2019-07-13 23:56:10 +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
Eugenij
4198c3ac39
Extend Pleroma.Pagination to support offset-based pagination, use async/await to execute status and account search in parallel
2019-07-11 13:55:31 +00:00
kaniini
e4e3fd7e55
Merge branch 'fix/1019-refactor' into 'develop'
...
Fix/1019 refactor
See merge request pleroma/pleroma!1397
2019-07-11 13:01:11 +00:00
Alexander Strizhakov
a237c6a2d4
support for idna domains
2019-07-10 15:23:25 +00:00
Alex S
beba7bbc85
removing synchronization worker
2019-07-10 17:42:18 +03:00
93a0eeab16
Add license/copyright to all project files
2019-07-10 05:13:23 +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
Alexander Strizhakov
23d4781e73
change for local user search
2019-07-09 08:52:49 +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
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
lain
cb2bcee842
User Search: Boost friends more strongly.
2019-06-06 16:18:27 +02:00
Egor
f82382de22
[ #943 ] Make the unauthenticated users limitation optional
2019-06-06 12:17:49 +00:00
Egor Kislitsyn
5b04f07a1e
Limit search for unauthenticated users to local users only
2019-06-05 16:51:04 +07:00
Roman Chvanikov
b1b1a270e8
Fix conflict
2019-06-05 02:45:21 +03:00
Maksim Pechnikov
4f2e359687
Merge branch 'develop' into issue/941
2019-06-04 09:49:08 +03:00
kaniini
9d2563a3de
Merge branch 'generic-fe-settings' into 'develop'
...
Generic settings store for frontend user settings
See merge request pleroma/pleroma!1221
2019-06-04 05:43:43 +00:00
Mark Felder
6ef145b4fc
Merge branch 'develop' into feature/digest-email
2019-06-03 15:29:53 -05:00
Maksim Pechnikov
080e1aa70e
add option skip_thread_containment
2019-06-03 16:13:37 +03:00
kaniini
5402d04e3c
Merge branch 'feature/notification-control-part-2' into 'develop'
...
notification controls, part 2
See merge request pleroma/pleroma!1204
2019-06-02 08:25:37 +00:00
Haelwenn (lanodan) Monnier
5d3ece2861
Remove now useless flavours switching
2019-06-01 01:44:10 +02:00
lain
7861974ab2
MastodonAPI: Add extension to set and get pleroma_settings_store.
2019-05-31 14:50:18 +02:00
lain
eb2963bc43
User: Add settings store to Info, AccountView
...
This is to provide a generic frontend settings storage mechanism for all kinds
of frontends.
2019-05-31 14:27:15 +02:00
Roman Chvanikov
ce47017c89
Merge develop
2019-05-29 18:18:22 +03:00
William Pitcock
750ede5764
notification: remove local/remote match rules (too complicated)
2019-05-26 00:05:47 +00:00
William Pitcock
e7e2e7a1a6
user info: allow formdata for notification settings like every other API
2019-05-25 05:54:02 +00:00
William Pitcock
4030837d91
notification: add non_follows/non_followers notification control settings
2019-05-25 05:19:47 +00:00
Sadposter
daeae8e2e7
Move default mascot configuration to config/
2019-05-20 16:12:55 +01:00