Commit Graph

4795 Commits

Author SHA1 Message Date
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
eal
c56d28f96c Fix return type of /api/v1/follows 2017-10-29 00:07:38 +03:00
lambda
353b66e432 Merge branch 'missing-mastodon-follow-endpoint' into 'develop'
Add missing mastodon follow endpoint.

See merge request pleroma/pleroma!2
2017-10-28 14:25:34 +00:00
eal
8e94936553 Add tests. 2017-10-28 17:09:32 +03:00
eal
11d2287476 Return error message on errors 2017-10-28 17:09:32 +03:00
eal
813d2eaaf0 Add mastodon API endpoint for follow 2017-10-28 17:09:32 +03:00
Roger Braun
ab2d4503e7 Update frontend. 2017-10-26 13:30:36 +02:00
Roger Braun
5293516730 Use more efficient query to fetch likes. 2017-10-24 14:39:01 +02:00
Roger Braun
9af560083f Use more efficient user note count update query. 2017-10-24 14:16:17 +02:00
Roger Braun
29c261e75b Drop superflous index. 2017-10-24 11:07:21 +02:00
Roger Braun
ec546baee9 Use different index for object fetching. 2017-10-24 10:39:23 +02:00
Roger Braun
261ec82451 Return nil for nil object requests. 2017-10-24 08:39:24 +02:00
Roger Braun
b35ff8f755 Use index in basic activity query. 2017-10-23 18:36:53 +02:00
Roger Braun
9f417fd5e9 Speed up deletion and related queries. 2017-10-23 18:30:09 +02:00
Roger Braun
5912dd0f5d Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop 2017-10-23 16:28:32 +02:00
Roger Braun
64bc38e009 MastoAPI: Add emoji output. 2017-10-23 16:27:51 +02:00
lambadalambda
d0d50f8a6b Merge branch 'develop' into 'develop'
Add an API endpoint for emoji.

See merge request lambadalambda/pleroma!28
2017-10-20 10:35:03 -04:00
eal
fe7804e42d Add an API endpoint for emoji. 2017-10-19 22:51:56 +03:00
Roger Braun
38f3908c14 Revert "Simplify query."
This reverts commit a17b261379.
2017-10-19 17:56:27 +02:00