akkoma
5 years agoMerge branch 'develop' into feature/polls-2-electric-boogalo
rinpatch [Mon, 3 Jun 2019 08:14:52 +0000 (11:14 +0300)]
Merge branch 'develop' into feature/polls-2-electric-boogalo

5 years agoChange query order in fetch_activities_for_context_query to make poll vote exclusion...
rinpatch [Mon, 3 Jun 2019 07:58:37 +0000 (10:58 +0300)]
Change query order in fetch_activities_for_context_query to make poll vote exclusion work

5 years agoAdd a changelog entry for polls
rinpatch [Mon, 3 Jun 2019 07:55:16 +0000 (10:55 +0300)]
Add a changelog entry for polls

5 years agoRemove a TODO comment as the tests for poll view were written
rinpatch [Sun, 2 Jun 2019 20:46:17 +0000 (23:46 +0300)]
Remove a TODO comment as the tests for poll view were written

5 years agoMake error message about author's inability to vote more sensible
rinpatch [Sun, 2 Jun 2019 20:30:36 +0000 (23:30 +0300)]
Make error message about author's inability to vote more sensible

5 years agoAdd tests for poll view
rinpatch [Sun, 2 Jun 2019 20:25:33 +0000 (23:25 +0300)]
Add tests for poll view

5 years agoRefresh the object in CommonAPI.vote instead of MastoAPI controller
rinpatch [Sun, 2 Jun 2019 20:24:48 +0000 (23:24 +0300)]
Refresh the object in CommonAPI.vote instead of MastoAPI controller

5 years agoMerge branch 'bugfix/reverse-proxy-hackney-wtf' into 'develop'
kaniini [Sun, 2 Jun 2019 09:19:15 +0000 (09:19 +0000)]
Merge branch 'bugfix/reverse-proxy-hackney-wtf' into 'develop'

reverse proxy: clean up some @hackney leftovers

See merge request pleroma/pleroma!1232

5 years agoreverse proxy: clean up some @hackney leftovers
William Pitcock [Sun, 2 Jun 2019 09:09:58 +0000 (09:09 +0000)]
reverse proxy: clean up some @hackney leftovers

5 years agoMerge branch 'feature/notification-control-part-2' into 'develop'
kaniini [Sun, 2 Jun 2019 08:25:37 +0000 (08:25 +0000)]
Merge branch 'feature/notification-control-part-2' into 'develop'

notification controls, part 2

See merge request pleroma/pleroma!1204

5 years agoRemove index on object name used for excluding poll votes (replaced by just rewriting...
rinpatch [Sat, 1 Jun 2019 18:49:18 +0000 (21:49 +0300)]
Remove index on object name used for excluding poll votes (replaced by just rewriting Note to Answer)

5 years agoFix Credo issues
rinpatch [Sat, 1 Jun 2019 18:42:29 +0000 (21:42 +0300)]
Fix Credo issues

5 years agoMastodon API: Refresh the object before rendering it after voting
rinpatch [Sat, 1 Jun 2019 18:41:49 +0000 (21:41 +0300)]
Mastodon API: Refresh the object before rendering it after voting

5 years agoMastodon API: actually check for poll votes
rinpatch [Sat, 1 Jun 2019 18:41:23 +0000 (21:41 +0300)]
Mastodon API: actually check for poll votes

5 years agoResolve merge conflicts
rinpatch [Sat, 1 Jun 2019 13:29:58 +0000 (16:29 +0300)]
Resolve merge conflicts

5 years agoAdd poll votes
rinpatch [Sat, 1 Jun 2019 13:07:01 +0000 (16:07 +0300)]
Add poll votes

Also in this commit by accident:
- Fix query ordering causing exclude_poll_votes to not work
- Do not create notifications for Answer objects

5 years agoMerge branch 'bugfix/visibility-indicator-litepub-dm' into 'develop'
kaniini [Sat, 1 Jun 2019 03:39:13 +0000 (03:39 +0000)]
Merge branch 'bugfix/visibility-indicator-litepub-dm' into 'develop'

visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility

See merge request pleroma/pleroma!1230

5 years agoMerge branch 'bugfix/remove-others-follower-collections' into 'develop'
kaniini [Sat, 1 Jun 2019 03:26:46 +0000 (03:26 +0000)]
Merge branch 'bugfix/remove-others-follower-collections' into 'develop'

Remove all follower collections but actor's from "cc"

Closes #858

See merge request pleroma/pleroma!1225

5 years agoRemove all follower collections but actor's from "cc"
Sergey Suprunenko [Sat, 1 Jun 2019 03:26:45 +0000 (03:26 +0000)]
Remove all follower collections but actor's from "cc"

5 years agoMerge branch 'bugfix/remove-vanilla-flavour' into 'develop'
kaniini [Sat, 1 Jun 2019 03:26:05 +0000 (03:26 +0000)]
Merge branch 'bugfix/remove-vanilla-flavour' into 'develop'

Bugfix: remove vanilla flavour

See merge request pleroma/pleroma!1228

5 years agoMerge branch 'add-missing-mock' into 'develop'
kaniini [Sat, 1 Jun 2019 03:25:33 +0000 (03:25 +0000)]
Merge branch 'add-missing-mock' into 'develop'

add the missing mock file [Fix the warning]

See merge request pleroma/pleroma!1229

5 years agovisibility: if litepub:directMessage is asserted, always report the object as "direct...
William Pitcock [Sat, 1 Jun 2019 03:23:21 +0000 (03:23 +0000)]
visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility

5 years agoadd the missing mock file
Sachin Joshi [Sat, 1 Jun 2019 02:52:10 +0000 (08:37 +0545)]
add the missing mock file

5 years agoRemove now useless flavours switching
Haelwenn (lanodan) Monnier [Fri, 31 May 2019 23:42:46 +0000 (01:42 +0200)]
Remove now useless flavours switching

5 years agomastodon_api_controller.ex: Remove vanilla from supported_flavours
Haelwenn (lanodan) Monnier [Fri, 31 May 2019 23:37:11 +0000 (01:37 +0200)]
mastodon_api_controller.ex: Remove vanilla from supported_flavours

5 years agoMerge branch 'dokku' into 'develop'
Haelwenn [Fri, 31 May 2019 23:09:06 +0000 (23:09 +0000)]
Merge branch 'dokku' into 'develop'

Dokku CI support - On-Demand review instances

See merge request pleroma/pleroma!1216

5 years agoMerge branch 'doc/mongoose-im-config' into 'develop'
feld [Fri, 31 May 2019 20:36:33 +0000 (20:36 +0000)]
Merge branch 'doc/mongoose-im-config' into 'develop'

Sample Mongoose IM config

See merge request pleroma/pleroma!1226

5 years agoSample Mongoose IM config.
feld [Fri, 31 May 2019 20:36:33 +0000 (20:36 +0000)]
Sample Mongoose IM config.

Change domain, ensure paths to PEM files are correct, and this is good to go.

5 years agoMerge branch 'fix/mastodon-user-search' into 'develop'
lambda [Fri, 31 May 2019 18:46:57 +0000 (18:46 +0000)]
Merge branch 'fix/mastodon-user-search' into 'develop'

Fix/mastodon user search

See merge request pleroma/pleroma!1224

5 years agoMastodon API search default value for "resolve" is false
feld [Fri, 31 May 2019 18:46:57 +0000 (18:46 +0000)]
Mastodon API search default value for "resolve" is false

https://docs.joinmastodon.org/api/rest/accounts/
https://docs.joinmastodon.org/api/rest/search/

5 years agoMerge branch 'hotfix/leaking-lists' into 'develop'
lambda [Fri, 31 May 2019 13:26:48 +0000 (13:26 +0000)]
Merge branch 'hotfix/leaking-lists' into 'develop'

Mastodon API: Fix lists leaking private posts

See merge request pleroma/pleroma!1222

5 years agoMastodon API: Fix lists leaking private posts
rinpatch [Fri, 31 May 2019 12:25:17 +0000 (15:25 +0300)]
Mastodon API: Fix lists leaking private posts

Our previous list visibility resolver grabbed posts if either follower
collection of the user in a list who is followed is in `to` or if
follower collection of the user in a list was in `cc`. This not only
missed unlisted posts but also lead to leaking private posts when
`fix_explicit_addressing` mistakingly started putting follower collections
to `cc` (also fixed in this MR).

Reported by @kurisu@iscute.moe via a DM

5 years agoFix fix_explicit_addressing moving follower collection to cc and add tests for it
rinpatch [Fri, 31 May 2019 11:17:05 +0000 (14:17 +0300)]
Fix fix_explicit_addressing moving follower collection to cc and add tests for it

5 years agoCI: Add auto-deployment via dokku.
lain [Fri, 31 May 2019 08:55:35 +0000 (10:55 +0200)]
CI: Add auto-deployment via dokku.

5 years agoMerge branch 'fix/install-guide' into 'develop'
feld [Thu, 30 May 2019 21:35:31 +0000 (21:35 +0000)]
Merge branch 'fix/install-guide' into 'develop'

Formatting

See merge request pleroma/pleroma!1219

5 years agoFormatting
feld [Thu, 30 May 2019 21:35:31 +0000 (21:35 +0000)]
Formatting

5 years agoMerge branch 'fix/install-guide' into 'develop'
feld [Thu, 30 May 2019 21:30:42 +0000 (21:30 +0000)]
Merge branch 'fix/install-guide' into 'develop'

Install docs should clone from master branch

See merge request pleroma/pleroma!1218

5 years agoInstall docs should clone from master branch
feld [Thu, 30 May 2019 21:30:42 +0000 (21:30 +0000)]
Install docs should clone from master branch

5 years agoMerge branch 'fix/ogp-missing-data' into 'develop'
feld [Thu, 30 May 2019 21:03:31 +0000 (21:03 +0000)]
Merge branch 'fix/ogp-missing-data' into 'develop'

Replace missing non-nullable Card attributes with empty strings

See merge request pleroma/pleroma!1217

5 years agoReplace missing non-nullable Card attributes with empty strings
Sergey Suprunenko [Thu, 30 May 2019 21:03:31 +0000 (21:03 +0000)]
Replace missing non-nullable Card attributes with empty strings

5 years agoMerge branch 'use-pleroma-config' into 'develop'
lambda [Thu, 30 May 2019 13:16:08 +0000 (13:16 +0000)]
Merge branch 'use-pleroma-config' into 'develop'

Use Pleroma.Config everywhere

See merge request pleroma/pleroma!1214

5 years agoUse Pleroma.Config everywhere
Egor Kislitsyn [Thu, 30 May 2019 08:33:58 +0000 (15:33 +0700)]
Use Pleroma.Config everywhere

5 years agoMerge branch 'revert-57e58d26' into 'develop'
kaniini [Wed, 29 May 2019 22:19:13 +0000 (22:19 +0000)]
Merge branch 'revert-57e58d26' into 'develop'

Revert "Merge branch 'feature/search-authenticated-only' into 'develop'"

See merge request pleroma/pleroma!1212

5 years agoRevert "Merge branch 'feature/search-authenticated-only' into 'develop'"
kaniini [Wed, 29 May 2019 22:10:16 +0000 (22:10 +0000)]
Revert "Merge branch 'feature/search-authenticated-only' into 'develop'"

This reverts merge request !1209

5 years agoMerge branch 'fix/mastodon-search-limit' into 'develop'
lambda [Wed, 29 May 2019 14:25:53 +0000 (14:25 +0000)]
Merge branch 'fix/mastodon-search-limit' into 'develop'

Default search limit should be 40

See merge request pleroma/pleroma!1210

5 years agoMerge branch 'issue/936' into 'develop'
lambda [Wed, 29 May 2019 14:04:58 +0000 (14:04 +0000)]
Merge branch 'issue/936' into 'develop'

[#936] fix tests

See merge request pleroma/pleroma!1208

5 years ago[#936] fix tests
Maksim [Wed, 29 May 2019 14:04:58 +0000 (14:04 +0000)]
[#936] fix tests

5 years agoDefault search limit should be 40
Mark Felder [Wed, 29 May 2019 13:06:26 +0000 (08:06 -0500)]
Default search limit should be 40

https://docs.joinmastodon.org/api/rest/search/

5 years agoMerge branch 'feature/search-authenticated-only' into 'develop'
kaniini [Wed, 29 May 2019 11:33:37 +0000 (11:33 +0000)]
Merge branch 'feature/search-authenticated-only' into 'develop'

router: require oauth_read for searching

Closes #935

See merge request pleroma/pleroma!1209

5 years agorouter: require oauth_read for searching
William Pitcock [Wed, 29 May 2019 10:58:45 +0000 (10:58 +0000)]
router: require oauth_read for searching

Search calls are generally expensive and allow unauthenticated users to
crawl the instance for user profiles or posts which contain specified
keywords.  An adversary can build a distributed search engine which not
only will consume significant instance resources, but also can be used
for undesirable purposes such as datamining.

Accordingly, require authenticated access to use the search API endpoints.
This acts as a nice balance as it allows guest users to make use of most
functionality available in Pleroma FE while ensuring that Pleroma
instances are reasonably protected from resource exhaustion.  It also
removes Pleroma as a potential vector in distributed search engines.

5 years agoMerge branch 'varnish-improvements' into 'develop'
feld [Tue, 28 May 2019 21:20:24 +0000 (21:20 +0000)]
Merge branch 'varnish-improvements' into 'develop'

More Varnish improvements

See merge request pleroma/pleroma!667

5 years agoImprove Varnish config. We set sane headers from the backend now.
feld [Tue, 28 May 2019 21:20:24 +0000 (21:20 +0000)]
Improve Varnish config. We set sane headers from the backend now.

5 years agoMerge branch 'respect-proxy-settings-federation' into 'develop'
kaniini [Tue, 28 May 2019 06:49:54 +0000 (06:49 +0000)]
Merge branch 'respect-proxy-settings-federation' into 'develop'

Respect proxy settings federation

See merge request pleroma/pleroma!1206

5 years agoRespect proxy settings federation
jeff [Tue, 28 May 2019 06:49:53 +0000 (06:49 +0000)]
Respect proxy settings federation

5 years agoMerge branch 'refactor/die-httpoison-die' into 'develop'
lambda [Sun, 26 May 2019 13:33:11 +0000 (13:33 +0000)]
Merge branch 'refactor/die-httpoison-die' into 'develop'

remove @httpoison, @ostatus and @websub compile-time constants

See merge request pleroma/pleroma!1203

5 years agoMerge branch 'fix/mrf-simple' into 'develop'
kaniini [Sun, 26 May 2019 02:10:31 +0000 (02:10 +0000)]
Merge branch 'fix/mrf-simple' into 'develop'

mrf: simple policy: fix matching imported activitypub and ostatus statuses

Closes #915

See merge request pleroma/pleroma!1205

5 years agomrf: simple policy: fix matching imported activitypub and ostatus statuses
William Pitcock [Sun, 26 May 2019 01:57:22 +0000 (01:57 +0000)]
mrf: simple policy: fix matching imported activitypub and ostatus statuses

5 years agotests: chase remote/local removal
William Pitcock [Sun, 26 May 2019 00:20:54 +0000 (00:20 +0000)]
tests: chase remote/local removal

5 years agonotification: remove local/remote match rules (too complicated)
William Pitcock [Sun, 26 May 2019 00:05:47 +0000 (00:05 +0000)]
notification: remove local/remote match rules (too complicated)

5 years agoadd migration to add notification settings to user accounts
William Pitcock [Sat, 25 May 2019 07:25:13 +0000 (07:25 +0000)]
add migration to add notification settings to user accounts

5 years agouser info: allow formdata for notification settings like every other API
William Pitcock [Sat, 25 May 2019 05:54:02 +0000 (05:54 +0000)]
user info: allow formdata for notification settings like every other API

5 years agotwitter api: user view: expose user notification settings under pleroma object
William Pitcock [Sat, 25 May 2019 05:31:13 +0000 (05:31 +0000)]
twitter api: user view: expose user notification settings under pleroma object

5 years agotests: add tests for non-follows/non-followers settings
William Pitcock [Sat, 25 May 2019 05:25:40 +0000 (05:25 +0000)]
tests: add tests for non-follows/non-followers settings

5 years agotests: chase notification setting changes
William Pitcock [Sat, 25 May 2019 05:22:13 +0000 (05:22 +0000)]
tests: chase notification setting changes

5 years agonotification: add non_follows/non_followers notification control settings
William Pitcock [Sat, 25 May 2019 05:19:47 +0000 (05:19 +0000)]
notification: add non_follows/non_followers notification control settings

5 years agoremove @websub and @ostatus module-level constants
William Pitcock [Sat, 25 May 2019 04:39:32 +0000 (04:39 +0000)]
remove @websub and @ostatus module-level constants

5 years agotests: websub: check only that signature validation succeeds or fails
William Pitcock [Sat, 25 May 2019 04:34:16 +0000 (04:34 +0000)]
tests: websub: check only that signature validation succeeds or fails

5 years agokill @httpoison
William Pitcock [Sat, 25 May 2019 04:24:21 +0000 (04:24 +0000)]
kill @httpoison

5 years agoMerge branch 'fix/nodeinfo-unavailable-when-not-federating' into 'develop'
kaniini [Sat, 25 May 2019 01:45:17 +0000 (01:45 +0000)]
Merge branch 'fix/nodeinfo-unavailable-when-not-federating' into 'develop'

Keep nodeinfo available when not federating

Closes #923

See merge request pleroma/pleroma!1202

5 years agoKeep nodeinfo available when not federating
Aaron Tinio [Sat, 25 May 2019 00:15:12 +0000 (08:15 +0800)]
Keep nodeinfo available when not federating

5 years agoMerge branch 'bugfix/mention-all-people-in-beginning-dm' into 'develop'
kaniini [Fri, 24 May 2019 20:34:23 +0000 (20:34 +0000)]
Merge branch 'bugfix/mention-all-people-in-beginning-dm' into 'develop'

Mention all people in the beginning of DM

Closes #924

See merge request pleroma/pleroma!1194

5 years agoMention all people in the beginning of DM
Sergey Suprunenko [Fri, 24 May 2019 20:34:23 +0000 (20:34 +0000)]
Mention all people in the beginning of DM

5 years agoMerge branch 'feature/static-headers' into 'develop'
kaniini [Fri, 24 May 2019 20:33:55 +0000 (20:33 +0000)]
Merge branch 'feature/static-headers' into 'develop'

Improve serving of static assets

See merge request pleroma/pleroma!1200

5 years agoMove the Cache Control header test to its own file
feld [Fri, 24 May 2019 20:33:55 +0000 (20:33 +0000)]
Move the Cache Control header test to its own file

We can consolidate our cache control header tests here

5 years agoMerge branch 'reverse_proxy_upstream_v4_fix' into 'develop'
lambda [Fri, 24 May 2019 09:54:45 +0000 (09:54 +0000)]
Merge branch 'reverse_proxy_upstream_v4_fix' into 'develop'

explicitly set reverse proxy upstream to IPv4

Closes #930

See merge request pleroma/pleroma!1197

5 years agoexplicitly set reverse proxy upstream to IPv4
Alfie Pates [Thu, 23 May 2019 21:33:27 +0000 (22:33 +0100)]
explicitly set reverse proxy upstream to IPv4

  since Pleroma.Web.Endpoint binds on IPv4 only and `localhost.` resolves to
  [::0] on some systems

  fixes #930.

5 years agoChange the order of preloading when fetching activities for context
rinpatch [Thu, 23 May 2019 11:03:16 +0000 (14:03 +0300)]
Change the order of preloading when fetching activities for context

5 years agoMerge branch 'feature/mrf-user-filter' into 'develop'
kaniini [Wed, 22 May 2019 19:03:14 +0000 (19:03 +0000)]
Merge branch 'feature/mrf-user-filter' into 'develop'

mrf: add support for filtering users

See merge request pleroma/pleroma!1188

5 years agoFix credo issues
rinpatch [Wed, 22 May 2019 18:57:46 +0000 (21:57 +0300)]
Fix credo issues

5 years agoMerge branch 'ssh-fixes' into 'develop'
kaniini [Wed, 22 May 2019 18:57:34 +0000 (18:57 +0000)]
Merge branch 'ssh-fixes' into 'develop'

Ssh fixes

Closes #869 and #925

See merge request pleroma/pleroma!1191

5 years agoupdate documentation for the new MRF features [no-ci]
William Pitcock [Wed, 22 May 2019 05:55:09 +0000 (05:55 +0000)]
update documentation for the new MRF features [no-ci]

5 years agotests: add tests for banner and avatar removal
William Pitcock [Wed, 22 May 2019 05:08:37 +0000 (05:08 +0000)]
tests: add tests for banner and avatar removal

5 years agomrf: simple policy: add the ability to strip avatars and banners from user profiles
William Pitcock [Wed, 22 May 2019 04:55:16 +0000 (04:55 +0000)]
mrf: simple policy: add the ability to strip avatars and banners from user profiles

5 years agoactivitypub: run user objects through MRF filters
William Pitcock [Wed, 22 May 2019 04:33:10 +0000 (04:33 +0000)]
activitypub: run user objects through MRF filters

5 years agomrf: defang policy modules for filtering user profile objects
William Pitcock [Wed, 22 May 2019 04:15:59 +0000 (04:15 +0000)]
mrf: defang policy modules for filtering user profile objects

5 years agoExclude Answers from fetching by default
rinpatch [Wed, 22 May 2019 18:49:19 +0000 (21:49 +0300)]
Exclude Answers from fetching by default

5 years agoNormalize poll votes to Answer objects
rinpatch [Wed, 22 May 2019 18:17:57 +0000 (21:17 +0300)]
Normalize poll votes to Answer objects

5 years agoMerge branch 'fix/prune-objects-times-out' into 'develop'
rinpatch [Wed, 22 May 2019 17:19:51 +0000 (17:19 +0000)]
Merge branch 'fix/prune-objects-times-out' into 'develop'

Disable timeouts for object pruning query

See merge request pleroma/pleroma!1193

5 years agoDisable timeouts for object pruning query
rinpatch [Wed, 22 May 2019 17:10:52 +0000 (20:10 +0300)]
Disable timeouts for object pruning query

5 years agoMerge branch 'issue/699' into 'develop'
lambda [Wed, 22 May 2019 15:44:50 +0000 (15:44 +0000)]
Merge branch 'issue/699' into 'develop'

[#699] add worker to clean expired oauth tokens

See merge request pleroma/pleroma!1184

5 years ago[#699] add worker to clean expired oauth tokens
Maksim [Wed, 22 May 2019 15:44:50 +0000 (15:44 +0000)]
[#699] add worker to clean expired oauth tokens

5 years agoUpdate CHANGELOG.md
lambda [Wed, 22 May 2019 11:07:51 +0000 (11:07 +0000)]
Update CHANGELOG.md

5 years agoMerge branch 'feature/object-pruning' into 'develop'
lambda [Wed, 22 May 2019 11:04:30 +0000 (11:04 +0000)]
Merge branch 'feature/object-pruning' into 'develop'

Object pruning

See merge request pleroma/pleroma!1181

5 years agoMix: Only start sshd when needed, second try.
lain [Wed, 22 May 2019 10:57:20 +0000 (12:57 +0200)]
Mix: Only start sshd when needed, second try.

5 years agoMerge branch 'bring-ecto-back-to-mainline' into 'develop'
lambda [Wed, 22 May 2019 10:05:05 +0000 (10:05 +0000)]
Merge branch 'bring-ecto-back-to-mainline' into 'develop'

Mix: Bring ecto-sql back to mainline.

See merge request pleroma/pleroma!1192

5 years agoMix: Bring ecto-sql back to mainline.
lain [Wed, 22 May 2019 09:44:17 +0000 (11:44 +0200)]
Mix: Bring ecto-sql back to mainline.

5 years agoChangelog: Add tip for debian users.
lain [Wed, 22 May 2019 09:01:10 +0000 (11:01 +0200)]
Changelog: Add tip for debian users.

5 years agoAdd GIN index on object data->'name'
rinpatch [Wed, 22 May 2019 08:56:53 +0000 (11:56 +0300)]
Add GIN index on object data->'name'

5 years agoDocumentation: Specify PEM format for SSH keys.
lain [Wed, 22 May 2019 08:44:26 +0000 (10:44 +0200)]
Documentation: Specify PEM format for SSH keys.

Otherwise openssh-client 7.9 will generate a different format that can't be used
by esshd.

5 years agoLinting.
lain [Wed, 22 May 2019 08:40:15 +0000 (10:40 +0200)]
Linting.