Alex Gleason [Wed, 2 Sep 2020 02:12:21 +0000 (21:12 -0500)]
Credo fix
Alex Gleason [Wed, 2 Sep 2020 01:56:42 +0000 (20:56 -0500)]
Docs: AdminAPI chat moderation
Alex Gleason [Wed, 2 Sep 2020 01:40:36 +0000 (20:40 -0500)]
AdminAPI: fix delete chat message
Alex Gleason [Wed, 2 Sep 2020 00:49:46 +0000 (19:49 -0500)]
AdminAPI: show chat
Alex Gleason [Wed, 2 Sep 2020 00:39:34 +0000 (19:39 -0500)]
AdminAPI: list messages in a chat
Alex Gleason [Wed, 2 Sep 2020 00:05:24 +0000 (19:05 -0500)]
Refactor with Chat.for_user_query/1
Alex Gleason [Tue, 1 Sep 2020 01:23:33 +0000 (20:23 -0500)]
AdminAPI: list chats for a user
Alex Gleason [Tue, 1 Sep 2020 00:56:05 +0000 (19:56 -0500)]
AdminAPI: delete a chat message
Alex Gleason [Mon, 31 Aug 2020 21:48:24 +0000 (16:48 -0500)]
MastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1
Haelwenn (lanodan) Monnier [Fri, 11 Sep 2020 17:58:58 +0000 (19:58 +0200)]
Fetcher: Correctly return MRF reject reason
Ivan Tashkinov [Fri, 11 Sep 2020 14:19:58 +0000 (17:19 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy
# Conflicts:
# lib/pleroma/instances/instance.ex
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
rinpatch [Fri, 11 Sep 2020 11:22:54 +0000 (14:22 +0300)]
ConnectionPool: Log possible HTTP1 blocks
Haelwenn [Fri, 11 Sep 2020 10:46:16 +0000 (10:46 +0000)]
Apply 1 suggestion(s) to 1 file(s)
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
Haelwenn (lanodan) Monnier [Fri, 11 Sep 2020 09:22:50 +0000 (11:22 +0200)]
instance: Handle not getting a favicon
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
Alexander Strizhakov [Fri, 11 Sep 2020 06:09:28 +0000 (09:09 +0300)]
migration to remove old cron jobs
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
Haelwenn (lanodan) Monnier [Thu, 20 Aug 2020 18:03:07 +0000 (20:03 +0200)]
Pipeline Ingestion: Article
Haelwenn (lanodan) Monnier [Thu, 20 Aug 2020 02:27:59 +0000 (04:27 +0200)]
object_validators: likes & announcements as [ObjectID]
Haelwenn (lanodan) Monnier [Thu, 20 Aug 2020 00:00:04 +0000 (02:00 +0200)]
Pipeline Ingestion: Video
Haelwenn (lanodan) Monnier [Tue, 25 Aug 2020 07:19:53 +0000 (09:19 +0200)]
transmogrifier: Call strip_internal_fields on pipeline ingestion
Haelwenn (lanodan) Monnier [Thu, 10 Sep 2020 21:13:51 +0000 (23:13 +0200)]
federator: normalize only actor, catch actor error
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
Ivan Tashkinov [Thu, 10 Sep 2020 18:54:26 +0000 (21:54 +0300)]
[#2497] Formatting fix.
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
Alexander Strizhakov [Tue, 8 Sep 2020 12:11:18 +0000 (15:11 +0300)]
remove validate_expires_at from enqueue method
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
Alexander Strizhakov [Mon, 7 Sep 2020 17:57:38 +0000 (20:57 +0300)]
configurable lifetime for ephemeral activities
Alexander Strizhakov [Mon, 7 Sep 2020 17:22:14 +0000 (20:22 +0300)]
changelog
Alexander Strizhakov [Mon, 7 Sep 2020 17:21:32 +0000 (20:21 +0300)]
oban warning
Alexander Strizhakov [Fri, 4 Sep 2020 09:05:17 +0000 (12:05 +0300)]
migration fix
Alexander Strizhakov [Fri, 4 Sep 2020 08:40:32 +0000 (11:40 +0300)]
pin/unpin for activities with expires_at option
Alexander Strizhakov [Thu, 3 Sep 2020 16:02:22 +0000 (19:02 +0300)]
little clean up
Alexander Strizhakov [Thu, 3 Sep 2020 15:08:19 +0000 (18:08 +0300)]
use another stream function in migration
Alexander Strizhakov [Thu, 3 Sep 2020 14:56:20 +0000 (17:56 +0300)]
expiration for new pipeline
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
Alexander Strizhakov [Tue, 25 Aug 2020 09:45:06 +0000 (12:45 +0300)]
copyright header
Alexander Strizhakov [Tue, 25 Aug 2020 09:33:38 +0000 (12:33 +0300)]
drop activity_expirations table
Alexander Strizhakov [Tue, 25 Aug 2020 09:30:00 +0000 (12:30 +0300)]
move old expirations into Oban
Alexander Strizhakov [Tue, 25 Aug 2020 06:10:45 +0000 (09:10 +0300)]
deprecation warning
changed namespace for activity expiration configuration
Alexander Strizhakov [Mon, 24 Aug 2020 10:43:02 +0000 (13:43 +0300)]
don't expire pinned posts
Alexander Strizhakov [Sat, 22 Aug 2020 17:46:01 +0000 (20:46 +0300)]
schedule activity expiration in Oban
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
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
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
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
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
Ivan Tashkinov [Thu, 10 Sep 2020 18:28:07 +0000 (21:28 +0300)]
[#2497] Removed support for thumbnail_max_* params for media preview proxy
(per https://git.pleroma.social/pleroma/pleroma/-/merge_requests/2497#note_70771)
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/
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
rinpatch [Thu, 10 Sep 2020 10:47:53 +0000 (13:47 +0300)]
websocket handler: Do not log client ping frames as errors
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
Alexander Strizhakov [Thu, 10 Sep 2020 17:09:44 +0000 (20:09 +0300)]
pass options without adapter key
Alexander Strizhakov [Mon, 7 Sep 2020 17:06:28 +0000 (20:06 +0300)]
oban warning
Alexander Strizhakov [Mon, 7 Sep 2020 10:54:28 +0000 (13:54 +0300)]
formatting
Alexander Strizhakov [Mon, 7 Sep 2020 10:44:42 +0000 (13:44 +0300)]
migration to move tokens expiration into Oban
Alexander Strizhakov [Mon, 7 Sep 2020 08:54:10 +0000 (11:54 +0300)]
migration and changelog
Alexander Strizhakov [Sat, 5 Sep 2020 15:35:01 +0000 (18:35 +0300)]
expire mfa tokens through Oban
Alexander Strizhakov [Tue, 25 Aug 2020 16:17:51 +0000 (19:17 +0300)]
schedule expired oauth tokens deletion with Oban
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
Maksim Pechnikov [Thu, 10 Sep 2020 09:24:44 +0000 (12:24 +0300)]
added paginate links to headers for /chats/:id/messages
Ivan Tashkinov [Thu, 10 Sep 2020 08:54:10 +0000 (11:54 +0300)]
[#2497] Removed Hackney-specific code
(no longer needed due to adapter options unification).
Alexander Strizhakov [Thu, 10 Sep 2020 08:23:39 +0000 (11:23 +0300)]
use Pleroma.HTTP in emoji packs tasks
Ivan Tashkinov [Wed, 9 Sep 2020 19:44:38 +0000 (22:44 +0300)]
[#2130] Fixed OAuth OOB authentication for users with enabled MFA.
Ivan Tashkinov [Wed, 9 Sep 2020 16:43:36 +0000 (19:43 +0300)]
[#2497] Formatting fix.
Ivan Tashkinov [Wed, 9 Sep 2020 16:30:42 +0000 (19:30 +0300)]
[#2497] Added missing alias, removed legacy `:adapter` option specification for HTTP.get/_.
Mark Felder [Wed, 9 Sep 2020 16:11:36 +0000 (11:11 -0500)]
Merge branch 'develop' into media-preview-proxy
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
rinpatch [Wed, 9 Sep 2020 15:34:07 +0000 (18:34 +0300)]
bump concurrent_limiter
Should fix gun deadlocks
Mark Felder [Wed, 9 Sep 2020 14:10:44 +0000 (09:10 -0500)]
New mix tasks for controlling user confirmation status and sending confirmation mails
Mark Felder [Wed, 9 Sep 2020 14:02:07 +0000 (09:02 -0500)]
Add tests for the bulk confirm/unconfirm tasks
Mark Felder [Tue, 8 Sep 2020 22:59:25 +0000 (17:59 -0500)]
Add test for pleroma.user set --confirmed
Order now matters because of testing shell_info
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
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/
tarteka [Wed, 9 Sep 2020 09:49:26 +0000 (09:49 +0000)]
Added translation using Weblate (Spanish)
Mark Felder [Tue, 8 Sep 2020 22:01:55 +0000 (17:01 -0500)]
Pedantry
Mark Felder [Tue, 8 Sep 2020 21:59:53 +0000 (16:59 -0500)]
Fix descriptions
Mark Felder [Tue, 8 Sep 2020 21:48:54 +0000 (16:48 -0500)]
Handle possibility of user account in a bulk operation not having an email address
Mark Felder [Tue, 8 Sep 2020 21:39:41 +0000 (16:39 -0500)]
Add mix task for bulk [un]confirming the local instance users
Mark Felder [Tue, 8 Sep 2020 21:39:08 +0000 (16:39 -0500)]
Make it possible to bulk send confirmation emails to all unconfirmed users
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
rinpatch [Tue, 8 Sep 2020 17:34:02 +0000 (20:34 +0300)]
Merge branch 'stable' into stable-sync/2.1.1
rinpatch [Mon, 7 Sep 2020 12:06:06 +0000 (15:06 +0300)]
Metadata: Move restriction check from Feed provider to activated_providers
Mark Felder [Tue, 1 Sep 2020 15:43:44 +0000 (10:43 -0500)]
Use :restrict_unauthenticated testing for more granular control
Mark Felder [Mon, 31 Aug 2020 21:11:13 +0000 (16:11 -0500)]
Document breaking change for metadata providers
Mark Felder [Mon, 31 Aug 2020 21:11:01 +0000 (16:11 -0500)]
RelMe and Feed no longer configurable
Mark Felder [Mon, 31 Aug 2020 20:58:21 +0000 (15:58 -0500)]
Do not serve RSS/Atom feeds when instance is private
Mark Felder [Mon, 31 Aug 2020 20:54:22 +0000 (15:54 -0500)]
Fix test so setting doesn't leak
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.
Mark Felder [Mon, 31 Aug 2020 19:35:22 +0000 (14:35 -0500)]
Disable providers of user and status metadata when instance is private
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.
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
Haelwenn (lanodan) Monnier [Wed, 2 Sep 2020 18:11:24 +0000 (20:11 +0200)]
search: Apply following filter only when user is usable
Haelwenn (lanodan) Monnier [Tue, 7 Jul 2020 05:06:29 +0000 (07:06 +0200)]
AP C2S: Restrict character limit on Note
Egor Kislitsyn [Wed, 10 Jun 2020 11:37:43 +0000 (15:37 +0400)]
Fix atom leak in AdminAPIController
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
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
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