akkoma
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 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 agoBetter error handling for OstatusController.
lain [Sun, 3 Jun 2018 19:04:44 +0000 (21:04 +0200)]
Better error handling for OstatusController.

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

6 years agoMerge branch 'feature/blocks-deny-refollow' into 'develop'
lambda [Fri, 25 May 2018 07:15:01 +0000 (07:15 +0000)]
Merge branch 'feature/blocks-deny-refollow' into 'develop'

activitypub conformance: deny refollow for blocks

See merge request pleroma/pleroma!170

6 years agoMerge branch 'bugfix/follow-query-overhead' into 'develop'
lambda [Fri, 25 May 2018 07:13:05 +0000 (07:13 +0000)]
Merge branch 'bugfix/follow-query-overhead' into 'develop'

activitypub utils: optimize block and follow activity lookup

See merge request pleroma/pleroma!171

6 years agoactivitypub: fix up accept/reject semantics for following
William Pitcock [Fri, 25 May 2018 06:09:01 +0000 (06:09 +0000)]
activitypub: fix up accept/reject semantics for following

fixes #175

6 years agomastodon api: properly track if an account is locked or not
William Pitcock [Fri, 25 May 2018 04:15:42 +0000 (04:15 +0000)]
mastodon api: properly track if an account is locked or not

6 years agotestsuite: fix module name for CommonAPI.Test (was duplicated with CommonAPI.UtilsTest)
William Pitcock [Fri, 25 May 2018 03:14:49 +0000 (03:14 +0000)]
testsuite: fix module name for CommonAPI.Test (was duplicated with CommonAPI.UtilsTest)

6 years agotestsuite: fix module name for CommonAPI.Test (was duplicated with CommonAPI.UtilsTest)
William Pitcock [Fri, 25 May 2018 03:14:49 +0000 (03:14 +0000)]
testsuite: fix module name for CommonAPI.Test (was duplicated with CommonAPI.UtilsTest)

6 years agoactivitypub utils: optimize block and follow activity lookup
William Pitcock [Fri, 25 May 2018 05:19:11 +0000 (05:19 +0000)]
activitypub utils: optimize block and follow activity lookup

multi-field @> comparison is very expensive, so only use @> for the field where it matters
this makes the query take only a few usec to execute verses many msec on a busy instance

6 years agouser: do not allow refollowing somebody who has blocked a user
William Pitcock [Fri, 25 May 2018 03:16:02 +0000 (03:16 +0000)]
user: do not allow refollowing somebody who has blocked a user

6 years agotestsuite: fix module name for CommonAPI.Test (was duplicated with CommonAPI.UtilsTest)
William Pitcock [Fri, 25 May 2018 03:14:49 +0000 (03:14 +0000)]
testsuite: fix module name for CommonAPI.Test (was duplicated with CommonAPI.UtilsTest)

6 years agoMerge branch 'feature/lists' into 'develop'
lambda [Thu, 24 May 2018 20:22:43 +0000 (20:22 +0000)]
Merge branch 'feature/lists' into 'develop'

Mastodon List API

See merge request pleroma/pleroma!138

6 years agoMerge branch 'feature/incoming-remote-unfollow' into 'develop'
lambda [Thu, 24 May 2018 19:52:24 +0000 (19:52 +0000)]
Merge branch 'feature/incoming-remote-unfollow' into 'develop'

Add support for incoming remote unfollows and blocks/unblocks

See merge request pleroma/pleroma!158

6 years agoRewrite block fetch query
Francis Dinh [Thu, 24 May 2018 17:26:59 +0000 (13:26 -0400)]
Rewrite block fetch query

6 years agoupdate frontend
lain [Thu, 24 May 2018 17:25:44 +0000 (19:25 +0200)]
update frontend

6 years agoMerge branch 'feature/change-password' into 'develop'
lambda [Thu, 24 May 2018 17:16:37 +0000 (17:16 +0000)]
Merge branch 'feature/change-password' into 'develop'

Feature/change password

See merge request pleroma/pleroma!166

6 years agoMastoAPI: add lists.
eal [Sun, 29 Apr 2018 13:02:46 +0000 (16:02 +0300)]
MastoAPI: add lists.

6 years agoMore efficient queries.
lain [Thu, 24 May 2018 10:44:26 +0000 (12:44 +0200)]
More efficient queries.

6 years agoMastoAPI: add lists.
eal [Sun, 29 Apr 2018 13:02:46 +0000 (16:02 +0300)]
MastoAPI: add lists.

6 years agoDon't save double tags in AP objects we create
lain [Wed, 23 May 2018 15:25:24 +0000 (17:25 +0200)]
Don't save double tags in AP objects we create

This crashed Mastodon workers.

6 years agoMerge branch 'feature/deps-migration' into 'develop'
lambda [Wed, 23 May 2018 09:03:11 +0000 (09:03 +0000)]
Merge branch 'feature/deps-migration' into 'develop'

Migrate to comeonin 4 and Cachex 3

See merge request pleroma/pleroma!162

6 years agoRepair some access-control headers required for third-party webclients
Niklas Poslovski [Tue, 22 May 2018 14:26:01 +0000 (16:26 +0200)]
Repair some access-control headers required for third-party webclients

6 years agoMerge branch 'nipos-develop' into develop
lain [Tue, 22 May 2018 14:02:53 +0000 (16:02 +0200)]
Merge branch 'nipos-develop' into develop

6 years agoAdd access-control-expose-headers to Nginx default config
Niklas Poslovski [Tue, 22 May 2018 13:39:29 +0000 (15:39 +0200)]
Add access-control-expose-headers to Nginx default config

6 years agoHook up block/unblock to TwitterAPI
Francis Dinh [Tue, 22 May 2018 09:41:17 +0000 (05:41 -0400)]
Hook up block/unblock to TwitterAPI

6 years agoHook unfollow into TwitterAPI
Francis Dinh [Tue, 22 May 2018 08:49:30 +0000 (04:49 -0400)]
Hook unfollow into TwitterAPI

6 years agoHook up unfollow and (un)block to MastoAPI + tests
Francis Dinh [Tue, 22 May 2018 08:27:40 +0000 (04:27 -0400)]
Hook up unfollow and (un)block to MastoAPI + tests

6 years agoMerge branch 'develop' into feature/mstdn-direct-api
csaurus [Tue, 22 May 2018 00:19:37 +0000 (20:19 -0400)]
Merge branch 'develop' into feature/mstdn-direct-api

6 years agoFixed test
Syldexia [Mon, 21 May 2018 21:32:28 +0000 (22:32 +0100)]
Fixed test

6 years agoAdded endpoint for changing passwords
Syldexia [Mon, 21 May 2018 21:17:34 +0000 (22:17 +0100)]
Added endpoint for changing passwords

6 years agoMerge branch 'feature/clarify-http-sig-error' into 'develop'
lambda [Mon, 21 May 2018 21:20:41 +0000 (21:20 +0000)]
Merge branch 'feature/clarify-http-sig-error' into 'develop'

clarify HTTP signature error in logs

See merge request pleroma/pleroma!165

6 years agoactivitypub controller: note that the HTTP Host header must be forwarded for http...
William Pitcock [Mon, 21 May 2018 19:19:40 +0000 (19:19 +0000)]
activitypub controller: note that the HTTP Host header must be forwarded for http signature validation to work

6 years agoPass correct number of arguments to unfollow
Francis Dinh [Mon, 21 May 2018 15:57:15 +0000 (11:57 -0400)]
Pass correct number of arguments to unfollow

6 years agoMerge branch 'bugfix/webfinger-statusnet' into 'develop'
lambda [Mon, 21 May 2018 13:58:20 +0000 (13:58 +0000)]
Merge branch 'bugfix/webfinger-statusnet' into 'develop'

webfinger: fix finding the XRD uri for statusnet instances

See merge request pleroma/pleroma!164

6 years agowebfinger: fix finding the XRD uri for statusnet instances
William Pitcock [Mon, 21 May 2018 12:38:12 +0000 (12:38 +0000)]
webfinger: fix finding the XRD uri for statusnet instances

6 years agoActually fix missing alias.
lain [Mon, 21 May 2018 10:32:29 +0000 (12:32 +0200)]
Actually fix missing alias.

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

6 years agoAdd missing alias.
lain [Mon, 21 May 2018 10:09:03 +0000 (12:09 +0200)]
Add missing alias.

6 years agoAdd tests for incoming unfollow over OStatus
Francis Dinh [Mon, 21 May 2018 09:11:13 +0000 (05:11 -0400)]
Add tests for incoming unfollow over OStatus

6 years agoFix unblock handling
Francis Dinh [Mon, 21 May 2018 09:00:58 +0000 (05:00 -0400)]
Fix unblock handling

6 years agoHandle unfollows from OStatus
Francis Dinh [Mon, 21 May 2018 08:36:20 +0000 (04:36 -0400)]
Handle unfollows from OStatus

6 years agoAdd undo block handler
Francis Dinh [Mon, 21 May 2018 08:35:43 +0000 (04:35 -0400)]
Add undo block handler

6 years agoFormat
Francis Dinh [Mon, 21 May 2018 01:02:06 +0000 (21:02 -0400)]
Format

6 years agoFix unfollows
Francis Dinh [Mon, 21 May 2018 01:01:14 +0000 (21:01 -0400)]
Fix unfollows

6 years agopass user to User.blocks?/2 instead of ap_id
Francis Dinh [Sun, 20 May 2018 23:45:05 +0000 (19:45 -0400)]
pass user to User.blocks?/2 instead of ap_id

6 years agoMerge remote-tracking branch 'upstream/develop' into feature/incoming-remote-unfollow
Francis Dinh [Sun, 20 May 2018 23:17:15 +0000 (19:17 -0400)]
Merge remote-tracking branch 'upstream/develop' into feature/incoming-remote-unfollow

Fixed some conflicts in transmogrifier.ex