hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
17,158 commits 1 branch 0 tags 221 MiB
Commit graph

17,158 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mark Felder
56aab905e8 Queue individual jobs for each user that needs to be deleted when deleting an instance. 2025-06-27 11:13:15 -07:00
vaartis
9be542e272 Merge branch 'handle-dislike' into 'develop' 
Handle the Dislike activity by transforming into a thumbs-down emote

Closes #3378

See merge request pleroma/pleroma!4369
 2025-06-21 14:18:46 +00:00
vaartis
a708bf4946 Merge branch 'add-tos-setting' into 'develop' 
Add tos setting

See merge request pleroma/pleroma!4321
 2025-06-20 21:22:29 +00:00
Pleroma User
9d6f201e5e Add tos setting 2025-06-20 21:22:27 +00:00
vaartis
29be5018b0 Merge branch 'ci-variables' into 'develop' 
Use manually created variables for CI instead of CI_JOB_TOKEN

See merge request pleroma/pleroma!4373
 2025-06-18 14:42:02 +00:00
Ekaterina Vaartis
0151d99202 Use manually created variables for CI instead of CI_JOB_TOKEN 
For protected branches, it seems now just CI_JOB_TOKEN is not enough.

https://gitlab.com/gitlab-org/gitlab-foss/-/issues/36898#note_38415655

According to this, the CI_JOB_TOKEN is based on whoever created the
job and creating a pipeline on a protected branch requires special
permissions. Somehow this still did not work for other people who
merged, even though they had access to the docs repo.
 2025-06-18 17:36:08 +03:00
vaartis
490a273dc1 Merge branch 'deepl-fix' into 'develop' 
Use JSON for DeepL API requests

See merge request pleroma/pleroma!4363
 2025-06-18 12:11:35 +00:00
vaartis
ca7dd87e2d Merge branch 'instance-markup-info' into 'develop' 
Expose markup configuration in InstanceView

See merge request pleroma/pleroma!4346
 2025-06-18 10:48:15 +00:00
vaartis
cda7cbf2a1 Merge branch 'scrobbles' into 'develop' 
Change ScrobbleView external link param name to use snake case

See merge request pleroma/pleroma!4243
 2025-06-18 10:25:38 +00:00
vaartis
d50822c313 Merge branch 'bugfix/toctou-mkdir' into 'develop' 
backports: Copy mkdir_p TOCTOU fix from elixir PR 14242

See merge request pleroma/pleroma!4320
 2025-06-16 12:20:19 +00:00
Ekaterina Vaartis
7ecfb95331 Handle the Dislike activity by transforming into a thumbs-down emote 2025-06-16 14:18:15 +03:00
Haelwenn (lanodan) Monnier
a69e417020
 		File.mkdir_p -> Pleroma.Backports.mkdir_p 2025-06-16 12:48:47 +02:00
Haelwenn (lanodan) Monnier
00d536d9e2
 		backports: Copy mkdir_p TOCTOU fix from elixir PR 14242 
See: https://github.com/elixir-lang/elixir/pull/14242
 2025-06-16 12:46:00 +02:00
lain
bc75bb35fa Merge branch 'relaxed-also-known-as' into 'develop' 
Relax alsoKnownAs requirements to just being a URI

See merge request pleroma/pleroma!4367
 2025-06-14 08:30:13 +00:00
feld
774e0cb172 Merge branch 'unlisted-fix' into 'develop' 
Public getting stripped from unlisted activity CC

See merge request pleroma/pleroma!4353
 2025-06-13 06:27:04 +00:00
Mark Felder
7c64bfaace Include public address in cc if original activity specified it and Publisher param_cc also has values 2025-06-12 22:42:40 -07:00
Mark Felder
fe6d2ecc97 Test for unlisted but Publisher param_cc is not empty 2025-06-12 22:41:39 -07:00
Mark Felder
d3adc3e05e Split this cc test into two individual cases 2025-06-12 21:59:37 -07:00
Mark Felder
23be24b92f Fix federation issue where Public visibility information in cc field was lost when sent to remote servers, causing posts to appear with inconsistent visibility across instances 2025-06-12 21:37:50 -07:00
Mark Felder
9f79df7508 Add test demonstrating public getting stripped from unlisted activity CC 2025-06-12 21:32:43 -07:00
Mark Felder
27ec46814c Revert "Public getting stripped from unlisted activity CC: Add possible tests" 
This reverts commit ded40182b0.
 2025-06-12 21:27:19 -07:00
Mark Felder
8488362248 Merge remote-tracking branch 'origin/develop' into unlisted-fix 2025-06-12 21:20:34 -07:00
Ekaterina Vaartis
a361b84fc9 Relax alsoKnownAs requirements to just being a URI 2025-06-11 23:24:18 +03:00
feld
f38e9228ef Merge branch 'tusooa/assign-app-user-oom' into 'develop' 
Fix AssignAppUser migration OOM

Closes #3358

See merge request pleroma/pleroma!4326
 2025-06-07 19:39:57 +00:00
feld
5cd8c23634 Merge branch 'mix-otpver' into 'develop' 
Remove forgotten Pleroma.OTPVersion usage in mix.exs

See merge request pleroma/pleroma!4364
 2025-06-06 20:14:14 +00:00
feld
7114635997 Merge branch 'private-functions' into 'develop' 
Pleroma.User: Mark some functions as private

See merge request pleroma/pleroma!4357
 2025-06-06 01:00:43 +00:00
feld
f38123ad2d Merge branch 'openbsd-docs' into 'develop' 
Update OpenBSD documentation and installation files

See merge request pleroma/pleroma!4258
 2025-06-06 00:59:58 +00:00
feld
7101d8ab1e Merge branch 'fixes' into 'develop' 
Fix test fallout from most recent merges

See merge request pleroma/pleroma!4365
 2025-06-06 00:58:00 +00:00
Mark Felder
9226963763 Fix test fallout from most recent merges 2025-06-05 17:13:55 -07:00
Mark Felder
db65b35ca3 Fix test Returns JSON when format is not supported (Pleroma.Web.WebFinger.WebFingerControllerTest) 
If we want to return JSON when a badly behaving client requests text/html, we still have to accept it at the Plug
 2025-06-05 17:11:16 -07:00
Mark Felder
48316d168c Fix failing tests due to Builder.block/2 becoming Builder.block/3 with no default value 2025-06-05 16:55:07 -07:00
Mark Felder
a2ad2d8d23 Remove unused import 2025-06-05 16:54:05 -07:00
Ekaterina Vaartis
8ae4ed0807 Make the opts in ActivityPub.Builder.block optional 2025-06-05 22:12:06 +03:00
Phantasm
a817f1800e
 		Remove forgotten Pleroma.OTPVersion usage in mix.exs 
This was used in OTP releases where the normal OTP_VERSION file
is unavailable.

If checking against OTP minor versions and patch levels
is needed again, revert this commit and commit mentioned below.

Context: 1be8deda73
 2025-06-05 16:48:58 +02:00
vaartis
8484e09424 Merge branch 'elixir-1.18' into 'develop' 
Elixir 1.18 warnings

See merge request pleroma/pleroma!4358
 2025-06-05 09:00:39 +00:00
nicole mikołajczyk
ae2c97fad8 Use JSON for DeepL API requests 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2025-06-04 21:32:30 +02:00
Phantasm
ff69b00eae
 		Elixir 1.18 Update credo 
warning: Credo.CLI.Command.Info.Output.Default.print_after_info/4 is undefined or private. Did you mean:

          * print/2

    │
  4 │   use Credo.CLI.Output.FormatDelegator,
    │   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    │
    └─ lib/credo/cli/command/info/info_output.ex:4: Credo.CLI.Command.Info.InfoOutput.print_after_info/4
 2025-06-04 19:18:01 +02:00
Phantasm
dc26f74961
 		Revert to previous tag_validator behavior 
This paritally reverts commit 9710063fdc
and reverts commit 7ddae61414

See thread: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/4358#note_112761
 2025-06-04 19:16:59 +02:00
Ekaterina Vaartis
7ddae61414 Change the test that assumes that a hashtag with # will remain as-is 
This does not seem to be the intended behaviour, as the code that produces it
did not actually ever do anything and just returned the tag as-is.

See
lib/pleroma/web/activity_pub/object_validators/tag_validator.ex
and
https://git.pleroma.social/pleroma/pleroma/-/merge_requests/4358#note_112681

At least Mastodon and Misskey output tags without the # from their API,
so in reality tags with the hash should rarely happen.
 2025-06-04 12:28:59 +03:00
Ekaterina Vaartis
d95e1066b9 Fix formatting 2025-06-04 12:03:54 +03:00
Ekaterina Vaartis
6fa4f08e67 Add back String.downcase that was accidentally removed from tag_validator 2025-06-04 11:43:18 +03:00
Phantasm
1be8deda73
 		Remove Pleroma.OTPVersion module 
Its last use was a check in lib/application.ex that was removed in
commit 0e53cb4940

Major OTP version can be fetched with System.otp_release/0.
If checking against minor versions and patch levels is needed,
revert this commit since it uses the recommended way of getting
a full OTP version string.
 2025-06-03 23:17:39 +02:00
Phantasm
0e53cb4940
 		Remove unreachable checks for OTP < 22.2 
OTP 22 is no longer supported at all.

Pleroma's dependencies cannot be built with Elixir 1.13 and
Elixir 1.14 cannot be built with OTP 22 since it depends on features not
present in OTP 22. Hence why these checks cannot get triggered anymore.
 2025-06-03 23:11:37 +02:00
Phantasm
9710063fdc
 		Apply suggestions to 2 files. 2025-06-03 23:11:37 +02:00
Phantasm
9386863019
 		openbsd: update install docs for 7.7 
Explicitely installing OTP 26 is no longer needed.
 2025-06-03 23:08:51 +02:00
lain
93ce56418e Merge branch 'permissive-webfinger' into 'develop' 
WebFinger query default to return JSON when no or unrecognized accept header is provided.

Closes #3381

See merge request pleroma/pleroma!4345
 2025-05-29 08:41:27 +00:00
lain
36be0d32a4 Merge branch 'expiring-blocks' into 'develop' 
Add expiring blocks

See merge request pleroma/pleroma!4351
 2025-05-29 08:25:21 +00:00
lain
374e8c85a7 Apply lambadalambda's suggestion(s) to 1 file(s) 2025-05-29 08:17:31 +00:00
Phantasm
286204913d
 		Replace Elixir 1.17 with 1.18 for build unit-testing pipelines 2025-05-24 22:17:38 +02:00
Phantasm
2b513fd450
 		Elixir 1.18 add changelog 2025-05-24 22:03:23 +02:00