Commit graph

253 commits

Author SHA1 Message Date
kaniini c9b418e547 Merge branch 'develop' into 'oembed_provider'
# Conflicts:
#   lib/pleroma/activity.ex
2019-01-25 05:00:47 +00:00
href 28d77e373c
Flake Ids for Users and Activities 2019-01-23 11:26:27 +01:00
Ivan Tashkinov 34d59e4008 [#502] Fixed User.active_local_user_query to return users with nil or missing info.deactivated. Adjusted test. 2019-01-22 17:12:53 +03:00
lambda f3045a179e Merge branch 'i1t/pleroma-477_user_search_improvements' into 'develop'
I1t/pleroma 477 user search improvements

See merge request pleroma/pleroma!685
2019-01-20 10:24:05 +00:00
lain 5834b08fe7 Set custom similarity limit. 2019-01-20 10:57:49 +01:00
lain b108aeee08 Make use of the indices.
Indices in postgresql rely on operators, so they won't be used if you use only functions.
2019-01-20 00:31:17 +01:00
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
2019-01-19 07:36:58 +00:00
rinpatch 74346a7035 Fix merge conflict 2019-01-18 18:31:25 +03:00
Ivan Tashkinov 79e44042bc [#477] User trigram index adjustment. 2019-01-18 10:57:42 +03:00
Ivan Tashkinov ed8f55ab8e [#477] User: FTS and trigram search results mixing (to handle misspelled requests). 2019-01-18 10:35:45 +03:00
Ivan Tashkinov 65bb9b2fba [#491] Made full nicknames be preserved in user links text only in Bio. 2019-01-18 09:30:16 +03:00
Ivan Tashkinov 954dc4a4ad [#502] Fixed user_count in /api/v1/instance to include only active local users. 2019-01-17 19:16:02 +03:00
rinpatch 388ceb6a7d Fix the issue with get_by_nickname never being called 2019-01-17 19:00:08 +03:00
rinpatch 5fa508cc2b Remove @providers and call Pleroma.config on runtime 2019-01-16 18:04:41 +03:00
rinpatch bb43f4cee9 Remove useless with in opengraph.ex 2019-01-16 18:02:46 +03:00
rinpatch 9a90b5d91a oof 2019-01-16 18:01:17 +03:00
rinpatch 8a9f089812 remove id cast 2019-01-16 17:58:11 +03:00
rinpatch 5a08dee379 cache ap_id in id instead of caching user two times 2019-01-16 17:44:08 +03:00
lain 943324b661 MastoAPI: Don't break on missing users. 2019-01-16 15:13:09 +01:00
Ivan Tashkinov 0bc6d30f7d [#477] Minor refactoring (user search query). 2019-01-16 10:44:32 +03:00
Ivan Tashkinov 5b8f9ff8c1 [#477] User search tests. Normalized search rank in User.search. 2019-01-15 13:05:25 +03:00
rinpatch 6f23139864 please don't bully me for this 2019-01-15 12:02:55 +03:00
rinpatch 4587a5712a cringe 2019-01-15 11:59:05 +03:00
rinpatch ce15e0659e Fix some edge cases [nervous laughter] 2019-01-15 11:56:35 +03:00
Ivan Tashkinov dc45ec62c2 [#477] User search improvements: tsquery search with field weights, friends & followers boosting. 2019-01-14 20:04:45 +03:00
rinpatch 5f9786288d Prefer ids to usernames 2019-01-14 09:52:52 +03:00
rinpatch e4dc3f71ae Resolve merge conflict 2019-01-13 13:38:28 +03:00
kaniini 11d08c6226 Merge branch 'twapi-follower-pagination' into 'develop'
Twapi follower pagination

See merge request pleroma/pleroma!648
2019-01-10 18:03:32 +00:00
lain 7ac152ed38 TwitterAPI: Add follower/following pagination. 2019-01-09 18:14:32 +01:00
lain 65fc2df7cc Use follow_all in autofollow. 2019-01-09 11:38:45 +01:00
lain 26938d65fd Add User mass following function. 2019-01-09 11:35:23 +01:00
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
2019-01-09 07:09:39 +00:00
William Pitcock f15183178c user: fix auth_active?/1 for remote users 2019-01-09 06:45:17 +00:00
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.
2019-01-09 06:44:50 +00:00
William Pitcock 74f48beec3 user: remove entirely redundant remote_or_auth_active?/1.
auth_active?/1 can check remote users and return true directly.
2019-01-09 06:36:50 +00:00
William Pitcock 2af67353c5 user: harden auth_active?/1, superuser?/1, visible_for?/1 2019-01-09 06:21:21 +00:00
William Pitcock 595a970493 user: use pattern matching to determine if user is local or remote instead of the previous hairy logic 2019-01-09 06:02:18 +00:00
lain 0fae04c4e3 Add a setting for users to autofollow on sign up. 2019-01-08 09:57:53 +01:00
lain 7382adf407 Make TwAPI UserView more resilient to issues.
Will work for missing users and badly migrated users.
2019-01-07 12:41:31 +01:00
cascode 5b23dfa1c5 handle null 2019-01-04 01:35:26 -08:00
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.
2019-01-02 22:47:12 +00:00
William Pitcock 980b5288ed update copyright years to 2019 2018-12-31 15:41:47 +00:00
Rin Toshaka dec23500d8 Resolve merge conflict 2018-12-30 21:00:40 +01:00
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 2018-12-29 17:45:50 +01:00
kaniini dd8f2196f6 Merge branch '483_blocks_import_export' into 'develop'
[#483] Blocked users list import & export

Closes #483

See merge request pleroma/pleroma!603
2018-12-29 11:34:51 +00:00
Ivan Tashkinov 7bd49a3222 [#483] User.get_by_nickname/1: ensured case-insensitive matching for local FQN. Added tests. 2018-12-29 12:26:23 +03:00
Ivan Tashkinov b3574dccbb [#483] User.get_by_nickname/1: allowed retrieving user by fully-qualified local nickname
(<nick>@<our_instance_host>).
2018-12-29 12:15:46 +03:00
Ivan Tashkinov 67b4297f4d [#483] Refactored blocks and follows import, added tests. 2018-12-29 12:02:37 +03:00
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
2018-12-29 03:03:18 +00:00
Ivan Tashkinov 6e9a15b181 [#483] Blocked users export for TwitterAPI. 2018-12-28 21:08:07 +03:00