akkoma
5 years agoMerge branch 'improve-search' into 'develop'
rinpatch [Thu, 6 Jun 2019 12:17:49 +0000 (12:17 +0000)]
Merge branch 'improve-search' into 'develop'

[#943] Make the unauthenticated users limitation optional

See merge request pleroma/pleroma!1251

5 years ago[#943] Make the unauthenticated users limitation optional
Egor [Thu, 6 Jun 2019 12:17:49 +0000 (12:17 +0000)]
[#943] Make the unauthenticated users limitation optional

5 years agoMerge branch 'bugfix/377-stuck-follow-request' into 'develop'
kaniini [Wed, 5 Jun 2019 15:52:40 +0000 (15:52 +0000)]
Merge branch 'bugfix/377-stuck-follow-request' into 'develop'

Bugfix/377 stuck follow request

Closes #377

See merge request pleroma/pleroma!1250

5 years agoMerge branch 'improve-search' into 'develop'
kaniini [Wed, 5 Jun 2019 15:51:32 +0000 (15:51 +0000)]
Merge branch 'improve-search' into 'develop'

[#943] Contain search for unauthenticated users

See merge request pleroma/pleroma!1220

5 years agoUtils: Use update_follow_state_for_all when appropriate.
lain [Wed, 5 Jun 2019 14:51:28 +0000 (16:51 +0200)]
Utils: Use update_follow_state_for_all when appropriate.

5 years agoUtils: Split update_follow_state and update_follow_state_for_all.
lain [Wed, 5 Jun 2019 14:43:35 +0000 (16:43 +0200)]
Utils: Split update_follow_state and update_follow_state_for_all.

5 years agoCommonAPI: Add test for accept_follow_request.
lain [Wed, 5 Jun 2019 13:43:54 +0000 (15:43 +0200)]
CommonAPI: Add test for accept_follow_request.

5 years agoUser: Remove superfluous `maybe_follow`.
lain [Wed, 5 Jun 2019 12:24:31 +0000 (14:24 +0200)]
User: Remove superfluous `maybe_follow`.

5 years agoTransmogrifier: Add tests for incoming follows to locked accounts.
lain [Wed, 5 Jun 2019 12:10:46 +0000 (14:10 +0200)]
Transmogrifier: Add tests for incoming follows to locked accounts.

5 years agoMerge branch 'fix-stuck-follows' into 'develop'
rinpatch [Wed, 5 Jun 2019 11:07:54 +0000 (11:07 +0000)]
Merge branch 'fix-stuck-follows' into 'develop'

User: Don't error out when following a user that's already followed.

See merge request pleroma/pleroma!1249

5 years agoMerge branch 'oauth_consumer_support_code' into 'develop'
lain [Wed, 5 Jun 2019 11:05:32 +0000 (11:05 +0000)]
Merge branch 'oauth_consumer_support_code' into 'develop'

OAuth consumer: tests fix, comments, Keycloak config notes

See merge request pleroma/pleroma!1248

5 years agoTypo + Linting.
lain [Wed, 5 Jun 2019 10:45:28 +0000 (12:45 +0200)]
Typo + Linting.

5 years agoUser: Don't error out when following a user that's already followed.
lain [Wed, 5 Jun 2019 10:06:45 +0000 (12:06 +0200)]
User: Don't error out when following a user that's already followed.

This leads to a few situations where it is impossible to follow a user.

5 years agoOAuth consumer: tests fix, comments, Keycloak config notes.
Ivan Tashkinov [Wed, 5 Jun 2019 10:02:13 +0000 (13:02 +0300)]
OAuth consumer: tests fix, comments, Keycloak config notes.

5 years agoFix formatting
Egor Kislitsyn [Wed, 5 Jun 2019 09:55:17 +0000 (16:55 +0700)]
Fix formatting

5 years agoLimit search for unauthenticated users to local users only
Egor Kislitsyn [Wed, 5 Jun 2019 09:34:14 +0000 (16:34 +0700)]
Limit search for unauthenticated users to local users only

5 years agoCreate index on `activities.local`
Egor Kislitsyn [Mon, 3 Jun 2019 11:57:24 +0000 (18:57 +0700)]
Create index on `activities.local`

5 years agoFix tests with enabled RUM
Egor Kislitsyn [Fri, 31 May 2019 10:11:45 +0000 (17:11 +0700)]
Fix tests with enabled RUM

5 years agoUpdate benchmark mix task
Egor Kislitsyn [Fri, 31 May 2019 09:37:33 +0000 (16:37 +0700)]
Update benchmark mix task

5 years agoContain search for unauthenticated users
Egor Kislitsyn [Fri, 31 May 2019 09:22:13 +0000 (16:22 +0700)]
Contain search for unauthenticated users

5 years agoMerge branch 'explicit-addressing' into 'develop'
kaniini [Wed, 5 Jun 2019 08:28:20 +0000 (08:28 +0000)]
Merge branch 'explicit-addressing' into 'develop'

Explicit addressing

See merge request pleroma/pleroma!1239

5 years agoMerge branch 'remove-tag-warning' into 'develop'
Haelwenn [Tue, 4 Jun 2019 15:46:38 +0000 (15:46 +0000)]
Merge branch 'remove-tag-warning' into 'develop'

Mix: Swallow git error messages during version number handling.

See merge request pleroma/pleroma!1247

5 years agoMerge branch 'bugfix/956-activity-id-nil-conversations' into 'develop'
Haelwenn [Tue, 4 Jun 2019 15:34:55 +0000 (15:34 +0000)]
Merge branch 'bugfix/956-activity-id-nil-conversations' into 'develop'

Participations: Filter out participations without activities.

Closes #956 and #953

See merge request pleroma/pleroma!1246

5 years agoNodeInfo: Add explicit addressing to nodeinfo.
lain [Tue, 4 Jun 2019 15:10:54 +0000 (17:10 +0200)]
NodeInfo: Add explicit addressing to nodeinfo.

5 years agoMix: Swallow git error messages during version number handling.
lain [Tue, 4 Jun 2019 14:44:56 +0000 (16:44 +0200)]
Mix: Swallow git error messages during version number handling.

Otherwise sometimes a 'fatal' message will be printed, confusing users.

5 years agoMerge branch 'issue/941' into 'develop'
lain [Tue, 4 Jun 2019 14:58:13 +0000 (14:58 +0000)]
Merge branch 'issue/941' into 'develop'

[#941] add option skip_thread_containment

See merge request pleroma/pleroma!1237

5 years agoupdate ActivityPub#fetch_activities_query
Maksim Pechnikov [Tue, 4 Jun 2019 12:20:24 +0000 (15:20 +0300)]
update ActivityPub#fetch_activities_query

5 years agoMerge branch 'develop' into issue/941
Maksim Pechnikov [Tue, 4 Jun 2019 12:06:58 +0000 (15:06 +0300)]
Merge branch 'develop' into issue/941

5 years agoupdate ActivityPub#fetch_activities_query
Maksim Pechnikov [Tue, 4 Jun 2019 12:04:36 +0000 (15:04 +0300)]
update ActivityPub#fetch_activities_query

5 years agoParticipations: Filter out participations without activities.
lain [Tue, 4 Jun 2019 11:58:36 +0000 (13:58 +0200)]
Participations: Filter out participations without activities.

5 years agoMerge branch 'emoji-loader-fix' into 'develop'
Haelwenn [Tue, 4 Jun 2019 11:26:42 +0000 (11:26 +0000)]
Merge branch 'emoji-loader-fix' into 'develop'

Emoji: Don't die when files are present in the emoji folder.

Closes #957

See merge request pleroma/pleroma!1245

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 agoEmoji: Don't die when files are present in the emoji folder.
lain [Tue, 4 Jun 2019 10:01:21 +0000 (12:01 +0200)]
Emoji: Don't die when files are present in the emoji folder.

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 agofix merge
Maksim Pechnikov [Tue, 4 Jun 2019 09:41:24 +0000 (12:41 +0300)]
fix merge

5 years agoMerge remote-tracking branch 'origin/develop' into explicit-addressing
lain [Tue, 4 Jun 2019 09:23:46 +0000 (11:23 +0200)]
Merge remote-tracking branch 'origin/develop' into explicit-addressing

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 agoDocs: Add Explicit addressing to Readme and changelog.
lain [Tue, 4 Jun 2019 08:49:57 +0000 (10:49 +0200)]
Docs: Add Explicit addressing to Readme and changelog.

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 'develop' into issue/941
Maksim Pechnikov [Tue, 4 Jun 2019 06:49:08 +0000 (09:49 +0300)]
Merge branch 'develop' into issue/941

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 agofix tests
Maksim Pechnikov [Mon, 3 Jun 2019 19:51:14 +0000 (22:51 +0300)]
fix tests

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 agoupdated changelog
Maksim Pechnikov [Mon, 3 Jun 2019 18:05:45 +0000 (21:05 +0300)]
updated changelog

5 years agoupdate api to set skip_thread_containment
Maksim Pechnikov [Mon, 3 Jun 2019 18:02:02 +0000 (21:02 +0300)]
update api to set skip_thread_containment

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 agoCommonAPI.Utils: Add tests.
lain [Mon, 3 Jun 2019 17:08:38 +0000 (19:08 +0200)]
CommonAPI.Utils: Add tests.

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 agoCommonAPI: Add explicit addressing.
lain [Mon, 3 Jun 2019 16:17:08 +0000 (18:17 +0200)]
CommonAPI: Add explicit addressing.

5 years agoUser: Add function to get AP ids from nicknames.
lain [Mon, 3 Jun 2019 16:16:11 +0000 (18:16 +0200)]
User: Add function to get AP ids from nicknames.

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 agoadd option skip_thread_containment
Maksim Pechnikov [Mon, 3 Jun 2019 13:04:39 +0000 (16:04 +0300)]
add option skip_thread_containment

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