limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity
14673 commits 27 branches 107 tags 315 MiB
Commit graph

14673 commits

This branch
This branch
All branches
Author SHA1 Message Date
Haelwenn
da0ef154a6 Merge branch 'from/upstream-develop/tusooa/2930-get-or-fetch' into 'develop' 
Fix User.get_or_fetch/1 with usernames starting with http

Closes #2930

See merge request pleroma/pleroma!3751
 2022-10-30 00:38:21 +00:00
tusooa
9fbf01f7a9 Merge branch 'push-updates' into 'develop' 
Push.Impl: support edits

See merge request pleroma/pleroma!3760
 2022-10-27 12:51:29 +00:00
feld
7a519b6a66 Merge branch 'fix-deprecation-text' into 'develop' 
Fix deprecation warning for Gun timeout

See merge request pleroma/pleroma!3759
 2022-10-24 14:22:49 +00:00
Haelwenn
705ba6d615 Merge branch 'security/PleromaAPI-delete' into 'develop' 
CommonAPI: generate ModerationLog for all admin/moderator deletes

See merge request pleroma/pleroma!3765
 2022-10-15 12:54:20 +00:00
Haelwenn (lanodan) Monnier
16b06160ac CommonAPI: generate ModerationLog for all admin/moderator deletes 
As a side-effect it also changes the ChatMessage delete ID to an
Activity.id rather than MessageReference.id

Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2958
 2022-10-14 18:51:08 +02:00
tusooa
c830282628 Merge branch 'weblate-extract' into 'develop' 
Extract translatable strings

See merge request pleroma/pleroma!3752
 2022-10-11 21:21:36 +00:00
weblate-extractor
1ac9bd0b4c Extract translatable strings 2022-10-11 06:13:00 +00:00
tusooa
8042e0ebe1 Merge branch 'mergeback/2.4.4' into 'develop' 
mergeback: 2.4.4

See merge request pleroma/pleroma!3762
 2022-10-09 04:29:09 +00:00
Tusooa Zhu
dd82fd234f
Merge branch 'release/2.4.4' into mergeback/2.4.4 2022-10-08 22:15:09 -04:00
marcin mikołajczak
1b238a4fad Push.Impl: support edits 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-01 23:28:02 +02:00
Mark Felder
1958f23fe7 Fix deprecation warning for Gun timeout 2022-09-30 12:22:06 -04:00
Haelwenn
3f1c31b7cd Merge branch 'fix/exclude-deactivated-in-search' into 'develop' 
User: search: exclude inactive users from user search

See merge request pleroma/pleroma!3755
 2022-09-27 23:58:45 +00:00
Haelwenn
d43d02bf41 Merge branch 'from/upstream-develop/tusooa/fix-static-tests' into 'develop' 
Make instance document controller test sync

Closes #2940

See merge request pleroma/pleroma!3757
 2022-09-27 21:50:43 +00:00
Haelwenn
757a21554f Merge branch 'from/upstream-develop/tusooa/2169-queue-limit' into 'develop' 
Reduce incoming and outgoing federation queue sizes to 5

Closes #2169

See merge request pleroma/pleroma!3756
 2022-09-27 21:50:06 +00:00
Haelwenn
5d7d623390 Merge branch 'bugfix/elixir-1.14' into 'develop' 
Bugfix: Elixir 1.14

See merge request pleroma/pleroma!3740
 2022-09-27 21:46:03 +00:00
Tusooa Zhu
e66c02b775
Make instance document controller test sync 2022-09-20 12:34:10 -04:00
tusooa
ac95b8b4f3 Merge branch 'websocketex' into 'develop' 
Use Websockex to replace websocket_client

See merge request pleroma/pleroma!3743
 2022-09-18 17:09:12 +00:00
Tusooa Zhu
467b6cad6f
Reduce incoming and outgoing federation queue sizes to 5 2022-09-17 16:34:33 -04:00
tusooa
1a7107f4a5 Merge branch 'remove_from_followers' into 'develop' 
MastoAPI: POST /api/v1/accounts/:id/remove_from_followers

See merge request pleroma/pleroma!3647
 2022-09-16 23:24:13 +00:00
a1batross
7f63b4c315 User: search: exclude deactivated users from user search 
This way we don't pollute search results with deactivated and deleted users
 2022-09-16 00:49:16 +03:00
Tusooa Zhu
ea60c4e709
Fix wrong relationship direction 2022-09-14 20:24:04 -04:00
tusooa
90d4b7d604 Merge branch 'fix/user-factory-speed' into 'develop' 
tests/Factory: improve user generation performance

See merge request pleroma/pleroma!3754
 2022-09-12 00:53:14 +00:00
FloatingGhost
6bdf451ce8
Use set of pregenerated RSA keys 
Randomness is a huge resource sink, so let's just use
a some that we made earlier
 2022-09-11 21:33:20 +02:00
tusooa
ac427de851 Merge branch 'fix/undo-boosts' into 'develop' 
ObjectView: do not fetch an object for its ID

See merge request pleroma/pleroma!3753
 2022-09-11 17:10:26 +00:00
Hélène
0b19625bfb
ObjectView: do not fetch an object for its ID 
Non-Create/Listen activities had their associated object field
normalized and fetched, but only to use their `id` field, which is both
slow and redundant. This also failed on Undo activities, which delete
the associated object/activity in database.

Undo activities will now render properly and database loads should
improve ever so slightly.
 2022-09-11 04:54:04 +02:00
Tusooa Zhu
50923f5438
Fix User.get_or_fetch/1 with usernames starting with http 2022-09-08 11:58:17 -04:00
Haelwenn
453a66f8c2 Merge branch 'weblate-extract' into 'develop' 
Extract translatable strings

See merge request pleroma/pleroma!3748
 2022-09-06 17:17:40 +00:00
weblate-extractor
3d32c92b37 Extract translatable strings 2022-09-06 16:45:08 +00:00
tusooa
c0b265b404 Merge branch 'birthday-config-description' into 'develop' 
Clarify `birthday_min_age` config description

See merge request pleroma/pleroma!3747
 2022-09-06 12:40:02 +00:00
marcin mikołajczak
c6bc523914 Clarify birthday_min_age config description 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-05 20:25:01 +02:00
Haelwenn
b8d6cb5845 Merge branch 'from/upstream-develop/tusooa/2892-backup-scope' into 'develop' 
Make backups require its own scope

Closes #2892

See merge request pleroma/pleroma!3721
 2022-09-05 15:42:02 +00:00
Haelwenn
346c130ddc Merge branch 'fix/user-private-key-generation' into 'develop' 
User: generate private keys on user creation

See merge request pleroma/pleroma!3737
 2022-09-05 15:38:15 +00:00
tusooa
f7c2073103 Merge branch 'bump/min-elixir-1.10' into 'develop' 
Bump minimum Elixir version to 1.10

See merge request pleroma/pleroma!3741
 2022-09-05 15:19:34 +00:00
tusooa
9874b4c985 Merge branch 'develop' into 'from/upstream-develop/tusooa/2892-backup-scope' 
# Conflicts:
#   CHANGELOG.md
 2022-09-05 15:00:19 +00:00
Hélène
cfb1bc967f
Migrations: generate unset user keys 
User keys are now generated on user creation instead of "when needed",
to prevent race conditions in federation and a few other issues. This
migration will generate keys missing for local users.
 2022-09-05 03:51:35 +02:00
Hélène
cd237d22f1
User: generate private keys on user creation 
This fixes a race condition bug where keys could be regenerated
post-federation, causing activities and HTTP signatures from an user to
be dropped due to key differences.
 2022-09-05 03:51:17 +02:00
tusooa
f8afba95b2 Merge branch 'fix/gts-federation' into 'develop' 
GoToSocial federation fixes

See merge request pleroma/pleroma!3725
 2022-09-05 01:10:34 +00:00
tusooa
20347898e2 Merge branch 'fix/federation-context-issues' into 'develop' 
Fix reply context fixing (Pleroma replies to Misskey threads) and removal of context objects

See merge request pleroma/pleroma!3717
 2022-09-04 18:43:36 +00:00
Haelwenn
c63cf954de Merge branch 'from/upstream-develop/tusooa/streaming-fix' into 'develop' 
Streaming fix

Closes #2796

See merge request pleroma/pleroma!3738
 2022-09-03 18:24:28 +00:00
tusooa
71839cb890 Merge branch 'changes/embed-metadata' into 'develop' 
Metadata/Utils: use summary as description if set

Closes #2491

See merge request pleroma/pleroma!3733
 2022-09-03 16:21:08 +00:00
Haelwenn (lanodan) Monnier
80a2528fd1 ci-base: Document building and pushing a new image 2022-09-03 18:19:58 +02:00
Hélène
4477c6baff
Metadata/Utils: use summary as description if set 
When generating OpenGraph and TwitterCard metadata for a post, the
summary field will be used first if it is set to generate the post
description.
 2022-09-03 17:17:48 +02:00
Haelwenn
257601d67d Merge branch 'ssh-bbs-improvements' into 'develop' 
BBS: add functionnalities and readability

See merge request pleroma/pleroma!3675
 2022-09-03 11:15:07 +00:00
Haelwenn (lanodan) Monnier
be411ad3bc Test coverage: Switch to covertool to get cobertura output 
This allows to have coverage information integrated into Gitlab
 2022-09-03 05:03:50 +02:00
Tusooa Zhu
d19696cf60
Lint 2022-09-02 22:58:35 -04:00
Haelwenn
299255b9bb Merge branch 'from/upstream-develop/tusooa/assoc-object-id' into 'develop' 
Add function to calculate associated object id

Closes #2307

See merge request pleroma/pleroma!3692
 2022-09-03 02:50:40 +00:00
Haelwenn
e40c221c31 Merge branch 'from/upstream-develop/tusooa/edits' into 'develop' 
Editing

Closes #1429, #2859, and #2288

See merge request pleroma/pleroma!3678
 2022-09-03 02:16:42 +00:00
Haelwenn
07ef72f493 Merge branch 'from/develop/tusooa/2807-remote-xact-post' into 'develop' 
Remote interaction with posts

Closes #2807 and #978

See merge request pleroma/pleroma!3587
 2022-09-03 02:03:48 +00:00
Haelwenn (lanodan) Monnier
ec80a1e405 Bump minimum Elixir version to 1.10 
1.9 being end-of-life
 2022-09-03 03:58:22 +02:00
Haelwenn (lanodan) Monnier
24af2e1c58 script_test: Fix %ErlangError for Elixir 1.14 2022-09-03 03:58:22 +02:00