akkoma
3 years agoCI: Purge pleroma build directory between runs
Alex Gleason [Thu, 29 Apr 2021 18:03:41 +0000 (13:03 -0500)]
CI: Purge pleroma build directory between runs

3 years agoMerge branch 'gitlab-ci-mix-lock' into 'develop'
Haelwenn [Wed, 28 Apr 2021 04:53:25 +0000 (04:53 +0000)]
Merge branch 'gitlab-ci-mix-lock' into 'develop'

Cache GitLab CI based on mix.lock

See merge request pleroma/pleroma!3398

3 years agoCache gitlab-ci based on mix.lock
Alex Gleason [Tue, 27 Apr 2021 16:54:28 +0000 (11:54 -0500)]
Cache gitlab-ci based on mix.lock

3 years agoMerge branch 'fix/delete_activities_timeout' into 'develop'
Haelwenn [Fri, 23 Apr 2021 02:14:11 +0000 (02:14 +0000)]
Merge branch 'fix/delete_activities_timeout' into 'develop'

Fix pleroma.user delete_activities mix task

See merge request pleroma/pleroma!3394

3 years agoFixed pleroma.user delete_activities mix task.
Mark Felder [Thu, 22 Apr 2021 15:15:05 +0000 (10:15 -0500)]
Fixed pleroma.user delete_activities mix task.

3 years agoCleanup and ensure we obey custom Repo timeout
Mark Felder [Thu, 22 Apr 2021 15:11:08 +0000 (10:11 -0500)]
Cleanup and ensure we obey custom Repo timeout

3 years agoOTP releases executing commands via pleroma_ctl show the parent of the process is...
Mark Felder [Tue, 20 Apr 2021 17:00:02 +0000 (12:00 -0500)]
OTP releases executing commands via pleroma_ctl show the parent of the process is :erl_eval

3 years agoTry to set query timeout intelligently
Mark Felder [Tue, 20 Apr 2021 16:16:24 +0000 (11:16 -0500)]
Try to set query timeout intelligently

3 years agoAdd utility function to return infinite timeout for SQL transactions if we detect...
Mark Felder [Tue, 20 Apr 2021 16:10:39 +0000 (11:10 -0500)]
Add utility function to return infinite timeout for SQL transactions if we detect it was called from a Mix Task

3 years agoSet Repo.transaction/2 timeout to infinity. Fixes pleroma.user delete_activities...
Mark Felder [Mon, 19 Apr 2021 20:43:17 +0000 (15:43 -0500)]
Set Repo.transaction/2 timeout to infinity. Fixes pleroma.user delete_activities mix task.

3 years agoMerge branch 'fix/docs' into 'develop'
feld [Tue, 20 Apr 2021 18:02:48 +0000 (18:02 +0000)]
Merge branch 'fix/docs' into 'develop'

Docs: Fix incorrect shell command

See merge request pleroma/pleroma!3396

3 years agoFix incorrect shell command
Mark Felder [Tue, 20 Apr 2021 17:31:14 +0000 (12:31 -0500)]
Fix incorrect shell command

Can't be in /opt/pleroma/bin and then call ./bin/pleroma_ctl :)

3 years agoMerge branch 'feature/opt-out-of-google-floc' into 'develop'
feld [Mon, 19 Apr 2021 22:39:52 +0000 (22:39 +0000)]
Merge branch 'feature/opt-out-of-google-floc' into 'develop'

Add opting out of Google FLoC to HTTPSecurityPlug headers

Closes #2630

See merge request pleroma/pleroma!3393

3 years agoAdd CHANGELOG entry
Sean King [Mon, 19 Apr 2021 22:06:19 +0000 (16:06 -0600)]
Add CHANGELOG entry

3 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/opt-out...
Sean King [Mon, 19 Apr 2021 21:42:38 +0000 (15:42 -0600)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/opt-out-of-google-floc

3 years agoMerge branch 'fix/tests' into 'develop'
feld [Mon, 19 Apr 2021 21:34:38 +0000 (21:34 +0000)]
Merge branch 'fix/tests' into 'develop'

Fix tests broken since !3312

See merge request pleroma/pleroma!3395

3 years agoFix error response which was breaking tests related to pinned posts
Mark Felder [Mon, 19 Apr 2021 21:23:57 +0000 (16:23 -0500)]
Fix error response which was breaking tests related to pinned posts

3 years agoAdd opting out of Google FLoC to HTTPSecurityPlug headers
Sean King [Sun, 18 Apr 2021 20:00:18 +0000 (14:00 -0600)]
Add opting out of Google FLoC to HTTPSecurityPlug headers

3 years agoMerge branch 'features/ingestion-ecto-tag' into 'develop'
rinpatch [Fri, 16 Apr 2021 09:55:55 +0000 (09:55 +0000)]
Merge branch 'features/ingestion-ecto-tag' into 'develop'

TagValidator: New

See merge request pleroma/pleroma!3244

3 years agoMerge branch 'feature/521-pinned-post-federation' into 'develop'
rinpatch [Fri, 16 Apr 2021 09:53:47 +0000 (09:53 +0000)]
Merge branch 'feature/521-pinned-post-federation' into 'develop'

Pinned posts federation

Closes #521

See merge request pleroma/pleroma!3312

3 years agoMerge branch 'fix/2593-reading-exported-config-file' into 'develop'
rinpatch [Fri, 16 Apr 2021 09:50:26 +0000 (09:50 +0000)]
Merge branch 'fix/2593-reading-exported-config-file' into 'develop'

Reading the file, instead of config keyword in ReleaseRuntimeProvider

Closes #2593

See merge request pleroma/pleroma!3381

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 agorelease runtime provider fix for paths
Alexander Strizhakov [Thu, 8 Apr 2021 12:45:31 +0000 (15:45 +0300)]
release runtime provider fix for paths

3 years agoMove tag fixup to object_validator
Haelwenn (lanodan) Monnier [Thu, 1 Apr 2021 11:49:04 +0000 (13:49 +0200)]
Move tag fixup to object_validator

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 agoobject_validators: Mark validate_data as private
Haelwenn (lanodan) Monnier [Tue, 12 Jan 2021 10:14:09 +0000 (11:14 +0100)]
object_validators: Mark validate_data as private

3 years agoInsert string-hashtags in Pipeline
Haelwenn (lanodan) Monnier [Tue, 12 Jan 2021 08:30:22 +0000 (09:30 +0100)]
Insert string-hashtags in Pipeline

Cannot be done in Ecto schemas because only one type is allowed in arrays, and
needs to be done before the MRFs.

3 years agopipeline_test: Fix usage of %Activity{}
Haelwenn (lanodan) Monnier [Tue, 12 Jan 2021 13:11:29 +0000 (14:11 +0100)]
pipeline_test: Fix usage of %Activity{}

3 years agoTagValidator: New
Haelwenn (lanodan) Monnier [Thu, 7 Jan 2021 17:23:01 +0000 (18:23 +0100)]
TagValidator: New

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 agotests for release config provider
Alexander Strizhakov [Sat, 27 Mar 2021 06:05:33 +0000 (09:05 +0300)]
tests for release config provider

3 years agoreading the file, instead of config keyword
Alexander Strizhakov [Fri, 26 Mar 2021 16:19:19 +0000 (19:19 +0300)]
reading the file, instead of config keyword

3 years agoexpanding validator
Alexander Strizhakov [Thu, 25 Mar 2021 10:26:54 +0000 (13:26 +0300)]
expanding validator

3 years agoexpanding AddRemoveValidator
Alexander Strizhakov [Fri, 19 Mar 2021 14:25:12 +0000 (17:25 +0300)]
expanding AddRemoveValidator

3 years agoremoveing corresponding add activity
Alexander Strizhakov [Tue, 9 Mar 2021 08:57:20 +0000 (11:57 +0300)]
removeing corresponding add activity

3 years agoseparate test file for featured collection
Alexander Strizhakov [Tue, 9 Mar 2021 06:00:44 +0000 (09:00 +0300)]
separate test file for featured collection

3 years agomoving fixture into mastodon folder
Alexander Strizhakov [Tue, 9 Mar 2021 06:00:20 +0000 (09:00 +0300)]
moving fixture into mastodon folder

3 years agonot needed
Alexander Strizhakov [Tue, 9 Mar 2021 05:59:50 +0000 (08:59 +0300)]
not needed

3 years agorefetch user on incoming add/remove activity
Alexander Strizhakov [Wed, 3 Mar 2021 15:04:06 +0000 (18:04 +0300)]
refetch user on incoming add/remove activity

if featured_address is nil

3 years agofeatured_address valition in AddRemoveValidator
Alexander Strizhakov [Wed, 3 Mar 2021 12:41:05 +0000 (15:41 +0300)]
featured_address valition in AddRemoveValidator

3 years agovalidator renaming & add validation for target
Alexander Strizhakov [Tue, 2 Mar 2021 14:24:06 +0000 (17:24 +0300)]
validator renaming & add validation for target

3 years agomastodon pins
Alexander Strizhakov [Thu, 25 Feb 2021 11:00:44 +0000 (14:00 +0300)]
mastodon pins

3 years agoLet pins federate
Alexander Strizhakov [Wed, 3 Feb 2021 13:09:28 +0000 (16:09 +0300)]
Let pins federate

- save object ids on pin, instead of activity ids
- pins federation
- removed pinned_activities field from the users table
- activityPub endpoint for user pins
- pulling remote users pins

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