akkoma
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 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 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 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

6 years agoMerge branch 'develop' into 'develop'
lambda [Sun, 20 May 2018 19:37:16 +0000 (19:37 +0000)]
Merge branch 'develop' into 'develop'

Correct 'register_user' parameters in README

See merge request pleroma/pleroma!163

6 years agoCorrect 'register_user' parameters in README
witti [Sun, 20 May 2018 18:49:44 +0000 (20:49 +0200)]
Correct 'register_user' parameters in README

password parameter was missing

6 years agoMigrate to comeonin 4 and Cachex 3
Thog [Sun, 20 May 2018 16:05:34 +0000 (18:05 +0200)]
Migrate to comeonin 4 and Cachex 3

Also fix some warning in the code and add a missing alias

6 years agoMore fixes.
lain [Sun, 20 May 2018 17:26:09 +0000 (19:26 +0200)]
More fixes.

6 years agoFix specs.
lain [Sun, 20 May 2018 17:22:26 +0000 (19:22 +0200)]
Fix specs.

6 years agoupdate frontend
lain [Sun, 20 May 2018 16:29:12 +0000 (18:29 +0200)]
update frontend

6 years agoReturn visilility in twitter api, too.
lain [Sun, 20 May 2018 16:01:24 +0000 (18:01 +0200)]
Return visilility in twitter api, too.

6 years agoReturn private / direct posts on user timelines, too.
lain [Sun, 20 May 2018 14:15:18 +0000 (16:15 +0200)]
Return private / direct posts on user timelines, too.

6 years agoupdate frontend
lain [Sun, 20 May 2018 11:24:16 +0000 (13:24 +0200)]
update frontend

6 years agoMerge branch 'feature/account-deletion' into 'develop'
lambda [Sun, 20 May 2018 10:57:19 +0000 (10:57 +0000)]
Merge branch 'feature/account-deletion' into 'develop'

Feature/account deletion

Closes #115

See merge request pleroma/pleroma!157

6 years agoMerge branch 'feature/undo-like-federation' into 'develop'
lambda [Sun, 20 May 2018 10:55:39 +0000 (10:55 +0000)]
Merge branch 'feature/undo-like-federation' into 'develop'

Support undo like over ActivityPub (Fix #139)

Closes #139

See merge request pleroma/pleroma!161

6 years agoFix test for blocks
Francis Dinh [Sun, 20 May 2018 06:15:56 +0000 (02:15 -0400)]
Fix test for blocks

6 years agoPass user instead of their ap_id to User.block
Francis Dinh [Sun, 20 May 2018 02:02:13 +0000 (22:02 -0400)]
Pass user instead of their ap_id to User.block

6 years agoRemove handler for incoming undos with object references
Francis Dinh [Sun, 20 May 2018 01:34:30 +0000 (21:34 -0400)]
Remove handler for incoming undos with object references

6 years agoFormatting and add tests for blocks/unblocks
Francis Dinh [Sun, 20 May 2018 01:23:52 +0000 (21:23 -0400)]
Formatting and add tests for blocks/unblocks

6 years agoUse correct variable names in unfollow
Francis Dinh [Sun, 20 May 2018 00:57:37 +0000 (20:57 -0400)]
Use correct variable names in unfollow

6 years agoSupport Undo like activities (Fix #139)
Thog [Sat, 19 May 2018 13:22:43 +0000 (15:22 +0200)]
Support Undo like activities (Fix #139)

6 years agoModified deleting an account to run as a task
Syldexia [Sat, 19 May 2018 12:35:49 +0000 (13:35 +0100)]
Modified deleting an account to run as a task

6 years agoMerge branch 'feature/webfinger-mime-ld-json' into 'develop'
lambda [Sat, 19 May 2018 09:31:08 +0000 (09:31 +0000)]
Merge branch 'feature/webfinger-mime-ld-json' into 'develop'

webfinger: handle application/ld+json links

See merge request pleroma/pleroma!159

6 years agoMerge branch 'feature/remote-user-deactivation' into 'develop'
lambda [Sat, 19 May 2018 09:30:09 +0000 (09:30 +0000)]
Merge branch 'feature/remote-user-deactivation' into 'develop'

remote user deactivation

See merge request pleroma/pleroma!154

6 years agoFix linking problem.
lain [Sat, 19 May 2018 09:27:14 +0000 (11:27 +0200)]
Fix linking problem.

6 years agoMerge branch 'bugfix/hubzilla-compat' into 'develop'
lambda [Sat, 19 May 2018 09:17:04 +0000 (09:17 +0000)]
Merge branch 'bugfix/hubzilla-compat' into 'develop'

hubzilla compatibility

Closes #100

See merge request pleroma/pleroma!160

6 years agorun mix format
William Pitcock [Sat, 19 May 2018 08:48:15 +0000 (08:48 +0000)]
run mix format

6 years agorun mix format
William Pitcock [Sat, 19 May 2018 08:37:04 +0000 (08:37 +0000)]
run mix format

6 years agotests: add test for hubzilla follow activity too
William Pitcock [Sat, 19 May 2018 08:25:45 +0000 (08:25 +0000)]
tests: add test for hubzilla follow activity too

6 years agotests: add tests for Transmogrifier.maybe_fix_user_object()
William Pitcock [Sat, 19 May 2018 08:06:23 +0000 (08:06 +0000)]
tests: add tests for Transmogrifier.maybe_fix_user_object()

6 years agoactivitypub transmogrifier: handle hubzilla AP actor quirks
William Pitcock [Sat, 19 May 2018 07:30:02 +0000 (07:30 +0000)]
activitypub transmogrifier: handle hubzilla AP actor quirks

6 years agoactivitypub: normalize the actor to ensure we have its URI
William Pitcock [Sat, 19 May 2018 07:03:53 +0000 (07:03 +0000)]
activitypub: normalize the actor to ensure we have its URI

6 years agowebfinger: add tests
William Pitcock [Sat, 19 May 2018 06:11:45 +0000 (06:11 +0000)]
webfinger: add tests

6 years agowebfinger: only do ld+json on modern json webfinger
William Pitcock [Sat, 19 May 2018 06:15:21 +0000 (06:15 +0000)]
webfinger: only do ld+json on modern json webfinger

6 years agowebfinger: interpret application/ld+json links as an alternate to application/activit...
William Pitcock [Sat, 19 May 2018 05:46:13 +0000 (05:46 +0000)]
webfinger: interpret application/ld+json links as an alternate to application/activity+json

6 years agowebfinger: expose the application/ld+json link alongside the older application/activi...
William Pitcock [Sat, 19 May 2018 05:43:13 +0000 (05:43 +0000)]
webfinger: expose the application/ld+json link alongside the older application/activity+json link

6 years agoremote user deactivation: fix test failures
William Pitcock [Sat, 19 May 2018 03:17:56 +0000 (22:17 -0500)]
remote user deactivation: fix test failures

6 years agoAdd federated blocks
Francis Dinh [Fri, 18 May 2018 22:09:56 +0000 (18:09 -0400)]
Add federated blocks

6 years agoactually rvert those changes
Francis Dinh [Fri, 18 May 2018 03:56:47 +0000 (23:56 -0400)]
actually rvert those changes

6 years agoRevert "Undo formatting in user.ex"
Francis Dinh [Fri, 18 May 2018 03:55:00 +0000 (23:55 -0400)]
Revert "Undo formatting in user.ex"

This reverts commit e6dc15b96cb971836211a1e57be1756936456c17.

6 years agoUndo formatting in user.ex
Francis Dinh [Fri, 18 May 2018 03:53:34 +0000 (23:53 -0400)]
Undo formatting in user.ex

6 years agoAdd support for incoming remote unfollows
Francis Dinh [Fri, 18 May 2018 02:15:57 +0000 (22:15 -0400)]
Add support for incoming remote unfollows

6 years agoFix User search.
lain [Wed, 16 May 2018 15:55:20 +0000 (17:55 +0200)]
Fix User search.

Now uses a trigram based search. This is a lot faster and gives better
results. Closes #185.

6 years agoupdate frontend
lain [Wed, 16 May 2018 11:02:53 +0000 (13:02 +0200)]
update frontend

6 years agoadd mix task for deactivating a user by nickname
William Pitcock [Sun, 13 May 2018 23:33:43 +0000 (23:33 +0000)]
add mix task for deactivating a user by nickname

6 years agoActivityPub create: discard activities from deactivated users
William Pitcock [Sun, 13 May 2018 23:28:56 +0000 (23:28 +0000)]
ActivityPub create: discard activities from deactivated users

6 years agoFixed formatting and test
Syldexia [Sun, 13 May 2018 13:56:59 +0000 (14:56 +0100)]
Fixed formatting and test

6 years agoMoved account deletion stuff to somewhere that hopefully makes more sense
Syldexia [Sun, 13 May 2018 13:24:15 +0000 (14:24 +0100)]
Moved account deletion stuff to somewhere that hopefully makes more sense

6 years agoAdded endpoint for user account deletion
Syldexia [Fri, 11 May 2018 11:32:59 +0000 (12:32 +0100)]
Added endpoint for user account deletion

6 years agoFix format.
lain [Sun, 13 May 2018 11:02:24 +0000 (13:02 +0200)]
Fix format.

6 years agoModify sort index for activities.
lain [Sun, 13 May 2018 10:54:08 +0000 (12:54 +0200)]
Modify sort index for activities.

This prevents a problem that made the local timeline very slow when
there were few posts.

6 years agoRevert "Remove 'unlisted' handling for now."
lain [Sun, 13 May 2018 10:38:13 +0000 (12:38 +0200)]
Revert "Remove 'unlisted' handling for now."

This reverts commit 1027d1f6963b495a5abc67b05447619ce7d429db.

6 years agoRemove 'unlisted' handling for now.
lain [Sun, 13 May 2018 10:07:11 +0000 (12:07 +0200)]
Remove 'unlisted' handling for now.

It's just too slow (over 1 second on small systems, haven't looked at
the queries in detail yet). We'll need some other way to handle it.

6 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
lain [Sun, 13 May 2018 09:59:35 +0000 (11:59 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

6 years agoUnlisted fetching: Reverse logic
lain [Sun, 13 May 2018 09:58:03 +0000 (11:58 +0200)]
Unlisted fetching: Reverse logic

Generates a faster query.

6 years agoMerge branch 'feature/unrepeats' into 'develop'
lambda [Sun, 13 May 2018 09:32:29 +0000 (09:32 +0000)]
Merge branch 'feature/unrepeats' into 'develop'

Add unrepeats

Closes #69

See merge request pleroma/pleroma!113

6 years agoMerge branch 'kaniini/pleroma-bugfix/unlisted-statuses' into develop
lain [Sun, 13 May 2018 09:19:08 +0000 (11:19 +0200)]
Merge branch 'kaniini/pleroma-bugfix/unlisted-statuses' into develop

6 years agoAdd test.
lain [Sun, 13 May 2018 09:18:48 +0000 (11:18 +0200)]
Add test.

6 years agoFormat.
lain [Sun, 13 May 2018 08:56:44 +0000 (10:56 +0200)]
Format.

6 years agoMerge branch 'develop' into kaniini/pleroma-bugfix/unlisted-statuses
lain [Sun, 13 May 2018 08:56:11 +0000 (10:56 +0200)]
Merge branch 'develop' into kaniini/pleroma-bugfix/unlisted-statuses

6 years agoMerge branch 'patch-2' into 'develop'
lambda [Sun, 13 May 2018 08:39:37 +0000 (08:39 +0000)]
Merge branch 'patch-2' into 'develop'

Nginx config - secure defaults

See merge request pleroma/pleroma!146

6 years agoMerge branch 'feld-varnish' into 'develop'
lambda [Sun, 13 May 2018 08:34:58 +0000 (08:34 +0000)]
Merge branch 'feld-varnish' into 'develop'

More varnish fixes

See merge request pleroma/pleroma!149

6 years agoMerge branch 'feature/chain-policies' into 'develop'
lambda [Sun, 13 May 2018 08:24:18 +0000 (08:24 +0000)]
Merge branch 'feature/chain-policies' into 'develop'

chain policies

See merge request pleroma/pleroma!150