akkoma
5 years agoMerge branch 'features/masto_fe-config' into 'develop'
kaniini [Wed, 6 Mar 2019 13:19:26 +0000 (13:19 +0000)]
Merge branch 'features/masto_fe-config' into 'develop'

Add default config for masto_fe

See merge request pleroma/pleroma!906

5 years agoMerge branch 'fix/escape-reserved-chars-in-filenames' into 'develop'
Haelwenn [Wed, 6 Mar 2019 01:45:17 +0000 (01:45 +0000)]
Merge branch 'fix/escape-reserved-chars-in-filenames' into 'develop'

Properly escape reserved URI charachters in upload urls

Closes #700

See merge request pleroma/pleroma!905

5 years agoAdd default config for masto_fe
Haelwenn (lanodan) Monnier [Wed, 6 Mar 2019 01:25:13 +0000 (02:25 +0100)]
Add default config for masto_fe

Related to: https://git.pleroma.social/pleroma/mastofe/merge_requests/22

5 years agoAdd tests for reserved char escaping in upload
rinpatch [Tue, 5 Mar 2019 16:28:58 +0000 (19:28 +0300)]
Add tests for reserved char escaping in upload

5 years agoProperly escape reserved URI charachters in upload urls
rinpatch [Tue, 5 Mar 2019 15:09:23 +0000 (18:09 +0300)]
Properly escape reserved URI charachters in upload urls

5 years agoMerge branch 'add-admin-to-node-info' into 'develop'
rinpatch [Tue, 5 Mar 2019 07:05:44 +0000 (07:05 +0000)]
Merge branch 'add-admin-to-node-info' into 'develop'

Include admins in nodeinfo

Closes #689

See merge request pleroma/pleroma!899

5 years agoMerge branch 'bugfix/rich-media-uri-validation' into 'develop'
Haelwenn [Tue, 5 Mar 2019 00:33:04 +0000 (00:33 +0000)]
Merge branch 'bugfix/rich-media-uri-validation' into 'develop'

rich media: don't crawl bogus URIs

See merge request pleroma/pleroma!864

5 years agoInclude admins in nodeinfo
eugenijm [Mon, 4 Mar 2019 19:14:04 +0000 (22:14 +0300)]
Include admins in nodeinfo

5 years agorich media: helpers: rework validate_page_url()
William Pitcock [Mon, 4 Mar 2019 18:38:23 +0000 (18:38 +0000)]
rich media: helpers: rework validate_page_url()

5 years agohelpers: use AutoLinker to validate URIs as well as the other tests
William Pitcock [Sat, 2 Mar 2019 12:22:02 +0000 (12:22 +0000)]
helpers: use AutoLinker to validate URIs as well as the other tests

5 years agotests: add tests for rich media helper functions
William Pitcock [Sun, 24 Feb 2019 19:39:27 +0000 (19:39 +0000)]
tests: add tests for rich media helper functions

5 years agorich media: don't crawl bogus URIs
William Pitcock [Sun, 24 Feb 2019 19:13:46 +0000 (19:13 +0000)]
rich media: don't crawl bogus URIs

5 years agoMerge branch 'feature/add-status-text-to-notifications' into 'develop'
kaniini [Mon, 4 Mar 2019 18:29:13 +0000 (18:29 +0000)]
Merge branch 'feature/add-status-text-to-notifications' into 'develop'

Add status text to notifications (mentions and reposts)

Closes #696

See merge request pleroma/pleroma!897

5 years agoRemove unused code
Maxim Filippov [Mon, 4 Mar 2019 17:49:20 +0000 (20:49 +0300)]
Remove unused code

5 years agoAdd status text to notifications (mentions and reposts)
Maxim Filippov [Mon, 4 Mar 2019 17:47:34 +0000 (20:47 +0300)]
Add status text to notifications (mentions and reposts)

5 years agoMerge branch 'fix/like-adressing' into 'develop'
kaniini [Mon, 4 Mar 2019 15:59:57 +0000 (15:59 +0000)]
Merge branch 'fix/like-adressing' into 'develop'

Stop adresssing like activities to actor's follower collection on non-public posts

See merge request pleroma/pleroma!896

5 years agoStop adresssing like activities to actor's follower collection on non-public posts
rinpatch [Mon, 4 Mar 2019 15:09:58 +0000 (18:09 +0300)]
Stop adresssing like activities to actor's follower collection on non-public posts

5 years agoMerge branch 'unify-follow' into 'develop'
kaniini [Mon, 4 Mar 2019 13:25:32 +0000 (13:25 +0000)]
Merge branch 'unify-follow' into 'develop'

Unify follow code with CommonAPI

Closes #690

See merge request pleroma/pleroma!889

5 years agoMerge branch 'dm-visibility-for-blocking-users' into 'develop'
kaniini [Mon, 4 Mar 2019 13:20:17 +0000 (13:20 +0000)]
Merge branch 'dm-visibility-for-blocking-users' into 'develop'

Fix DM visibility for blocking users #698

Closes #698

See merge request pleroma/pleroma!890

5 years agoFix DM visibility for blocking users
eugenijm [Sun, 3 Mar 2019 23:59:54 +0000 (02:59 +0300)]
Fix DM visibility for blocking users

5 years agoUnify Mastodon and Twitter follow implementations using CommonAPI
eugenijm [Sun, 3 Mar 2019 21:50:00 +0000 (00:50 +0300)]
Unify Mastodon and Twitter follow implementations using CommonAPI

5 years agoMerge branch 'muting' into 'develop'
kaniini [Sun, 3 Mar 2019 21:10:10 +0000 (21:10 +0000)]
Merge branch 'muting' into 'develop'

Don't stream muted accounts

See merge request pleroma/pleroma!888

5 years agoDon't stream muted accounts
William Pearson [Sun, 20 Jan 2019 04:28:34 +0000 (04:28 +0000)]
Don't stream muted accounts

5 years agoMerge branch 'remove-todo-txt' into 'develop'
rinpatch [Sun, 3 Mar 2019 17:39:46 +0000 (17:39 +0000)]
Merge branch 'remove-todo-txt' into 'develop'

Remove TODO.txt

See merge request pleroma/pleroma!887

5 years agoRemove TODO.txt
rinpatch [Sun, 3 Mar 2019 17:32:46 +0000 (20:32 +0300)]
Remove TODO.txt

5 years agoMerge branch 'features/bio_rel_me' into 'develop'
kaniini [Sun, 3 Mar 2019 16:00:49 +0000 (16:00 +0000)]
Merge branch 'features/bio_rel_me' into 'develop'

Add rel=me to the User bio

Closes #423

See merge request pleroma/pleroma!813

5 years agoMerge branch 'feature/add-pagination-to-users-admin-api' into 'develop'
kaniini [Sun, 3 Mar 2019 15:59:15 +0000 (15:59 +0000)]
Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop'

Add pagination and search to users

See merge request pleroma/pleroma!873

5 years agoMerge branch 'get-follow-requests-sql' into 'develop'
kaniini [Sun, 3 Mar 2019 15:51:32 +0000 (15:51 +0000)]
Merge branch 'get-follow-requests-sql' into 'develop'

Use sql query in User.get_follow_requests/1 for filtering logic

See merge request pleroma/pleroma!883

5 years agoMerge branch 'atomic-note-count-updates' into 'develop'
kaniini [Sun, 3 Mar 2019 15:50:41 +0000 (15:50 +0000)]
Merge branch 'atomic-note-count-updates' into 'develop'

Atomic update for note count and follower count

See merge request pleroma/pleroma!885

5 years agoMerge branch 'count-only-public-statuses' into 'develop'
kaniini [Sun, 3 Mar 2019 15:49:19 +0000 (15:49 +0000)]
Merge branch 'count-only-public-statuses' into 'develop'

Increment user note count only on public activities #703

See merge request pleroma/pleroma!884

5 years agoMerge branch 'remove-follow-request-count' into 'develop'
kaniini [Sun, 3 Mar 2019 15:48:00 +0000 (15:48 +0000)]
Merge branch 'remove-follow-request-count' into 'develop'

Remove follow_request_count as it's not needed for FE anymore.

See merge request pleroma/pleroma!886

5 years agoRemove follow_request_count as it's not needed for FE anymore.
eugenijm [Sun, 3 Mar 2019 15:39:37 +0000 (18:39 +0300)]
Remove follow_request_count as it's not needed for FE anymore.

MastoFE uses `GET /api/v1/follow_requests` and PleromaFE uses
`GET /api/pleroma/friend_requests` which they query on the initial page
load.

5 years agoUse atomic update for note count and follower count
eugenijm [Sun, 3 Mar 2019 14:27:09 +0000 (17:27 +0300)]
Use atomic update for note count and follower count

5 years agoAdded migration to update existing user note counters
eugenijm [Sun, 3 Mar 2019 12:35:32 +0000 (15:35 +0300)]
Added migration to update existing user note counters

5 years agoMerge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop'
lambda [Sun, 3 Mar 2019 11:13:59 +0000 (11:13 +0000)]
Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop'

[#675] Do not show DMs in mentions timeline

See merge request pleroma/pleroma!877

5 years agoIncrement user note count only on public activities
eugenijm [Sun, 3 Mar 2019 10:21:03 +0000 (13:21 +0300)]
Increment user note count only on public activities

5 years agoUse sql query in User.get_follow_requests/1 for filtering logic
eugenijm [Sat, 2 Mar 2019 19:18:51 +0000 (22:18 +0300)]
Use sql query in User.get_follow_requests/1 for filtering logic

5 years agoAdd docs
Maxim Filippov [Sat, 2 Mar 2019 14:32:46 +0000 (17:32 +0300)]
Add docs

5 years agoWe do not guarantee the order of elements when we search
Maxim Filippov [Sat, 2 Mar 2019 14:32:40 +0000 (17:32 +0300)]
We do not guarantee the order of elements when we search

5 years agoAdd pagination to search
Maxim Filippov [Sat, 2 Mar 2019 14:21:18 +0000 (17:21 +0300)]
Add pagination to search

5 years agoMerge branch 'bugfix/oauth-scopes-join' into 'develop'
rinpatch [Sat, 2 Mar 2019 06:39:07 +0000 (06:39 +0000)]
Merge branch 'bugfix/oauth-scopes-join' into 'develop'

Bugfix: OAuth scopes formatting

Closes #702

See merge request pleroma/pleroma!881

5 years agoPleroma.User: mix format
Haelwenn (lanodan) Monnier [Sat, 2 Mar 2019 06:04:49 +0000 (07:04 +0100)]
Pleroma.User: mix format

5 years agoPleroma.UserTest: Add tests for rel=me
Haelwenn (lanodan) Monnier [Sat, 2 Mar 2019 05:59:09 +0000 (06:59 +0100)]
Pleroma.UserTest: Add tests for rel=me

5 years agoRelMe.maybe_put_rel_me/2: When true put "me" otherwise nil
Haelwenn (lanodan) Monnier [Sat, 2 Mar 2019 05:58:42 +0000 (06:58 +0100)]
RelMe.maybe_put_rel_me/2: When true put "me" otherwise nil

5 years agoPleroma.User: Fix syntax and user.ap_id call
Haelwenn (lanodan) Monnier [Sat, 2 Mar 2019 05:57:28 +0000 (06:57 +0100)]
Pleroma.User: Fix syntax and user.ap_id call

5 years agoPleroma.User: Pass an array to profile_urls
Haelwenn (lanodan) Monnier [Sat, 2 Mar 2019 05:33:15 +0000 (06:33 +0100)]
Pleroma.User: Pass an array to profile_urls

5 years agoPleroma.Web.RelMe: fixups
Haelwenn (lanodan) Monnier [Sat, 2 Mar 2019 05:32:03 +0000 (06:32 +0100)]
Pleroma.Web.RelMe: fixups

5 years agoPleroma.Web.RelMeTest: Add test against Pleroma.Web.RelMe
Haelwenn (lanodan) Monnier [Sat, 2 Mar 2019 05:13:04 +0000 (06:13 +0100)]
Pleroma.Web.RelMeTest: Add test against Pleroma.Web.RelMe

5 years agoPleroma.User: Add rel=me to URLs where it linkbacks to the profile
Haelwenn (lanodan) Monnier [Mon, 11 Feb 2019 21:27:02 +0000 (22:27 +0100)]
Pleroma.User: Add rel=me to URLs where it linkbacks to the profile

5 years agoWeb.OAuth.OAuthControllerTest: Add test against token formatting
Haelwenn (lanodan) Monnier [Sat, 2 Mar 2019 03:10:43 +0000 (04:10 +0100)]
Web.OAuth.OAuthControllerTest: Add test against token formatting

5 years agoWeb.OAuth.OAuthController: Fix scopes Enum.join for OAuth response
Haelwenn (lanodan) Monnier [Sat, 2 Mar 2019 03:04:16 +0000 (04:04 +0100)]
Web.OAuth.OAuthController: Fix scopes Enum.join for OAuth response

5 years agoRefactor a little bit
Maxim Filippov [Fri, 1 Mar 2019 18:17:20 +0000 (21:17 +0300)]
Refactor a little bit

5 years agoFormat
Maxim Filippov [Fri, 1 Mar 2019 18:07:05 +0000 (21:07 +0300)]
Format

5 years agoFix user_test
Maxim Filippov [Fri, 1 Mar 2019 17:58:47 +0000 (20:58 +0300)]
Fix user_test

5 years agoFormat
Maxim Filippov [Fri, 1 Mar 2019 17:23:19 +0000 (20:23 +0300)]
Format

5 years agoShow current user in users list as well
Maxim Filippov [Fri, 1 Mar 2019 17:23:03 +0000 (20:23 +0300)]
Show current user in users list as well

5 years agoAdd "local" params to users search
Maxim Filippov [Fri, 1 Mar 2019 17:13:02 +0000 (20:13 +0300)]
Add "local" params to users search

5 years agoAdd docs to /users/search
Maxim Filippov [Fri, 1 Mar 2019 14:34:14 +0000 (17:34 +0300)]
Add docs to /users/search

5 years agouse commonapi.post instead of activitybulder
rinpatch [Fri, 1 Mar 2019 12:48:04 +0000 (15:48 +0300)]
use commonapi.post instead of activitybulder

5 years agoMerge branch 'hotfix/http-date-header' into 'develop'
kaniini [Fri, 1 Mar 2019 12:28:08 +0000 (12:28 +0000)]
Merge branch 'hotfix/http-date-header' into 'develop'

activitypub: fix date header format

See merge request pleroma/pleroma!879

5 years agoactivitypub: fix date header format
William Pitcock [Fri, 1 Mar 2019 12:21:09 +0000 (12:21 +0000)]
activitypub: fix date header format

HTTP date header specification says that days must always be two-digit.
Accordingly, change the format string used to ensure days are always
represented as two-digit (e.g. 01).

5 years agoMerge branch 'default-tags-for-existing-users' into 'develop'
kaniini [Fri, 1 Mar 2019 11:09:36 +0000 (11:09 +0000)]
Merge branch 'default-tags-for-existing-users' into 'develop'

Migration for adding tags to the existing users records

See merge request pleroma/pleroma!878

5 years agoAdded migration for setting default tags in existing users records
eugenijm [Fri, 1 Mar 2019 10:25:32 +0000 (13:25 +0300)]
Added migration for setting default tags in existing users records

5 years agoMerge branch 'bugfix/236-ambiguous-route-for-numerical-handles' into 'develop'
lambda [Fri, 1 Mar 2019 09:48:24 +0000 (09:48 +0000)]
Merge branch 'bugfix/236-ambiguous-route-for-numerical-handles' into 'develop'

Bugfix #236 Prefer user look-up by nickname

See merge request pleroma/pleroma!860

5 years agoMerge branch 'feature/cowboy2' into 'develop'
lambda [Fri, 1 Mar 2019 09:42:34 +0000 (09:42 +0000)]
Merge branch 'feature/cowboy2' into 'develop'

upgrade to cowboy 2.6

See merge request pleroma/pleroma!876

5 years ago[#675] Do not show DMs in mentions timeline
rinpatch [Fri, 1 Mar 2019 06:37:29 +0000 (09:37 +0300)]
[#675] Do not show DMs in mentions timeline

5 years agoconfig: fix chat endpoint path
William Pitcock [Thu, 28 Feb 2019 16:58:00 +0000 (16:58 +0000)]
config: fix chat endpoint path

5 years agomastodon websocket: return errors using ok, not stop
William Pitcock [Thu, 28 Feb 2019 16:23:55 +0000 (16:23 +0000)]
mastodon websocket: return errors using ok, not stop

5 years agomastodon websocket: bring back infinity timeout
William Pitcock [Thu, 28 Feb 2019 16:23:24 +0000 (16:23 +0000)]
mastodon websocket: bring back infinity timeout

5 years agoAdd search users endpoint
Maxim Filippov [Thu, 28 Feb 2019 16:04:47 +0000 (19:04 +0300)]
Add search users endpoint

5 years agomastodon websocket: use pattern match to get query data, robustly handle errors
William Pitcock [Thu, 28 Feb 2019 16:02:48 +0000 (16:02 +0000)]
mastodon websocket: use pattern match to get query data, robustly handle errors

5 years agoconfig: update config for cowboy 2 endpoints
William Pitcock [Thu, 28 Feb 2019 15:43:38 +0000 (15:43 +0000)]
config: update config for cowboy 2 endpoints

5 years agomastodon api: websocket: update code for cowboy 2.x
William Pitcock [Thu, 28 Feb 2019 15:17:01 +0000 (15:17 +0000)]
mastodon api: websocket: update code for cowboy 2.x

5 years agomix: update dependencies for cowboy 2.0
William Pitcock [Thu, 28 Feb 2019 14:53:54 +0000 (14:53 +0000)]
mix: update dependencies for cowboy 2.0

5 years agoAdd test for the second page
Maxim Filippov [Thu, 28 Feb 2019 14:54:02 +0000 (17:54 +0300)]
Add test for the second page

5 years agoUse Mastodon API views in Admin API
Maxim Filippov [Thu, 28 Feb 2019 14:43:09 +0000 (17:43 +0300)]
Use Mastodon API views in Admin API

5 years agoMerge branch 'customizable_auth' into 'develop'
href [Thu, 28 Feb 2019 11:18:01 +0000 (11:18 +0000)]
Merge branch 'customizable_auth' into 'develop'

Authenticator tweaks

See merge request pleroma/pleroma!875

5 years agoRenamed *DatabaseAuthenticator to *Authenticator.
Ivan Tashkinov [Thu, 28 Feb 2019 11:12:41 +0000 (14:12 +0300)]
Renamed *DatabaseAuthenticator to *Authenticator.

5 years agoAdded `auth_template/0` to DatabaseAuthenticator.
Ivan Tashkinov [Thu, 28 Feb 2019 10:58:58 +0000 (13:58 +0300)]
Added `auth_template/0` to DatabaseAuthenticator.

5 years agoMerge branch 'with-mutes' into 'develop'
kaniini [Thu, 28 Feb 2019 10:22:19 +0000 (10:22 +0000)]
Merge branch 'with-mutes' into 'develop'

Add `with_muted` param.

Closes #683

See merge request pleroma/pleroma!872

5 years agoMerge branch 'customizable_auth' into 'develop'
href [Thu, 28 Feb 2019 10:12:26 +0000 (10:12 +0000)]
Merge branch 'customizable_auth' into 'develop'

Auth customization support

See merge request pleroma/pleroma!852

5 years agoMerge branch 'speedup-follow-requests' into 'develop'
kaniini [Thu, 28 Feb 2019 10:10:03 +0000 (10:10 +0000)]
Merge branch 'speedup-follow-requests' into 'develop'

Speedup follow requests

Closes #677

See merge request pleroma/pleroma!871

5 years agoMerge branch 'deactivated-in-user-view' into 'develop'
kaniini [Thu, 28 Feb 2019 10:08:31 +0000 (10:08 +0000)]
Merge branch 'deactivated-in-user-view' into 'develop'

Add activation status to the regular user view

See merge request pleroma/pleroma!874

5 years agoMade auth customization be runtime-configurable.
Ivan Tashkinov [Thu, 28 Feb 2019 10:00:54 +0000 (13:00 +0300)]
Made auth customization be runtime-configurable.

5 years agoMerge branch 'feature/mastoapi-embedded-relationships' into 'develop'
lambda [Thu, 28 Feb 2019 07:35:26 +0000 (07:35 +0000)]
Merge branch 'feature/mastoapi-embedded-relationships' into 'develop'

mastodon api: embed relationship card under account card for Pleroma FE convenience

See merge request pleroma/pleroma!870

5 years agoAdded deactivated to the user view
eugenijm [Thu, 28 Feb 2019 05:31:33 +0000 (08:31 +0300)]
Added deactivated to the user view

5 years agoAdd pagination to users admin API
Maxim Filippov [Wed, 27 Feb 2019 22:11:56 +0000 (01:11 +0300)]
Add pagination to users admin API

5 years agoRemove parts of the old activity view.
lain [Wed, 27 Feb 2019 16:24:51 +0000 (17:24 +0100)]
Remove parts of the old activity view.

Not used anymore.

5 years agoAdd user muted status info to twitterapi.
lain [Wed, 27 Feb 2019 15:52:03 +0000 (16:52 +0100)]
Add user muted status info to twitterapi.

5 years agoAdd user muted status info to MastodonAPI.
lain [Wed, 27 Feb 2019 15:46:47 +0000 (16:46 +0100)]
Add user muted status info to MastodonAPI.

5 years agoAdd `with_muted` param.
lain [Wed, 27 Feb 2019 15:37:42 +0000 (16:37 +0100)]
Add `with_muted` param.

5 years agoFollower requests: Utilize object index.
lain [Wed, 27 Feb 2019 14:01:54 +0000 (15:01 +0100)]
Follower requests: Utilize object index.

Closes #677

5 years agoAdd follow request test.
lain [Wed, 27 Feb 2019 13:51:07 +0000 (14:51 +0100)]
Add follow request test.

5 years agomastodon api: embed relationship card under account card for Pleroma FE convenience
William Pitcock [Wed, 27 Feb 2019 13:01:10 +0000 (13:01 +0000)]
mastodon api: embed relationship card under account card for Pleroma FE convenience

5 years agoMerge branch 'fix/formatter' into 'develop'
kaniini [Wed, 27 Feb 2019 08:45:43 +0000 (08:45 +0000)]
Merge branch 'fix/formatter' into 'develop'

Bugfix: markdown in formatter

Closes #688

See merge request pleroma/pleroma!869

5 years agofix formatter
Egor Kislitsyn [Wed, 27 Feb 2019 08:40:30 +0000 (15:40 +0700)]
fix formatter

5 years agoMerge branch 'chore/add-missing-tests-docs-to-admin-api' into 'develop'
kaniini [Wed, 27 Feb 2019 07:28:10 +0000 (07:28 +0000)]
Merge branch 'chore/add-missing-tests-docs-to-admin-api' into 'develop'

Add missing docs and tests to Admin API

See merge request pleroma/pleroma!868

5 years agoAdd missing docs and tests
Maxim Filippov [Wed, 27 Feb 2019 00:08:03 +0000 (03:08 +0300)]
Add missing docs and tests

5 years agoMerge branch 'auto_linker' into 'develop'
kaniini [Tue, 26 Feb 2019 23:32:26 +0000 (23:32 +0000)]
Merge branch 'auto_linker' into 'develop'

AutoLinker

Closes #609

See merge request pleroma/pleroma!839

5 years agoAutoLinker
Egor [Tue, 26 Feb 2019 23:32:26 +0000 (23:32 +0000)]
AutoLinker