akkoma
3 years agoMerge branch 'chat-moderation-stable' into chat-moderation
Alex Gleason [Fri, 11 Sep 2020 19:30:28 +0000 (14:30 -0500)]
Merge branch 'chat-moderation-stable' into chat-moderation

3 years agoChat moderation: fix formatting
Alex Gleason [Fri, 11 Sep 2020 19:29:56 +0000 (14:29 -0500)]
Chat moderation: fix formatting

3 years agoMerge remote-tracking branch 'upstream/develop' into chat-moderation
Alex Gleason [Fri, 11 Sep 2020 19:13:38 +0000 (14:13 -0500)]
Merge remote-tracking branch 'upstream/develop' into chat-moderation

3 years agoChat moderation: add tests for unauthorized access
Alex Gleason [Fri, 11 Sep 2020 19:00:34 +0000 (14:00 -0500)]
Chat moderation: add tests for unauthorized access

3 years agoChat Moderation: use explicit `sender` and `recipient` fields
Alex Gleason [Thu, 10 Sep 2020 06:44:32 +0000 (01:44 -0500)]
Chat Moderation: use explicit `sender` and `recipient` fields

3 years agoCredo fix
Alex Gleason [Wed, 2 Sep 2020 02:12:21 +0000 (21:12 -0500)]
Credo fix

3 years agoDocs: AdminAPI chat moderation
Alex Gleason [Wed, 2 Sep 2020 01:56:42 +0000 (20:56 -0500)]
Docs: AdminAPI chat moderation

3 years agoAdminAPI: fix delete chat message
Alex Gleason [Wed, 2 Sep 2020 01:40:36 +0000 (20:40 -0500)]
AdminAPI: fix delete chat message

3 years agoAdminAPI: show chat
Alex Gleason [Wed, 2 Sep 2020 00:49:46 +0000 (19:49 -0500)]
AdminAPI: show chat

3 years agoAdminAPI: list messages in a chat
Alex Gleason [Wed, 2 Sep 2020 00:39:34 +0000 (19:39 -0500)]
AdminAPI: list messages in a chat

3 years agoRefactor with Chat.for_user_query/1
Alex Gleason [Wed, 2 Sep 2020 00:05:24 +0000 (19:05 -0500)]
Refactor with Chat.for_user_query/1

3 years agoAdminAPI: list chats for a user
Alex Gleason [Tue, 1 Sep 2020 01:23:33 +0000 (20:23 -0500)]
AdminAPI: list chats for a user

3 years agoAdminAPI: delete a chat message
Alex Gleason [Tue, 1 Sep 2020 00:56:05 +0000 (19:56 -0500)]
AdminAPI: delete a chat message

3 years agoMastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1
Alex Gleason [Mon, 31 Aug 2020 21:48:24 +0000 (16:48 -0500)]
MastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1

3 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

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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

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

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

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

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

3 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

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

3 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

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

3 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

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

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

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

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

changed namespace for activity expiration configuration

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

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

3 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

3 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

3 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

3 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

3 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

3 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/

3 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

3 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

3 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

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

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

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

3 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

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

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

3 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

3 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

3 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

3 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.

3 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

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

Should fix gun deadlocks

3 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

3 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/

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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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.

3 years agoDisable providers of user and status metadata when instance is private
Mark Felder [Mon, 31 Aug 2020 19:35:22 +0000 (14:35 -0500)]
Disable providers of user and status metadata when instance is private

3 years agoDo not make RelMe metadata provider optional.
Mark Felder [Mon, 31 Aug 2020 19:19:48 +0000 (14:19 -0500)]
Do not make RelMe metadata provider optional.

There's really no sound reason to turn this off anyway.

3 years agouser: harden get_friends_query(), get_followers_query() and their wrappers
Haelwenn (lanodan) Monnier [Wed, 2 Sep 2020 18:24:03 +0000 (20:24 +0200)]
user: harden get_friends_query(), get_followers_query() and their wrappers

3 years agosearch: Apply following filter only when user is usable
Haelwenn (lanodan) Monnier [Wed, 2 Sep 2020 18:11:24 +0000 (20:11 +0200)]
search: Apply following filter only when user is usable

3 years agoAP C2S: Restrict character limit on Note
Haelwenn (lanodan) Monnier [Tue, 7 Jul 2020 05:06:29 +0000 (07:06 +0200)]
AP C2S: Restrict character limit on Note

3 years agoFix atom leak in AdminAPIController
Egor Kislitsyn [Wed, 10 Jun 2020 11:37:43 +0000 (15:37 +0400)]
Fix atom leak in AdminAPIController

3 years agoMerge branch 'release/2.1.1' into 'stable'
rinpatch [Tue, 8 Sep 2020 17:21:12 +0000 (17:21 +0000)]
Merge branch 'release/2.1.1' into 'stable'

2.1.1 release

See merge request pleroma/secteam/pleroma!13

3 years agoSECURITY.md: we don't support 2.0 anymore, bump to 2.1
rinpatch [Tue, 8 Sep 2020 17:13:00 +0000 (20:13 +0300)]
SECURITY.md: we don't support 2.0 anymore, bump to 2.1

3 years agoMerge branch 'bugfix/mock' into 'develop'
Haelwenn [Tue, 8 Sep 2020 16:42:27 +0000 (16:42 +0000)]
Merge branch 'bugfix/mock' into 'develop'

mockfix but for non-secteam because gitlab

See merge request pleroma/pleroma!2973

3 years agopleroma-fe bundle: update to 938887ef91a12dcaaaaa0884af4e76abd1c6c679
rinpatch [Tue, 8 Sep 2020 12:34:20 +0000 (15:34 +0300)]
pleroma-fe bundle: update to 938887ef91a12dcaaaaa0884af4e76abd1c6c679

3 years agoMerge branch 'temp-hackney-fix' into 'develop'
rinpatch [Mon, 7 Sep 2020 12:47:43 +0000 (12:47 +0000)]
Merge branch 'temp-hackney-fix' into 'develop'

temp hackney fix

See merge request pleroma/pleroma!2951

3 years agoMerge branch 'fix/upload-filter-exiftool-webp' into 'develop'
rinpatch [Tue, 8 Sep 2020 12:21:33 +0000 (12:21 +0000)]
Merge branch 'fix/upload-filter-exiftool-webp' into 'develop'

Skip processing webp image files because we can't strip EXIF

Closes #2080

See merge request pleroma/pleroma!2924

3 years agoCHANGELOG.md: Add 2.1.1 entry
rinpatch [Tue, 8 Sep 2020 11:21:34 +0000 (14:21 +0300)]
CHANGELOG.md: Add 2.1.1 entry

3 years agoRemove OStatus in testsuite
Haelwenn (lanodan) Monnier [Tue, 8 Sep 2020 07:13:11 +0000 (09:13 +0200)]
Remove OStatus in testsuite

3 years agoDrop unused "inReplyToAtomUri" in objects
Haelwenn (lanodan) Monnier [Tue, 8 Sep 2020 08:43:57 +0000 (10:43 +0200)]
Drop unused "inReplyToAtomUri" in objects

3 years agoMerge branch 'bugfix/mock' into 'develop'
Haelwenn [Tue, 8 Sep 2020 16:42:27 +0000 (16:42 +0000)]
Merge branch 'bugfix/mock' into 'develop'

mockfix but for non-secteam because gitlab

See merge request pleroma/pleroma!2973

3 years agocombo fixes
Alexander Strizhakov [Tue, 8 Sep 2020 14:29:28 +0000 (17:29 +0300)]
combo fixes

3 years agodon't run async tests, which use Mock
Alexander Strizhakov [Tue, 8 Sep 2020 14:12:38 +0000 (17:12 +0300)]
don't run async tests, which use Mock

3 years agoMerge branch 'develop' into 'develop'
feld [Tue, 8 Sep 2020 14:52:51 +0000 (14:52 +0000)]
Merge branch 'develop' into 'develop'

ForceBotUnlistedPolicy

See merge request pleroma/pleroma!2967

3 years agoMerge branch 'bugfix/favicon-empty-test' into 'develop'
Haelwenn [Tue, 8 Sep 2020 14:52:33 +0000 (14:52 +0000)]
Merge branch 'bugfix/favicon-empty-test' into 'develop'

Bugfix/favicon empty test

See merge request pleroma/pleroma!2972

3 years agoaccount_view_test: Remove empty test
Haelwenn (lanodan) Monnier [Tue, 8 Sep 2020 13:47:20 +0000 (15:47 +0200)]
account_view_test: Remove empty test

3 years agotest: remove extraneous :instances_favicons config bits
Haelwenn (lanodan) Monnier [Tue, 8 Sep 2020 14:08:01 +0000 (16:08 +0200)]
test: remove extraneous :instances_favicons config bits

3 years agoRevert "description.exs: add ForceBotUnlistedPolicy"
Mark Felder [Tue, 8 Sep 2020 14:31:47 +0000 (09:31 -0500)]
Revert "description.exs: add ForceBotUnlistedPolicy"

This reverts commit 7215563641e2a5096293128519d6a454aabc46f2.

3 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted
Mark Felder [Tue, 8 Sep 2020 14:31:26 +0000 (09:31 -0500)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted

3 years agoMerge branch 'fix/upload-filter-exiftool-webp' into 'develop'
rinpatch [Tue, 8 Sep 2020 12:21:33 +0000 (12:21 +0000)]
Merge branch 'fix/upload-filter-exiftool-webp' into 'develop'

Skip processing webp image files because we can't strip EXIF

Closes #2080

See merge request pleroma/pleroma!2924

3 years agomix.exs: bump version to 2.1.1
rinpatch [Tue, 8 Sep 2020 12:08:51 +0000 (15:08 +0300)]
mix.exs: bump version to 2.1.1

3 years agoDisable favicon scraping in tests
rinpatch [Tue, 8 Sep 2020 12:06:53 +0000 (15:06 +0300)]
Disable favicon scraping in tests

3 years agochangelog: add ForceBotUnlistedPolicy
Alibek Omarov [Tue, 8 Sep 2020 11:35:34 +0000 (11:35 +0000)]
changelog: add ForceBotUnlistedPolicy