akkoma
6 years agoMerge branch 'twitterapi-show-user' into 'develop'
lambda [Tue, 14 Nov 2017 16:44:25 +0000 (16:44 +0000)]
Merge branch 'twitterapi-show-user' into 'develop'

TwitterAPI: Add /users/show.

See merge request pleroma/pleroma!19

6 years agoTwitterAPI: Add /users/show.
eal [Tue, 14 Nov 2017 15:34:48 +0000 (17:34 +0200)]
TwitterAPI: Add /users/show.

6 years agoMerge branch 'api-links' into 'develop'
lambda [Tue, 14 Nov 2017 14:19:39 +0000 (14:19 +0000)]
Merge branch 'api-links' into 'develop'

Add links to API documentation.

See merge request pleroma/pleroma!17

6 years agoAdd links to API documentation.
eal [Tue, 14 Nov 2017 14:15:03 +0000 (16:15 +0200)]
Add links to API documentation.

6 years agoMerge branch 'mastoapi-media-timeline' into 'develop'
lambda [Tue, 14 Nov 2017 14:09:36 +0000 (14:09 +0000)]
Merge branch 'mastoapi-media-timeline' into 'develop'

MastoAPI: Add media timelines.

Closes #63

See merge request pleroma/pleroma!16

6 years agoAccept 1 as true.
eal [Tue, 14 Nov 2017 13:50:23 +0000 (15:50 +0200)]
Accept 1 as true.

6 years agoMastoAPI: Add media timelines.
eal [Tue, 14 Nov 2017 13:41:16 +0000 (15:41 +0200)]
MastoAPI: Add media timelines.

6 years agoUpdate frontend.
Roger Braun [Tue, 14 Nov 2017 08:34:28 +0000 (09:34 +0100)]
Update frontend.

6 years agoMastoAPI: Fix repeat api bug.
Roger Braun [Mon, 13 Nov 2017 08:48:56 +0000 (09:48 +0100)]
MastoAPI: Fix repeat api bug.

Documentation was wrong, reblogging actually returns the reblog, not
the reblogged status.

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

6 years agoAdd Mastodon frontend.
Roger Braun [Sun, 12 Nov 2017 13:23:05 +0000 (14:23 +0100)]
Add Mastodon frontend.

6 years agoMerge branch 'mastodon-notification-endpoints' into 'develop'
lambda [Sun, 12 Nov 2017 11:08:06 +0000 (11:08 +0000)]
Merge branch 'mastodon-notification-endpoints' into 'develop'

MastoAPI: Add notification endpoints get, clear and dismiss.

Closes #42

See merge request pleroma/pleroma!13

6 years agoMerge branch 'filetype-recognition' into 'develop'
lambda [Sun, 12 Nov 2017 09:27:59 +0000 (09:27 +0000)]
Merge branch 'filetype-recognition' into 'develop'

Use headers for file content type recognition.

See merge request pleroma/pleroma!14

6 years agoMerge branch 'mastoapi-update-credentials' into 'develop'
lambda [Sun, 12 Nov 2017 09:24:32 +0000 (09:24 +0000)]
Merge branch 'mastoapi-update-credentials' into 'develop'

MastoAPI: Add update credentials endpoint.

Closes #61

See merge request pleroma/pleroma!15

6 years agoAdd common video and audio types.
eal [Sat, 11 Nov 2017 23:16:46 +0000 (01:16 +0200)]
Add common video and audio types.

6 years agoMastoAPI: Add update credentials endpoint.
eal [Sat, 11 Nov 2017 22:27:09 +0000 (00:27 +0200)]
MastoAPI: Add update credentials endpoint.

6 years agoUse headers for file content type recognition.
eal [Sat, 11 Nov 2017 21:09:33 +0000 (23:09 +0200)]
Use headers for file content type recognition.

6 years agoMastoAPI: Websocket streaming for federated timeline.
Roger Braun [Sat, 11 Nov 2017 19:00:11 +0000 (20:00 +0100)]
MastoAPI: Websocket streaming for federated timeline.

6 years agoMastoAPI: Basic streaming.
Roger Braun [Sat, 11 Nov 2017 13:59:25 +0000 (14:59 +0100)]
MastoAPI: Basic streaming.

6 years agoMastoAPI: Fix reblog emojis.
Roger Braun [Sat, 11 Nov 2017 10:18:05 +0000 (11:18 +0100)]
MastoAPI: Fix reblog emojis.

6 years agoHandle existing redirect params.
Roger Braun [Fri, 10 Nov 2017 17:24:50 +0000 (18:24 +0100)]
Handle existing redirect params.

6 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
Roger Braun [Fri, 10 Nov 2017 16:37:54 +0000 (17:37 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

6 years agoMastoAPI: Use string ids everywhere.
Roger Braun [Fri, 10 Nov 2017 16:18:19 +0000 (17:18 +0100)]
MastoAPI: Use string ids everywhere.

6 years agoMastoAPI: Add notification get, clear and dismiss.
eal [Fri, 10 Nov 2017 13:24:39 +0000 (15:24 +0200)]
MastoAPI: Add notification get, clear and dismiss.

6 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
Roger Braun [Thu, 9 Nov 2017 15:49:32 +0000 (16:49 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

6 years agoMastoAPI: Fetch statuses in search.
Roger Braun [Thu, 9 Nov 2017 15:48:45 +0000 (16:48 +0100)]
MastoAPI: Fetch statuses in search.

6 years agoMerge branch 'fix-tootdon-image-uploads' into 'develop'
lambda [Thu, 9 Nov 2017 14:41:44 +0000 (14:41 +0000)]
Merge branch 'fix-tootdon-image-uploads' into 'develop'

Correct mimetype on bad uploads.

See merge request pleroma/pleroma!12

6 years agoadd sort index for activities
Roger Braun [Thu, 9 Nov 2017 14:16:10 +0000 (15:16 +0100)]
add sort index for activities

6 years agoCorrect mimetype on bad uploads.
eal [Thu, 9 Nov 2017 12:11:37 +0000 (14:11 +0200)]
Correct mimetype on bad uploads.

6 years agoFix migration for empty db.
Roger Braun [Thu, 9 Nov 2017 12:45:17 +0000 (13:45 +0100)]
Fix migration for empty db.

6 years agoUpdate activities in own migration.
Roger Braun [Thu, 9 Nov 2017 12:32:53 +0000 (13:32 +0100)]
Update activities in own migration.

6 years agoUpdate in chunks.
Roger Braun [Thu, 9 Nov 2017 11:33:38 +0000 (12:33 +0100)]
Update in chunks.

6 years agoAdd actor column to activities.
Roger Braun [Thu, 9 Nov 2017 09:41:19 +0000 (10:41 +0100)]
Add actor column to activities.

6 years agoRe-fetch user data on salmon decode error.
Roger Braun [Thu, 9 Nov 2017 07:32:54 +0000 (08:32 +0100)]
Re-fetch user data on salmon decode error.

6 years agoMerge branch 'following-you-in-user-view' into 'develop'
lambda [Wed, 8 Nov 2017 17:57:13 +0000 (17:57 +0000)]
Merge branch 'following-you-in-user-view' into 'develop'

TwitterAPI user view: add follows_you.

See merge request pleroma/pleroma!11

6 years agoTwitterAPI user view: add follows_you.
eal [Wed, 8 Nov 2017 17:13:03 +0000 (19:13 +0200)]
TwitterAPI user view: add follows_you.

6 years agoLook through whole db for user timelines.
Roger Braun [Wed, 8 Nov 2017 16:25:18 +0000 (17:25 +0100)]
Look through whole db for user timelines.

They already have an index that's good enough.

6 years agoUpdate frontend.
Roger Braun [Wed, 8 Nov 2017 15:16:29 +0000 (16:16 +0100)]
Update frontend.

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