akkoma
6 years agotwitterapi: add profile setting for locked/unlocked accounts
William Pitcock [Mon, 28 May 2018 18:19:20 +0000 (18:19 +0000)]
twitterapi: add profile setting for locked/unlocked accounts

6 years agotests: assert the state prior to mutating it as well as afterward
William Pitcock [Mon, 28 May 2018 17:51:50 +0000 (17:51 +0000)]
tests: assert the state prior to mutating it as well as afterward

6 years agotestsuite: add mastodon api tests
William Pitcock [Mon, 28 May 2018 17:45:23 +0000 (17:45 +0000)]
testsuite: add mastodon api tests

6 years agoactivitypub transmogrifier: remove debug code
William Pitcock [Mon, 28 May 2018 17:42:58 +0000 (17:42 +0000)]
activitypub transmogrifier: remove debug code

6 years agouser: add a workaround for situations where Pleroma may believe a followee is followed
William Pitcock [Mon, 28 May 2018 16:42:18 +0000 (16:42 +0000)]
user: add a workaround for situations where Pleroma may believe a followee is followed

this was caused by lack of Undo follows in the early days, and can likely be eventually removed

6 years agoactivitypub: when unfollowing, update the follow activity's disposition to 'cancelled...
William Pitcock [Sun, 27 May 2018 13:51:13 +0000 (13:51 +0000)]
activitypub: when unfollowing, update the follow activity's disposition to 'cancelled' so it cannot be reused

6 years agomastodon api: allow setting an account locked or not
William Pitcock [Sun, 27 May 2018 10:03:53 +0000 (10:03 +0000)]
mastodon api: allow setting an account locked or not

6 years agouser: use Enum.uniq on the follow request query
William Pitcock [Sun, 27 May 2018 09:45:12 +0000 (09:45 +0000)]
user: use Enum.uniq on the follow request query

6 years agoactivitypub transmogrifier: send Rejects in the format Mastodon wants
William Pitcock [Sun, 27 May 2018 09:10:46 +0000 (09:10 +0000)]
activitypub transmogrifier: send Rejects in the format Mastodon wants

6 years agoactivitypub transmogrifier: send @context on accept activities
William Pitcock [Sun, 27 May 2018 09:09:35 +0000 (09:09 +0000)]
activitypub transmogrifier: send @context on accept activities

6 years agoadd a bunch of stuff
William Pitcock [Sat, 26 May 2018 18:03:23 +0000 (18:03 +0000)]
add a bunch of stuff

6 years agostash api controller
William Pitcock [Sat, 26 May 2018 16:16:20 +0000 (16:16 +0000)]
stash api controller

6 years agoimplement tracking of follow requests
William Pitcock [Sat, 26 May 2018 16:03:32 +0000 (16:03 +0000)]
implement tracking of follow requests

6 years agoactivitypub transmogrifier: learn locked state in Update messages
William Pitcock [Sat, 26 May 2018 15:03:32 +0000 (15:03 +0000)]
activitypub transmogrifier: learn locked state in Update messages

6 years agoactivitypub: only send accept back automatically if the account is not locked
William Pitcock [Sat, 26 May 2018 14:55:16 +0000 (14:55 +0000)]
activitypub: only send accept back automatically if the account is not locked

6 years agomix: add task for setting an account as locked or not
William Pitcock [Sat, 26 May 2018 14:45:41 +0000 (14:45 +0000)]
mix: add task for setting an account as locked or not

6 years agoMerge branch 'fix/mix-task-caching' into 'develop'
eal [Mon, 11 Jun 2018 19:59:30 +0000 (19:59 +0000)]
Merge branch 'fix/mix-task-caching' into 'develop'

make_moderator.ex: set cache on update

See merge request pleroma/pleroma!206

6 years agomake_moderator.ex: set cache on update
eal [Mon, 11 Jun 2018 19:53:38 +0000 (22:53 +0300)]
make_moderator.ex: set cache on update

6 years agoMerge branch 'feature/domain-blocks' into 'develop'
lambda [Mon, 11 Jun 2018 11:19:45 +0000 (11:19 +0000)]
Merge branch 'feature/domain-blocks' into 'develop'

Domain blocks

See merge request pleroma/pleroma!190

6 years agoMerge branch 'users' into 'develop'
lambda [Fri, 8 Jun 2018 11:10:10 +0000 (11:10 +0000)]
Merge branch 'users' into 'develop'

Fix users lookup/return type

See merge request pleroma/pleroma!201

6 years agoMerge branch 'feature/rejectnonpublic' into 'develop'
lambda [Fri, 8 Jun 2018 11:08:50 +0000 (11:08 +0000)]
Merge branch 'feature/rejectnonpublic' into 'develop'

Add MRF to drop all posts with "followers-only" or "direct" privacy settings

See merge request pleroma/pleroma!202

6 years agoFix users lookup/return type
Rachel H [Fri, 8 Jun 2018 04:23:30 +0000 (21:23 -0700)]
Fix users lookup/return type

* Allow viewing user in frontend by id on pageload

6 years agoMerge branch 'mastopost' into 'develop'
lambda [Fri, 8 Jun 2018 06:02:21 +0000 (06:02 +0000)]
Merge branch 'mastopost' into 'develop'

Allow posting images without text in mastofe

See merge request pleroma/pleroma!194

6 years agos/get_by_ap_id/get_cached_by_ap_id/
squidboi [Fri, 8 Jun 2018 05:33:50 +0000 (22:33 -0700)]
s/get_by_ap_id/get_cached_by_ap_id/

6 years agofinal format
squidboi [Fri, 8 Jun 2018 05:14:39 +0000 (22:14 -0700)]
final format

6 years agoeven more formatting
squidboi [Fri, 8 Jun 2018 05:10:11 +0000 (22:10 -0700)]
even more formatting

6 years agoMerge branch 'bugfix/locked-account-regression' into 'develop'
lambda [Fri, 8 Jun 2018 05:10:08 +0000 (05:10 +0000)]
Merge branch 'bugfix/locked-account-regression' into 'develop'

security fix: locked account regression

See merge request pleroma/pleroma!200

6 years agomore formatting
squidboi [Fri, 8 Jun 2018 05:03:24 +0000 (22:03 -0700)]
more formatting

6 years agoformatting
squidboi [Fri, 8 Jun 2018 04:55:58 +0000 (21:55 -0700)]
formatting

6 years agoadd mrf for dropping follower-only and direct posts
squidboi [Fri, 8 Jun 2018 04:00:57 +0000 (21:00 -0700)]
add mrf for dropping follower-only and direct posts

6 years agouser: fix maybe_direct_follow() after user_info() refactoring broke it slightly
William Pitcock [Fri, 8 Jun 2018 02:47:07 +0000 (02:47 +0000)]
user: fix maybe_direct_follow() after user_info() refactoring broke it slightly

6 years agotests: add regression test for locking/unlocking account updates
William Pitcock [Fri, 8 Jun 2018 02:28:08 +0000 (02:28 +0000)]
tests: add regression test for locking/unlocking account updates

6 years agoactivitypub transmogrifier: fix locked account state from being clobbered
William Pitcock [Fri, 8 Jun 2018 02:18:47 +0000 (02:18 +0000)]
activitypub transmogrifier: fix locked account state from being clobbered

6 years agoactivitypub transmogrifier: learn locked state in Update messages
William Pitcock [Sat, 26 May 2018 15:03:32 +0000 (15:03 +0000)]
activitypub transmogrifier: learn locked state in Update messages

6 years agoMerge branch 'develop' into 'mastopost'
lambda [Thu, 7 Jun 2018 16:29:33 +0000 (16:29 +0000)]
Merge branch 'develop' into 'mastopost'

# Conflicts:
#   .gitignore

6 years agoMerge branch 'feature/quarantine' into 'develop'
lambda [Thu, 7 Jun 2018 14:44:08 +0000 (14:44 +0000)]
Merge branch 'feature/quarantine' into 'develop'

add the ability to 'quarantine' an activitypub peer, causing them to be treated as an OStatus peer.

See merge request pleroma/pleroma!199

6 years agoMerge branch 'import' into 'develop'
lambda [Thu, 7 Jun 2018 14:42:32 +0000 (14:42 +0000)]
Merge branch 'import' into 'develop'

Fix follow errors

See merge request pleroma/pleroma!198

6 years agoadd the ability to 'quarantine' an activitypub peer, causing them to be treated as...
William Pitcock [Thu, 7 Jun 2018 03:26:41 +0000 (03:26 +0000)]
add the ability to 'quarantine' an activitypub peer, causing them to be treated as an OStatus peer.

6 years agoFix follow errors
Rachel H [Thu, 7 Jun 2018 04:26:44 +0000 (21:26 -0700)]
Fix follow errors

6 years agoAllow posting images without text in mastofe
Rachel H [Wed, 6 Jun 2018 06:47:16 +0000 (23:47 -0700)]
Allow posting images without text in mastofe

6 years agoExtract host from ap_id, add index
eal [Wed, 6 Jun 2018 18:13:40 +0000 (21:13 +0300)]
Extract host from ap_id, add index

6 years agoMerge branch 'bugfix/webfinger-xml-crash' into 'develop'
lambda [Wed, 6 Jun 2018 16:44:44 +0000 (16:44 +0000)]
Merge branch 'bugfix/webfinger-xml-crash' into 'develop'

webfinger robustness improvements

See merge request pleroma/pleroma!195

6 years agotestsuite: update fixture URIs that were http
William Pitcock [Wed, 6 Jun 2018 16:36:58 +0000 (16:36 +0000)]
testsuite: update fixture URIs that were http

6 years agowebfinger: use https as default fallback instead of http
William Pitcock [Fri, 1 Jun 2018 17:58:20 +0000 (17:58 +0000)]
webfinger: use https as default fallback instead of http

realistically, all instances need to be on https anyway to properly federate with all
software

6 years agoXML: handle erlang errors too
William Pitcock [Fri, 1 Jun 2018 17:55:25 +0000 (17:55 +0000)]
XML: handle erlang errors too

6 years agoMerge branch 'fix/oauth-http-basic' into 'develop'
lambda [Wed, 6 Jun 2018 08:27:08 +0000 (08:27 +0000)]
Merge branch 'fix/oauth-http-basic' into 'develop'

Make OAuth token endpoint work with HTTP Basic auth

See merge request pleroma/pleroma!191

6 years agoAdd OAuth controller tests
D Anzorge [Wed, 6 Jun 2018 01:18:11 +0000 (03:18 +0200)]
Add OAuth controller tests

Tests for Pleroma.Web.OAuth.OAuthController

6 years agoMake token exchange return errors with 400 as status code
D Anzorge [Wed, 6 Jun 2018 01:14:50 +0000 (03:14 +0200)]
Make token exchange return errors with 400 as status code

6 years agoMerge branch 'fix/emoji-picker' into 'develop'
eal [Tue, 5 Jun 2018 21:18:25 +0000 (21:18 +0000)]
Merge branch 'fix/emoji-picker' into 'develop'

set visible_in_picker to true in custom_emojis

Closes #177 and mastofe#16

See merge request pleroma/pleroma!188

6 years agoMake OAuth token endpoint work with HTTP Basic auth
D Anzorge [Fri, 1 Jun 2018 16:01:56 +0000 (18:01 +0200)]
Make OAuth token endpoint work with HTTP Basic auth

client_id/client_secret can now be supplied in an Authorization header

6 years agoActivityPub.ex: filter domain blocked activities.
eal [Sun, 3 Jun 2018 20:33:33 +0000 (23:33 +0300)]
ActivityPub.ex: filter domain blocked activities.

6 years agoMerge branch 'develop' into 'develop'
lambda [Sun, 3 Jun 2018 19:52:48 +0000 (19:52 +0000)]
Merge branch 'develop' into 'develop'

Added: caddy webserver config example

Closes #192

See merge request pleroma/pleroma!189

6 years agoMastoAPI: add domain blocking.
eal [Sun, 3 Jun 2018 19:21:23 +0000 (22:21 +0300)]
MastoAPI: add domain blocking.

6 years agoBetter error handling for OstatusController.
lain [Sun, 3 Jun 2018 19:04:44 +0000 (21:04 +0200)]
Better error handling for OstatusController.

6 years agouser.ex: add domain blocks.
eal [Sun, 3 Jun 2018 19:01:37 +0000 (22:01 +0300)]
user.ex: add domain blocks.

6 years agocaddy config example
witti [Sun, 3 Jun 2018 18:13:33 +0000 (20:13 +0200)]
caddy config example

6 years agoBetter error handling for ActivityPubController
lain [Sun, 3 Jun 2018 17:58:59 +0000 (19:58 +0200)]
Better error handling for ActivityPubController

6 years agoBetter error handling for MastodonApiController.
lain [Sun, 3 Jun 2018 17:28:11 +0000 (19:28 +0200)]
Better error handling for MastodonApiController.

6 years agoBetter error handling in TwitterApiController.
lain [Sun, 3 Jun 2018 17:11:22 +0000 (19:11 +0200)]
Better error handling in TwitterApiController.

6 years agolib/pleroma/web/mastodon_api/mastodon_api_controller.ex: set visible_in_picker to...
Haelwenn (lanodan) Monnier [Tue, 1 May 2018 06:24:30 +0000 (08:24 +0200)]
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex: set visible_in_picker to true in custom_emojis

Fixes: https://github.com/ilianaw/emojos.in/issues/4
Closes: https://git.pleroma.social/pleroma/pleroma/issues/177
Closes: https://git.pleroma.social/pleroma/mastofe/issues/16
6 years agoRevert "Update Mastofe."
lain [Sat, 2 Jun 2018 17:45:23 +0000 (19:45 +0200)]
Revert "Update Mastofe."

This reverts commit 726b131b0a675a1116e579e0c1adbed8e5a1a856.

Some things broke (threads).

6 years agoUpdate Mastofe.
lain [Sat, 2 Jun 2018 14:11:38 +0000 (16:11 +0200)]
Update Mastofe.

6 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
lain [Sat, 2 Jun 2018 13:39:21 +0000 (15:39 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

6 years agoMerge branch 'fix/user-timeline-reading-user' into 'develop'
eal [Fri, 1 Jun 2018 09:35:29 +0000 (09:35 +0000)]
Merge branch 'fix/user-timeline-reading-user' into 'develop'

MastoAPI user timelines: render statuses for the logged in user.

See merge request pleroma/pleroma!187

6 years agoMastoAPI user timelines: render statuses for the logged in user.
eal [Fri, 1 Jun 2018 09:16:42 +0000 (12:16 +0300)]
MastoAPI user timelines: render statuses for the logged in user.

6 years agoMerge branch 'fix/twitterapi-incorrect-follows-you' into 'develop'
lambda [Fri, 1 Jun 2018 08:51:04 +0000 (08:51 +0000)]
Merge branch 'fix/twitterapi-incorrect-follows-you' into 'develop'

TwitterAPI: fix "Follows you" being shown for the wrong user.

Closes pleroma-fe#89

See merge request pleroma/pleroma!185

6 years agoTwitterAPI: fix "Follows you" being shown for the wrong user.
eal [Thu, 31 May 2018 12:27:42 +0000 (15:27 +0300)]
TwitterAPI: fix "Follows you" being shown for the wrong user.

6 years agoFix url guessing attacks.
lain [Wed, 30 May 2018 18:00:27 +0000 (20:00 +0200)]
Fix url guessing attacks.

6 years agoFix url guessing attacks.
lain [Wed, 30 May 2018 18:00:27 +0000 (20:00 +0200)]
Fix url guessing attacks.

6 years agoMerge branch 'fix/dm-timeline-activities' into 'develop'
eal [Wed, 30 May 2018 12:31:59 +0000 (12:31 +0000)]
Merge branch 'fix/dm-timeline-activities' into 'develop'

MastoAPI: fix dm_timeline getting non-create activities.

See merge request pleroma/pleroma!182

6 years agoMastoAPI: fix dm_timeline getting non-create activities.
eal [Wed, 30 May 2018 12:02:22 +0000 (15:02 +0300)]
MastoAPI: fix dm_timeline getting non-create activities.

6 years agoMerge branch 'patch-3' into 'develop'
lambda [Tue, 29 May 2018 10:58:43 +0000 (10:58 +0000)]
Merge branch 'patch-3' into 'develop'

Update pleroma.nginx

See merge request pleroma/pleroma!179

6 years agoMerge branch 'fix/link-headers' into 'develop'
lambda [Tue, 29 May 2018 10:58:27 +0000 (10:58 +0000)]
Merge branch 'fix/link-headers' into 'develop'

MastoAPI: Fix link headers with restrictive params.

See merge request pleroma/pleroma!181

6 years agoMastoAPI: Fix link headers with restrictive params.
eal [Tue, 29 May 2018 10:29:51 +0000 (13:29 +0300)]
MastoAPI: Fix link headers with restrictive params.

6 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
lain [Mon, 28 May 2018 10:39:49 +0000 (12:39 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

6 years agoOnly return certain activities in TwitterAPI mentions.
lain [Mon, 28 May 2018 10:38:48 +0000 (12:38 +0200)]
Only return certain activities in TwitterAPI mentions.

6 years agoUpdate pleroma.nginx
Dominik V. Salonen [Mon, 28 May 2018 10:36:27 +0000 (10:36 +0000)]
Update pleroma.nginx

proxy_ignore_client_abort will continue to fetch from upstream even if a client aborts the connection. This is highly recommended when cache is being used. If a client leaves/refreshes the page while a user's avatar or some other media is halfway loaded, the cached copy might in some cases be broken. Leaving future requests to the same URL broken until cache expires.

6 years agoMerge branch 'feature/mastodon-context-microformat' into 'develop'
lambda [Sun, 27 May 2018 13:16:10 +0000 (13:16 +0000)]
Merge branch 'feature/mastodon-context-microformat' into 'develop'

formatter: use class='mention' on links to user profiles

See merge request pleroma/pleroma!178

6 years agorun mix format
William Pitcock [Sun, 27 May 2018 13:06:38 +0000 (13:06 +0000)]
run mix format

6 years agotests: update for html changes
William Pitcock [Sun, 27 May 2018 13:03:34 +0000 (13:03 +0000)]
tests: update for html changes

6 years agoformatter: use class='mention' on links to user profiles
William Pitcock [Sun, 27 May 2018 12:53:14 +0000 (12:53 +0000)]
formatter: use class='mention' on links to user profiles

helps mastodon frontend and apps have better context:
https://mastodon.social/users/Gargron/statuses/100101267352899379

6 years agoFix user topic streaming.
lain [Sat, 26 May 2018 19:06:46 +0000 (21:06 +0200)]
Fix user topic streaming.

6 years agoMerge branch 'csaurus/pleroma-feature/mstdn-direct-api' into develop
lain [Sat, 26 May 2018 14:26:14 +0000 (16:26 +0200)]
Merge branch 'csaurus/pleroma-feature/mstdn-direct-api' into develop

6 years agoSimplify DM query.
lain [Sat, 26 May 2018 14:25:32 +0000 (16:25 +0200)]
Simplify DM query.

Should also use indexes better.

6 years agoMerge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api
lain [Sat, 26 May 2018 14:00:59 +0000 (16:00 +0200)]
Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api

6 years agoThere are no symbols in JSON.
lain [Sat, 26 May 2018 13:20:21 +0000 (15:20 +0200)]
There are no symbols in JSON.

6 years agoMerge branch 'kaniini/pleroma-feature/activitypub-accept-reject-conformance' into...
lain [Sat, 26 May 2018 13:15:52 +0000 (15:15 +0200)]
Merge branch 'kaniini/pleroma-feature/activitypub-accept-reject-conformance' into develop

6 years agoFormatting.
lain [Sat, 26 May 2018 13:11:50 +0000 (15:11 +0200)]
Formatting.

6 years agoMake Mastodon follow hack more explicit.
lain [Sat, 26 May 2018 13:07:21 +0000 (15:07 +0200)]
Make Mastodon follow hack more explicit.

6 years agoDon't treat remote accepts/rejects as local.
lain [Sat, 26 May 2018 12:07:46 +0000 (14:07 +0200)]
Don't treat remote accepts/rejects as local.

Also, use specialized functions to get safe data.

6 years agoRename id helper method.
lain [Sat, 26 May 2018 11:52:05 +0000 (13:52 +0200)]
Rename id helper method.

6 years agotests: add tests to verify the accept request is discarded if no follow activity...
William Pitcock [Sat, 26 May 2018 11:16:05 +0000 (11:16 +0000)]
tests: add tests to verify the accept request is discarded if no follow activity could be found

6 years agoactivitypub transmogrifier: use fetch_latest_follow to verify a follow object exists
William Pitcock [Sat, 26 May 2018 11:07:04 +0000 (11:07 +0000)]
activitypub transmogrifier: use fetch_latest_follow to verify a follow object exists

6 years agoMerge branch 'feature/mastodon-s2s-block-opt-out' into 'develop'
lambda [Sat, 26 May 2018 09:50:54 +0000 (09:50 +0000)]
Merge branch 'feature/mastodon-s2s-block-opt-out' into 'develop'

activitypub: allow mastodon S2S block extension support to be disabled

See merge request pleroma/pleroma!176

6 years agoactivitypub: allow mastodon S2S block extension support to be disabled
William Pitcock [Sat, 26 May 2018 08:24:50 +0000 (08:24 +0000)]
activitypub: allow mastodon S2S block extension support to be disabled

6 years agoactivitypub transmogrifier: cleanups and tests for incoming accepts/rejects
William Pitcock [Fri, 25 May 2018 12:51:04 +0000 (12:51 +0000)]
activitypub transmogrifier: cleanups and tests for incoming accepts/rejects

6 years agoactivitypub transmogrifier: clean up accept/reject handling a bit
William Pitcock [Fri, 25 May 2018 09:38:07 +0000 (09:38 +0000)]
activitypub transmogrifier: clean up accept/reject handling a bit

6 years agointroduce User.maybe_direct_follow() and use it where we used to call User.follow()
William Pitcock [Fri, 25 May 2018 09:31:42 +0000 (09:31 +0000)]
introduce User.maybe_direct_follow() and use it where we used to call User.follow()

6 years agotwitter api: also remove explicit User.follow here
William Pitcock [Fri, 25 May 2018 08:35:38 +0000 (08:35 +0000)]
twitter api: also remove explicit User.follow here

6 years agorun mix format
William Pitcock [Fri, 25 May 2018 08:03:34 +0000 (08:03 +0000)]
run mix format