nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
12828 commits 2 branches 0 tags 272 MiB
Commit graph

268 commits

Author SHA1 Message Date
Mark Felder 860b5c7804 Change user.deactivated field to user.is_active 2021-01-15 11:24:46 -06:00
Lain Soykaf c4b74c9c3f Linting. 2021-01-14 16:01:14 +01:00
Lain Soykaf 39f3683a06 Pbkdf2: Use it everywhere. 2021-01-14 15:06:16 +01:00
Lain Soykaf aff83eb7c1 Linting 2021-01-13 16:00:12 +01:00
lain 9106048c61 Password: Replace Pbkdf2 with Password. 2021-01-13 15:11:11 +01:00
Haelwenn (lanodan) Monnier c4439c630f
Bump Copyright to 2021 
grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;'
 2021-01-13 07:49:50 +01:00
lain e1a547d7d3 ChatMessages: Fix pagination headers. 
They used to contain the path parameter `id` as query param,
which would break the link.
 2021-01-11 15:30:40 +01:00
lain 5822338f3a Merge branch 'guppe-example' into 'develop' 
ActivtityPub Test: Add example for guppe actor

See merge request pleroma/pleroma!3243
 2021-01-08 15:55:48 +00:00
lain 80167e62dd Merge branch 'fix/missing_emoji_steal_dir' into 'develop' 
Create dir for EmojiStealPolicy automatically

See merge request pleroma/pleroma!3218
 2021-01-08 13:10:49 +00:00
Alex Gleason 3342f6a7ef
Backups: render ID in API 2021-01-07 13:06:22 -06:00
lain bd788c0939 ActivtityPub Test: Add example for guppe actor 2021-01-07 16:20:30 +01:00
lain cf0eb0c1c5 Merge branch 'object-normalize-refactor' into 'develop' 
Object: Rework how Object.normalize works

See merge request pleroma/pleroma!3229
 2021-01-07 11:09:18 +00:00
lain 4d56aca904 Merge branch 'adminapi-user-email' into 'develop' 
AdminAPI: return user email

See merge request pleroma/pleroma!3240
 2021-01-07 10:08:02 +00:00
Alex Gleason 9f6fa5877f
Add AdminAPI.AccountViewTest 2021-01-06 11:43:07 -06:00
Alex Gleason 20af025c65
AdminAPI: return user email 2021-01-06 11:30:32 -06:00
Roger Braun 48cd336a72 allow external emoji 2021-01-06 10:13:01 -06:00
Mark Felder f9090e00e6 Add test to validate URLs to custom emojis are properly encoded 2021-01-05 13:58:49 -06:00
lain 20a269ed69 Merge branch 'fix/pagination-regression' into 'develop' 
Do not try to guess which pagination we need by the existence of an :offset param.

Closes #2399

See merge request pleroma/pleroma!3230
 2021-01-05 12:40:45 +00:00
lain e802b48d55 User: Use ObjectID type to validate also-known-as field 2021-01-05 13:10:14 +01:00
lain f0e6cff583 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases 2021-01-05 12:42:30 +01:00
lain bea69853a2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-moderation-log-stuff 2021-01-05 12:19:39 +01:00
lain 95a0ae8a35 AccountControllerTest: Fix test logic 2021-01-05 11:48:40 +01:00
lain d44850d7a5 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into object-normalize-refactor 2021-01-05 10:48:32 +01:00
lain 8e5904daa5 SideEffects.DeleteTest: asyncify. 
Replace Mock with Mox, mock out Logger.
 2021-01-04 18:40:59 +01:00
Mark Felder 0e93775ed0 Add test to validate profile pagination works with keyset 2021-01-04 11:04:58 -06:00
lain e1e7e4d379 Object: Rework how Object.normalize works 
Now it defaults to not fetching, and the option is named.
 2021-01-04 13:38:31 +01:00
Alex Gleason 0ec7e9b8e9
AdminAPI: return id for moderation log entries 2021-01-01 11:59:48 -06:00
feld afe9c152ab Merge branch 'fix/reports-ordering' into 'develop' 
Do not reverse order of reports. We want newest ones sorted to the top.

Closes #2364

See merge request pleroma/pleroma!3225
 2020-12-31 19:24:49 +00:00
Mark Felder e4791258d4 Ensure newest report is returned first in the list 2020-12-31 12:40:42 -06:00
Alex Gleason 11d40e92b7
Render AKAs in Actor endpoints 2020-12-30 18:53:27 -06:00
Alex Gleason cbce880076
Merge remote-tracking branch 'upstream/develop' into aliases 2020-12-30 17:10:02 -06:00
Mark Felder 4c5f75f4e9 Support pagination in AdminAPI for user statuses 2020-12-30 15:18:54 -06:00
Haelwenn 3966add048 Revert "Merge branch 'features/hashtag-column' into 'develop'" 
This reverts merge request !2824
 2020-12-28 12:02:16 +00:00
Haelwenn b122b6ffa3 Merge branch 'features/hashtag-column' into 'develop' 
Insert text representation of hashtags into object["hashtags"]

See merge request pleroma/pleroma!2824
 2020-12-28 10:14:58 +00:00
Alexander Strizhakov 7bfb041658
insreasing test coverage for StealEmojiPolicy 2020-12-27 21:53:30 +03:00
lain e4f1d8f48c Merge branch 'cachex-test' into 'develop' 
Test framework overhaul (speed, reliability)

See merge request pleroma/pleroma!3209
 2020-12-26 10:26:35 +00:00
Haelwenn (lanodan) Monnier acb03d591b
Insert text representation of hashtags into object["hashtags"] 
Includes a new mix task: pleroma.database fill_old_hashtags
 2020-12-22 05:15:34 +01:00
lain ab633e51ab Linting 2020-12-21 16:48:35 +01:00
lain 5db1e6c8d3 Pipeline test: Switch from Mock to Mox. 
Speeds up the test and makes it possible to run async.
 2020-12-21 16:35:12 +01:00
lain 0ef0aed205 Tests: Add a helper method to reduce sleeping times in test. 
This will 'time travel', i.e. change the inserted_at and update_at
fields of the object in question. This is used to backdate things
were we used sleeping before to ensure time differences.
 2020-12-21 16:31:23 +01:00
lain ba19975838 Linting 2020-12-21 16:22:36 +01:00
lain 9d5ce82221 Test: More async/sync tweaks. 2020-12-21 15:05:56 +01:00
lain 9ba60f70d2 Tests: Make as many tests as possible async. 
In general, tests that match these criteria can be made async:

- Doesn't use real Cachex.
- Doesn't write to the Config / Application Environment.
- Uses Mock. Using Mox is fine.
- Uses the streamer.
 2020-12-21 12:21:40 +01:00
Kaizhe Huang 509f82e4d6 Add test for subscribe_address in JSON WebFinger response 2020-12-19 22:11:47 +11:00
lain 95a9bdfc37 Tests: Use NullCache for async tests. 
Caching can't work in async tests, so for them it is mocked to a
null cache that is always empty. Synchronous tests are stubbed
with the real Cachex, which is emptied after every test.
 2020-12-18 19:53:19 +01:00
lain b4b68b71fc Tests: Remove unneeded explicit cachex use. 
Only use cachex when we're actually testing it.
 2020-12-18 13:18:17 +01:00
Alex Gleason 80891e83d8
Merge remote-tracking branch 'upstream/develop' into registration-workflow 2020-12-17 09:05:36 -06:00
lain 8b8c317c0f Merge branch 'fix/2336-mastoapi-ws-posts-dropping' into 'develop' 
Fix mastoapi ws posts dropping

Closes #2336

See merge request pleroma/pleroma!3198
 2020-12-16 11:35:45 +00:00
lain 6bb4f4e172 Merge branch 'support/2255_posix_errors' into 'develop' 
[#2255] added error messages for posix error code

See merge request pleroma/pleroma!3138
 2020-12-15 15:16:03 +00:00
Alexander Strizhakov cebe3c7def Fix for dropping posts/notifs in WS when mix task is executed 
- start oban in mix tasks with empty queues, plugins and crontab
- fix for update_users_following_followers_counts
- fix for removed logo.png
- typo in resend confirmation emails mix task docs
- fix for uploads mix task (start Majic.Pool)
- fix for creating user mix task (start :fast_html app)
 2020-12-14 11:02:32 -06:00