akkoma
3 years agoMerge remote-tracking branch 'pleroma/develop' into instance-deletion
Alex Gleason [Sat, 17 Jul 2021 20:03:43 +0000 (15:03 -0500)]
Merge remote-tracking branch 'pleroma/develop' into instance-deletion

3 years agoAdminAPI.InstanceController: clean up tests, rename actions
Alex Gleason [Sat, 17 Jul 2021 20:00:15 +0000 (15:00 -0500)]
AdminAPI.InstanceController: clean up tests, rename actions

3 years agoAdminAPI: add DELETE /instances/:instance to delete all content from a remote instance
Alex Gleason [Sat, 17 Jul 2021 19:55:05 +0000 (14:55 -0500)]
AdminAPI: add DELETE /instances/:instance to delete all content from a remote instance

3 years agoAdd Instance.delete_users_and_activities/1 to delete all content from a remote instance
Alex Gleason [Sat, 17 Jul 2021 19:06:35 +0000 (14:06 -0500)]
Add Instance.delete_users_and_activities/1 to delete all content from a remote instance

3 years agoUpgrade Ecto to v3.6.2, remove deprecated ecto_explain
Alex Gleason [Wed, 23 Jun 2021 18:02:41 +0000 (13:02 -0500)]
Upgrade Ecto to v3.6.2, remove deprecated ecto_explain

3 years agoCreate AdminAPI.InstanceController
Alex Gleason [Sat, 17 Jul 2021 18:05:25 +0000 (13:05 -0500)]
Create AdminAPI.InstanceController

3 years agoMerge branch 'admin-api-users-sort' into 'develop'
feld [Wed, 14 Jul 2021 14:39:14 +0000 (14:39 +0000)]
Merge branch 'admin-api-users-sort' into 'develop'

AdminAPI: sort new users at the top

Closes #2709

See merge request pleroma/pleroma!3481

3 years agoMerge branch 'admin-api-users-date' into 'develop'
feld [Wed, 14 Jul 2021 14:35:21 +0000 (14:35 +0000)]
Merge branch 'admin-api-users-date' into 'develop'

AdminAPI: add created_at date to users

See merge request pleroma/pleroma!3482

3 years agoCHANGELOG: AdminAPI return date with users
Alex Gleason [Wed, 14 Jul 2021 14:03:20 +0000 (09:03 -0500)]
CHANGELOG: AdminAPI return date with users

3 years agoMerge remote-tracking branch 'pleroma/develop' into admin-api-users-date
Alex Gleason [Wed, 14 Jul 2021 14:02:55 +0000 (09:02 -0500)]
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-date

3 years agoAdminAPI: add date to users
Alex Gleason [Wed, 14 Jul 2021 04:51:32 +0000 (23:51 -0500)]
AdminAPI: add date to users

3 years agoCHANGELOG: AdminAPI users sort
Alex Gleason [Wed, 14 Jul 2021 02:44:42 +0000 (21:44 -0500)]
CHANGELOG: AdminAPI users sort

3 years agoMerge remote-tracking branch 'pleroma/develop' into admin-api-users-sort
Alex Gleason [Wed, 14 Jul 2021 03:47:47 +0000 (22:47 -0500)]
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-sort

3 years agoAdminAPI: sort user results by ID descending
Alex Gleason [Wed, 14 Jul 2021 02:37:25 +0000 (21:37 -0500)]
AdminAPI: sort user results by ID descending

3 years agoMerge branch 'features/ingestion-page' into 'develop'
Haelwenn [Mon, 12 Jul 2021 05:05:49 +0000 (05:05 +0000)]
Merge branch 'features/ingestion-page' into 'develop'

Pipeline Ingestion: Page

See merge request pleroma/pleroma!3097

3 years agoMerge branch 'features/validators-apc2s' into 'develop'
Haelwenn [Mon, 12 Jul 2021 05:01:36 +0000 (05:01 +0000)]
Merge branch 'features/validators-apc2s' into 'develop'

AP C2S: Remove restrictions and make it go through pipeline

See merge request pleroma/pleroma!3203

3 years agoAP C2S: Remove restrictions and make it go through pipeline
Haelwenn (lanodan) Monnier [Fri, 18 Sep 2020 12:22:27 +0000 (14:22 +0200)]
AP C2S: Remove restrictions and make it go through pipeline

3 years agoMerge branch 'update/linkify' into 'develop'
feld [Thu, 8 Jul 2021 17:44:52 +0000 (17:44 +0000)]
Merge branch 'update/linkify' into 'develop'

Update Linkify

See merge request pleroma/pleroma!3478

3 years agoUpdate Linkify to fix crash on posts with a URL we failed to parse correctly
Mark Felder [Thu, 8 Jul 2021 17:33:17 +0000 (12:33 -0500)]
Update Linkify to fix crash on posts with a URL we failed to parse correctly

3 years agoMerge branch 'remote-deletions' into 'develop'
feld [Tue, 6 Jul 2021 20:05:05 +0000 (20:05 +0000)]
Merge branch 'remote-deletions' into 'develop'

Fix user deletion problems

See merge request pleroma/pleroma!3476

3 years agoDeletions: change User.purge/1 to defp, add CHANGELOG entry
Alex Gleason [Wed, 30 Jun 2021 17:25:20 +0000 (12:25 -0500)]
Deletions: change User.purge/1 to defp, add CHANGELOG entry

3 years agoMerge remote-tracking branch 'pleroma/develop' into remote-deletions
Alex Gleason [Wed, 30 Jun 2021 07:02:30 +0000 (02:02 -0500)]
Merge remote-tracking branch 'pleroma/develop' into remote-deletions

3 years agoDeletions: don't purge keys so Delete/Undo activities can be signed
Alex Gleason [Wed, 30 Jun 2021 06:48:17 +0000 (01:48 -0500)]
Deletions: don't purge keys so Delete/Undo activities can be signed

3 years agoDeletions: allow deactivated users to be deleted
Alex Gleason [Wed, 30 Jun 2021 06:14:34 +0000 (01:14 -0500)]
Deletions: allow deactivated users to be deleted

3 years agoDeletions: preserve account status fields during purge, fix checks
Alex Gleason [Wed, 30 Jun 2021 04:56:19 +0000 (23:56 -0500)]
Deletions: preserve account status fields during purge, fix checks

3 years agoAlso purge the user in User.perform/2
Alex Gleason [Wed, 30 Jun 2021 03:53:33 +0000 (22:53 -0500)]
Also purge the user in User.perform/2

3 years agoDeletions: purge the user immediately
Alex Gleason [Wed, 30 Jun 2021 03:30:48 +0000 (22:30 -0500)]
Deletions: purge the user immediately

3 years agoCorrectly purge a remote user
Alex Gleason [Wed, 30 Jun 2021 02:45:38 +0000 (21:45 -0500)]
Correctly purge a remote user

3 years agoMerge branch 'fix-2686' into 'develop'
Haelwenn [Fri, 25 Jun 2021 04:52:19 +0000 (04:52 +0000)]
Merge branch 'fix-2686' into 'develop'

Activity deletion: fix FunctionClauseError, fixes #2686

Closes #2686

See merge request pleroma/pleroma!3475

3 years agoActivity deletion: fix FunctionClauseError #2686
Alex Gleason [Fri, 25 Jun 2021 02:00:23 +0000 (21:00 -0500)]
Activity deletion: fix FunctionClauseError #2686

3 years agoMerge branch 'ecto-upgrade' into 'develop'
feld [Wed, 23 Jun 2021 20:17:01 +0000 (20:17 +0000)]
Merge branch 'ecto-upgrade' into 'develop'

Upgrade Ecto to v3.6.2, remove deprecated ecto_explain

See merge request pleroma/pleroma!3473

3 years agoUpgrade Ecto to v3.6.2, remove deprecated ecto_explain
Alex Gleason [Wed, 23 Jun 2021 18:02:41 +0000 (13:02 -0500)]
Upgrade Ecto to v3.6.2, remove deprecated ecto_explain

3 years agoMerge branch 'bugfix/upload-limit-plug' into 'develop'
Haelwenn [Tue, 22 Jun 2021 23:27:32 +0000 (23:27 +0000)]
Merge branch 'bugfix/upload-limit-plug' into 'develop'

Downgrade Plug to 1.10.x, revert upload_limit tuple to function change

See merge request pleroma/pleroma!3472

3 years agoMerge branch 'docs/dependencies-rewrite' into 'develop'
feld [Tue, 22 Jun 2021 16:52:19 +0000 (16:52 +0000)]
Merge branch 'docs/dependencies-rewrite' into 'develop'

Rewrite docs related to dependencies

See merge request pleroma/pleroma!3466

3 years agoAdd test on changing [:instance, :upload_limit]
Haelwenn (lanodan) Monnier [Tue, 22 Jun 2021 10:25:25 +0000 (12:25 +0200)]
Add test on changing [:instance, :upload_limit]

3 years agoDowngrade Plug to 1.10.x, revert upload_limit tuple to function change
Haelwenn (lanodan) Monnier [Tue, 22 Jun 2021 09:12:53 +0000 (11:12 +0200)]
Downgrade Plug to 1.10.x, revert upload_limit tuple to function change

This should fix setting the upload limit in the database as found in:
https://queer.hacktivis.me/notice/A8XUZp74Cg7eYNEMxU

This reverts commit 7d350b73f58664eb822efaa5f522fcf2bd38f669.

3 years agoMerge branch 'cycles-ci-skip' into 'develop'
Haelwenn [Fri, 11 Jun 2021 22:25:41 +0000 (22:25 +0000)]
Merge branch 'cycles-ci-skip' into 'develop'

Cycles CI: skip unless Elixir code is modified

See merge request pleroma/pleroma!3467

3 years agoCycles CI: skip unless Elixir code is modified
Alex Gleason [Fri, 11 Jun 2021 13:45:19 +0000 (08:45 -0500)]
Cycles CI: skip unless Elixir code is modified

3 years agodocs/…/opt_en.md: Reuse /main/ repository url for the /community/ repo
Haelwenn (lanodan) Monnier [Fri, 11 Jun 2021 06:46:38 +0000 (08:46 +0200)]
docs/…/opt_en.md: Reuse /main/ repository url for the /community/ repo

3 years agodocs: Remove Erlang Solutions repository
Haelwenn (lanodan) Monnier [Fri, 11 Jun 2021 06:44:27 +0000 (08:44 +0200)]
docs: Remove Erlang Solutions repository

3 years agodocs: Use one file to describe dependencies
Haelwenn (lanodan) Monnier [Fri, 11 Jun 2021 06:43:36 +0000 (08:43 +0200)]
docs: Use one file to describe dependencies

3 years agoMerge branch 'fix/twittercard-video-dimensions' into 'develop'
feld [Thu, 10 Jun 2021 15:03:58 +0000 (15:03 +0000)]
Merge branch 'fix/twittercard-video-dimensions' into 'develop'

Generate Twittercard/OGP metadata with correct dimensions

See merge request pleroma/pleroma!3456

3 years agoAdd note about video thumbnails for code spelunkers unfamiliar with Media Preview...
Mark Felder [Thu, 10 Jun 2021 14:56:43 +0000 (09:56 -0500)]
Add note about video thumbnails for code spelunkers unfamiliar with Media Preview Proxy

3 years agoMerge branch 'cycles-ci' into 'develop'
feld [Wed, 9 Jun 2021 19:04:40 +0000 (19:04 +0000)]
Merge branch 'cycles-ci' into 'develop'

Prevent compile-time cycles in CI

See merge request pleroma/pleroma!3420

3 years agoFix compile cycle in Pleroma.Tests.AuthTestController
Alex Gleason [Wed, 9 Jun 2021 18:30:19 +0000 (13:30 -0500)]
Fix compile cycle in Pleroma.Tests.AuthTestController

3 years agoCycles CI: disable cache
Alex Gleason [Wed, 9 Jun 2021 18:12:33 +0000 (13:12 -0500)]
Cycles CI: disable cache

3 years agoCI: echo $MIX_ENV
Alex Gleason [Wed, 9 Jun 2021 18:08:24 +0000 (13:08 -0500)]
CI: echo $MIX_ENV

3 years agoAdd cycles test to .gitlab-ci.yml
Alex Gleason [Sun, 23 May 2021 23:31:07 +0000 (18:31 -0500)]
Add cycles test to .gitlab-ci.yml
Thank you @jb55@bitcoinhackers.org for the awk syntax

3 years agoMerge branch 'refactor/ingestion-activity-context' into 'develop'
feld [Wed, 9 Jun 2021 17:17:41 +0000 (17:17 +0000)]
Merge branch 'refactor/ingestion-activity-context' into 'develop'

ObjectValidators.{Announce,EmojiReact,Like}: Fix context, actor & addressing

See merge request pleroma/pleroma!3462

3 years agoMerge branch 'eblurhash-hex' into 'develop'
feld [Wed, 9 Jun 2021 17:08:37 +0000 (17:08 +0000)]
Merge branch 'eblurhash-hex' into 'develop'

Use eblurhash 1.1.0 from Hex

See merge request pleroma/pleroma!3464

3 years agoFormatting of the comment
Mark Felder [Wed, 9 Jun 2021 16:58:51 +0000 (11:58 -0500)]
Formatting of the comment

3 years agoAdd new Twittercard/OGP changes
Mark Felder [Wed, 9 Jun 2021 16:56:54 +0000 (11:56 -0500)]
Add new Twittercard/OGP changes

3 years agoTest that videos only get image thumbnails in OGP metadata when we can produce them...
Mark Felder [Wed, 9 Jun 2021 16:46:31 +0000 (11:46 -0500)]
Test that videos only get image thumbnails in OGP metadata when we can produce them with Preview Proxy

3 years agoCredo
Mark Felder [Wed, 9 Jun 2021 16:09:14 +0000 (11:09 -0500)]
Credo

3 years agoLint
Mark Felder [Wed, 9 Jun 2021 16:06:53 +0000 (11:06 -0500)]
Lint

3 years agoFix incorrectly ordered arguments to the function and not properly merging lists.
Mark Felder [Wed, 9 Jun 2021 16:05:24 +0000 (11:05 -0500)]
Fix incorrectly ordered arguments to the function and not properly merging lists.

3 years agoMetadata.Utils.attachment_url/1 was used in this test too
Mark Felder [Wed, 9 Jun 2021 15:06:44 +0000 (10:06 -0500)]
Metadata.Utils.attachment_url/1 was used in this test too

3 years agoAdd a video thumbnail to the OpenGraph metadata if Media Preview Proxy is enabled.
Mark Felder [Wed, 9 Jun 2021 15:02:41 +0000 (10:02 -0500)]
Add a video thumbnail to the OpenGraph metadata if Media Preview Proxy is enabled.

3 years agoRemove Metadata.Utils.attachment_url/1
Mark Felder [Wed, 9 Jun 2021 14:58:29 +0000 (09:58 -0500)]
Remove Metadata.Utils.attachment_url/1

This was a wasteful shortcut to MediaProxy.preview_url/1 and we don't
always want the preview_url in the metadata anyway.

3 years agoUse eblurhash 1.1.0 from Hex
Alex Gleason [Wed, 9 Jun 2021 14:28:22 +0000 (09:28 -0500)]
Use eblurhash 1.1.0 from Hex

3 years agoObjectValidators.{Announce,EmojiReact,Like}: Fix context, actor & addressing
Haelwenn (lanodan) Monnier [Wed, 9 Jun 2021 01:43:01 +0000 (03:43 +0200)]
ObjectValidators.{Announce,EmojiReact,Like}: Fix context, actor & addressing

3 years agoMerge branch 'cycles-plug-deps' into 'develop'
Haelwenn [Wed, 9 Jun 2021 02:20:00 +0000 (02:20 +0000)]
Merge branch 'cycles-plug-deps' into 'develop'

Refactor skipped plugs into Pleroma.Web functions

See merge request pleroma/pleroma!3463

3 years agoMerge branch 'cycles-side-effects' into 'develop'
Haelwenn [Wed, 9 Jun 2021 01:54:38 +0000 (01:54 +0000)]
Merge branch 'cycles-side-effects' into 'develop'

Recompilation speedup: Switch to runtime deps in ActivityPub.SideEffects

See merge request pleroma/pleroma!3460

3 years agoMerge branch 'cycles-instances' into 'develop'
Haelwenn [Wed, 9 Jun 2021 01:53:31 +0000 (01:53 +0000)]
Merge branch 'cycles-instances' into 'develop'

Recompilation speedup: Switch to runtime deps in Pleroma.Instances

See merge request pleroma/pleroma!3459

3 years agoRefactor skipped plugs into Pleroma.Web functions
Alex Gleason [Wed, 9 Jun 2021 00:14:12 +0000 (19:14 -0500)]
Refactor skipped plugs into Pleroma.Web functions
Speeds up recompilation by reducing compile cycles

3 years agoSwitch to runtime deps in ActivityPub.SideEffects
Alex Gleason [Tue, 8 Jun 2021 23:18:25 +0000 (18:18 -0500)]
Switch to runtime deps in ActivityPub.SideEffects
Speeds up recompilation by reducing compile cycles

3 years agoSwitch to runtime deps in Pleroma.Instances
Alex Gleason [Tue, 8 Jun 2021 23:03:21 +0000 (18:03 -0500)]
Switch to runtime deps in Pleroma.Instances
Speeds up recompilation by limiting compile cycles

3 years agoSwitch OGP default type from "website" to "article"
Mark Felder [Tue, 8 Jun 2021 22:14:30 +0000 (17:14 -0500)]
Switch OGP default type from "website" to "article"

This is what Mastodon uses and might fix some link preview bugs I've encountered

3 years agoMerge branch 'cycles-config-loader-redux' into 'develop'
feld [Tue, 8 Jun 2021 22:08:37 +0000 (22:08 +0000)]
Merge branch 'cycles-config-loader-redux' into 'develop'

Recompilation speedup: Ignore runtime deps in Pleroma.Config.Loader with Module.concat/1

See merge request pleroma/pleroma!3458

3 years agoMerge branch 'cycles-user-view' into 'develop'
feld [Tue, 8 Jun 2021 22:07:25 +0000 (22:07 +0000)]
Merge branch 'cycles-user-view' into 'develop'

Recompilation speedup: Create AdminAPI.UserView to avoid compile-time dep

See merge request pleroma/pleroma!3457

3 years agoSet the correct height/width if the data is available when generating opengraph metadata
Mark Felder [Tue, 8 Jun 2021 21:58:33 +0000 (16:58 -0500)]
Set the correct height/width if the data is available when generating opengraph metadata

3 years agoCreate AdminAPI.UserView to avoid compile-time dep
Alex Gleason [Tue, 8 Jun 2021 20:58:19 +0000 (15:58 -0500)]
Create AdminAPI.UserView to avoid compile-time dep
Speeds up recompilation

3 years agoOnly use fallback for videos and only add this metadata for images if we really have it.
Mark Felder [Tue, 8 Jun 2021 21:31:12 +0000 (16:31 -0500)]
Only use fallback for videos and only add this metadata for images if we really have it.

3 years agoTwittercard metadata for images should also include dimensions if available
Mark Felder [Tue, 8 Jun 2021 21:19:12 +0000 (16:19 -0500)]
Twittercard metadata for images should also include dimensions if available

3 years agoIgnore runtime deps in Pleroma.Config.Loader with Module.concat/1
Alex Gleason [Tue, 8 Jun 2021 21:07:51 +0000 (16:07 -0500)]
Ignore runtime deps in Pleroma.Config.Loader with Module.concat/1
Speeds up recompilation

3 years agoSet the correct height/width if the data is available when generating twittercard...
Mark Felder [Tue, 8 Jun 2021 20:59:55 +0000 (15:59 -0500)]
Set the correct height/width if the data is available when generating twittercard metadata

3 years agoMerge branch 'metadata-for-all' into 'develop'
feld [Tue, 8 Jun 2021 20:30:55 +0000 (20:30 +0000)]
Merge branch 'metadata-for-all' into 'develop'

Support metadata for video files too

See merge request pleroma/pleroma!3441

3 years agoBlurhash varies slightly by computer generating it, so just validate it wasn't nil
Mark Felder [Tue, 8 Jun 2021 19:49:57 +0000 (14:49 -0500)]
Blurhash varies slightly by computer generating it, so just validate it wasn't nil

3 years agoMerge branch 'improve-og-embed' into 'develop'
feld [Tue, 8 Jun 2021 19:26:17 +0000 (19:26 +0000)]
Merge branch 'improve-og-embed' into 'develop'

Improve opengraph embeds

See merge request pleroma/pleroma!3442

3 years agoUpdate test names and verify blurhash is correctly generated for images
Mark Felder [Tue, 8 Jun 2021 19:05:13 +0000 (14:05 -0500)]
Update test names and verify blurhash is correctly generated for images

3 years agoAdd test for AnalyzeMetadata upload filter fetching dimensions from a video
Mark Felder [Tue, 8 Jun 2021 19:02:56 +0000 (14:02 -0500)]
Add test for AnalyzeMetadata upload filter fetching dimensions from a video

3 years agoMerge branch 'cycles-params' into 'develop'
feld [Tue, 8 Jun 2021 18:06:44 +0000 (18:06 +0000)]
Merge branch 'cycles-params' into 'develop'

Recompilation speedup: break out Pleroma.Web.Params.truthy_param?/1 from ControllerHelper

See merge request pleroma/pleroma!3449

3 years agoUpdate scope of AnalyzeMetadata features
Mark Felder [Tue, 8 Jun 2021 17:56:03 +0000 (12:56 -0500)]
Update scope of AnalyzeMetadata features

3 years agoSupport metadata for video files too
Mark Felder [Thu, 3 Jun 2021 21:58:18 +0000 (16:58 -0500)]
Support metadata for video files too

3 years agoFix order of Pleroma.Web.Utils.Params aliases
Alex Gleason [Mon, 7 Jun 2021 21:45:33 +0000 (16:45 -0500)]
Fix order of Pleroma.Web.Utils.Params aliases

3 years agoPleroma.Web.Params --> Pleroma.Web.Utils.Params
Alex Gleason [Mon, 7 Jun 2021 21:01:26 +0000 (16:01 -0500)]
Pleroma.Web.Params --> Pleroma.Web.Utils.Params

3 years agoPleroma.Web.ControllerHelper.truthy_param?/1 --> Pleroma.Web.Params.truthy_param?/1
Alex Gleason [Sat, 22 May 2021 16:41:55 +0000 (11:41 -0500)]
Pleroma.Web.ControllerHelper.truthy_param?/1 --> Pleroma.Web.Params.truthy_param?/1
Breaks cycle in lib/pleroma/web/api_spec/operations/status_operation.ex

3 years agoMerge branch 'cycles-uploads' into 'develop'
feld [Tue, 8 Jun 2021 17:49:24 +0000 (17:49 +0000)]
Merge branch 'cycles-uploads' into 'develop'

Recompilation speedup: use generic types in @spec in Upload.Filter

See merge request pleroma/pleroma!3453

3 years agoMerge branch 'cycles-authenticator' into 'develop'
feld [Tue, 8 Jun 2021 17:45:10 +0000 (17:45 +0000)]
Merge branch 'cycles-authenticator' into 'develop'

Recompilation speedup: create WrapperAuthenticator and simplify Authenticator behaviour

See merge request pleroma/pleroma!3454

3 years agoCreate WrapperAuthenticator and simplify Authenticator behaviour
Alex Gleason [Mon, 7 Jun 2021 23:07:54 +0000 (18:07 -0500)]
Create WrapperAuthenticator and simplify Authenticator behaviour
Speeds up recompilation by reducing compile-time cycles

3 years agoUpload.Filter: use generic types in @spec
Alex Gleason [Mon, 7 Jun 2021 22:07:40 +0000 (17:07 -0500)]
Upload.Filter: use generic types in @spec
Speeds up recompilation by reducing compile-time deps

3 years agoMerge branch 'fix/config-test-warning' into 'develop'
feld [Mon, 7 Jun 2021 21:22:23 +0000 (21:22 +0000)]
Merge branch 'fix/config-test-warning' into 'develop'

Fix test warnings

See merge request pleroma/pleroma!3452

3 years agoMerge branch 'pleromapi' into 'develop'
feld [Mon, 7 Jun 2021 21:21:35 +0000 (21:21 +0000)]
Merge branch 'pleromapi' into 'develop'

Add Raspberry Pi install instructions

See merge request pleroma/pleroma!3430

3 years agoMerge branch 'cycles-guard' into 'develop'
feld [Mon, 7 Jun 2021 21:21:10 +0000 (21:21 +0000)]
Merge branch 'cycles-guard' into 'develop'

Recompilation speedup: Put custom guards in Web.Utils.Guards

See merge request pleroma/pleroma!3451

3 years agoChannel name was incorrect. We left it as chat:public for backwards compatibility.
Mark Felder [Mon, 7 Jun 2021 21:10:24 +0000 (16:10 -0500)]
Channel name was incorrect. We left it as chat:public for backwards compatibility.

3 years agoTest was named incorrectly and did not execute
Mark Felder [Mon, 7 Jun 2021 21:09:47 +0000 (16:09 -0500)]
Test was named incorrectly and did not execute

3 years agoFix test warnings
Mark Felder [Mon, 7 Jun 2021 21:06:53 +0000 (16:06 -0500)]
Fix test warnings

3 years agoPut custom guards in Web.Utils.Guards
Alex Gleason [Mon, 7 Jun 2021 20:51:52 +0000 (15:51 -0500)]
Put custom guards in Web.Utils.Guards
Speeds up recompilation by removing a compile-time cycle on AdminAPI.Search

3 years agoFormatting
Mark Felder [Mon, 7 Jun 2021 20:47:50 +0000 (15:47 -0500)]
Formatting

3 years agoMerge branch 'fix/prune-hashtags' into 'develop'
feld [Mon, 7 Jun 2021 20:11:45 +0000 (20:11 +0000)]
Merge branch 'fix/prune-hashtags' into 'develop'

get prune_objects to work again

See merge request pleroma/pleroma!3397