akkoma
4 years agoMerge branch 'chore/unused-import' into 'develop'
feld [Wed, 16 Sep 2020 16:12:22 +0000 (16:12 +0000)]
Merge branch 'chore/unused-import' into 'develop'

Remove unused import

See merge request pleroma/pleroma!3004

4 years agoRemove unused import
Mark Felder [Wed, 16 Sep 2020 15:56:42 +0000 (10:56 -0500)]
Remove unused import

4 years agoMerge branch '2144-empty-users' into 'develop'
rinpatch [Wed, 16 Sep 2020 15:47:07 +0000 (15:47 +0000)]
Merge branch '2144-empty-users' into 'develop'

User: Remote users don't need to be confirmed or approved

Closes #2144

See merge request pleroma/pleroma!3003

4 years agoUser: Remote users don't need to be confirmed or approved
lain [Wed, 16 Sep 2020 15:29:16 +0000 (17:29 +0200)]
User: Remote users don't need to be confirmed or approved

4 years agoMerge branch 'feat/connection-worker-monitor-flush' into 'develop'
rinpatch [Wed, 16 Sep 2020 15:10:20 +0000 (15:10 +0000)]
Merge branch 'feat/connection-worker-monitor-flush' into 'develop'

ConnectionPool Worker: use monitor flush instead of checking ref

See merge request pleroma/pleroma!3002

4 years agoConnectionPool Worker: use monitor flush instead of checking ref
rinpatch [Wed, 16 Sep 2020 14:23:05 +0000 (17:23 +0300)]
ConnectionPool Worker: use monitor flush instead of checking ref

`:flush` removes the DOWN message if one had arrived, so this check
should no longer be necessary.

4 years agoMerge branch 'chores/mrf-loglevel' into 'develop'
rinpatch [Wed, 16 Sep 2020 13:37:04 +0000 (13:37 +0000)]
Merge branch 'chores/mrf-loglevel' into 'develop'

Fetcher: Correctly return MRF reject reason

See merge request pleroma/pleroma!2990

4 years agoMerge branch 'features/validators-video' into 'develop'
rinpatch [Wed, 16 Sep 2020 13:36:27 +0000 (13:36 +0000)]
Merge branch 'features/validators-video' into 'develop'

Pipeline Ingestion: Video and Article

See merge request pleroma/pleroma!2908

4 years agoMerge branch 'issue/2089' into 'develop'
lain [Wed, 16 Sep 2020 12:22:48 +0000 (12:22 +0000)]
Merge branch 'issue/2089' into 'develop'

[#2089] fix notifications

See merge request pleroma/pleroma!3000

4 years agoRepoStreamer.chunk_stream -> Repo.chunk_stream
Maksim Pechnikov [Wed, 16 Sep 2020 06:47:18 +0000 (09:47 +0300)]
RepoStreamer.chunk_stream ->  Repo.chunk_stream

4 years agoApply 1 suggestion(s) to 1 file(s)
Maksim [Wed, 16 Sep 2020 03:18:50 +0000 (03:18 +0000)]
Apply 1 suggestion(s) to 1 file(s)

4 years agofixed tests
Maksim Pechnikov [Tue, 15 Sep 2020 12:32:49 +0000 (15:32 +0300)]
fixed tests

4 years agoMerge branch 'reply-visibility-user-guard' into 'develop'
lain [Tue, 15 Sep 2020 12:21:38 +0000 (12:21 +0000)]
Merge branch 'reply-visibility-user-guard' into 'develop'

Mastodon API: fix the public timeline returning an error when the `reply_visibility` parameter is set to `self` for an unauthenticated user

See merge request pleroma/pleroma!2999

4 years agoMastodon API: fix the public timeline returning an error when the `reply_visibility...
eugenijm [Tue, 15 Sep 2020 10:00:07 +0000 (13:00 +0300)]
Mastodon API: fix the public timeline returning an error when the `reply_visibility` parameter is set to `self` for an unauthenticated user

4 years agoMerge branch 'fix/mrf-simple-welcome-chats' into 'develop'
Haelwenn [Tue, 15 Sep 2020 08:25:10 +0000 (08:25 +0000)]
Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'

Ensure we only apply media_nsfw simple policy on parsable objects

Closes #2133

See merge request pleroma/pleroma!2992

4 years agoMove changelog entry to next patch
Mark Felder [Mon, 14 Sep 2020 22:11:08 +0000 (17:11 -0500)]
Move changelog entry to next patch

4 years agoEnsure SimplePolicy's tags in string representation don't trip up the object validator
Mark Felder [Mon, 14 Sep 2020 22:06:42 +0000 (17:06 -0500)]
Ensure SimplePolicy's tags in string representation don't trip up the object validator

4 years agoFixed Welcome chats with MRF Simple applied locally
Mark Felder [Mon, 14 Sep 2020 17:08:32 +0000 (12:08 -0500)]
Fixed Welcome chats with MRF Simple applied locally

4 years agoMerge duplicate Changed sections
Mark Felder [Mon, 14 Sep 2020 17:07:31 +0000 (12:07 -0500)]
Merge duplicate Changed sections

4 years agoValidate Welcome Chat message works with Simple policy applied to local instance
Mark Felder [Mon, 14 Sep 2020 17:06:08 +0000 (12:06 -0500)]
Validate Welcome Chat message works with Simple policy applied to local instance

4 years agoMerge branch 'remove/managed-config-option' into 'develop'
rinpatch [Mon, 14 Sep 2020 15:19:09 +0000 (15:19 +0000)]
Merge branch 'remove/managed-config-option' into 'develop'

Remove `:managed_config` option.

Closes #2086

See merge request pleroma/pleroma!2983

4 years agoRemove `:managed_config` option.
rinpatch [Thu, 10 Sep 2020 12:00:19 +0000 (15:00 +0300)]
Remove `:managed_config` option.

In practice, it was already removed half a year ago, but the description
 and cheatsheet entries were still there.

The migration intentionally does not use ConfigDB.get_by_params, since
this will break migration code as soon as we add a new field is added
 to ConfigDB.

Closes #2086

4 years agoMerge branch 'hotfix/rich-media-compile-error' into 'develop'
rinpatch [Mon, 14 Sep 2020 12:48:27 +0000 (12:48 +0000)]
Merge branch 'hotfix/rich-media-compile-error' into 'develop'

RichMedia: fix a compilation error due to nonexistent variable

See merge request pleroma/pleroma!2996

4 years agoRichMedia: fix a compilation error due to nonexistent variable
rinpatch [Mon, 14 Sep 2020 12:46:00 +0000 (15:46 +0300)]
RichMedia: fix a compilation error due to nonexistent variable

No idea why this passed Gitlab CI

4 years agoMerge branch 'feat/rich-media-head' into 'develop'
rinpatch [Mon, 14 Sep 2020 12:38:00 +0000 (12:38 +0000)]
Merge branch 'feat/rich-media-head' into 'develop'

RichMedia: Do a HEAD request to check content type/length

See merge request pleroma/pleroma!2995

4 years agoApply 1 suggestion(s) to 1 file(s)
rinpatch [Mon, 14 Sep 2020 11:56:00 +0000 (11:56 +0000)]
Apply 1 suggestion(s) to 1 file(s)

4 years agoRichMedia: Do a HEAD request to check content type/length
rinpatch [Mon, 14 Sep 2020 11:45:58 +0000 (14:45 +0300)]
RichMedia: Do a HEAD request to check content type/length

This shouldn't be too expensive, since the connections are pooled,
but it should save us some bandwidth since we won't fetch non-html
files and files that are too large for us to process (especially
since you can't cancel a request without closing the connection
with HTTP1).

4 years agoRichMedia parser: do not set a cache TTL for unchanging errors
rinpatch [Mon, 14 Sep 2020 11:44:25 +0000 (14:44 +0300)]
RichMedia parser: do not set a cache TTL for unchanging errors

4 years agoadded notification constraints
Maksim Pechnikov [Mon, 14 Sep 2020 11:08:12 +0000 (14:08 +0300)]
added notification constraints

4 years agoMerge branch 'fix/2139-oban-migration' into 'develop'
rinpatch [Mon, 14 Sep 2020 07:54:06 +0000 (07:54 +0000)]
Merge branch 'fix/2139-oban-migration' into 'develop'

Remove old workers in oban migrations

Closes #2139

See merge request pleroma/pleroma!2994

4 years agoremove old workers in oban migrations
Alexander Strizhakov [Sun, 13 Sep 2020 07:04:50 +0000 (10:04 +0300)]
remove old workers in oban migrations

4 years agoMerge branch 'weblate-pleroma-pleroma' into 'develop'
Haelwenn [Sat, 12 Sep 2020 08:26:41 +0000 (08:26 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'

Translations update from Weblate

See merge request pleroma/pleroma!2991

4 years agoEnsure we only apply NSFW Simple policy on parsable objects
Mark Felder [Fri, 11 Sep 2020 21:59:45 +0000 (16:59 -0500)]
Ensure we only apply NSFW Simple policy on parsable objects

4 years agoTranslated using Weblate (Spanish)
tarteka [Fri, 11 Sep 2020 18:24:59 +0000 (18:24 +0000)]
Translated using Weblate (Spanish)

Currently translated at 20.7% (22 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/es/

4 years agoMerge branch 'chore/docs-spelling' into 'develop'
feld [Fri, 11 Sep 2020 23:14:54 +0000 (23:14 +0000)]
Merge branch 'chore/docs-spelling' into 'develop'

Spelling nit

See merge request pleroma/pleroma!2993

4 years agoSpelling
Mark Felder [Fri, 11 Sep 2020 22:42:39 +0000 (17:42 -0500)]
Spelling

Reported by: trevoke

4 years agoFetcher: Correctly return MRF reject reason
Haelwenn (lanodan) Monnier [Fri, 11 Sep 2020 17:58:58 +0000 (19:58 +0200)]
Fetcher: Correctly return MRF reject reason

4 years agoMerge branch 'feat/log-possible-hol' into 'develop'
rinpatch [Fri, 11 Sep 2020 12:50:05 +0000 (12:50 +0000)]
Merge branch 'feat/log-possible-hol' into 'develop'

ConnectionPool: Log possible HTTP1 blocks

See merge request pleroma/pleroma!2989

4 years agoConnectionPool: Log possible HTTP1 blocks
rinpatch [Fri, 11 Sep 2020 11:22:54 +0000 (14:22 +0300)]
ConnectionPool: Log possible HTTP1 blocks

4 years agoMerge branch 'bugfix/favicon-none-found' into 'develop'
rinpatch [Fri, 11 Sep 2020 10:42:25 +0000 (10:42 +0000)]
Merge branch 'bugfix/favicon-none-found' into 'develop'

instance: Handle not getting a favicon

See merge request pleroma/pleroma!2988

4 years agoinstance: Handle not getting a favicon
Haelwenn (lanodan) Monnier [Fri, 11 Sep 2020 09:22:50 +0000 (11:22 +0200)]
instance: Handle not getting a favicon

4 years agoMerge branch 'fix/2134-old-cron-jobs' into 'develop'
Haelwenn [Fri, 11 Sep 2020 08:58:01 +0000 (08:58 +0000)]
Merge branch 'fix/2134-old-cron-jobs' into 'develop'

Migration to remove old cron jobs

Closes #2134

See merge request pleroma/pleroma!2987

4 years agomigration to remove old cron jobs
Alexander Strizhakov [Fri, 11 Sep 2020 06:09:28 +0000 (09:09 +0300)]
migration to remove old cron jobs

4 years agoAttachmentValidator: directly embed url schema and pass it fix_media_type
Haelwenn (lanodan) Monnier [Sat, 22 Aug 2020 00:01:33 +0000 (02:01 +0200)]
AttachmentValidator: directly embed url schema and pass it fix_media_type

4 years agoPipeline Ingestion: Article
Haelwenn (lanodan) Monnier [Thu, 20 Aug 2020 18:03:07 +0000 (20:03 +0200)]
Pipeline Ingestion: Article

4 years agoobject_validators: likes & announcements as [ObjectID]
Haelwenn (lanodan) Monnier [Thu, 20 Aug 2020 02:27:59 +0000 (04:27 +0200)]
object_validators: likes & announcements as [ObjectID]

4 years agoPipeline Ingestion: Video
Haelwenn (lanodan) Monnier [Thu, 20 Aug 2020 00:00:04 +0000 (02:00 +0200)]
Pipeline Ingestion: Video

4 years agotransmogrifier: Call strip_internal_fields on pipeline ingestion
Haelwenn (lanodan) Monnier [Tue, 25 Aug 2020 07:19:53 +0000 (09:19 +0200)]
transmogrifier: Call strip_internal_fields on pipeline ingestion

4 years agoMerge branch 'oban-overuse' into 'develop'
rinpatch [Thu, 10 Sep 2020 19:17:15 +0000 (19:17 +0000)]
Merge branch 'oban-overuse' into 'develop'

Expired activities as scheduled jobs in Oban

See merge request pleroma/pleroma!2916

4 years agoCHANGELOG.md: clarify that the functionality is not removed, just the config options
rinpatch [Thu, 10 Sep 2020 18:53:58 +0000 (21:53 +0300)]
CHANGELOG.md: clarify that the functionality is not removed, just the config options

4 years agoremove validate_expires_at from enqueue method
Alexander Strizhakov [Tue, 8 Sep 2020 12:11:18 +0000 (15:11 +0300)]
remove validate_expires_at from enqueue method

4 years agoDocument ephemeral activity changes better
rinpatch [Tue, 8 Sep 2020 09:07:33 +0000 (12:07 +0300)]
Document ephemeral activity changes better

Also remove the example from the cheatsheet, there is no need for it
when the types are simple

4 years agoconfigurable lifetime for ephemeral activities
Alexander Strizhakov [Mon, 7 Sep 2020 17:57:38 +0000 (20:57 +0300)]
configurable lifetime for ephemeral activities

4 years agochangelog
Alexander Strizhakov [Mon, 7 Sep 2020 17:22:14 +0000 (20:22 +0300)]
changelog

4 years agooban warning
Alexander Strizhakov [Mon, 7 Sep 2020 17:21:32 +0000 (20:21 +0300)]
oban warning

4 years agomigration fix
Alexander Strizhakov [Fri, 4 Sep 2020 09:05:17 +0000 (12:05 +0300)]
migration fix

4 years agopin/unpin for activities with expires_at option
Alexander Strizhakov [Fri, 4 Sep 2020 08:40:32 +0000 (11:40 +0300)]
pin/unpin for activities with expires_at option

4 years agolittle clean up
Alexander Strizhakov [Thu, 3 Sep 2020 16:02:22 +0000 (19:02 +0300)]
little clean up

4 years agouse another stream function in migration
Alexander Strizhakov [Thu, 3 Sep 2020 15:08:19 +0000 (18:08 +0300)]
use another stream function in migration

4 years agoexpiration for new pipeline
Alexander Strizhakov [Thu, 3 Sep 2020 14:56:20 +0000 (17:56 +0300)]
expiration for new pipeline

4 years agoreject activity creation
Alexander Strizhakov [Thu, 3 Sep 2020 10:30:39 +0000 (13:30 +0300)]
reject activity creation

if passed expires_at option and expiring activities are not configured

4 years agocopyright header
Alexander Strizhakov [Tue, 25 Aug 2020 09:45:06 +0000 (12:45 +0300)]
copyright header

4 years agodrop activity_expirations table
Alexander Strizhakov [Tue, 25 Aug 2020 09:33:38 +0000 (12:33 +0300)]
drop activity_expirations table

4 years agomove old expirations into Oban
Alexander Strizhakov [Tue, 25 Aug 2020 09:30:00 +0000 (12:30 +0300)]
move old expirations into Oban

4 years agodeprecation warning
Alexander Strizhakov [Tue, 25 Aug 2020 06:10:45 +0000 (09:10 +0300)]
deprecation warning

changed namespace for activity expiration configuration

4 years agodon't expire pinned posts
Alexander Strizhakov [Mon, 24 Aug 2020 10:43:02 +0000 (13:43 +0300)]
don't expire pinned posts

4 years agoschedule activity expiration in Oban
Alexander Strizhakov [Sat, 22 Aug 2020 17:46:01 +0000 (20:46 +0300)]
schedule activity expiration in Oban

4 years agoMerge branch 'feature/1790-oban-overuse-clear-oauth-token' into 'develop'
rinpatch [Thu, 10 Sep 2020 18:45:04 +0000 (18:45 +0000)]
Merge branch 'feature/1790-oban-overuse-clear-oauth-token' into 'develop'

Feature/1790 removing expired tokens through Oban scheduled jobs

See merge request pleroma/pleroma!2957

4 years agoMerge branch 'chores/remove-ostatus-fixtures' into 'develop'
rinpatch [Thu, 10 Sep 2020 18:41:00 +0000 (18:41 +0000)]
Merge branch 'chores/remove-ostatus-fixtures' into 'develop'

Remove OStatus in testsuite

See merge request pleroma/pleroma!2968

4 years agoMerge branch 'fix/streaming-termination-errors' into 'develop'
rinpatch [Thu, 10 Sep 2020 18:40:54 +0000 (18:40 +0000)]
Merge branch 'fix/streaming-termination-errors' into 'develop'

Fix two pseudo-errors in websocket handler

Closes #2131

See merge request pleroma/pleroma!2982

4 years agoMerge branch '2130-mfa-users-oauth-login-fix' into 'develop'
rinpatch [Thu, 10 Sep 2020 18:38:48 +0000 (18:38 +0000)]
Merge branch '2130-mfa-users-oauth-login-fix' into 'develop'

[#2130] Fixed OAuth OOB authentication for users with enabled MFA

Closes #2130

See merge request pleroma/pleroma!2979

4 years agoStreaming integration tests: remove unexpected error assumption
rinpatch [Thu, 10 Sep 2020 18:28:47 +0000 (21:28 +0300)]
Streaming integration tests: remove unexpected error assumption

For some reason instead of fixing unexpected errors, we made tests
assert they indeed trigger... Now that the errors are fixed these were
failing

4 years agoWebsocket handler: fix never matching code on failed auth
rinpatch [Thu, 10 Sep 2020 18:26:52 +0000 (21:26 +0300)]
Websocket handler: fix never matching code on failed auth

`:cowboy_req.reply` does not return tuples since 2.0, see
https://ninenines.eu/docs/en/cowboy/2.4/manual/cowboy_req.reply/

4 years agoWebsocket handler: do not raise if handler is terminated before switching protocols
rinpatch [Thu, 10 Sep 2020 10:48:24 +0000 (13:48 +0300)]
Websocket handler: do not raise if handler is terminated before switching protocols

Closes #2131

4 years agowebsocket handler: Do not log client ping frames as errors
rinpatch [Thu, 10 Sep 2020 10:47:53 +0000 (13:47 +0300)]
websocket handler: Do not log client ping frames as errors

4 years agoMerge branch 'fix/tesla-client-opts' into 'develop'
rinpatch [Thu, 10 Sep 2020 17:41:37 +0000 (17:41 +0000)]
Merge branch 'fix/tesla-client-opts' into 'develop'

Pass options without adapter key in tesla reverse proxy client

See merge request pleroma/pleroma!2985

4 years agopass options without adapter key
Alexander Strizhakov [Thu, 10 Sep 2020 17:09:44 +0000 (20:09 +0300)]
pass options without adapter key

4 years agooban warning
Alexander Strizhakov [Mon, 7 Sep 2020 17:06:28 +0000 (20:06 +0300)]
oban warning

4 years agoformatting
Alexander Strizhakov [Mon, 7 Sep 2020 10:54:28 +0000 (13:54 +0300)]
formatting

4 years agomigration to move tokens expiration into Oban
Alexander Strizhakov [Mon, 7 Sep 2020 10:44:42 +0000 (13:44 +0300)]
migration to move tokens expiration into Oban

4 years agomigration and changelog
Alexander Strizhakov [Mon, 7 Sep 2020 08:54:10 +0000 (11:54 +0300)]
migration and changelog

4 years agoexpire mfa tokens through Oban
Alexander Strizhakov [Sat, 5 Sep 2020 15:35:01 +0000 (18:35 +0300)]
expire mfa tokens  through Oban

4 years agoschedule expired oauth tokens deletion with Oban
Alexander Strizhakov [Tue, 25 Aug 2020 16:17:51 +0000 (19:17 +0300)]
schedule expired oauth tokens deletion with Oban

4 years agoMerge branch 'fix/2132-emoji-packs' into 'develop'
lain [Thu, 10 Sep 2020 11:05:00 +0000 (11:05 +0000)]
Merge branch 'fix/2132-emoji-packs' into 'develop'

use Pleroma.HTTP in emoji packs tasks

Closes #2132

See merge request pleroma/pleroma!2980

4 years agouse Pleroma.HTTP in emoji packs tasks
Alexander Strizhakov [Thu, 10 Sep 2020 08:23:39 +0000 (11:23 +0300)]
use Pleroma.HTTP in emoji packs tasks

4 years ago[#2130] Fixed OAuth OOB authentication for users with enabled MFA.
Ivan Tashkinov [Wed, 9 Sep 2020 19:44:38 +0000 (22:44 +0300)]
[#2130] Fixed OAuth OOB authentication for users with enabled MFA.

4 years agoMerge branch 'chore/concurrent_limiter_update' into 'develop'
rinpatch [Wed, 9 Sep 2020 15:49:34 +0000 (15:49 +0000)]
Merge branch 'chore/concurrent_limiter_update' into 'develop'

bump concurrent_limiter

See merge request pleroma/pleroma!2978

4 years agobump concurrent_limiter
rinpatch [Wed, 9 Sep 2020 15:34:07 +0000 (18:34 +0300)]
bump concurrent_limiter

Should fix gun deadlocks

4 years agoMerge branch 'weblate-pleroma-pleroma' into 'develop'
lain [Wed, 9 Sep 2020 11:34:31 +0000 (11:34 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'

Translations update from Weblate

See merge request pleroma/pleroma!2977

4 years agoTranslated using Weblate (Spanish)
tarteka [Wed, 9 Sep 2020 09:52:08 +0000 (09:52 +0000)]
Translated using Weblate (Spanish)

Currently translated at 9.4% (10 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/es/

4 years agoAdded translation using Weblate (Spanish)
tarteka [Wed, 9 Sep 2020 09:49:26 +0000 (09:49 +0000)]
Added translation using Weblate (Spanish)

4 years agoMerge branch 'stable-sync/2.1.1' into 'develop'
rinpatch [Tue, 8 Sep 2020 17:57:02 +0000 (17:57 +0000)]
Merge branch 'stable-sync/2.1.1' into 'develop'

Sync stable with develop after 2.1.1

Closes #2, #2047, #2095, #2116, #1987, and #2080

See merge request pleroma/pleroma!2974

4 years agoMerge branch 'stable' into stable-sync/2.1.1
rinpatch [Tue, 8 Sep 2020 17:34:02 +0000 (20:34 +0300)]
Merge branch 'stable' into stable-sync/2.1.1

4 years agoMetadata: Move restriction check from Feed provider to activated_providers
rinpatch [Mon, 7 Sep 2020 12:06:06 +0000 (15:06 +0300)]
Metadata: Move restriction check from Feed provider to activated_providers

4 years agoUse :restrict_unauthenticated testing for more granular control
Mark Felder [Tue, 1 Sep 2020 15:43:44 +0000 (10:43 -0500)]
Use :restrict_unauthenticated testing for more granular control

4 years agoDocument breaking change for metadata providers
Mark Felder [Mon, 31 Aug 2020 21:11:13 +0000 (16:11 -0500)]
Document breaking change for metadata providers

4 years agoRelMe and Feed no longer configurable
Mark Felder [Mon, 31 Aug 2020 21:11:01 +0000 (16:11 -0500)]
RelMe and Feed no longer configurable

4 years agoDo not serve RSS/Atom feeds when instance is private
Mark Felder [Mon, 31 Aug 2020 20:58:21 +0000 (15:58 -0500)]
Do not serve RSS/Atom feeds when instance is private

4 years agoFix test so setting doesn't leak
Mark Felder [Mon, 31 Aug 2020 20:54:22 +0000 (15:54 -0500)]
Fix test so setting doesn't leak

4 years agoFeed provider only generates a redirect, so always activate it.
Mark Felder [Mon, 31 Aug 2020 19:48:22 +0000 (14:48 -0500)]
Feed provider only generates a redirect, so always activate it.

Making this configurable is misleading.