Commit graph

3862 commits

Author SHA1 Message Date
Roger Braun 7da978f3f5 Linkify fixes. 2017-11-07 12:06:37 +01:00
Roger Braun 6dfa62800a Revert "Longer timeouts for user fetching."
Breaks too many tests.

This reverts commit 7de3a65214.
2017-11-07 09:41:35 +01:00
Roger Braun 7de3a65214 Longer timeouts for user fetching. 2017-11-07 09:11:19 +01:00
eal f85566324e Allow profile fetching for authenticated users only. 2017-11-07 00:33:44 +02:00
lambda ed1eb5deea Merge branch 'fix-tootdon-oauth' into 'develop'
Fix tootdon logins.

See merge request pleroma/pleroma!6
2017-11-06 20:27:31 +00:00
eal d1c126ac98 Update README. 2017-11-06 22:22:36 +02:00
eal b0e27b21dd Fix tootdon logins. 2017-11-06 21:51:31 +02:00
Roger Braun 7252f6b054 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop 2017-11-05 12:12:19 +01:00
Roger Braun 046bee34d3 Fix bug when no posts are in the db. 2017-11-05 12:11:59 +01:00
lambda fa1f11e8e9 Merge branch 'feature/blocks' into 'develop'
Feature/blocks

See merge request pleroma/pleroma!5
2017-11-03 08:56:44 +00:00
Roger Braun c6b9b777da MastoAPI: Add list of blocked users. 2017-11-03 08:51:17 +01:00
Roger Braun 5bf92e50be MastoAPI: Add blocking. 2017-11-03 08:38:05 +01:00
Roger Braun 33beb51da4 MastoAPI: Add blocking to AccountView. 2017-11-03 08:23:31 +01:00
Roger Braun 8a1a7191fd MastoAPI: Fix mentions always being for an anonymous user. 2017-11-03 08:13:39 +01:00
Roger Braun 9b63647aff MastoApi: Add blocking to fetches. 2017-11-02 22:53:34 +01:00
Roger Braun d89a7a0b34 TwitterAPI: Add blocking to fetches. 2017-11-02 22:50:42 +01:00
Roger Braun 867ac1e4f5 Handle nil cases. 2017-11-02 22:47:48 +01:00
Roger Braun 8ef58a266b Don't return blocked users' activities in contexts. 2017-11-02 22:44:36 +01:00
Roger Braun a47727adde Don't return activities from blocked users. 2017-11-02 22:37:26 +01:00
Roger Braun 632da6c927 Don't create notifications if the user is blocked. 2017-11-02 22:08:22 +01:00
Roger Braun 6a5f087174 Add blocks to User. 2017-11-02 21:57:37 +01:00
Roger Braun 345ad870f7 Clean up user_test.exs. 2017-11-02 21:57:21 +01:00
Roger Braun 9554436d61 update gitlab ci 2017-11-02 17:52:53 +01:00
Roger Braun 5794558077 Read variable for testing db. 2017-11-02 17:45:33 +01:00
lambda 32e1e52bd8 Update .gitlab-ci.yml 2017-11-02 16:33:05 +00:00
lambda 520cc0c80f Update .gitlab-ci.yml 2017-11-02 16:31:03 +00:00
lambda 41425fd64a Update .gitlab-ci.yml 2017-11-02 16:28:38 +00:00
lambda 201fbd972e Add gitlab-ci.yml 2017-11-02 16:26:13 +00:00
Roger Braun 9be286a900 Handle empty terms / tags. 2017-11-01 09:33:29 +01:00
Roger Braun 6f05367325 Federate out content warnings. 2017-10-31 19:51:58 +01:00
Roger Braun e014cc6ed8 Allow using cws in mastodon api. 2017-10-31 19:44:36 +01:00
Roger Braun c877583a4f Update README. 2017-10-31 18:56:04 +01:00
Roger Braun f3083ab18e Update README. 2017-10-31 18:51:51 +01:00
Roger Braun 0c871e5c6e Fix specs. 2017-10-31 17:57:26 +01:00
Roger Braun 44295dd49a MastoAPI: Include CW. 2017-10-31 17:49:47 +01:00
Roger Braun 04217f52c9 TwitterAPI: Display cws. 2017-10-31 17:43:37 +01:00
Roger Braun 4cbf17dac6 Save cws in the activitypub data. 2017-10-31 17:30:46 +01:00
Roger Braun 4dcbb64f19 Avoid potentially slow count queries for user note count.
For a variety of reasons, posgresql won't use the available actor,
type index to do an index only scan. We now just increase the user
note count, which will lead to slightly wrong counts in some cases,
but it's better than the potentially very slow count query.
2017-10-31 16:37:11 +01:00
Roger Braun 3037814fde Only search through last 100_000 activities for fetches.
This is purely a performance enhancement
2017-10-31 15:26:37 +01:00
Roger Braun 997c01be53 Merge branch 'feature/mastodon-api-fixes' into develop 2017-10-31 14:53:14 +01:00
Roger Braun 968a546d4a MastoAPI: Return id as string instead of integer. 2017-10-31 14:51:41 +01:00
Roger Braun f6372b245a Small readme update. 2017-10-31 14:46:53 +01:00
Roger Braun 2f39bb6b43 Typo. 2017-10-31 14:46:01 +01:00
Roger Braun ce7f9f527c MastoAPI: Always return an url for statuses.
External url if available, id if not.
2017-10-31 14:40:12 +01:00
Roger Braun f23edd2d6b Merge branch 'feld/pleroma-feld-mastodon-usersearch' into develop 2017-10-30 19:25:32 +01:00
Roger Braun 502cb38cd6 Move user search to User module. 2017-10-30 19:23:16 +01:00
Mark Felder efe12e1a73 Fix /api/v1/accounts/search by splitting account search into its own function 2017-10-30 03:37:07 +00:00
lambda 9168497f8f Merge branch 'missing-mastodon-follow-endpoint' into 'develop'
Fix return type of /api/v1/follows

See merge request pleroma/pleroma!3
2017-10-29 18:16:09 +00:00
eal 71f66bd458 Fix follow test semantics. 2017-10-29 14:25:11 +02:00
eal 2ffc6da207 Clean style.
Use 'follow' instead of 'follows' and correct indentation.
2017-10-29 00:30:10 +03:00