akkoma
6 years agoMerge branch 'blocks-in-user-view' into 'develop'
lambda [Wed, 8 Nov 2017 13:39:02 +0000 (13:39 +0000)]
Merge branch 'blocks-in-user-view' into 'develop'

TwitterAPI user view: add blocks.

See merge request pleroma/pleroma!10

6 years agoTwitterAPI user view: add blocks.
eal [Wed, 8 Nov 2017 11:02:00 +0000 (13:02 +0200)]
TwitterAPI user view: add blocks.

6 years agoMerge branch 'twitter-api-blocks' into 'develop'
lambda [Wed, 8 Nov 2017 10:35:23 +0000 (10:35 +0000)]
Merge branch 'twitter-api-blocks' into 'develop'

TwitterAPI: Add blocks.

See merge request pleroma/pleroma!9

6 years agoTwitterAPI: Add blocks.
eal [Tue, 7 Nov 2017 22:04:53 +0000 (00:04 +0200)]
TwitterAPI: Add blocks.

6 years agoMerge branch 'mastodon-emoji-endpoint' into 'develop'
lambda [Tue, 7 Nov 2017 20:01:15 +0000 (20:01 +0000)]
Merge branch 'mastodon-emoji-endpoint' into 'develop'

Add mastodon API endpoint for custom emoji.

See merge request pleroma/pleroma!8

6 years agoAdd mastodon API endpoint for custom emoji.
eal [Tue, 7 Nov 2017 19:28:31 +0000 (21:28 +0200)]
Add mastodon API endpoint for custom emoji.

6 years agoMerge branch 'authenticated-profile-fetching' into 'develop'
lambda [Tue, 7 Nov 2017 18:58:22 +0000 (18:58 +0000)]
Merge branch 'authenticated-profile-fetching' into 'develop'

Allow profile fetching for authenticated users only.

Closes #54

See merge request pleroma/pleroma!7

6 years agoUpdate frontend.
Roger Braun [Tue, 7 Nov 2017 17:33:06 +0000 (18:33 +0100)]
Update frontend.

6 years agoUpdate fronted.
Roger Braun [Tue, 7 Nov 2017 17:27:08 +0000 (18:27 +0100)]
Update fronted.

6 years agoAllow self-rt.
Roger Braun [Tue, 7 Nov 2017 15:45:27 +0000 (16:45 +0100)]
Allow self-rt.

6 years agoLinkify fixes.
Roger Braun [Tue, 7 Nov 2017 11:06:37 +0000 (12:06 +0100)]
Linkify fixes.

6 years agoRevert "Longer timeouts for user fetching."
Roger Braun [Tue, 7 Nov 2017 08:41:35 +0000 (09:41 +0100)]
Revert "Longer timeouts for user fetching."

Breaks too many tests.

This reverts commit 7de3a652147d9b7da9cf3fd82d8a8438df93bae8.

6 years agoLonger timeouts for user fetching.
Roger Braun [Tue, 7 Nov 2017 08:11:19 +0000 (09:11 +0100)]
Longer timeouts for user fetching.

6 years agoAllow profile fetching for authenticated users only.
eal [Mon, 6 Nov 2017 22:33:44 +0000 (00:33 +0200)]
Allow profile fetching for authenticated users only.

6 years agoMerge branch 'fix-tootdon-oauth' into 'develop'
lambda [Mon, 6 Nov 2017 20:27:31 +0000 (20:27 +0000)]
Merge branch 'fix-tootdon-oauth' into 'develop'

Fix tootdon logins.

See merge request pleroma/pleroma!6

6 years agoUpdate README.
eal [Mon, 6 Nov 2017 20:22:36 +0000 (22:22 +0200)]
Update README.

6 years agoFix tootdon logins.
eal [Mon, 6 Nov 2017 19:51:31 +0000 (21:51 +0200)]
Fix tootdon logins.

6 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
Roger Braun [Sun, 5 Nov 2017 11:12:19 +0000 (12:12 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

6 years agoFix bug when no posts are in the db.
Roger Braun [Sun, 5 Nov 2017 11:05:25 +0000 (12:05 +0100)]
Fix bug when no posts are in the db.

6 years agoMerge branch 'feature/blocks' into 'develop'
lambda [Fri, 3 Nov 2017 08:56:44 +0000 (08:56 +0000)]
Merge branch 'feature/blocks' into 'develop'

Feature/blocks

See merge request pleroma/pleroma!5

6 years agoMastoAPI: Add list of blocked users.
Roger Braun [Fri, 3 Nov 2017 07:51:17 +0000 (08:51 +0100)]
MastoAPI: Add list of blocked users.

6 years agoMastoAPI: Add blocking.
Roger Braun [Fri, 3 Nov 2017 07:38:05 +0000 (08:38 +0100)]
MastoAPI: Add blocking.

6 years agoMastoAPI: Add blocking to AccountView.
Roger Braun [Fri, 3 Nov 2017 07:23:31 +0000 (08:23 +0100)]
MastoAPI: Add blocking to AccountView.

6 years agoMastoAPI: Fix mentions always being for an anonymous user.
Roger Braun [Fri, 3 Nov 2017 07:13:39 +0000 (08:13 +0100)]
MastoAPI: Fix mentions always being for an anonymous user.

6 years agoMastoApi: Add blocking to fetches.
Roger Braun [Thu, 2 Nov 2017 21:53:34 +0000 (22:53 +0100)]
MastoApi: Add blocking to fetches.

6 years agoTwitterAPI: Add blocking to fetches.
Roger Braun [Thu, 2 Nov 2017 21:50:42 +0000 (22:50 +0100)]
TwitterAPI: Add blocking to fetches.

6 years agoHandle nil cases.
Roger Braun [Thu, 2 Nov 2017 21:47:11 +0000 (22:47 +0100)]
Handle nil cases.

6 years agoDon't return blocked users' activities in contexts.
Roger Braun [Thu, 2 Nov 2017 21:44:36 +0000 (22:44 +0100)]
Don't return blocked users' activities in contexts.

6 years agoDon't return activities from blocked users.
Roger Braun [Thu, 2 Nov 2017 21:37:26 +0000 (22:37 +0100)]
Don't return activities from blocked users.

6 years agoDon't create notifications if the user is blocked.
Roger Braun [Thu, 2 Nov 2017 21:08:22 +0000 (22:08 +0100)]
Don't create notifications if the user is blocked.

6 years agoAdd blocks to User.
Roger Braun [Thu, 2 Nov 2017 20:57:37 +0000 (21:57 +0100)]
Add blocks to User.

6 years agoClean up user_test.exs.
Roger Braun [Thu, 2 Nov 2017 20:57:21 +0000 (21:57 +0100)]
Clean up user_test.exs.

6 years agoupdate gitlab ci
Roger Braun [Thu, 2 Nov 2017 16:52:53 +0000 (17:52 +0100)]
update gitlab ci

6 years agoRead variable for testing db.
Roger Braun [Thu, 2 Nov 2017 16:45:33 +0000 (17:45 +0100)]
Read variable for testing db.

6 years agoUpdate .gitlab-ci.yml
lambda [Thu, 2 Nov 2017 16:33:05 +0000 (16:33 +0000)]
Update .gitlab-ci.yml

6 years agoUpdate .gitlab-ci.yml
lambda [Thu, 2 Nov 2017 16:31:03 +0000 (16:31 +0000)]
Update .gitlab-ci.yml

6 years agoUpdate .gitlab-ci.yml
lambda [Thu, 2 Nov 2017 16:28:38 +0000 (16:28 +0000)]
Update .gitlab-ci.yml

6 years agoAdd gitlab-ci.yml
lambda [Thu, 2 Nov 2017 16:26:13 +0000 (16:26 +0000)]
Add gitlab-ci.yml

6 years agoHandle empty terms / tags.
Roger Braun [Wed, 1 Nov 2017 08:33:29 +0000 (09:33 +0100)]
Handle empty terms / tags.

6 years agoFederate out content warnings.
Roger Braun [Tue, 31 Oct 2017 18:51:58 +0000 (19:51 +0100)]
Federate out content warnings.

6 years agoAllow using cws in mastodon api.
Roger Braun [Tue, 31 Oct 2017 18:44:36 +0000 (19:44 +0100)]
Allow using cws in mastodon api.

6 years agoUpdate README.
Roger Braun [Tue, 31 Oct 2017 17:56:04 +0000 (18:56 +0100)]
Update README.

6 years agoUpdate README.
Roger Braun [Tue, 31 Oct 2017 17:51:51 +0000 (18:51 +0100)]
Update README.

6 years agoFix specs.
Roger Braun [Tue, 31 Oct 2017 16:57:26 +0000 (17:57 +0100)]
Fix specs.

6 years agoMastoAPI: Include CW.
Roger Braun [Tue, 31 Oct 2017 16:49:47 +0000 (17:49 +0100)]
MastoAPI: Include CW.

6 years agoTwitterAPI: Display cws.
Roger Braun [Tue, 31 Oct 2017 16:43:37 +0000 (17:43 +0100)]
TwitterAPI: Display cws.

6 years agoSave cws in the activitypub data.
Roger Braun [Tue, 31 Oct 2017 16:30:46 +0000 (17:30 +0100)]
Save cws in the activitypub data.

6 years agoAvoid potentially slow count queries for user note count.
Roger Braun [Tue, 31 Oct 2017 15:37:11 +0000 (16:37 +0100)]
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.

6 years agoOnly search through last 100_000 activities for fetches.
Roger Braun [Tue, 31 Oct 2017 14:26:37 +0000 (15:26 +0100)]
Only search through last 100_000 activities for fetches.

This is purely a performance enhancement

6 years agoMerge branch 'feature/mastodon-api-fixes' into develop
Roger Braun [Tue, 31 Oct 2017 13:53:14 +0000 (14:53 +0100)]
Merge branch 'feature/mastodon-api-fixes' into develop

6 years agoMastoAPI: Return id as string instead of integer.
Roger Braun [Tue, 31 Oct 2017 13:51:41 +0000 (14:51 +0100)]
MastoAPI: Return id as string instead of integer.

6 years agoSmall readme update.
Roger Braun [Tue, 31 Oct 2017 13:46:53 +0000 (14:46 +0100)]
Small readme update.

6 years agoTypo.
Roger Braun [Tue, 31 Oct 2017 13:46:01 +0000 (14:46 +0100)]
Typo.

6 years agoMastoAPI: Always return an url for statuses.
Roger Braun [Tue, 31 Oct 2017 13:40:12 +0000 (14:40 +0100)]
MastoAPI: Always return an url for statuses.

External url if available, id if not.

6 years agoMerge branch 'feld/pleroma-feld-mastodon-usersearch' into develop
Roger Braun [Mon, 30 Oct 2017 18:25:32 +0000 (19:25 +0100)]
Merge branch 'feld/pleroma-feld-mastodon-usersearch' into develop

6 years agoMove user search to User module.
Roger Braun [Mon, 30 Oct 2017 18:23:16 +0000 (19:23 +0100)]
Move user search to User module.

6 years agoFix /api/v1/accounts/search by splitting account search into its own function
Mark Felder [Mon, 30 Oct 2017 03:37:07 +0000 (03:37 +0000)]
Fix /api/v1/accounts/search by splitting account search into its own function

6 years agoMerge branch 'missing-mastodon-follow-endpoint' into 'develop'
lambda [Sun, 29 Oct 2017 18:16:09 +0000 (18:16 +0000)]
Merge branch 'missing-mastodon-follow-endpoint' into 'develop'

Fix return type of /api/v1/follows

See merge request pleroma/pleroma!3

6 years agoFix follow test semantics.
eal [Sun, 29 Oct 2017 12:25:11 +0000 (14:25 +0200)]
Fix follow test semantics.

6 years agoClean style.
eal [Sat, 28 Oct 2017 21:30:10 +0000 (00:30 +0300)]
Clean style.

Use 'follow' instead of 'follows' and correct indentation.

6 years agoFix return type of /api/v1/follows
eal [Sat, 28 Oct 2017 21:07:38 +0000 (00:07 +0300)]
Fix return type of /api/v1/follows

6 years agoMerge branch 'missing-mastodon-follow-endpoint' into 'develop'
lambda [Sat, 28 Oct 2017 14:25:34 +0000 (14:25 +0000)]
Merge branch 'missing-mastodon-follow-endpoint' into 'develop'

Add missing mastodon follow endpoint.

See merge request pleroma/pleroma!2

6 years agoAdd tests.
eal [Fri, 27 Oct 2017 10:55:36 +0000 (13:55 +0300)]
Add tests.

6 years agoReturn error message on errors
eal [Wed, 25 Oct 2017 18:25:37 +0000 (21:25 +0300)]
Return error message on errors

6 years agoAdd mastodon API endpoint for follow
eal [Wed, 25 Oct 2017 18:02:42 +0000 (21:02 +0300)]
Add mastodon API endpoint for follow

6 years agoUpdate frontend.
Roger Braun [Thu, 26 Oct 2017 11:27:56 +0000 (13:27 +0200)]
Update frontend.

6 years agoUse more efficient query to fetch likes.
Roger Braun [Tue, 24 Oct 2017 12:39:01 +0000 (14:39 +0200)]
Use more efficient query to fetch likes.

6 years agoUse more efficient user note count update query.
Roger Braun [Tue, 24 Oct 2017 12:16:17 +0000 (14:16 +0200)]
Use more efficient user note count update query.

6 years agoDrop superflous index.
Roger Braun [Tue, 24 Oct 2017 09:07:21 +0000 (11:07 +0200)]
Drop superflous index.

6 years agoUse different index for object fetching.
Roger Braun [Tue, 24 Oct 2017 08:39:23 +0000 (10:39 +0200)]
Use different index for object fetching.

6 years agoReturn nil for nil object requests.
Roger Braun [Tue, 24 Oct 2017 06:39:24 +0000 (08:39 +0200)]
Return nil for nil object requests.

6 years agoUse index in basic activity query.
Roger Braun [Mon, 23 Oct 2017 16:36:53 +0000 (18:36 +0200)]
Use index in basic activity query.

6 years agoSpeed up deletion and related queries.
Roger Braun [Mon, 23 Oct 2017 16:30:09 +0000 (18:30 +0200)]
Speed up deletion and related queries.

6 years agoMerge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
Roger Braun [Mon, 23 Oct 2017 14:28:32 +0000 (16:28 +0200)]
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop

6 years agoMastoAPI: Add emoji output.
Roger Braun [Mon, 23 Oct 2017 14:27:51 +0000 (16:27 +0200)]
MastoAPI: Add emoji output.

6 years agoMerge branch 'develop' into 'develop'
lambadalambda [Fri, 20 Oct 2017 14:35:03 +0000 (10:35 -0400)]
Merge branch 'develop' into 'develop'

Add an API endpoint for emoji.

See merge request lambadalambda/pleroma!28

6 years agoAdd an API endpoint for emoji.
eal [Thu, 19 Oct 2017 19:51:56 +0000 (22:51 +0300)]
Add an API endpoint for emoji.

6 years agoRevert "Simplify query."
Roger Braun [Thu, 19 Oct 2017 15:56:27 +0000 (17:56 +0200)]
Revert "Simplify query."

This reverts commit a17b2613795b24162e953dd457b411dddc0c902e.

6 years agoAdd password reset.
Roger Braun [Thu, 19 Oct 2017 15:37:24 +0000 (17:37 +0200)]
Add password reset.

6 years agoSimplify query.
Roger Braun [Wed, 18 Oct 2017 09:56:47 +0000 (11:56 +0200)]
Simplify query.

6 years agoDon't reject already accepted subscriptions.
Roger Braun [Thu, 5 Oct 2017 10:53:16 +0000 (12:53 +0200)]
Don't reject already accepted subscriptions.

6 years agoRemove tag links for now, they break some regular links.
Roger Braun [Sun, 17 Sep 2017 21:03:03 +0000 (23:03 +0200)]
Remove tag links for now, they break some regular links.

6 years agoAdd tag links.
Roger Braun [Sun, 17 Sep 2017 13:21:44 +0000 (15:21 +0200)]
Add tag links.

6 years agoUpdate frontend.
Roger Braun [Sun, 17 Sep 2017 12:38:04 +0000 (14:38 +0200)]
Update frontend.

6 years agoTwitterAPI: Return proper error.
Roger Braun [Sun, 17 Sep 2017 12:37:00 +0000 (14:37 +0200)]
TwitterAPI: Return proper error.

Fixes #32.

6 years agoMastoAPI: Fix reblog view.
Roger Braun [Sun, 17 Sep 2017 12:25:34 +0000 (14:25 +0200)]
MastoAPI: Fix reblog view.

6 years agoMastoAPI: Return reblogs, too.
Roger Braun [Sun, 17 Sep 2017 12:20:54 +0000 (14:20 +0200)]
MastoAPI: Return reblogs, too.

6 years agoAdd tag index.
Roger Braun [Sun, 17 Sep 2017 12:05:53 +0000 (14:05 +0200)]
Add tag index.

This still isn't optimal, but at least it isn't super slow.

6 years agoMastoAPI: Add repeats to statusview.
Roger Braun [Sun, 17 Sep 2017 11:54:14 +0000 (13:54 +0200)]
MastoAPI: Add repeats to statusview.

6 years agoPrefer post-specific emoji.
Roger Braun [Sun, 17 Sep 2017 11:24:52 +0000 (13:24 +0200)]
Prefer post-specific emoji.

6 years agoMastodonAPI: Add user favorites endpoint.
Roger Braun [Sun, 17 Sep 2017 11:09:49 +0000 (13:09 +0200)]
MastodonAPI: Add user favorites endpoint.

6 years agoTwitterAPI: Use correct endpoint for tag timeline.
Roger Braun [Sun, 17 Sep 2017 11:03:46 +0000 (13:03 +0200)]
TwitterAPI: Use correct endpoint for tag timeline.

6 years agoFix typo.
Roger Braun [Sun, 17 Sep 2017 10:08:50 +0000 (12:08 +0200)]
Fix typo.

6 years agoTwitterAPI: Add tag timeline.
Roger Braun [Sun, 17 Sep 2017 09:45:16 +0000 (11:45 +0200)]
TwitterAPI: Add tag timeline.

6 years agoUse inserted_at as sort in search.
Roger Braun [Sun, 17 Sep 2017 09:32:24 +0000 (11:32 +0200)]
Use inserted_at as sort in search.

6 years agoUse desc id to sort instead of desc inserted_at
Roger Braun [Sun, 17 Sep 2017 09:16:08 +0000 (11:16 +0200)]
Use desc id to sort instead of desc inserted_at

Should mean the same and is indexed.

6 years agoAdd missing fixtures.
Roger Braun [Sat, 16 Sep 2017 22:33:58 +0000 (00:33 +0200)]
Add missing fixtures.

6 years agoReadme update.
Roger Braun [Sat, 16 Sep 2017 22:06:09 +0000 (00:06 +0200)]
Readme update.

6 years agoFixup old migrations.
Roger Braun [Sat, 16 Sep 2017 22:01:49 +0000 (00:01 +0200)]
Fixup old migrations.

6 years agoMake emoji configurable in files.
Roger Braun [Sat, 16 Sep 2017 14:49:46 +0000 (16:49 +0200)]
Make emoji configurable in files.