akkoma
3 years agoRemove bash script for downloading new MastoFE build
Sean King [Fri, 16 Apr 2021 05:41:34 +0000 (23:41 -0600)]
Remove bash script for downloading new MastoFE build

3 years agoAdd note about Mastodon FE being removed from Pleroma in changelog
Sean King [Fri, 16 Apr 2021 05:39:33 +0000 (23:39 -0600)]
Add note about Mastodon FE being removed from Pleroma in changelog

3 years agoRemove MastoFE stuff from docs and default panel
Sean King [Fri, 16 Apr 2021 05:37:18 +0000 (23:37 -0600)]
Remove MastoFE stuff from docs and default panel

3 years agoRemove MastoFE settings from users table
Sean King [Fri, 16 Apr 2021 05:33:24 +0000 (23:33 -0600)]
Remove MastoFE settings from users table

3 years agoRemove no longer necessary unit tests for MastoFE
Sean King [Fri, 16 Apr 2021 05:12:42 +0000 (23:12 -0600)]
Remove no longer necessary unit tests for MastoFE

3 years agoRemove MastoFE-related backend code and frontend pieces
Sean King [Fri, 16 Apr 2021 04:56:21 +0000 (22:56 -0600)]
Remove MastoFE-related backend code and frontend pieces

3 years agoMerge branch 'fix/notifsettings-breaking-login' into 'develop'
Haelwenn [Thu, 15 Apr 2021 21:34:55 +0000 (21:34 +0000)]
Merge branch 'fix/notifsettings-breaking-login' into 'develop'

Enforce user.notification_settings is NOT NULL

Closes #2571

See merge request pleroma/pleroma!3386

3 years agoMerge branch 'develop' into 'fix/notifsettings-breaking-login'
feld [Thu, 15 Apr 2021 14:59:26 +0000 (14:59 +0000)]
Merge branch 'develop' into 'fix/notifsettings-breaking-login'

# Conflicts:
#   CHANGELOG.md

3 years agoMerge branch 'fix/mastodon-interface-docs-link' into 'develop'
Haelwenn [Thu, 15 Apr 2021 05:44:01 +0000 (05:44 +0000)]
Merge branch 'fix/mastodon-interface-docs-link' into 'develop'

Fix Mastodon interface link in documentation, fixes #2622

Closes #2622

See merge request pleroma/pleroma!3391

3 years agoFix Mastodon interface link
Sean King [Wed, 14 Apr 2021 20:01:33 +0000 (14:01 -0600)]
Fix Mastodon interface link

3 years agoMerge branch 'fix/adminapi-concurrent-limiter' into 'develop'
feld [Wed, 14 Apr 2021 16:52:02 +0000 (16:52 +0000)]
Merge branch 'fix/adminapi-concurrent-limiter' into 'develop'

Fix ConcurrentLimiter settings via AdminAPI

See merge request pleroma/pleroma!3390

3 years agoRevert guards on string_to_elixir_types/1, remove unnecessary assignment in test
Mark Felder [Wed, 14 Apr 2021 14:39:57 +0000 (09:39 -0500)]
Revert guards on string_to_elixir_types/1, remove unnecessary assignment in test

3 years agoImprove string_to_elixir_types/1 with guards
Mark Felder [Tue, 13 Apr 2021 19:25:15 +0000 (14:25 -0500)]
Improve string_to_elixir_types/1 with guards

3 years agoDocument fixed ability to save ConcurrentLimiter settings in ConfigDB
Mark Felder [Tue, 13 Apr 2021 19:39:44 +0000 (14:39 -0500)]
Document fixed ability to save ConcurrentLimiter settings in ConfigDB

3 years agoAdd ConcurrentLimiter to module_name?/1 and apply string_to_elixir_types/1 to search_...
Mark Felder [Tue, 13 Apr 2021 17:09:18 +0000 (12:09 -0500)]
Add ConcurrentLimiter to module_name?/1 and apply string_to_elixir_types/1 to search_opts keys during update_or_create/1

3 years agoInitial test validating the AdminAPI issue
Mark Felder [Tue, 13 Apr 2021 16:15:52 +0000 (11:15 -0500)]
Initial test validating the AdminAPI issue

3 years agoMerge branch 'fix/instance-thumbnail-url' into 'develop'
Haelwenn [Tue, 13 Apr 2021 19:05:07 +0000 (19:05 +0000)]
Merge branch 'fix/instance-thumbnail-url' into 'develop'

Fix URL to custom instance thumbnail

Closes #2611

See merge request pleroma/pleroma!3388

3 years agoFix assignment / assertion
Mark Felder [Tue, 13 Apr 2021 15:55:54 +0000 (10:55 -0500)]
Fix assignment / assertion

3 years agoValidate custom instance thumbnail set via AdminAPI produces correct URL
Mark Felder [Tue, 13 Apr 2021 15:52:53 +0000 (10:52 -0500)]
Validate custom instance thumbnail set via AdminAPI produces correct URL

3 years agoUse URI.merge to prevent concatenating two canonical URLs when a custom instance...
Mark Felder [Fri, 9 Apr 2021 15:30:27 +0000 (10:30 -0500)]
Use URI.merge to prevent concatenating two canonical URLs when a custom instance thumbnail was uploaded via AdminFE

3 years agoMerge branch 'chore/CHANGELOG' into 'develop'
feld [Thu, 1 Apr 2021 15:26:46 +0000 (15:26 +0000)]
Merge branch 'chore/CHANGELOG' into 'develop'

Fix CHANGELOG entry meant for next release

See merge request pleroma/pleroma!3387

3 years agoFix CHANGELOG entry meant for next release
Mark Felder [Thu, 1 Apr 2021 15:09:32 +0000 (10:09 -0500)]
Fix CHANGELOG entry meant for next release

3 years agoDocument user login failure fix for NULL notification_settings
Mark Felder [Thu, 1 Apr 2021 15:07:57 +0000 (10:07 -0500)]
Document user login failure fix for NULL notification_settings

3 years agoEnforce user.notification_settings is NOT NULL
Mark Felder [Thu, 1 Apr 2021 15:01:31 +0000 (10:01 -0500)]
Enforce user.notification_settings is NOT NULL

3 years agoMerge branch 'revert-c368bf6d' into 'develop'
Haelwenn [Thu, 1 Apr 2021 12:11:21 +0000 (12:11 +0000)]
Merge branch 'revert-c368bf6d' into 'develop'

Revert "Merge branch 'patch-fix-open-api-spec' into 'develop'"

See merge request pleroma/pleroma!3385

3 years agoRevert "Merge branch 'patch-fix-open-api-spec' into 'develop'"
Haelwenn [Thu, 1 Apr 2021 12:00:58 +0000 (12:00 +0000)]
Revert "Merge branch 'patch-fix-open-api-spec' into 'develop'"

This reverts merge request !3382

3 years agoMerge branch 'refactor/object_validator_validate' into 'develop'
rinpatch [Thu, 1 Apr 2021 11:10:12 +0000 (11:10 +0000)]
Merge branch 'refactor/object_validator_validate' into 'develop'

object_validator: Refactor most of validate/2 to a generic block

See merge request pleroma/pleroma!3383

3 years agoobject_validator: Refactor most of validate/2 to a generic block
Haelwenn (lanodan) Monnier [Thu, 1 Apr 2021 09:50:45 +0000 (11:50 +0200)]
object_validator: Refactor most of validate/2 to a generic block

3 years agoMerge branch 'patch-fix-open-api-spec' into 'develop'
rinpatch [Wed, 31 Mar 2021 08:19:31 +0000 (08:19 +0000)]
Merge branch 'patch-fix-open-api-spec' into 'develop'

OpenAPI: Fix `date-time` being specified as an `integer` in OpenAPI spec (when it should be a `string`) in AccountCreateResponse

See merge request pleroma/pleroma!3382

3 years agodate-times are always strings
Miss Pasture [Wed, 31 Mar 2021 06:51:22 +0000 (06:51 +0000)]
date-times are always strings

3 years agoMerge branch 'upstream/mrf-followbot' into 'develop'
feld [Tue, 30 Mar 2021 16:59:34 +0000 (16:59 +0000)]
Merge branch 'upstream/mrf-followbot' into 'develop'

Upstream/mrf followbot

See merge request pleroma/pleroma!3060

3 years agoFix function calls due to module name change
Mark Felder [Fri, 26 Feb 2021 17:04:27 +0000 (11:04 -0600)]
Fix function calls due to module name change

3 years agoTemp file leaked, oops
Mark Felder [Wed, 24 Feb 2021 18:07:40 +0000 (12:07 -0600)]
Temp file leaked, oops

3 years agoAdd more details to the cheatsheat for FollowBot MRF
Mark Felder [Wed, 24 Feb 2021 18:02:33 +0000 (12:02 -0600)]
Add more details to the cheatsheat for FollowBot MRF

3 years agoPrefer FollowBot naming convention vs Followbot
Mark Felder [Wed, 24 Feb 2021 17:59:11 +0000 (11:59 -0600)]
Prefer FollowBot naming convention vs Followbot

3 years agoDocument new FollowBot MRF
Mark Felder [Wed, 24 Feb 2021 17:58:09 +0000 (11:58 -0600)]
Document new FollowBot MRF

3 years agoMore tests to validate Followbot is behaving
Mark Felder [Wed, 24 Feb 2021 17:52:03 +0000 (11:52 -0600)]
More tests to validate Followbot is behaving

3 years agoRemove Task.async as it is broken here and probably a premature optimization anyway
Mark Felder [Sat, 20 Feb 2021 00:36:35 +0000 (18:36 -0600)]
Remove Task.async as it is broken here and probably a premature optimization anyway

3 years agoOnly need to validate a follow request is generated for now
Mark Felder [Sat, 20 Feb 2021 00:36:21 +0000 (18:36 -0600)]
Only need to validate a follow request is generated for now

3 years agoRevert
Mark Felder [Sat, 20 Feb 2021 00:34:52 +0000 (18:34 -0600)]
Revert

3 years agoDo not try to follow local users. Their posts are already available locally on the...
Mark Felder [Fri, 19 Feb 2021 21:25:26 +0000 (15:25 -0600)]
Do not try to follow local users. Their posts are already available locally on the instance.

3 years agoChange module name to FollowbotPolicy
Mark Felder [Fri, 19 Feb 2021 21:17:33 +0000 (15:17 -0600)]
Change module name to FollowbotPolicy

3 years agoAdd follow_requests_outstanding_since?/3 to Pleroma.Activity
Mark Felder [Fri, 19 Feb 2021 21:16:55 +0000 (15:16 -0600)]
Add follow_requests_outstanding_since?/3 to Pleroma.Activity

3 years agoLint
Mark Felder [Fri, 19 Feb 2021 20:55:05 +0000 (14:55 -0600)]
Lint

3 years agoBetter checking of previous follow request attempts
Mark Felder [Fri, 19 Feb 2021 20:42:20 +0000 (14:42 -0600)]
Better checking of previous follow request attempts

3 years agoPrevent duplicates from being processed
Mark Felder [Fri, 19 Feb 2021 15:59:30 +0000 (09:59 -0600)]
Prevent duplicates from being processed

3 years agoMake the followbot only dispatch follow requests once per 30 day period
Mark Felder [Fri, 19 Feb 2021 15:47:25 +0000 (09:47 -0600)]
Make the followbot only dispatch follow requests once per 30 day period

3 years agoApply 1 suggestion(s) to 1 file(s)
feld [Thu, 8 Oct 2020 19:48:09 +0000 (19:48 +0000)]
Apply 1 suggestion(s) to 1 file(s)

3 years agoSupport for configuration via AdminFE
Mark Felder [Thu, 8 Oct 2020 17:46:27 +0000 (12:46 -0500)]
Support for configuration via AdminFE

3 years agoEnforce that the followbot must be marked as a bot.
Mark Felder [Thu, 8 Oct 2020 17:41:01 +0000 (12:41 -0500)]
Enforce that the followbot must be marked as a bot.

3 years agoDocument :mrf_follow_bot
Mark Felder [Tue, 30 Mar 2021 16:10:34 +0000 (11:10 -0500)]
Document :mrf_follow_bot

3 years agoTry to handle misconfiguration scenarios gracefully
Mark Felder [Thu, 8 Oct 2020 17:09:31 +0000 (12:09 -0500)]
Try to handle misconfiguration scenarios gracefully

3 years agoUpstream original followbot implementation
Mark Felder [Thu, 8 Oct 2020 16:55:35 +0000 (11:55 -0500)]
Upstream original followbot implementation

3 years agoMerge branch 'fix/2585-config-migration-dir' into 'develop'
feld [Tue, 23 Mar 2021 17:46:52 +0000 (17:46 +0000)]
Merge branch 'fix/2585-config-migration-dir' into 'develop'

migrating config to tmp folder

Closes #2585

See merge request pleroma/pleroma!3379

3 years agochangelog entry
Alexander Strizhakov [Tue, 23 Mar 2021 16:37:25 +0000 (19:37 +0300)]
changelog entry

3 years agosuggestion
Alexander Strizhakov [Tue, 23 Mar 2021 14:27:02 +0000 (17:27 +0300)]
suggestion

3 years agomigrating config to tmp folder
Alexander Strizhakov [Tue, 23 Mar 2021 11:23:37 +0000 (14:23 +0300)]
migrating config to tmp folder

3 years agoMerge branch 'fix/copy-emoji-summary' into 'develop'
Haelwenn [Tue, 23 Mar 2021 09:27:03 +0000 (09:27 +0000)]
Merge branch 'fix/copy-emoji-summary' into 'develop'

Copy emoji in the subject from parent post

See merge request pleroma/pleroma!3378

3 years agoCopy emoji in the subject from parent post
rinpatch [Mon, 22 Mar 2021 17:07:07 +0000 (20:07 +0300)]
Copy emoji in the subject from parent post

Sometimes people put emoji in the subject, which results in the subject
looking broken if someone replies to it from a server that does not
have the said emoji under the same shortcode. This patch solves the problem
by extending the emoji set available in the summary to that of the parent
post.

3 years agoMerge branch 'fix/2579-finger-content-type' into 'develop'
rinpatch [Sun, 21 Mar 2021 08:25:02 +0000 (08:25 +0000)]
Merge branch 'fix/2579-finger-content-type' into 'develop'

respect content-type header in finger request

Closes #2579

See merge request pleroma/pleroma!3375

3 years agoMerge branch 'richmedia-workaround' into 'develop'
rinpatch [Sun, 21 Mar 2021 08:19:42 +0000 (08:19 +0000)]
Merge branch 'richmedia-workaround' into 'develop'

Workaround for RichMedia preview image breakage edge case

See merge request pleroma/pleroma!3363

3 years agoMerge branch 'fix/timex-retired-version' into 'develop'
feld [Sat, 20 Mar 2021 15:52:01 +0000 (15:52 +0000)]
Merge branch 'fix/timex-retired-version' into 'develop'

updating Timex

See merge request pleroma/pleroma!3377

3 years agoupdating timex
Alexander Strizhakov [Sat, 20 Mar 2021 05:29:02 +0000 (08:29 +0300)]
updating timex

3 years agorespect content-type header in finger request
Alexander Strizhakov [Thu, 18 Mar 2021 10:49:03 +0000 (13:49 +0300)]
respect content-type header in finger request

3 years agoMerge branch 'mediaproxy-decode' into 'develop'
rinpatch [Fri, 19 Mar 2021 08:52:12 +0000 (08:52 +0000)]
Merge branch 'mediaproxy-decode' into 'develop'

Simple way to decode mediaproxy URLs

See merge request pleroma/pleroma!3364

3 years agoMerge branch 'fix/remove_auto_nsfw' into 'develop'
rinpatch [Fri, 19 Mar 2021 08:48:22 +0000 (08:48 +0000)]
Merge branch 'fix/remove_auto_nsfw' into 'develop'

Remove sensitive setting #nsfw

See merge request pleroma/pleroma!3223

3 years agoMerge branch 'bugfix/bridgy-user-icon' into 'develop'
rinpatch [Fri, 19 Mar 2021 08:36:26 +0000 (08:36 +0000)]
Merge branch 'bugfix/bridgy-user-icon' into 'develop'

Add support for actor icon being a list (Bridgy)

See merge request pleroma/pleroma!3372

3 years agoMerge branch 'update_open_api_spex' into 'develop'
Haelwenn [Tue, 16 Mar 2021 01:54:43 +0000 (01:54 +0000)]
Merge branch 'update_open_api_spex' into 'develop'

Update OpenApiSpex dependency

See merge request pleroma/pleroma!3362

3 years agoMerge branch 'feature/object-hashtags-rework' into 'develop'
rinpatch [Mon, 15 Mar 2021 09:35:46 +0000 (09:35 +0000)]
Merge branch 'feature/object-hashtags-rework' into 'develop'

Hashtags extraction from objects. Background migration infrastructure.

Closes #1840 and #2455

See merge request pleroma/pleroma!3213

3 years agoAdd support for actor icon being a list (Bridgy)
Haelwenn (lanodan) Monnier [Mon, 15 Mar 2021 05:43:12 +0000 (06:43 +0100)]
Add support for actor icon being a list (Bridgy)

3 years agoMerge branch 'weblate-pleroma-pleroma' into 'develop'
Haelwenn [Sun, 14 Mar 2021 08:09:22 +0000 (08:09 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'

Translations update from Weblate

See merge request pleroma/pleroma!3370

3 years agoPrefer naming this function build_image_url/2
Mark Felder [Sat, 13 Mar 2021 18:27:15 +0000 (12:27 -0600)]
Prefer naming this function build_image_url/2

3 years agoTranslated using Weblate (Italian)
Ben Is [Thu, 11 Mar 2021 13:51:22 +0000 (13:51 +0000)]
Translated using Weblate (Italian)

Currently translated at 100.0% (106 of 106 strings)

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

3 years ago[#3213] Code formatting fix.
Ivan Tashkinov [Fri, 12 Mar 2021 09:25:18 +0000 (12:25 +0300)]
[#3213] Code formatting fix.

3 years ago[#3213] Background migration infrastructure refactoring.
Ivan Tashkinov [Fri, 12 Mar 2021 09:18:11 +0000 (12:18 +0300)]
[#3213] Background migration infrastructure refactoring.
Extracted BaseMigrator and BaseMigratorState.

3 years agoMerge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...
Ivan Tashkinov [Fri, 12 Mar 2021 05:49:25 +0000 (08:49 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework

3 years agoMerge branch 'improve-gitlab-ci' into 'develop'
rinpatch [Thu, 11 Mar 2021 19:14:59 +0000 (19:14 +0000)]
Merge branch 'improve-gitlab-ci' into 'develop'

Execute mix deps.get earlier and avoid duplicate invocations if possible

See merge request pleroma/pleroma!3369

3 years agoExecute mix deps.get earlier and avoid duplicate invocations if possible
Mark Felder [Thu, 11 Mar 2021 15:40:40 +0000 (09:40 -0600)]
Execute mix deps.get earlier and avoid duplicate invocations if possible

3 years agoLeverage function pattern matching instead
Mark Felder [Thu, 11 Mar 2021 15:20:29 +0000 (09:20 -0600)]
Leverage function pattern matching instead

3 years agoWorkaround for URI.merge/2 bug https://github.com/elixir-lang/elixir/issues/10771
Mark Felder [Sat, 6 Mar 2021 18:02:32 +0000 (12:02 -0600)]
Workaround for URI.merge/2 bug https://github.com/elixir-lang/elixir/issues/10771

If we avoid URI.merge unless we know we need it we reduce the edge cases we could encounter.
The site would need to both have "//" in the %URI{:path} and the image needs to be a relative URL.

3 years agoMerge branch 'fix/spec-build' into 'develop'
feld [Wed, 10 Mar 2021 23:14:46 +0000 (23:14 +0000)]
Merge branch 'fix/spec-build' into 'develop'

Ensure we fetch deps during spec-build stage

See merge request pleroma/pleroma!3368

3 years agoRevert "See if switching to same image as releases fixes the build"
Mark Felder [Wed, 10 Mar 2021 22:37:24 +0000 (16:37 -0600)]
Revert "See if switching to same image as releases fixes the build"

This reverts commit 502d166b7e44e36a94974df4770de6c6a239ad75.

3 years agoSee if switching to same image as releases fixes the build
Mark Felder [Wed, 10 Mar 2021 22:19:18 +0000 (16:19 -0600)]
See if switching to same image as releases fixes the build

3 years agoEnsure we fetch deps during spec-build stage
Mark Felder [Wed, 10 Mar 2021 19:03:14 +0000 (13:03 -0600)]
Ensure we fetch deps during spec-build stage

3 years agoMerge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...
Ivan Tashkinov [Wed, 10 Mar 2021 04:48:50 +0000 (07:48 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework

3 years agoMerge branch 'openapi/admin/user' into 'develop'
Haelwenn [Wed, 10 Mar 2021 03:24:40 +0000 (03:24 +0000)]
Merge branch 'openapi/admin/user' into 'develop'

Add OpenAPI spec for AdminAPI.UserController

See merge request pleroma/pleroma!3355

3 years agoMerge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...
Ivan Tashkinov [Sun, 7 Mar 2021 08:34:39 +0000 (11:34 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework

3 years ago[#3213] Performance optimization of filtering by hashtags ("any" condition).
Ivan Tashkinov [Sun, 7 Mar 2021 08:33:21 +0000 (11:33 +0300)]
[#3213] Performance optimization of filtering by hashtags ("any" condition).

3 years agoMake tests use it
Mark Felder [Fri, 5 Mar 2021 19:21:22 +0000 (13:21 -0600)]
Make tests use it

3 years agoAdd simple way to decode fully qualified mediaproxy URLs
Mark Felder [Fri, 5 Mar 2021 19:18:37 +0000 (13:18 -0600)]
Add simple way to decode fully qualified mediaproxy URLs

3 years agoUpdate OpenApiSpex dependency
Egor Kislitsyn [Fri, 5 Mar 2021 11:51:29 +0000 (15:51 +0400)]
Update OpenApiSpex dependency

3 years agoAdd UserOperation to Redoc
Egor Kislitsyn [Thu, 4 Mar 2021 17:13:53 +0000 (21:13 +0400)]
Add UserOperation to Redoc

3 years ago[#3213] ActivityPub hashtags filtering refactoring. Test fix.
Ivan Tashkinov [Wed, 3 Mar 2021 20:09:30 +0000 (23:09 +0300)]
[#3213] ActivityPub hashtags filtering refactoring. Test fix.

3 years agoMerge branch 'mergeback/2.3.0' into 'develop'
lain [Wed, 3 Mar 2021 15:07:50 +0000 (15:07 +0000)]
Merge branch 'mergeback/2.3.0' into 'develop'

Mergeback/2.3.0

See merge request pleroma/pleroma!3360

3 years agoChangelog: Re-add application support
lain [Wed, 3 Mar 2021 14:35:25 +0000 (15:35 +0100)]
Changelog: Re-add application support

3 years agoRevert "StatusController: Deactivate application support for now."
lain [Wed, 3 Mar 2021 14:33:06 +0000 (15:33 +0100)]
Revert "StatusController: Deactivate application support for now."

This reverts commit 024c11c18d289d4acd65d749f939ad3684f31905.

3 years agoChangelog, mix: merge in stable
lain [Wed, 3 Mar 2021 12:56:40 +0000 (13:56 +0100)]
Changelog, mix: merge in stable

3 years agoMerge branch 'fix-migration' into 'develop'
Haelwenn [Wed, 3 Mar 2021 00:57:39 +0000 (00:57 +0000)]
Merge branch 'fix-migration' into 'develop'

Fix migration in cases where database name has a hyphen

See merge request pleroma/pleroma!3359

3 years agoFix migration in cases where database name has a hyphen
Mark Felder [Wed, 3 Mar 2021 00:17:32 +0000 (18:17 -0600)]
Fix migration in cases where database name has a hyphen

3 years agoMerge branch 'fix/inconsistent-reference' into 'develop'
Haelwenn [Tue, 2 Mar 2021 20:48:40 +0000 (20:48 +0000)]
Merge branch 'fix/inconsistent-reference' into 'develop'

MastoAPI Status View: make consistently named object references

See merge request pleroma/pleroma!3358