Commit graph

14760 commits

Author SHA1 Message Date
d5bbc3eeb2 Merge pull request 'fix flaky test filter_controller_test.exs:200' (#239) from ilja/akkoma:fix_flaky_filter_controller_test.exs_200 into develop
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
Reviewed-on: #239
2022-11-01 14:42:43 +00:00
479542c692 Merge pull request 'fix flaky participation_test.exs' (#238) from ilja/akkoma:fix_erratic_participation_test into develop
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
Reviewed-on: #238
2022-11-01 14:37:06 +00:00
be5044f785 fix_flaky_transfer_task_test.exs (#237)
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
There were async calls happening, so they weren't always finished when assert happened.

I also fixed some bugs in the erratic tests that were introduced when removing :shout.:shout is a key where restart is needed, and was changed in the test to use :rate_limit (which also requires a restart). But there was a bug in the syntax that didn't get caught because the test was tagged as erratic and therefor didn't fail. Here I fixed it.

During compilation, we had a warning `:logger is used by the current application but the current application does not depend on :logger` which is now fixed as well (see commit message for complete stacktrace).

Co-authored-by: Ilja <ilja@ilja.space>
Reviewed-on: #237
Co-authored-by: ilja <akkoma.dev@ilja.space>
Co-committed-by: ilja <akkoma.dev@ilja.space>
2022-11-01 14:31:29 +00:00
f1dfd76b98 Fix rate_limiter_test.exs test "it restricts based on config values" (#233)
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
Fixes one of the 'erratic' tests

It used a timer to sleep.
But time also goes on when doing other things, so depending on hardware, the timings could be off.
I slightly changed the tests so we still test what we functionally want.
Instead of waiting until the cache expires I now have a function to expire the test and use that.

That means we're not testing any more if the cache really expires after a certain amount of time,
but that's the responsability of the dependency imo, so shouldn't be a problem.

I also changed `Pleroma.Web.Endpoint, :http, :ip` in the tests to `127.0.0.1`
Currently it was set to 8.8.8.8, but I see no reason for that and, while I assume that no calls
are made to it, it may come over as weird or suspicious to people.

Co-authored-by: Ilja <ilja@ilja.space>
Reviewed-on: #233
Co-authored-by: ilja <akkoma.dev@ilja.space>
Co-committed-by: ilja <akkoma.dev@ilja.space>
2022-11-01 14:25:54 +00:00
1bb8b76311 Fix tests in ldap registration
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
2022-11-01 14:21:35 +00:00
cbc693f832 Fix LDAP user registration (#229)
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
Simple fix for LDAP user registration. I'm not sure what changed but I managed to get Akkoma running in a debug session and figured out it was missing a match for an extra value at the end. I don't know Elixir all that well so I'm not sure if this was the correct way to do it... but it works. :)

Reviewed-on: #229
Co-authored-by: nullobsi <me@nullob.si>
Co-committed-by: nullobsi <me@nullob.si>
2022-11-01 14:17:55 +00:00
d782140e2b Reword stop gifs
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2022-10-29 22:08:18 +01:00
4d9ca8909d Add StopGifs to description 2022-10-29 21:57:50 +01:00
Ilja
a59d310982 fix flaky test filter_controller_test.exs:200
Some checks are pending
ci/woodpecker/pr/woodpecker Pipeline is pending
2022-10-23 13:07:02 +02:00
ilja
e6ceea3553 fix flaky participation_test.exs
Some checks are pending
ci/woodpecker/pr/woodpecker Pipeline is pending
It was tested if the updated_at after marking as "read" was equal as the updated_at at insertion, but that seems wrong.
Firstly, if a record is updated, you expect the updated_at to also update.
Secondly, the insert and update happen almost at the same time, so it's flaky regardless.

Here I make sure it has a much older updated_at during insert so we can clealy see the effect after update.
I also check that the updated_at is actually updated because I expect that this is the expected behaviour and it's also the current behaviour.
2022-10-23 12:33:31 +02:00
16a31872fe document local_bubble
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
2022-10-21 10:23:07 +01:00
7bb6df2d5b Remove unused DATA arg
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
2022-10-20 13:26:00 +01:00
f36d14818d Unilateral remove from followers (#232)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
from https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3647/

Co-authored-by: marcin mikołajczak <git@mkljczk.pl>
Co-authored-by: Tusooa Zhu <tusooa@kazv.moe>
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: #232
2022-10-19 10:01:14 +00:00
5231d436d1 Add docker migration guide
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2022-10-18 16:16:55 +01:00
deba1d25f5 add DB restart to docker file
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
2022-10-17 16:29:36 +01:00
66f913355a Docker builds (#231)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: #231
2022-10-16 19:25:54 +00:00
60b3c8d17b bump version
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
2022-10-14 12:49:35 +01:00
edf7d5089f Merge pull request 'Check that the signature matches the creator' (#230) from domain-blocks into develop
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: #230
2022-10-14 11:41:34 +00:00
d4bdd3ddb7 Merge pull request 'SQL optimisations' (#227) from i-hate-sql into develop
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
Reviewed-on: #227
2022-10-14 10:49:02 +00:00
03662501c3 Check that the signature matches the creator
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/pr/woodpecker Pipeline was successful
2022-10-14 11:48:32 +01:00
856c57208b Ensure deletes are handled after everything else
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/pr/woodpecker Pipeline was successful
2022-10-11 14:30:08 +01:00
cb9b0d3720 optimise notifications query
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
ci/woodpecker/pr/woodpecker Pipeline was successful
2022-10-11 11:40:43 +01:00
8af50dea36 format
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
ci/woodpecker/pr/woodpecker Pipeline was successful
2022-10-10 17:13:42 +01:00
ca9e6ffc55 Use inner lateral join to not get dropped in :total
Some checks failed
ci/woodpecker/push/woodpecker Pipeline is pending
ci/woodpecker/pr/woodpecker Pipeline failed
2022-10-10 16:45:02 +01:00
574f010bc8 Extract deactivated users query to a join
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
2022-10-10 15:55:58 +01:00
c6e63aaf6b Backend settings sync (#226)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: #226
2022-10-06 16:22:15 +00:00
07295f7c8c Merge pull request 'include requirement to enable HTTP tunnel in tor' (#224) from tor-docs into develop
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: #224
2022-09-20 13:43:14 +00:00
47a793f33e include requirement to enable HTTP tunnel in tor
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
ci/woodpecker/pr/woodpecker Pipeline is pending
2022-09-20 14:40:32 +01:00
7775cefd73 Merge pull request 'ensure we use the same OTP for all releases' (#223) from update-otp-version into develop
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: #223
2022-09-20 12:33:16 +00:00
69099d6f44 ensure we use the same OTP for all releases
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/pr/woodpecker Pipeline was successful
2022-09-20 12:20:54 +01:00
5827f7781f Add installation note about flavour, support special cases (#222)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Fixes #210

Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: #222
2022-09-20 11:04:26 +00:00
b2aa82cee5 Fix false error in meilisearch index (#221)
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
the schema changed

https://docs.meilisearch.com/reference/api/documents.html#add-or-update-documents

this wasn't breaking anything, it would just report errors that were actually successes

Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: #221
2022-09-20 10:36:21 +00:00
9b2c169cef Merge pull request 'Move remote user interaction changelog entry to correct version' (#219) from norm/akkoma:changelog-remote-user-interaction into develop
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
Reviewed-on: #219
2022-09-19 17:33:32 +00:00
561e1f2470 Make backups require its own scope (#218)
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
Pulled from https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3721.

This makes backups require its own scope (`read:backups`) instead of the `read:accounts` scope.

Co-authored-by: Tusooa Zhu <tusooa@kazv.moe>
Reviewed-on: #218
Co-authored-by: Norm <normandy@biribiri.dev>
Co-committed-by: Norm <normandy@biribiri.dev>
2022-09-19 17:31:35 +00:00
0aabe4d0c3 Merge pull request 'Update soapbox-fe base url' (#220) from lou_de_sel/akkoma:lou_de_sel-patch-1 into develop
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
Reviewed-on: #220
2022-09-19 17:30:04 +00:00
8fe59d495d Update soapbox base url
Some checks are pending
ci/woodpecker/pr/woodpecker Pipeline is pending
At some point 'soapbox-pub/soapbox-fe' was moved to 'soapbox-pub/soapbox' and the build url is now updated.
2022-09-18 07:45:30 +00:00
84f8f32ef9 Move remote user interaction changelog entry to correct version
Some checks are pending
ci/woodpecker/pr/woodpecker Pipeline is pending
That feature was added in 2022.09, not 2022.08.
2022-09-18 03:21:05 +00:00
ad1a6d3dc2 ensure queue_target can't be silly low
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2022-09-16 14:23:31 +01:00
ee2eb7752d Ensure rollback succeeds
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2022-09-16 13:00:40 +01:00
4e01e1bf72 Merge pull request 'User: search: exclude deactivated users from user search' (#214) from norm/akkoma:exclude-deactivated-search into develop
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
Reviewed-on: #214
2022-09-16 11:56:00 +00:00
911f8feb0a Ensure migrations succeed (#216)
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: #216
2022-09-16 11:53:11 +00:00
77596a3021
User: search: exclude deactivated users from user search
Some checks are pending
ci/woodpecker/pr/woodpecker Pipeline is pending
This way we don't pollute search results with deactivated and deleted users
2022-09-15 21:21:06 -04:00
00f840fd44 Update styles.json path in frontend config doc (#212)
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
Co-authored-by: Francis Dinh <normandy@biribiri.dev>
Reviewed-on: #212
Co-authored-by: Norm <normandy@biribiri.dev>
Co-committed-by: Norm <normandy@biribiri.dev>
2022-09-14 10:20:07 +00:00
Tusooa Zhu
4c06c4ecb1 Add margin to forms and make inputs fill whole width
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2022-09-11 20:30:03 +01:00
Tusooa Zhu
2aa8e66527 Fix User.get_or_fetch/1 with usernames starting with http 2022-09-11 20:29:05 +01:00
dbe678cb06 Merge pull request 'pleroma-cherry-picks' (#209) from pleroma-cherry-picks into develop
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: #209
2022-09-11 19:28:06 +00:00
b4261b0335 Use set of pregenerated RSA keys
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/pr/woodpecker Pipeline was successful
Randomness is a huge resource sink, so let's just use
a some that we made earlier
2022-09-11 20:14:58 +01:00
1acd38fe7f OAuthPlug: use user cache instead of joining
As this plug is called on every request, this should reduce load on the
database by not requiring to select on the users table every single
time, and to instead use the by-ID user cache whenever possible.
2022-09-11 19:55:55 +01:00
3e2d15c71d emoji-test: update to latest 15.0 draft 2022-09-11 19:55:45 +01:00
8683252fc5 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-11 19:55:38 +01:00