Ekaterina Vaartis
|
465b547c90
|
Remove unused "muted" parameter, use piping for mute/block fns
|
6 years ago |
|
Ekaterina Vaartis
|
092b1b1453
|
Do not unfollow muted users
|
6 years ago |
|
Ekaterina Vaartis
|
f41f017bbc
|
Implement muting, add it to the mastodon API
|
6 years ago |
|
lambda
|
1dd718e83c
|
Merge branch 'set-cache-on-user-tag-update' into 'develop'
Update user cache when user tags are updated
See merge request pleroma/pleroma!840
|
6 years ago |
|
lambda
|
f53dc5ee08
|
Merge branch 'fix/ap_id-unique_constraint' into 'develop'
mark ap_id unique_constraint
See merge request pleroma/pleroma!842
|
6 years ago |
|
rinpatch
|
109b01a631
|
mark ap_id unique_constraint
|
6 years ago |
|
eugenijm
|
fc35481445
|
Update user cache when user tags are updated
|
6 years ago |
|
kaniini
|
cd019a5927
|
Merge branch 'follow-request-count' into 'develop'
Follow request count
See merge request pleroma/pleroma!817
|
6 years ago |
|
lain
|
d812a347ca
|
Add optional welcome message.
|
6 years ago |
|
eugenijm
|
ecdf0657ba
|
Add logic for keeping follow_request_count up-to-date on the `follow`,
`approve_friend_request`, and `deny_friend_request` actions.
Add follow_request_count to the user view.
|
6 years ago |
|
William Pitcock
|
da44cdd381
|
user: search: use get_or_fetch() instead of get_or_fetch_by_nickname()
get_or_fetch() handles the nickname verses URI differences transparently.
|
6 years ago |
|
lain
|
88a4de24f9
|
User.follow_all: Respect blocks in both directions.
|
6 years ago |
|
kaniini
|
6c8d15da11
|
Merge branch 'fix/credo-issues' into 'develop'
Fix credo issues
See merge request pleroma/pleroma!786
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
6a6a5b3251
|
de-group alias/es
|
6 years ago |
|
lain
|
563f04e81b
|
Do autofollow first.
|
6 years ago |
|
lain
|
bbd0049fae
|
Respect blocks in mass follow.
|
6 years ago |
|
href
|
308b35ebe2
|
User.follow_all: ensure its stays unique
|
6 years ago |
|
Haelwenn
|
00d4333373
|
Merge branch 'features/glitch-soc-frontend' into 'develop'
Features/glitch soc frontend
See merge request pleroma/pleroma!192
|
6 years ago |
|
lain
|
47ec690c54
|
Use race-condition free mass follow.
|
6 years ago |
|
lain
|
935e65e261
|
Use race-condition free following method.
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
cda1470e02
|
[MastoAPI][GlitchAPI] Add bookmarks
|
6 years ago |
|
kaniini
|
c9b418e547
|
Merge branch 'develop' into 'oembed_provider'
# Conflicts:
# lib/pleroma/activity.ex
|
6 years ago |
|
href
|
28d77e373c
|
Flake Ids for Users and Activities
|
6 years ago |
|
Ivan Tashkinov
|
34d59e4008
|
[#502] Fixed User.active_local_user_query to return users with nil or missing `info.deactivated`. Adjusted test.
|
6 years ago |
|
lambda
|
f3045a179e
|
Merge branch 'i1t/pleroma-477_user_search_improvements' into 'develop'
I1t/pleroma 477 user search improvements
See merge request pleroma/pleroma!685
|
6 years ago |
|
lain
|
5834b08fe7
|
Set custom similarity limit.
|
6 years ago |
|
lain
|
b108aeee08
|
Make use of the indices.
Indices in postgresql rely on operators, so they won't be used if you use only functions.
|
6 years ago |
|
kaniini
|
651ce1c97b
|
Merge branch '491_full_mentions_in_user_bio' into 'develop'
[#491] Made user bio preserve full nicknames (nick@host)
Closes #491
See merge request pleroma/pleroma!676
|
6 years ago |
|
rinpatch
|
74346a7035
|
Fix merge conflict
|
6 years ago |
|
Ivan Tashkinov
|
79e44042bc
|
[#477] User trigram index adjustment.
|
6 years ago |
|
Ivan Tashkinov
|
ed8f55ab8e
|
[#477] User: FTS and trigram search results mixing (to handle misspelled requests).
|
6 years ago |
|
Ivan Tashkinov
|
65bb9b2fba
|
[#491] Made full nicknames be preserved in user links text only in Bio.
|
6 years ago |
|
Ivan Tashkinov
|
954dc4a4ad
|
[#502] Fixed `user_count` in `/api/v1/instance` to include only active local users.
|
6 years ago |
|
rinpatch
|
388ceb6a7d
|
Fix the issue with get_by_nickname never being called
|
6 years ago |
|
rinpatch
|
5fa508cc2b
|
Remove @providers and call Pleroma.config on runtime
|
6 years ago |
|
rinpatch
|
bb43f4cee9
|
Remove useless with in opengraph.ex
|
6 years ago |
|
rinpatch
|
9a90b5d91a
|
oof
|
6 years ago |
|
rinpatch
|
8a9f089812
|
remove id cast
|
6 years ago |
|
rinpatch
|
5a08dee379
|
cache ap_id in id instead of caching user two times
|
6 years ago |
|
lain
|
943324b661
|
MastoAPI: Don't break on missing users.
|
6 years ago |
|
Ivan Tashkinov
|
0bc6d30f7d
|
[#477] Minor refactoring (user search query).
|
6 years ago |
|
Ivan Tashkinov
|
5b8f9ff8c1
|
[#477] User search tests. Normalized search rank in User.search.
|
6 years ago |
|
rinpatch
|
6f23139864
|
please don't bully me for this
|
6 years ago |
|
rinpatch
|
4587a5712a
|
cringe
|
6 years ago |
|
rinpatch
|
ce15e0659e
|
Fix some edge cases [nervous laughter]
|
6 years ago |
|
Ivan Tashkinov
|
dc45ec62c2
|
[#477] User search improvements: tsquery search with field weights, friends & followers boosting.
|
6 years ago |
|
rinpatch
|
5f9786288d
|
Prefer ids to usernames
|
6 years ago |
|
rinpatch
|
e4dc3f71ae
|
Resolve merge conflict
|
6 years ago |
|
kaniini
|
11d08c6226
|
Merge branch 'twapi-follower-pagination' into 'develop'
Twapi follower pagination
See merge request pleroma/pleroma!648
|
6 years ago |
|
lain
|
7ac152ed38
|
TwitterAPI: Add follower/following pagination.
|
6 years ago |
|
lain
|
65fc2df7cc
|
Use follow_all in autofollow.
|
6 years ago |
|
lain
|
26938d65fd
|
Add User mass following function.
|
6 years ago |
|
kaniini
|
5c5c8508c2
|
Merge branch 'hotfix/media-proxy-uri' into 'develop'
user: fix local vs remote determination in remote_or_auth_active?/1
See merge request pleroma/pleroma!640
|
6 years ago |
|
William Pitcock
|
f15183178c
|
user: fix auth_active?/1 for remote users
|
6 years ago |
|
William Pitcock
|
0015d43e13
|
user: factor out illogical User.Info.superuser?/1.
any actual callee will be dealing with a User struct to begin with, so
just check the child struct inside User.superuser?/1 with pattern matching.
|
6 years ago |
|
William Pitcock
|
74f48beec3
|
user: remove entirely redundant remote_or_auth_active?/1.
auth_active?/1 can check remote users and return true directly.
|
6 years ago |
|
William Pitcock
|
2af67353c5
|
user: harden auth_active?/1, superuser?/1, visible_for?/1
|
6 years ago |
|
William Pitcock
|
595a970493
|
user: use pattern matching to determine if user is local or remote instead of the previous hairy logic
|
6 years ago |
|
lain
|
0fae04c4e3
|
Add a setting for users to autofollow on sign up.
|
6 years ago |
|
lain
|
7382adf407
|
Make TwAPI UserView more resilient to issues.
Will work for missing users and badly migrated users.
|
6 years ago |
|
cascode
|
5b23dfa1c5
|
handle null
|
6 years ago |
|
William Pitcock
|
eb1a18d22f
|
user: check that the follow request actually has an active account associated with it
because of user refetch, accounts can stop existing (get_from_ap_id() can fail), accordingly
filter the follow requests for these failures.
|
6 years ago |
|
William Pitcock
|
980b5288ed
|
update copyright years to 2019
|
6 years ago |
|
Rin Toshaka
|
dec23500d8
|
Resolve merge conflict
|
6 years ago |
|
Rin Toshaka
|
19f9889fbe
|
I am not sure what's going on anymore so I'll just commit and reset all the other files to HEAD
|
6 years ago |
|
kaniini
|
dd8f2196f6
|
Merge branch '483_blocks_import_export' into 'develop'
[#483] Blocked users list import & export
Closes #483
See merge request pleroma/pleroma!603
|
6 years ago |
|
Ivan Tashkinov
|
7bd49a3222
|
[#483] User.get_by_nickname/1: ensured case-insensitive matching for local FQN. Added tests.
|
6 years ago |
|
Ivan Tashkinov
|
b3574dccbb
|
[#483] User.get_by_nickname/1: allowed retrieving user by fully-qualified local nickname
(<nick>@<our_instance_host>).
|
6 years ago |
|
Ivan Tashkinov
|
67b4297f4d
|
[#483] Refactored blocks and follows import, added tests.
|
6 years ago |
|
kaniini
|
49cf5f9ce0
|
Merge branch '471_invalid_accounts_rendering' into 'develop'
[#471] Prevented rendering of inactive local accounts
Closes #471
See merge request pleroma/pleroma!599
|
6 years ago |
|
Ivan Tashkinov
|
6e9a15b181
|
[#483] Blocked users export for TwitterAPI.
|
6 years ago |
|
Ivan Tashkinov
|
0d1788ce44
|
[#471] Factored out User.visible_for?/2.
|
6 years ago |
|
Ivan Tashkinov
|
e6aeb1d4a5
|
[#471] Prevented rendering of inactive local accounts.
|
6 years ago |
|
lain
|
91724d160a
|
Reserve a few user names
These are all names that are used for domain.com/:route routes or projected to be.
|
6 years ago |
|
William Pitcock
|
2791ce9a1f
|
add license boilerplate to pleroma core
|
6 years ago |
|
Ivan Tashkinov
|
7cab7de9ff
|
[#114] Allowed unconfirmed users to authenticate if :account_activation_required is disabled prior to confirmation.
Ensured that no confirmation emails are sent if :account_activation_required is not true. Adjusted tests.
|
6 years ago |
|
Ivan Tashkinov
|
f69cbf4755
|
[#114] Added :user_id component to email confirmation path to improve the security.
Added tests for `confirm_email` action.
|
6 years ago |
|
Ivan Tashkinov
|
501ce34d7f
|
[#114] Stylistic adjustments.
|
6 years ago |
|
Ivan Tashkinov
|
279096228c
|
[#114] Made MastodonAPI and TwitterAPI user show actions return 404 for auth-inactive users
unless requested by admin or moderator.
|
6 years ago |
|
Ivan Tashkinov
|
a532ad5d72
|
[#114] User.register/1 tweak.
|
6 years ago |
|
Ivan Tashkinov
|
968d7490b6
|
[#114] User.Info: renamed `confirmation_update` to `confirmation_changeset`.
|
6 years ago |
|
Ivan Tashkinov
|
59fc5d15df
|
[#114] User.Info: renamed `confirmation_update` to `confirmation_change`.
|
6 years ago |
|
Ivan Tashkinov
|
b096e30cff
|
[#114] Added email confirmation resend action. Added tests
for registration, authentication, email confirmation, confirmation resending.
Made admin methods create confirmed users.
|
6 years ago |
|
Ivan Tashkinov
|
b86057cc7f
|
[#114] Refactored User.register_changeset to init confirmation data.
Introduced User.register/1 to encapsulate User record creation and post-registration actions.
|
6 years ago |
|
Ivan Tashkinov
|
1de0aa2f10
|
[#114] Account confirmation email, registration as unconfirmed (config-based), auth prevention for unconfirmed.
|
6 years ago |
|
Ivan Tashkinov
|
a05cb10a95
|
[#114] Email confirmation route, action, node setting, User.Info fields.
|
6 years ago |
|
raeno
|
a300336459
|
Merge branch 'develop' into oembed_provider
|
6 years ago |
|
lain
|
e4763cd459
|
Fix tagging problems for existing instances.
|
6 years ago |
|
raeno
|
46486595ff
|
Handle "users/:id" links as well. Fix comments in MR.
|
6 years ago |
|
href
|
7214d57463
|
Extended nicknames: allow dashes.
|
6 years ago |
|
href
|
7d9ddbe689
|
Allow underscores in usernames.
Fixes #429.
|
6 years ago |
|
Maksim Pechnikov
|
89b3729afa
|
fix warnings
|
6 years ago |
|
lain
|
d6bf06ab4f
|
Fix warnings.
|
6 years ago |
|
lambda
|
0863ec2737
|
Merge branch 'fix_empty_bio_crash' into 'develop'
Fixes #415. Do not crash during registration when hasn't filled bio field
Closes #415
See merge request pleroma/pleroma!529
|
6 years ago |
|
raeno
|
9ba4a1c5fe
|
Fixes #415. Properly handle nil and empty string by User.parse_bio
|
6 years ago |
|
Maksim Pechnikov
|
074fa790ba
|
fix compile warnings
|
6 years ago |
|
lambda
|
94d8f1ab30
|
Merge branch '394_user_tags' into 'develop'
[#394] User tags
Closes #394
See merge request pleroma/pleroma!508
|
6 years ago |
|
Ivan Tashkinov
|
1cea97df64
|
[#394] Refactoring of User.tag and User.untag (removed User.tag_or_untag etc.)
|
6 years ago |
|
Ivan Tashkinov
|
6ed5044c4e
|
[#394] Refactoring (using Ecto.Multi; "untag" route change).
|
6 years ago |
|
Ivan Tashkinov
|
7bcb6a183a
|
[#394] Refactoring.
|
6 years ago |
