akkoma
5 years agoMerge branch 'feature/masto_api_markers' into 'develop'
kaniini [Mon, 21 Oct 2019 09:26:17 +0000 (09:26 +0000)]
Merge branch 'feature/masto_api_markers' into 'develop'

[#1275] Markers /api/v1/markers

See merge request pleroma/pleroma!1852

5 years agoupdate changelog
Maksim Pechnikov [Mon, 21 Oct 2019 08:53:11 +0000 (11:53 +0300)]
update changelog

5 years agoMerge branch 'develop' into feature/masto_api_markers
Maksim Pechnikov [Mon, 21 Oct 2019 08:32:28 +0000 (11:32 +0300)]
Merge branch 'develop' into feature/masto_api_markers

5 years agoMerge branch 'feature/activitypub-semantics' into 'develop'
kaniini [Mon, 21 Oct 2019 07:54:48 +0000 (07:54 +0000)]
Merge branch 'feature/activitypub-semantics' into 'develop'

activitypub semantics

See merge request pleroma/pleroma!1798

5 years agoMerge branch 'chore/add-missing-websub-drop-migration' into 'develop'
kaniini [Sun, 20 Oct 2019 11:04:22 +0000 (11:04 +0000)]
Merge branch 'chore/add-missing-websub-drop-migration' into 'develop'

add missing migration to drop websub table

See merge request pleroma/pleroma!1868

5 years agoadd missing migration to drop websub table
Ariadne Conill [Sun, 20 Oct 2019 10:39:03 +0000 (10:39 +0000)]
add missing migration to drop websub table

5 years agochange Maksim's test description
Ariadne Conill [Sat, 19 Oct 2019 23:23:13 +0000 (23:23 +0000)]
change Maksim's test description

5 years agotests: add test to ensure invisible actors are rendered with the invisible hint set...
Ariadne Conill [Sat, 19 Oct 2019 17:53:52 +0000 (17:53 +0000)]
tests: add test to ensure invisible actors are rendered with the invisible hint set to true

5 years agotests: add test verifying the relay user is invisible
Ariadne Conill [Sat, 19 Oct 2019 17:50:17 +0000 (17:50 +0000)]
tests: add test verifying the relay user is invisible

5 years agorework to use properties instead of compound typing, per SocialCG
Ariadne Conill [Sat, 19 Oct 2019 17:46:24 +0000 (17:46 +0000)]
rework to use properties instead of compound typing, per SocialCG

5 years agofix test
Maksim Pechnikov [Mon, 14 Oct 2019 06:31:08 +0000 (09:31 +0300)]
fix test

5 years agoadded test fo Pleroma.Web.MastodonAPI.StatusController
Maksim Pechnikov [Mon, 14 Oct 2019 06:09:32 +0000 (09:09 +0300)]
added test fo Pleroma.Web.MastodonAPI.StatusController

5 years agotest: activitypub: use User.invisible?/1 for testing invisibility
Ariadne Conill [Tue, 8 Oct 2019 20:59:43 +0000 (20:59 +0000)]
test: activitypub: use User.invisible?/1 for testing invisibility

5 years agoimplement invisible support for remote users
Ariadne Conill [Sat, 5 Oct 2019 20:41:33 +0000 (20:41 +0000)]
implement invisible support for remote users

5 years agouser: implement User.invisible?/1
Ariadne Conill [Sat, 5 Oct 2019 20:11:43 +0000 (20:11 +0000)]
user: implement User.invisible?/1

5 years agorelay: set invisible to true
Ariadne Conill [Sat, 5 Oct 2019 20:06:31 +0000 (20:06 +0000)]
relay: set invisible to true

5 years agouser info: add invisible field
Ariadne Conill [Sat, 5 Oct 2019 20:06:03 +0000 (20:06 +0000)]
user info: add invisible field

5 years agoMerge branch 'chore/fixup-testsuite-import' into 'develop'
kaniini [Sat, 19 Oct 2019 23:20:38 +0000 (23:20 +0000)]
Merge branch 'chore/fixup-testsuite-import' into 'develop'

tests: ostatus controller tests: fix sporadic compilation failure

See merge request pleroma/pleroma!1867

5 years agotests: ostatus controller tests: fix sporadic compilation failure
Ariadne Conill [Sat, 19 Oct 2019 23:16:15 +0000 (23:16 +0000)]
tests: ostatus controller tests: fix sporadic compilation failure

5 years agoMerge branch 'feature/mastofe-pwa' into 'develop'
Haelwenn [Sat, 19 Oct 2019 20:11:58 +0000 (20:11 +0000)]
Merge branch 'feature/mastofe-pwa' into 'develop'

MastoFE: Add PWA manifest.

See merge request pleroma/pleroma!1834

5 years agoMerge branch 'mark-all-conversations-as-read' into 'develop'
Haelwenn [Sat, 19 Oct 2019 19:55:16 +0000 (19:55 +0000)]
Merge branch 'mark-all-conversations-as-read' into 'develop'

Pleroma API: `POST /api/v1/pleroma/conversations/read`

See merge request pleroma/pleroma!1830

5 years agoMerge branch 'develop-version-bump' into 'develop'
rinpatch [Sat, 19 Oct 2019 19:13:00 +0000 (19:13 +0000)]
Merge branch 'develop-version-bump' into 'develop'

mix.exs: Bump version for develop builds

See merge request pleroma/pleroma!1866

5 years agomix.exs: Bump version for develop builds
rinpatch [Sat, 19 Oct 2019 18:59:04 +0000 (21:59 +0300)]
mix.exs: Bump version for develop builds

As per discussion on irc, we already used GNU-style versioning system
for release candidates, so it makes sense to use it for develop builds as well.

5 years agoPleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's conversatio...
eugenijm [Fri, 11 Oct 2019 03:40:58 +0000 (06:40 +0300)]
Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's conversations as read

5 years agoAdd documentation for PWA manifest configuration.
KokaKiwi [Sat, 19 Oct 2019 10:11:25 +0000 (12:11 +0200)]
Add documentation for PWA manifest configuration.

5 years agoMastoFE: Add PWA manifest.
KokaKiwi [Fri, 11 Oct 2019 12:48:01 +0000 (14:48 +0200)]
MastoFE: Add PWA manifest.

5 years agoMerge branch 'mix-emoji-task-pack-json' into 'develop'
rinpatch [Sat, 19 Oct 2019 08:51:03 +0000 (08:51 +0000)]
Merge branch 'mix-emoji-task-pack-json' into 'develop'

For pleroma.emoji downloaded packs, generate pack.json instead

See merge request pleroma/pleroma!1748

5 years agoMerge branch 'patch-1' into 'develop'
rinpatch [Fri, 18 Oct 2019 22:29:04 +0000 (22:29 +0000)]
Merge branch 'patch-1' into 'develop'

Fix a typo in default static directory configuration for OTP releases

Closes #1289

See merge request pleroma/pleroma!1829

5 years agoMerge branch 'fix/pleroma-ctl-rpc' into 'develop'
rinpatch [Fri, 18 Oct 2019 21:40:07 +0000 (21:40 +0000)]
Merge branch 'fix/pleroma-ctl-rpc' into 'develop'

pleroma_ctl: Fix attempting to use RPC for config generation

See merge request pleroma/pleroma!1862

5 years agopleroma_ctl: Fix attempting to use RPC for config generation
rinpatch [Fri, 18 Oct 2019 21:37:39 +0000 (00:37 +0300)]
pleroma_ctl: Fix attempting to use RPC for config generation

5 years agoMerge branch 'feature/relay-list' into 'develop'
kaniini [Fri, 18 Oct 2019 16:51:04 +0000 (16:51 +0000)]
Merge branch 'feature/relay-list' into 'develop'

Admin API: Ability to list all followed relays

See merge request pleroma/pleroma!1835

5 years agoMerge branch 'develop' into feature/relay-list
Maxim Filippov [Fri, 18 Oct 2019 16:35:58 +0000 (18:35 +0200)]
Merge branch 'develop' into feature/relay-list

5 years agoMerge branch 'feature/ostatus-removal' into 'develop'
kaniini [Fri, 18 Oct 2019 16:04:57 +0000 (16:04 +0000)]
Merge branch 'feature/ostatus-removal' into 'develop'

ostatus removal

Closes #1145

See merge request pleroma/pleroma!1854

5 years agotests: mastodon api: fix broken test that used OStatus
Ariadne Conill [Fri, 18 Oct 2019 15:46:46 +0000 (15:46 +0000)]
tests: mastodon api: fix broken test that used OStatus

5 years agoobject: containment: simplify the pattern match for OStatus testsuite hack
Ariadne Conill [Fri, 18 Oct 2019 15:39:15 +0000 (15:39 +0000)]
object: containment: simplify the pattern match for OStatus testsuite hack

5 years agoobject: containment: only allow OStatus references in test suite environment
Ariadne Conill [Fri, 18 Oct 2019 15:34:36 +0000 (15:34 +0000)]
object: containment: only allow OStatus references in test suite environment

5 years agotests: mastodon search: search for an account that is visible via activitypub, not...
Ariadne Conill [Fri, 18 Oct 2019 04:14:26 +0000 (04:14 +0000)]
tests: mastodon search: search for an account that is visible via activitypub, not ostatus

5 years agoobject: fetcher: fix up formatting
Ariadne Conill [Fri, 18 Oct 2019 04:08:25 +0000 (04:08 +0000)]
object: fetcher: fix up formatting

5 years agoadd some missing tesla fixtures
Ariadne Conill [Fri, 18 Oct 2019 03:58:28 +0000 (03:58 +0000)]
add some missing tesla fixtures

5 years agoactivitypub: tag containment checks for better error tracing
Ariadne Conill [Fri, 18 Oct 2019 03:57:32 +0000 (03:57 +0000)]
activitypub: tag containment checks for better error tracing

5 years agoobject: containment: also allow OStatus object IDs through when comparing origins
Ariadne Conill [Fri, 18 Oct 2019 03:56:31 +0000 (03:56 +0000)]
object: containment: also allow OStatus object IDs through when comparing origins

5 years agoobject: fetcher: improve error reporting
Ariadne Conill [Fri, 18 Oct 2019 03:41:38 +0000 (03:41 +0000)]
object: fetcher: improve error reporting

5 years agoobject: containment: don't try to contain ostatus objects
Ariadne Conill [Fri, 18 Oct 2019 03:26:50 +0000 (03:26 +0000)]
object: containment: don't try to contain ostatus objects

5 years agotests: fix up signature tests
Ariadne Conill [Fri, 18 Oct 2019 02:56:02 +0000 (02:56 +0000)]
tests: fix up signature tests

5 years agotests: fix relay tests
Ariadne Conill [Fri, 18 Oct 2019 02:52:08 +0000 (02:52 +0000)]
tests: fix relay tests

5 years agoobject fetcher: fix up error handling
Ariadne Conill [Fri, 18 Oct 2019 02:42:25 +0000 (02:42 +0000)]
object fetcher: fix up error handling

5 years agotests: simplify object fetching and containment tests
Ariadne Conill [Fri, 18 Oct 2019 00:51:53 +0000 (00:51 +0000)]
tests: simplify object fetching and containment tests

5 years agotests: remove some more ostatus tests
Ariadne Conill [Fri, 18 Oct 2019 00:37:13 +0000 (00:37 +0000)]
tests: remove some more ostatus tests

5 years agofix up some tests
Ariadne Conill [Fri, 18 Oct 2019 00:30:01 +0000 (00:30 +0000)]
fix up some tests

5 years agokill almost all of the OStatus module
Ariadne Conill [Thu, 17 Oct 2019 23:37:21 +0000 (23:37 +0000)]
kill almost all of the OStatus module

5 years agofederator: remove OStatus incoming document support
Ariadne Conill [Thu, 17 Oct 2019 23:15:09 +0000 (23:15 +0000)]
federator: remove OStatus incoming document support

5 years agoremove Salmon module
Ariadne Conill [Thu, 17 Oct 2019 23:09:15 +0000 (23:09 +0000)]
remove Salmon module

5 years agorouter: disconnect Salmon
Ariadne Conill [Thu, 17 Oct 2019 23:07:54 +0000 (23:07 +0000)]
router: disconnect Salmon

5 years agowebfinger: stop pulling Salmon data out of WebFinger
Ariadne Conill [Thu, 17 Oct 2019 23:07:20 +0000 (23:07 +0000)]
webfinger: stop pulling Salmon data out of WebFinger

5 years agofeed: don't advertise salmon endpoint
Ariadne Conill [Thu, 17 Oct 2019 23:06:53 +0000 (23:06 +0000)]
feed: don't advertise salmon endpoint

5 years agopublisher: move remote_users() from Salmon module
Ariadne Conill [Thu, 17 Oct 2019 23:05:45 +0000 (23:05 +0000)]
publisher: move remote_users() from Salmon module

5 years agowebsub: remove entirely
Ariadne Conill [Thu, 17 Oct 2019 22:57:37 +0000 (22:57 +0000)]
websub: remove entirely

5 years agofederator: remove websub stuff
Ariadne Conill [Thu, 17 Oct 2019 22:53:45 +0000 (22:53 +0000)]
federator: remove websub stuff

5 years agoapplication: don't start Federator.init/1 anymore
Ariadne Conill [Thu, 17 Oct 2019 22:52:46 +0000 (22:52 +0000)]
application: don't start Federator.init/1 anymore

5 years agoconfig: disable Websub and Salmon publisher modules
Ariadne Conill [Thu, 17 Oct 2019 22:31:20 +0000 (22:31 +0000)]
config: disable Websub and Salmon publisher modules

5 years agoupdate changelog
Ariadne Conill [Thu, 17 Oct 2019 22:29:28 +0000 (22:29 +0000)]
update changelog

5 years agoMerge branch 'fix/changelog-typo' into 'develop'
rinpatch [Fri, 18 Oct 2019 13:00:33 +0000 (13:00 +0000)]
Merge branch 'fix/changelog-typo' into 'develop'

Fix wrong list level in the changelog

See merge request pleroma/pleroma!1860

5 years agoFix wrong list level in the changelog
rinpatch [Fri, 18 Oct 2019 12:56:14 +0000 (15:56 +0300)]
Fix wrong list level in the changelog

5 years agoMerge branch 'chore/develop-changelog-sync' into 'develop'
rinpatch [Fri, 18 Oct 2019 12:47:45 +0000 (12:47 +0000)]
Merge branch 'chore/develop-changelog-sync' into 'develop'

Sync the changelog from stable and collapse the API sections

See merge request pleroma/pleroma!1859

5 years agoSync the changelog from stable and collapse the API sections
rinpatch [Fri, 18 Oct 2019 12:34:29 +0000 (15:34 +0300)]
Sync the changelog from stable and collapse the API sections

5 years agoMerge branch 'backport/develop-safe-jsonb' into 'develop'
rinpatch [Fri, 18 Oct 2019 12:42:09 +0000 (12:42 +0000)]
Merge branch 'backport/develop-safe-jsonb' into 'develop'

Backport safe_jsonb_set fixes to develop

See merge request pleroma/pleroma!1858

5 years agoAdd a test for safe_jsonb_set
rinpatch [Fri, 18 Oct 2019 11:33:51 +0000 (14:33 +0300)]
Add a test for safe_jsonb_set

5 years agoFix a migration wiping user info of users that don't have any mutes
rinpatch [Fri, 18 Oct 2019 11:11:30 +0000 (14:11 +0300)]
Fix a migration wiping user info of users that don't have any mutes

And introduce safe_jsonb_set

5 years agoMerge branch 'cleanup/deprecated_config_upload' into 'develop'
rinpatch [Fri, 18 Oct 2019 11:34:48 +0000 (11:34 +0000)]
Merge branch 'cleanup/deprecated_config_upload' into 'develop'

upload.ex: Remove deprecated configuration

See merge request pleroma/pleroma!1855

5 years agoupload.ex: Remove deprecated configuration
Haelwenn (lanodan) Monnier [Fri, 18 Oct 2019 10:29:42 +0000 (12:29 +0200)]
upload.ex: Remove deprecated configuration

5 years agoMerge branch 'develop' into feature/relay-list
Maxim Filippov [Fri, 18 Oct 2019 08:24:29 +0000 (10:24 +0200)]
Merge branch 'develop' into feature/relay-list

5 years agoMerge branch 'fix-streaming-with-sec-websocket-protocol' into 'develop'
kaniini [Fri, 18 Oct 2019 04:42:02 +0000 (04:42 +0000)]
Merge branch 'fix-streaming-with-sec-websocket-protocol' into 'develop'

Fix streaming websocket handshake with `Sec-WebSocket-Protocol`

See merge request pleroma/pleroma!1847

5 years agoApply suggestion to lib/pleroma/web/mastodon_api/websocket_handler.ex
kaniini [Fri, 18 Oct 2019 04:36:37 +0000 (04:36 +0000)]
Apply suggestion to lib/pleroma/web/mastodon_api/websocket_handler.ex

5 years agoMerge branch 'mark-converstation-as-read-on-new-direct-message' into 'develop'
feld [Thu, 17 Oct 2019 20:05:01 +0000 (20:05 +0000)]
Merge branch 'mark-converstation-as-read-on-new-direct-message' into 'develop'

Mastodon API / Conversations: Mark the conversation as read for the author when they send a new direct message

See merge request pleroma/pleroma!1853

5 years agoMastodon API: Mark the conversation as read for the author when they send a new direc...
eugenijm [Thu, 17 Oct 2019 12:25:15 +0000 (15:25 +0300)]
Mastodon API: Mark the conversation as read for the author when they send a new direct message

5 years agoadd Markers /api/v1/markers
Maksim Pechnikov [Thu, 17 Oct 2019 12:26:59 +0000 (15:26 +0300)]
add Markers /api/v1/markers

5 years agoMerge branch 'user-search-experiments' into 'develop'
lain [Wed, 16 Oct 2019 12:29:08 +0000 (12:29 +0000)]
Merge branch 'user-search-experiments' into 'develop'

User search: Remove trigram and refactor the module

See merge request pleroma/pleroma!1850

5 years agoMerge branch 'feature/multiple-users-activation-permissions' into 'develop'
feld [Wed, 16 Oct 2019 12:14:47 +0000 (12:14 +0000)]
Merge branch 'feature/multiple-users-activation-permissions' into 'develop'

Ability to toggle activation status, permission group & delete multiple users

Closes admin-fe#39

See merge request pleroma/pleroma!1825

5 years agoRemove a failing search test due to it being unrealistic
rinpatch [Wed, 16 Oct 2019 12:09:39 +0000 (15:09 +0300)]
Remove a failing search test due to it being unrealistic
While the case tested (`lain@ple`) gives wrong ordering due to
using only trigram to order, it almost never happens in reality. In reality
it would be either `lain` (in which case it's fine to list the user with `lain`
in display name first), or `@lain@pleroma.soykaf.com`/`lain@pleroma.soykaf.com` (which is
handled fine as well)

5 years agoMerge branch 'benchmark-finishing' into 'develop'
lain [Wed, 16 Oct 2019 11:54:49 +0000 (11:54 +0000)]
Merge branch 'benchmark-finishing' into 'develop'

Benchmark finishing

Closes #755

See merge request pleroma/pleroma!1848

5 years agoOrder fts results by trigram
rinpatch [Wed, 16 Oct 2019 10:49:33 +0000 (13:49 +0300)]
Order fts results by trigram

5 years agoUser search: Remove trigram and refactor the module
rinpatch [Wed, 16 Oct 2019 09:52:47 +0000 (12:52 +0300)]
User search: Remove trigram and refactor the module

- Remove trigram as it tends to rank garbage results highly, resulting
in it prioritized above fts, which gives actually decent results. ACKed
by kaniini and lain on irc.
- Remove a test for handling misspelled requests, since we no longer have
trigram
- Remove a test for searching users with `nil` display names, because it
is unrealistic, we don't accept usernames that are not >1 char strings
- Make rank boosting for followers/followees sane again, previous values
resulted in garbage matches getting on top just because the users are
followers/followees

5 years agoDELETE /api/pleroma/admin/users now accepts nicknames array
Maxim Filippov [Tue, 15 Oct 2019 15:33:29 +0000 (17:33 +0200)]
DELETE /api/pleroma/admin/users now accepts nicknames array

5 years agosome fixes
Alexander [Tue, 15 Oct 2019 13:26:04 +0000 (16:26 +0300)]
some fixes

5 years agodon't stream in benchmark env
Alexander [Tue, 15 Oct 2019 12:16:17 +0000 (15:16 +0300)]
don't stream in benchmark env

5 years agoAdd `Sec-WebSocket-Protocol` to response header
kPherox [Tue, 15 Oct 2019 10:10:22 +0000 (19:10 +0900)]
Add `Sec-WebSocket-Protocol` to response header

5 years agoFor pleroma.emoji downloaded packs, generate pack.json instead
Ekaterina Vaartis [Mon, 30 Sep 2019 13:04:30 +0000 (16:04 +0300)]
For pleroma.emoji downloaded packs, generate pack.json instead

5 years agoMerge branch 'exclude-visibilities-for-timelines' into 'develop'
feld [Mon, 14 Oct 2019 19:40:40 +0000 (19:40 +0000)]
Merge branch 'exclude-visibilities-for-timelines' into 'develop'

Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints

See merge request pleroma/pleroma!1818

5 years agoMerge branch 'backport/develop-branch-hiding-fix' into 'develop'
rinpatch [Mon, 14 Oct 2019 19:17:06 +0000 (19:17 +0000)]
Merge branch 'backport/develop-branch-hiding-fix' into 'develop'

Backport "Fix hiding branch name logic" to develop

See merge request pleroma/pleroma!1846

5 years agoFix hiding branch name logic
rinpatch [Mon, 14 Oct 2019 19:13:18 +0000 (22:13 +0300)]
Fix hiding branch name logic

5 years agoMerge branch 'master-to-stable' into 'develop'
rinpatch [Mon, 14 Oct 2019 16:08:53 +0000 (16:08 +0000)]
Merge branch 'master-to-stable' into 'develop'

Preparations for renaming `master` to `stable`

See merge request pleroma/pleroma!1840

5 years agoCorrect version parser branch name detection
rinpatch [Mon, 14 Oct 2019 15:45:16 +0000 (18:45 +0300)]
Correct version parser branch name detection

5 years agoAdd a changelog entry for branch-moving
rinpatch [Mon, 14 Oct 2019 15:42:30 +0000 (18:42 +0300)]
Add a changelog entry for branch-moving

5 years agoPrepare pleroma_ctl for moving master to stable and relax the error
rinpatch [Mon, 14 Oct 2019 15:39:56 +0000 (18:39 +0300)]
Prepare pleroma_ctl for moving master to stable and relax the error
message

5 years agoPreparations for renaming `master` to `stable`
rinpatch [Mon, 14 Oct 2019 15:38:51 +0000 (18:38 +0300)]
Preparations for renaming `master` to `stable`

5 years agoMastodon API: Add `exclude_visibilities` parameter to the timeline and notification...
eugenijm [Tue, 8 Oct 2019 20:05:57 +0000 (23:05 +0300)]
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints

5 years agoMerge branch 'incoming-id-fixes' into 'develop'
lain [Sun, 13 Oct 2019 15:37:49 +0000 (15:37 +0000)]
Merge branch 'incoming-id-fixes' into 'develop'

Assorted transmogrifier fixes

See merge request pleroma/pleroma!1831

5 years agoMerge branch 'fix/mediaproxy-too-brutal' into 'develop'
rinpatch [Sat, 12 Oct 2019 14:42:55 +0000 (14:42 +0000)]
Merge branch 'fix/mediaproxy-too-brutal' into 'develop'

Make MediaProxy failure tracking less brutal

See merge request pleroma/pleroma!1836

5 years agoMake MediaProxy failure tracking less brutal
rinpatch [Fri, 11 Oct 2019 19:52:38 +0000 (22:52 +0300)]
Make MediaProxy failure tracking less brutal

The current failure tracking mechanism will never request anything that
didn't respond with a success, 403, 404, or 5xx codes. This is causing
issues when using in real fediverse because of weird status codes
some software has and timeouts being frequent. This patch changes
failure tracking mechanism to only never request the url again if it
responded with 400, 204, or the body is too large, otherwise it can be
re-requested in 60 seconds.

5 years agoThis line either causes a warning, or a failed test
Maxim Filippov [Fri, 11 Oct 2019 16:31:00 +0000 (19:31 +0300)]
This line either causes a warning, or a failed test