William Pitcock [Sat, 26 May 2018 14:45:41 +0000 (14:45 +0000)]
mix: add task for setting an account as locked or not
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
eal [Mon, 11 Jun 2018 19:53:38 +0000 (22:53 +0300)]
make_moderator.ex: set cache on update
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
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
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
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
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
squidboi [Fri, 8 Jun 2018 05:33:50 +0000 (22:33 -0700)]
s/get_by_ap_id/get_cached_by_ap_id/
squidboi [Fri, 8 Jun 2018 05:14:39 +0000 (22:14 -0700)]
final format
squidboi [Fri, 8 Jun 2018 05:10:11 +0000 (22:10 -0700)]
even more formatting
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
squidboi [Fri, 8 Jun 2018 05:03:24 +0000 (22:03 -0700)]
more formatting
squidboi [Fri, 8 Jun 2018 04:55:58 +0000 (21:55 -0700)]
formatting
squidboi [Fri, 8 Jun 2018 04:00:57 +0000 (21:00 -0700)]
add mrf for dropping follower-only and direct posts
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
William Pitcock [Fri, 8 Jun 2018 02:28:08 +0000 (02:28 +0000)]
tests: add regression test for locking/unlocking account updates
William Pitcock [Fri, 8 Jun 2018 02:18:47 +0000 (02:18 +0000)]
activitypub transmogrifier: fix locked account state from being clobbered
William Pitcock [Sat, 26 May 2018 15:03:32 +0000 (15:03 +0000)]
activitypub transmogrifier: learn locked state in Update messages
lambda [Thu, 7 Jun 2018 16:29:33 +0000 (16:29 +0000)]
Merge branch 'develop' into 'mastopost'
# Conflicts:
# .gitignore
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
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
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.
Rachel H [Thu, 7 Jun 2018 04:26:44 +0000 (21:26 -0700)]
Fix follow errors
Rachel H [Wed, 6 Jun 2018 06:47:16 +0000 (23:47 -0700)]
Allow posting images without text in mastofe
eal [Wed, 6 Jun 2018 18:13:40 +0000 (21:13 +0300)]
Extract host from ap_id, add index
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
William Pitcock [Wed, 6 Jun 2018 16:36:58 +0000 (16:36 +0000)]
testsuite: update fixture URIs that were 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
William Pitcock [Fri, 1 Jun 2018 17:55:25 +0000 (17:55 +0000)]
XML: handle erlang errors too
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
D Anzorge [Wed, 6 Jun 2018 01:18:11 +0000 (03:18 +0200)]
Add OAuth controller tests
Tests for Pleroma.Web.OAuth.OAuthController
D Anzorge [Wed, 6 Jun 2018 01:14:50 +0000 (03:14 +0200)]
Make token exchange return errors with 400 as status code
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
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
eal [Sun, 3 Jun 2018 20:33:33 +0000 (23:33 +0300)]
ActivityPub.ex: filter domain blocked activities.
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
eal [Sun, 3 Jun 2018 19:21:23 +0000 (22:21 +0300)]
MastoAPI: add domain blocking.
lain [Sun, 3 Jun 2018 19:04:44 +0000 (21:04 +0200)]
Better error handling for OstatusController.
eal [Sun, 3 Jun 2018 19:01:37 +0000 (22:01 +0300)]
user.ex: add domain blocks.
witti [Sun, 3 Jun 2018 18:13:33 +0000 (20:13 +0200)]
caddy config example
lain [Sun, 3 Jun 2018 17:58:59 +0000 (19:58 +0200)]
Better error handling for ActivityPubController
lain [Sun, 3 Jun 2018 17:28:11 +0000 (19:28 +0200)]
Better error handling for MastodonApiController.
lain [Sun, 3 Jun 2018 17:11:22 +0000 (19:11 +0200)]
Better error handling in TwitterApiController.
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
lain [Sat, 2 Jun 2018 17:45:23 +0000 (19:45 +0200)]
Revert "Update Mastofe."
This reverts commit
726b131b0a675a1116e579e0c1adbed8e5a1a856.
Some things broke (threads).
lain [Sat, 2 Jun 2018 14:11:38 +0000 (16:11 +0200)]
Update Mastofe.
lain [Sat, 2 Jun 2018 13:39:21 +0000 (15:39 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma 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
eal [Fri, 1 Jun 2018 09:16:42 +0000 (12:16 +0300)]
MastoAPI user timelines: render statuses for the logged in user.
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
eal [Thu, 31 May 2018 12:27:42 +0000 (15:27 +0300)]
TwitterAPI: fix "Follows you" being shown for the wrong user.
lain [Wed, 30 May 2018 18:00:27 +0000 (20:00 +0200)]
Fix url guessing attacks.
lain [Wed, 30 May 2018 18:00:27 +0000 (20:00 +0200)]
Fix url guessing attacks.
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
eal [Wed, 30 May 2018 12:02:22 +0000 (15:02 +0300)]
MastoAPI: fix dm_timeline getting non-create activities.
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
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
eal [Tue, 29 May 2018 10:29:51 +0000 (13:29 +0300)]
MastoAPI: Fix link headers with restrictive params.
lain [Mon, 28 May 2018 10:39:49 +0000 (12:39 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
lain [Mon, 28 May 2018 10:38:48 +0000 (12:38 +0200)]
Only return certain activities in TwitterAPI mentions.
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.
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
William Pitcock [Sun, 27 May 2018 13:06:38 +0000 (13:06 +0000)]
run mix format
William Pitcock [Sun, 27 May 2018 13:03:34 +0000 (13:03 +0000)]
tests: update for html changes
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
lain [Sat, 26 May 2018 19:06:46 +0000 (21:06 +0200)]
Fix user topic streaming.
lain [Sat, 26 May 2018 14:26:14 +0000 (16:26 +0200)]
Merge branch 'csaurus/pleroma-feature/mstdn-direct-api' into develop
lain [Sat, 26 May 2018 14:25:32 +0000 (16:25 +0200)]
Simplify DM query.
Should also use indexes better.
lain [Sat, 26 May 2018 14:00:59 +0000 (16:00 +0200)]
Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api
lain [Sat, 26 May 2018 13:20:21 +0000 (15:20 +0200)]
There are no symbols in JSON.
lain [Sat, 26 May 2018 13:15:52 +0000 (15:15 +0200)]
Merge branch 'kaniini/pleroma-feature/activitypub-accept-reject-conformance' into develop
lain [Sat, 26 May 2018 13:11:50 +0000 (15:11 +0200)]
Formatting.
lain [Sat, 26 May 2018 13:07:21 +0000 (15:07 +0200)]
Make Mastodon follow hack more explicit.
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.
lain [Sat, 26 May 2018 11:52:05 +0000 (13:52 +0200)]
Rename id helper method.
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
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
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
William Pitcock [Sat, 26 May 2018 08:24:50 +0000 (08:24 +0000)]
activitypub: allow mastodon S2S block extension support to be disabled
William Pitcock [Fri, 25 May 2018 12:51:04 +0000 (12:51 +0000)]
activitypub transmogrifier: cleanups and tests for incoming accepts/rejects
William Pitcock [Fri, 25 May 2018 09:38:07 +0000 (09:38 +0000)]
activitypub transmogrifier: clean up accept/reject handling a bit
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()
William Pitcock [Fri, 25 May 2018 08:35:38 +0000 (08:35 +0000)]
twitter api: also remove explicit User.follow here
William Pitcock [Fri, 25 May 2018 08:03:34 +0000 (08:03 +0000)]
run mix format
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
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
William Pitcock [Fri, 25 May 2018 06:09:01 +0000 (06:09 +0000)]
activitypub: fix up accept/reject semantics for following
fixes #175
William Pitcock [Fri, 25 May 2018 04:15:42 +0000 (04:15 +0000)]
mastodon api: properly track if an account is locked or not
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)
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)
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
William Pitcock [Fri, 25 May 2018 03:16:02 +0000 (03:16 +0000)]
user: do not allow refollowing somebody who has blocked a user
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)
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
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
Francis Dinh [Thu, 24 May 2018 17:26:59 +0000 (13:26 -0400)]
Rewrite block fetch query
lain [Thu, 24 May 2018 17:25:44 +0000 (19:25 +0200)]
update frontend
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
eal [Sun, 29 Apr 2018 13:02:46 +0000 (16:02 +0300)]
MastoAPI: add lists.
projects / akkoma / log