akkoma
5 years agoAdd some nicer urls in status view.
lain [Wed, 20 Feb 2019 16:36:16 +0000 (17:36 +0100)]
Add some nicer urls in status view.

5 years agoMerge branch '468_oauth2_scopes' into 'develop'
lambda [Wed, 20 Feb 2019 16:15:45 +0000 (16:15 +0000)]
Merge branch '468_oauth2_scopes' into 'develop'

[#468] OAuth2 scopes

Closes #468

See merge request pleroma/pleroma!799

5 years ago[#468] Added support for `push` OAuth scope (Mastodon 2.4+).
Ivan Tashkinov [Wed, 20 Feb 2019 14:27:41 +0000 (17:27 +0300)]
[#468] Added support for `push` OAuth scope (Mastodon 2.4+).

5 years ago[#468] Merged `upstream/develop`.
Ivan Tashkinov [Wed, 20 Feb 2019 13:48:59 +0000 (16:48 +0300)]
[#468] Merged `upstream/develop`.

5 years agoMerge branch 'muting' into 'develop'
lambda [Wed, 20 Feb 2019 13:19:37 +0000 (13:19 +0000)]
Merge branch 'muting' into 'develop'

Implement muting, add it to the whole mastodon API

See merge request pleroma/pleroma!319

5 years agoAdd test for User.mutes and so on.
lain [Wed, 20 Feb 2019 13:14:52 +0000 (14:14 +0100)]
Add test for User.mutes and so on.

5 years agoAdd test for muting functionality.
lain [Wed, 20 Feb 2019 12:47:44 +0000 (13:47 +0100)]
Add test for muting functionality.

5 years agoRemove superfluous migration.
lain [Wed, 20 Feb 2019 12:47:24 +0000 (13:47 +0100)]
Remove superfluous migration.

5 years ago[#468] Adjusted scope restriction for MastodonAPIController#index.
Ivan Tashkinov [Wed, 20 Feb 2019 11:05:02 +0000 (14:05 +0300)]
[#468] Adjusted scope restriction for MastodonAPIController#index.

5 years ago[#468] More OAuth scopes-specific tests.
Ivan Tashkinov [Wed, 20 Feb 2019 09:27:28 +0000 (12:27 +0300)]
[#468] More OAuth scopes-specific tests.

5 years agoMerge branch 'set-activation-status-admin-api' into 'develop'
kaniini [Tue, 19 Feb 2019 22:45:51 +0000 (22:45 +0000)]
Merge branch 'set-activation-status-admin-api' into 'develop'

Added admin API for changing user activation status

See merge request pleroma/pleroma!843

5 years agoUpdate the mute implementation to the current codebase
Ekaterina Vaartis [Tue, 19 Feb 2019 20:09:16 +0000 (23:09 +0300)]
Update the mute implementation to the current codebase

Make it part of the info thing (and do a migration to ensure it's there)

5 years ago[#468] Added OAuth scopes-specific tests.
Ivan Tashkinov [Tue, 19 Feb 2019 19:28:21 +0000 (22:28 +0300)]
[#468] Added OAuth scopes-specific tests.

5 years agoRemove unused "muted" parameter, use piping for mute/block fns
Ekaterina Vaartis [Mon, 3 Sep 2018 21:20:22 +0000 (00:20 +0300)]
Remove unused "muted" parameter, use piping for mute/block fns

5 years agoDo not unfollow muted users
Ekaterina Vaartis [Mon, 3 Sep 2018 21:17:25 +0000 (00:17 +0300)]
Do not unfollow muted users

5 years agoAdd test for mastodon muting endpoints
Ekaterina Vaartis [Sat, 1 Sep 2018 21:34:15 +0000 (00:34 +0300)]
Add test for mastodon muting endpoints

5 years agoImplement mastodon mutes endpoint
Ekaterina Vaartis [Sat, 1 Sep 2018 21:33:13 +0000 (00:33 +0300)]
Implement mastodon mutes endpoint

Aparently i forgot to add it, it gets a list of muted users

5 years agoImplement muting, add it to the mastodon API
Ekaterina Vaartis [Wed, 5 Sep 2018 20:49:15 +0000 (23:49 +0300)]
Implement muting, add it to the mastodon API

5 years agoAdded admin API for changing user activation status
eugenijm [Tue, 19 Feb 2019 15:40:57 +0000 (18:40 +0300)]
Added admin API for changing user activation status

5 years ago[#468] Merged `upstream/develop`.
Ivan Tashkinov [Tue, 19 Feb 2019 16:10:55 +0000 (19:10 +0300)]
[#468] Merged `upstream/develop`.

5 years agoMerge branch 'set-cache-on-user-tag-update' into 'develop'
lambda [Tue, 19 Feb 2019 14:20:58 +0000 (14:20 +0000)]
Merge branch 'set-cache-on-user-tag-update' into 'develop'

Update user cache when user tags are updated

See merge request pleroma/pleroma!840

5 years agoMerge branch 'fix/check-follower-collection-in-is_private' into 'develop'
lambda [Tue, 19 Feb 2019 14:08:19 +0000 (14:08 +0000)]
Merge branch 'fix/check-follower-collection-in-is_private' into 'develop'

properly check for follower address in is_private?

See merge request pleroma/pleroma!841

5 years agoMerge branch 'fix/ap_id-unique_constraint' into 'develop'
lambda [Tue, 19 Feb 2019 14:07:16 +0000 (14:07 +0000)]
Merge branch 'fix/ap_id-unique_constraint' into 'develop'

mark ap_id unique_constraint

See merge request pleroma/pleroma!842

5 years agomark ap_id unique_constraint
rinpatch [Tue, 19 Feb 2019 10:52:15 +0000 (13:52 +0300)]
mark ap_id unique_constraint

5 years agoproperly check for follower address in is_private?
rinpatch [Tue, 19 Feb 2019 10:23:13 +0000 (13:23 +0300)]
properly check for follower address in is_private?

5 years agoUpdate user cache when user tags are updated
eugenijm [Tue, 19 Feb 2019 07:43:37 +0000 (10:43 +0300)]
Update user cache when user tags are updated

5 years agoMerge branch 'feature/jobs' into 'develop'
kaniini [Mon, 18 Feb 2019 19:43:06 +0000 (19:43 +0000)]
Merge branch 'feature/jobs' into 'develop'

Job Queue

See merge request pleroma/pleroma!732

5 years agoMerge branch 'patch-image-description' into 'develop'
kaniini [Mon, 18 Feb 2019 04:11:46 +0000 (04:11 +0000)]
Merge branch 'patch-image-description' into 'develop'

Patch to support image descriptions for pleroma-fe

See merge request pleroma/pleroma!626

5 years agoMerge branch 'feature/add-oauth-tokens-endpoint' into 'develop'
kaniini [Mon, 18 Feb 2019 04:02:41 +0000 (04:02 +0000)]
Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'

Add OAuth tokens endpoint

See merge request pleroma/pleroma!805

5 years agoMerge branch 'features/flavour-switching' into 'develop'
kaniini [Mon, 18 Feb 2019 04:01:51 +0000 (04:01 +0000)]
Merge branch 'features/flavour-switching' into 'develop'

[MastoAPI] Add switching of frontend flavours

See merge request pleroma/pleroma!807

5 years agoMerge branch 'follow-request-count' into 'develop'
kaniini [Mon, 18 Feb 2019 04:01:26 +0000 (04:01 +0000)]
Merge branch 'follow-request-count' into 'develop'

Follow request count

See merge request pleroma/pleroma!817

5 years agoMerge branch 'csv-export' into 'develop'
kaniini [Mon, 18 Feb 2019 03:59:46 +0000 (03:59 +0000)]
Merge branch 'csv-export' into 'develop'

Add option to return all friends in twitter api.

Closes #602

See merge request pleroma/pleroma!833

5 years agoFix test
Maxim Filippov [Sun, 17 Feb 2019 21:10:48 +0000 (00:10 +0300)]
Fix test

5 years agoRender only "id", "valid_until" and "app_name" in TokenView
Maxim Filippov [Sun, 17 Feb 2019 20:57:35 +0000 (23:57 +0300)]
Render only "id", "valid_until" and "app_name" in TokenView

5 years agoMerge branch 'docs/add-clients-to-ex_doc' into 'develop'
lambda [Sun, 17 Feb 2019 17:53:57 +0000 (17:53 +0000)]
Merge branch 'docs/add-clients-to-ex_doc' into 'develop'

mix.exs: Add docs/Clients.md to docs.extras

See merge request pleroma/pleroma!835

5 years agoMerge branch 'develop' into 'docs/add-clients-to-ex_doc'
lambda [Sun, 17 Feb 2019 17:39:45 +0000 (17:39 +0000)]
Merge branch 'develop' into 'docs/add-clients-to-ex_doc'

# Conflicts:
#   mix.exs

5 years agoMerge branch 'docker-speedup' into 'develop'
lambda [Sun, 17 Feb 2019 17:38:25 +0000 (17:38 +0000)]
Merge branch 'docker-speedup' into 'develop'

Docker speedup

See merge request pleroma/pleroma!837

5 years agoMerge branch 'mastoapi-stop-capping-attachments' into 'develop'
lambda [Sun, 17 Feb 2019 17:37:48 +0000 (17:37 +0000)]
Merge branch 'mastoapi-stop-capping-attachments' into 'develop'

Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla Mastodon

See merge request pleroma/pleroma!834

5 years agoUpdate Differences-in-MastodonAPI-Responses.md
lambda [Sun, 17 Feb 2019 17:01:22 +0000 (17:01 +0000)]
Update Differences-in-MastodonAPI-Responses.md

5 years agoMerge branch 'fix/hellthread-policy-recipient-check' into 'develop'
lambda [Sun, 17 Feb 2019 16:57:57 +0000 (16:57 +0000)]
Merge branch 'fix/hellthread-policy-recipient-check' into 'develop'

Fix recipient count in hellthread policy

See merge request pleroma/pleroma!836

5 years agoMore speedup, test fixes.
lain [Sun, 17 Feb 2019 16:47:24 +0000 (17:47 +0100)]
More speedup, test fixes.

5 years agomore tests for HellthreadPolicy
rinpatch [Sun, 17 Feb 2019 11:33:44 +0000 (14:33 +0300)]
more tests for HellthreadPolicy

5 years ago[#468] Formatting fix.
Ivan Tashkinov [Sun, 17 Feb 2019 11:07:35 +0000 (14:07 +0300)]
[#468] Formatting fix.

5 years ago[#468] Merged `upstream/develop`, resolved conflicts.
Ivan Tashkinov [Sun, 17 Feb 2019 11:07:04 +0000 (14:07 +0300)]
[#468] Merged `upstream/develop`, resolved conflicts.

5 years ago[#468] Refactored OAuth scopes' defaults & missing selection handling.
Ivan Tashkinov [Sun, 17 Feb 2019 10:49:14 +0000 (13:49 +0300)]
[#468] Refactored OAuth scopes' defaults & missing selection handling.

5 years agoSpeed up docker postgres.
lain [Sun, 17 Feb 2019 10:36:14 +0000 (11:36 +0100)]
Speed up docker postgres.

5 years agoFix recipient count in hellthread policy
rinpatch [Sun, 17 Feb 2019 10:46:40 +0000 (13:46 +0300)]
Fix recipient count in hellthread policy

5 years agoFix formating
rinpatch [Sun, 17 Feb 2019 09:07:49 +0000 (12:07 +0300)]
Fix formating

5 years agoAdd differences in MastoAPI responses to mix.exs extras
rinpatch [Sun, 17 Feb 2019 07:34:00 +0000 (10:34 +0300)]
Add differences in MastoAPI responses to mix.exs extras

5 years agoWeb.MastodonAPI.MastodonAPIControllerTest: Add testing of the flavour switching
Haelwenn (lanodan) Monnier [Sun, 10 Feb 2019 22:11:12 +0000 (23:11 +0100)]
Web.MastodonAPI.MastodonAPIControllerTest: Add testing of the flavour switching

5 years ago[MastoAPI] Add switching of frontend flavours
Haelwenn (lanodan) Monnier [Sun, 3 Feb 2019 11:31:12 +0000 (12:31 +0100)]
[MastoAPI] Add switching of frontend flavours

5 years agomix.exs: Add docs/Clients.md to docs.extras
Haelwenn (lanodan) Monnier [Sat, 16 Feb 2019 18:39:03 +0000 (19:39 +0100)]
mix.exs: Add docs/Clients.md to docs.extras

[ci skip]

5 years agoAdd a section on how to identify a pleroma instance, clarify that post upload limit...
rinpatch [Sat, 16 Feb 2019 18:14:07 +0000 (21:14 +0300)]
Add a section on how to identify a pleroma instance, clarify that post upload limit is not capped too

5 years agoMerge branch 'welcome-message' into 'develop'
rinpatch [Sat, 16 Feb 2019 17:39:04 +0000 (17:39 +0000)]
Merge branch 'welcome-message' into 'develop'

Add optional welcome message.

See merge request pleroma/pleroma!832

5 years agoRemove a limit on attachments in Mastodon API and document the changes in responses...
rinpatch [Sat, 16 Feb 2019 17:38:25 +0000 (20:38 +0300)]
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla mastodon

5 years agoWelcomeMessage: specify that the user has to be local.
lain [Sat, 16 Feb 2019 16:25:06 +0000 (17:25 +0100)]
WelcomeMessage: specify that the user has to be local.

5 years agoWelcomeMessage: Get rid of Ecto reference.
lain [Sat, 16 Feb 2019 16:24:48 +0000 (17:24 +0100)]
WelcomeMessage: Get rid of Ecto reference.

5 years agoCheck that the welcome message is sent from the correct user.
lain [Sat, 16 Feb 2019 16:24:31 +0000 (17:24 +0100)]
Check that the welcome message is sent from the correct user.

5 years agoAdd option to return all friends in twitter api.
lain [Sat, 16 Feb 2019 16:01:15 +0000 (17:01 +0100)]
Add option to return all friends in twitter api.

Mainly useful for user export.

5 years agoAdd optional welcome message.
lain [Sat, 16 Feb 2019 15:42:34 +0000 (16:42 +0100)]
Add optional welcome message.

5 years ago[#468] Defined OAuth restrictions for all applicable routes.
Ivan Tashkinov [Fri, 15 Feb 2019 16:54:37 +0000 (19:54 +0300)]
[#468] Defined OAuth restrictions for all applicable routes.
Improved missing "scopes" param handling.
Allowed "any of" / "all of" mode specification in OAuthScopesPlug.
Fixed auth UI / behavior when user selects no permissions at /oauth/authorize.

5 years agoMerge branch 'bugfix/oauth-token-padding' into 'develop'
lambda [Fri, 15 Feb 2019 14:58:13 +0000 (14:58 +0000)]
Merge branch 'bugfix/oauth-token-padding' into 'develop'

oauth: never use base64 padding when returning tokens to applications

See merge request pleroma/pleroma!825

5 years agoMerge branch 'hellthread-filter-fix' into 'develop'
rinpatch [Fri, 15 Feb 2019 13:18:35 +0000 (13:18 +0000)]
Merge branch 'hellthread-filter-fix' into 'develop'

Hellthread filter fix

Closes #634

See merge request pleroma/pleroma!831

5 years agoReadd threshold is not 0 check, optmization?
Karen Konou [Fri, 15 Feb 2019 13:05:20 +0000 (14:05 +0100)]
Readd threshold is not 0 check, optmization?

5 years agoRename test, add check for follower collection when delisting
Karen Konou [Fri, 15 Feb 2019 12:43:14 +0000 (13:43 +0100)]
Rename test, add check for follower collection when delisting

5 years agoMerge branch 'bugfix/actor-containment' into 'develop'
rinpatch [Fri, 15 Feb 2019 12:27:03 +0000 (12:27 +0000)]
Merge branch 'bugfix/actor-containment' into 'develop'

activitypub: correctly handle bare URIs in user lookup

Closes #645

See merge request pleroma/pleroma!829

5 years agoAdd tests, change default config values, fix a bug
Karen Konou [Fri, 15 Feb 2019 11:47:50 +0000 (12:47 +0100)]
Add tests, change default config values, fix a bug

5 years agoAdd logic for keeping follow_request_count up-to-date on the `follow`,
eugenijm [Sat, 9 Feb 2019 23:26:29 +0000 (02:26 +0300)]
Add logic for keeping follow_request_count up-to-date on the `follow`,

`approve_friend_request`, and `deny_friend_request` actions.
Add follow_request_count to the user view.

5 years agotest: user: add a test for whether user search returns a user or not
William Pitcock [Thu, 14 Feb 2019 19:59:12 +0000 (19:59 +0000)]
test: user: add a test for whether user search returns a user or not

5 years agouser: search: use get_or_fetch() instead of get_or_fetch_by_nickname()
William Pitcock [Thu, 14 Feb 2019 19:58:24 +0000 (19:58 +0000)]
user: search: use get_or_fetch() instead of get_or_fetch_by_nickname()

get_or_fetch() handles the nickname verses URI differences transparently.

5 years agoMerge branch 'bugfix/activitypub-reserialization' into 'develop'
lambda [Thu, 14 Feb 2019 19:54:16 +0000 (19:54 +0000)]
Merge branch 'bugfix/activitypub-reserialization' into 'develop'

activitypub transmogrifier: fix reserialization edge cases

See merge request pleroma/pleroma!826

5 years agoactivitypub: clean up logging statements a little
William Pitcock [Thu, 14 Feb 2019 19:42:33 +0000 (19:42 +0000)]
activitypub: clean up logging statements a little

5 years agoMerge remote-tracking branch 'upstream/develop' into patch-image-description
Wim Vanderbauwhede [Thu, 14 Feb 2019 16:41:40 +0000 (16:41 +0000)]
Merge remote-tracking branch 'upstream/develop' into patch-image-description

5 years ago[#468] Refactored OAuth scopes parsing / defaults handling.
Ivan Tashkinov [Thu, 14 Feb 2019 14:03:19 +0000 (17:03 +0300)]
[#468] Refactored OAuth scopes parsing / defaults handling.

5 years ago[#468] OAuth scopes-related data migration simplification.
Ivan Tashkinov [Thu, 14 Feb 2019 11:28:26 +0000 (14:28 +0300)]
[#468] OAuth scopes-related data migration simplification.

5 years agoMerge branch 'fix/mediaproxy-s3' into 'develop'
href [Thu, 14 Feb 2019 10:10:13 +0000 (10:10 +0000)]
Merge branch 'fix/mediaproxy-s3' into 'develop'

Fix S3 links encoding in Mediaproxy

Closes #580

See merge request pleroma/pleroma!828

5 years agoFix queue name
Egor Kislitsyn [Thu, 14 Feb 2019 10:02:47 +0000 (17:02 +0700)]
Fix queue name

5 years agofix S3 links encoding in Mediaproxy
Egor Kislitsyn [Thu, 14 Feb 2019 08:55:21 +0000 (15:55 +0700)]
fix S3 links encoding in Mediaproxy

5 years agoMerge branch 'fix/credo-issues-test' into 'develop'
kaniini [Thu, 14 Feb 2019 03:55:26 +0000 (03:55 +0000)]
Merge branch 'fix/credo-issues-test' into 'develop'

Fix credo issues in ./test

See merge request pleroma/pleroma!808

5 years agoMerge branch 'bugfix/activitypub-totalitems-removal' into 'develop'
Haelwenn [Thu, 14 Feb 2019 03:40:33 +0000 (03:40 +0000)]
Merge branch 'bugfix/activitypub-totalitems-removal' into 'develop'

activitypub: user inbox/outbox: `totalItems` removal

See merge request pleroma/pleroma!827

5 years agotests: update tests for totalItems leak fix
William Pitcock [Thu, 14 Feb 2019 03:22:54 +0000 (03:22 +0000)]
tests: update tests for totalItems leak fix

5 years agoactivitypub: user view: formatting
William Pitcock [Thu, 14 Feb 2019 03:13:07 +0000 (03:13 +0000)]
activitypub: user view: formatting

5 years agoactivitypub: user view: report totalItems=0 for follows/followers when hidden
William Pitcock [Thu, 14 Feb 2019 03:03:41 +0000 (03:03 +0000)]
activitypub: user view: report totalItems=0 for follows/followers when hidden

5 years agoactivitypub: user view: remove totalItems from user outbox
William Pitcock [Thu, 14 Feb 2019 03:02:45 +0000 (03:02 +0000)]
activitypub: user view: remove totalItems from user outbox

(this is based on a counter in User.Info, but the counter is not reliable.)

5 years agoactivitypub: user view: remove totalInbox from user inbox view
William Pitcock [Thu, 14 Feb 2019 03:01:39 +0000 (03:01 +0000)]
activitypub: user view: remove totalInbox from user inbox view

It is not really feasible to quickly calculate the totalItems value and
it shouldn't be trusted anyway.

5 years agoMerge branch 'feature/activitypub-oauth-endpoints' into 'develop'
kaniini [Thu, 14 Feb 2019 02:50:06 +0000 (02:50 +0000)]
Merge branch 'feature/activitypub-oauth-endpoints' into 'develop'

ActivityPub C2S oauth endpoints

See merge request pleroma/pleroma!821

5 years agoactivitypub: user view: do not expose oAuth endpoints for instance users
William Pitcock [Thu, 14 Feb 2019 02:41:21 +0000 (02:41 +0000)]
activitypub: user view: do not expose oAuth endpoints for instance users

5 years agooauth: never use base64 padding when returning tokens to applications
William Pitcock [Thu, 14 Feb 2019 01:05:25 +0000 (01:05 +0000)]
oauth: never use base64 padding when returning tokens to applications

The normal Base64 alphabet uses the equals sign (=) as a padding character.  Since
Base64 strings are self-synchronizing, padding characters are unnecessary, so don't
generate them in the first place.

5 years agotests: add some reserialization tests based on IR differences
William Pitcock [Thu, 14 Feb 2019 00:59:18 +0000 (00:59 +0000)]
tests: add some reserialization tests based on IR differences

5 years agoactivitypub: transmogrifier: correctly handle nil inReplyTo value
William Pitcock [Thu, 14 Feb 2019 00:34:20 +0000 (00:34 +0000)]
activitypub: transmogrifier: correctly handle nil inReplyTo value

5 years agoactivitypub: transmogrifier: do not attempt to expand pre-existing AS2 tag objects
William Pitcock [Thu, 14 Feb 2019 00:27:35 +0000 (00:27 +0000)]
activitypub: transmogrifier: do not attempt to expand pre-existing AS2 tag objects

5 years agoMerge branch 'feature/better-login-errors' into 'develop'
kaniini [Wed, 13 Feb 2019 23:42:11 +0000 (23:42 +0000)]
Merge branch 'feature/better-login-errors' into 'develop'

Improve login error for OAuth flow

See merge request pleroma/pleroma!824

5 years agoImprove login error for OAuth flow
Mark Felder [Wed, 13 Feb 2019 22:33:22 +0000 (22:33 +0000)]
Improve login error for OAuth flow

5 years ago[#468] User UI for OAuth permissions restriction. Standardized storage format for...
Ivan Tashkinov [Wed, 13 Feb 2019 21:29:29 +0000 (00:29 +0300)]
[#468] User UI for OAuth permissions restriction. Standardized storage format for `scopes` fields, updated usages.

5 years agotests: add tests for endpoints
William Pitcock [Wed, 13 Feb 2019 19:48:24 +0000 (19:48 +0000)]
tests: add tests for endpoints

5 years agoactivitypub: user view: use route helpers instead of hardcoded URIs
William Pitcock [Wed, 13 Feb 2019 19:20:41 +0000 (19:20 +0000)]
activitypub: user view: use route helpers instead of hardcoded URIs

5 years agoactivitypub: user view: add oauthRegistrationEndpoint to user profiles
William Pitcock [Tue, 12 Feb 2019 21:49:48 +0000 (21:49 +0000)]
activitypub: user view: add oauthRegistrationEndpoint to user profiles

5 years agoactivitypub: user view: fix up endpoints rendering
William Pitcock [Tue, 12 Feb 2019 21:42:32 +0000 (21:42 +0000)]
activitypub: user view: fix up endpoints rendering

5 years agolitepub schema: add oauthRegistrationEndpoint [ci skip]
William Pitcock [Tue, 12 Feb 2019 21:37:37 +0000 (21:37 +0000)]
litepub schema: add oauthRegistrationEndpoint [ci skip]

5 years agouser view: add AP C2S oauth endpoints to local user profiles
William Pitcock [Tue, 12 Feb 2019 21:28:11 +0000 (21:28 +0000)]
user view: add AP C2S oauth endpoints to local user profiles