akkoma
5 years agoMerge branch 'fix/fetch-votes-restrict-create' into 'develop'
lain [Tue, 4 Jun 2019 10:55:45 +0000 (10:55 +0000)]
Merge branch 'fix/fetch-votes-restrict-create' into 'develop'

Restrict `get_existing_votes` to only get Create activities

See merge request pleroma/pleroma!1244

5 years agoAdd tests for get_existing_votes
rinpatch [Tue, 4 Jun 2019 10:47:53 +0000 (13:47 +0300)]
Add tests for get_existing_votes

5 years agoFix CommonAPI.vote returning tuples inside of the activity array instead of just...
rinpatch [Tue, 4 Jun 2019 10:38:24 +0000 (13:38 +0300)]
Fix CommonAPI.vote returning tuples inside of the activity array instead of just activities

5 years agoRestrict `get_existing_votes` to only get Create activities
rinpatch [Tue, 4 Jun 2019 09:42:10 +0000 (12:42 +0300)]
Restrict `get_existing_votes` to only get Create activities

5 years agoMerge branch 'fix/poll-performance' into 'develop'
kaniini [Tue, 4 Jun 2019 08:55:04 +0000 (08:55 +0000)]
Merge branch 'fix/poll-performance' into 'develop'

utils: access inReplyTo as an explicit string when fetching poll results`

See merge request pleroma/pleroma!1243

5 years agoutils: access inReplyTo as an explicit string when fetching poll results`
William Pitcock [Tue, 4 Jun 2019 08:45:03 +0000 (08:45 +0000)]
utils: access inReplyTo as an explicit string when fetching poll results`

5 years agoMerge branch 'feature/nodeinfo-polls' into 'develop'
kaniini [Tue, 4 Jun 2019 06:29:03 +0000 (06:29 +0000)]
Merge branch 'feature/nodeinfo-polls' into 'develop'

nodeinfo: add pollLimits to metadata

See merge request pleroma/pleroma!1242

5 years agonodeinfo: add pollLimits to metadata
William Pitcock [Tue, 4 Jun 2019 06:19:44 +0000 (06:19 +0000)]
nodeinfo: add pollLimits to metadata

5 years agoMerge branch 'feature/mrf-subchain' into 'develop'
kaniini [Tue, 4 Jun 2019 05:49:54 +0000 (05:49 +0000)]
Merge branch 'feature/mrf-subchain' into 'develop'

MRF: subchain policy

See merge request pleroma/pleroma!1233

5 years agoMerge branch 'fix/mock-errors-in-tests' into 'develop'
kaniini [Tue, 4 Jun 2019 05:46:20 +0000 (05:46 +0000)]
Merge branch 'fix/mock-errors-in-tests' into 'develop'

Add missing HTTP Request mocks

See merge request pleroma/pleroma!1231

5 years agoAdd missing HTTP Request mocks
Sergey Suprunenko [Tue, 4 Jun 2019 05:46:19 +0000 (05:46 +0000)]
Add missing HTTP Request mocks

5 years agoMerge branch 'generic-fe-settings' into 'develop'
kaniini [Tue, 4 Jun 2019 05:43:43 +0000 (05:43 +0000)]
Merge branch 'generic-fe-settings' into 'develop'

Generic settings store for frontend user settings

See merge request pleroma/pleroma!1221

5 years agoMerge branch 'ueberauth_config_extension' into 'develop'
kaniini [Tue, 4 Jun 2019 05:42:49 +0000 (05:42 +0000)]
Merge branch 'ueberauth_config_extension' into 'develop'

Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification

See merge request pleroma/pleroma!1234

5 years agoMerge branch 'update-oauth-template-css-fix' into 'develop'
kaniini [Tue, 4 Jun 2019 05:39:38 +0000 (05:39 +0000)]
Merge branch 'update-oauth-template-css-fix' into 'develop'

Update oauth template css fix

See merge request pleroma/pleroma!1238

5 years agoMerge branch 'hotfix/add-in_reply_to_index' into 'develop'
kaniini [Tue, 4 Jun 2019 05:38:13 +0000 (05:38 +0000)]
Merge branch 'hotfix/add-in_reply_to_index' into 'develop'

Add index on inReplyTo for objects

See merge request pleroma/pleroma!1240

5 years agoupdate CHANGELOG for mrf_subchain
William Pitcock [Tue, 4 Jun 2019 05:37:31 +0000 (05:37 +0000)]
update CHANGELOG for mrf_subchain

5 years agoMerge branch 'fix/tag-timeline-missing-index' into 'develop'
lambda [Mon, 3 Jun 2019 19:03:35 +0000 (19:03 +0000)]
Merge branch 'fix/tag-timeline-missing-index' into 'develop'

Add missing tag index on objects

Closes #867

See merge request pleroma/pleroma!1241

5 years agoAdd missing tag index on objects
rinpatch [Mon, 3 Jun 2019 17:42:08 +0000 (20:42 +0300)]
Add missing tag index on objects

The previous activity index is useless because objects are not embedded
anymore and instead a joined object is queried.

5 years agoAdd index on inReplyTo for objects
rinpatch [Mon, 3 Jun 2019 16:26:43 +0000 (19:26 +0300)]
Add index on inReplyTo for objects

Fixes the performance of `get_existing_votes`

5 years agoRemove repeated scope lists
eugenijm [Mon, 3 Jun 2019 15:58:04 +0000 (18:58 +0300)]
Remove repeated scope lists

5 years agoUse workaround for the heavy checkmark symbol in iOS
eugenijm [Mon, 3 Jun 2019 15:00:32 +0000 (18:00 +0300)]
Use workaround for the heavy checkmark symbol in iOS

5 years agoMerge branch 'develop' into update-oauth-template
Mark Felder [Mon, 3 Jun 2019 14:12:17 +0000 (09:12 -0500)]
Merge branch 'develop' into update-oauth-template

5 years agoMerge branch 'feature/polls-2-electric-boogalo' into 'develop'
rinpatch [Mon, 3 Jun 2019 12:19:19 +0000 (12:19 +0000)]
Merge branch 'feature/polls-2-electric-boogalo' into 'develop'

Polls 2 Electric Boogalo

Closes #657

See merge request pleroma/pleroma!1190

5 years agoMerge branch 'develop' into feature/polls-2-electric-boogalo
rinpatch [Mon, 3 Jun 2019 10:16:17 +0000 (13:16 +0300)]
Merge branch 'develop' into feature/polls-2-electric-boogalo

5 years agoMerge branch 'fix-dokku' into 'develop'
rinpatch [Mon, 3 Jun 2019 10:15:18 +0000 (10:15 +0000)]
Merge branch 'fix-dokku' into 'develop'

Fix dokku

See merge request pleroma/pleroma!1236

5 years agoCI: Actually push to correct repo.
lain [Mon, 3 Jun 2019 09:47:10 +0000 (11:47 +0200)]
CI: Actually push to correct repo.

5 years agoMerge branch 'align-mastodon-conversations' into 'develop'
lambda [Mon, 3 Jun 2019 09:48:37 +0000 (09:48 +0000)]
Merge branch 'align-mastodon-conversations' into 'develop'

Mastodon Conversations API: Align to Mastodon behavior

See merge request pleroma/pleroma!1215

5 years agoMerge branch 'chore/ci-speedup' into 'develop'
rinpatch [Mon, 3 Jun 2019 08:35:24 +0000 (08:35 +0000)]
Merge branch 'chore/ci-speedup' into 'develop'

CI: Replace mix test and mix coveralls with just mix coveralls

See merge request pleroma/pleroma!1235

5 years agoCI: Replace mix test and mix coveralls with just mix coveralls
rinpatch [Mon, 3 Jun 2019 08:24:03 +0000 (11:24 +0300)]
CI: Replace mix test and mix coveralls with just mix coveralls

`mix coveralls` runs the tests by itself, exits with failure if one of them
fails and accepts the same args, so there is no reason to run two of
them at the same time.

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 agoUeberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency...
Ivan Tashkinov [Sun, 2 Jun 2019 14:45:32 +0000 (17:45 +0300)]
Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification.

5 years agoformatting
William Pitcock [Sun, 2 Jun 2019 10:29:15 +0000 (10:29 +0000)]
formatting

5 years agodocs: document mrf_subchain
William Pitcock [Sun, 2 Jun 2019 10:14:56 +0000 (10:14 +0000)]
docs: document mrf_subchain

5 years agotest: add tests for subchain policy
William Pitcock [Sun, 2 Jun 2019 10:08:51 +0000 (10:08 +0000)]
test: add tests for subchain policy

5 years agomrf: add subchain policy
William Pitcock [Sun, 2 Jun 2019 09:50:16 +0000 (09:50 +0000)]
mrf: add subchain policy

5 years agomrf: allow a policy chain to be specified when filtering
William Pitcock [Sun, 2 Jun 2019 09:44:42 +0000 (09:44 +0000)]
mrf: allow a policy chain to be specified when filtering

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 agoSetting Store: Document in changelog.
lain [Fri, 31 May 2019 17:15:44 +0000 (19:15 +0200)]
Setting Store: Document in changelog.

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 agoDocumentation: Document Settings store mechanism.
lain [Fri, 31 May 2019 12:58:28 +0000 (14:58 +0200)]
Documentation: Document Settings store mechanism.

5 years agoMastodonAPI: Add extension to set and get pleroma_settings_store.
lain [Fri, 31 May 2019 12:50:18 +0000 (14:50 +0200)]
MastodonAPI: Add extension to set and get pleroma_settings_store.

5 years agoAccountView: settings -> settings_store
lain [Fri, 31 May 2019 12:49:46 +0000 (14:49 +0200)]
AccountView: settings -> settings_store

5 years agoUser: Add settings store to Info, AccountView
lain [Fri, 31 May 2019 12:27:15 +0000 (14:27 +0200)]
User: Add settings store to Info, AccountView

This is to provide a generic frontend settings storage mechanism for all kinds
of frontends.

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 agoMastodon Conversation API: Don't return own account in 'accounts'.
lain [Fri, 31 May 2019 09:27:14 +0000 (11:27 +0200)]
Mastodon Conversation API: Don't return own account in 'accounts'.

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)