sam/pleroma
sam/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
15155 commits 2 branches 40 tags 290 MiB
Commit graph

863 commits

Author SHA1 Message Date
Sam Therapy d5da181de0
Merge branch 'develop' of https://akkoma.dev/AkkomaGang/akkoma into froth-akkoma 2023-03-21 15:27:47 +01:00
flisk 0c77be9308 don't crash on malformed avatar and banner values 
weird values in href will cause base64 encoding to fail later down the
line, so let's make sure the value we're passing on is somewhat sane, or
at the very least a binary

this fixes #482
 2023-03-12 18:14:05 +01:00
FloatingGhost b2112302ce Add more information about failed verifications 2023-03-10 03:51:24 +00:00
Sam Therapy 8d299302b6
Merge branch 'develop' of https://akkoma.dev/AkkomaGang/akkoma into froth-akkoma 2023-02-18 15:11:56 +01:00
ilja b71db2f82d create_service_actor is now type Application 
This is used for internal fetch and for relay. Both represent the instance and therefore are an aplication.
 2023-02-04 21:00:21 +00:00
floatingghost aeb68a0ad1 paginate follow requests (#460) 
matches https://docs.joinmastodon.org/methods/follow_requests/#get mostly

Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/460
 2023-02-04 20:51:17 +00:00
Sam Therapy 7d88510d12
Merge branch 'develop' of https://akkoma.dev/AkkomaGang/akkoma into froth-akkoma 2023-01-04 15:40:14 +01:00
floatingghost 9be6caf125 argon2 password hashing (#406) 
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/406
 2022-12-30 02:46:58 +00:00
floatingghost a5e98083f2 Add link verification in profile fields (#405) 
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/405
 2022-12-29 20:56:06 +00:00
Sam Therapy 61fa2b72b2
Merge branch 'develop' of https://akkoma.dev/AkkomaGang/akkoma into froth-akkoma 2022-12-28 23:12:34 +01:00
floatingghost 07a48b9293 giant massive dep upgrade and dialyxir-found error emporium (#371) 
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/371
 2022-12-14 12:38:48 +00:00
Sam Therapy 0cfd42a7d4
Merge develop :) 
Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2022-12-13 23:01:02 +01:00
duponin c9304962c3
Uploading an avatar media exceeding max size returns a 413 
Until now it was returning a 500 because the upload plug were going
through the changeset and ending in the JSON encoder, which raised
because struct has to @derive the encoder.
 2022-12-12 17:28:09 -05:00
FloatingGhost a1515f9a60 Add some extra info around possible nils 2022-12-09 23:45:51 +00:00
floatingghost b77ae236c9
Remerge of hashtag following (#341) 
this time with less idiot

Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/341
 2022-12-09 15:09:48 +01:00
floatingghost b5ed9560c4
revert 4a94c9a31e 
revert Add ability to follow hashtags (#336)

Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/336
 2022-12-09 15:09:48 +01:00
floatingghost b1c8e4aab2
Add ability to follow hashtags (#336) 
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/336
 2022-12-09 15:09:48 +01:00
floatingghost d55de5debf Remerge of hashtag following (#341) 
this time with less idiot

Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/341
 2022-12-05 12:58:48 +00:00
floatingghost ec6bf8c3f7 revert 4a94c9a31e 
revert Add ability to follow hashtags (#336)

Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/336
 2022-12-04 20:04:09 +00:00
floatingghost 4a94c9a31e Add ability to follow hashtags (#336) 
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/336
 2022-12-04 17:36:59 +00:00
floatingghost 8ee97f6989
Add ability to set a default post expiry (#321) 
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/321
 2022-12-02 14:44:06 +01:00
Zero 8bb003a6ca
Bring chat and shoutbox back 2022-11-30 22:17:13 +01:00
floatingghost 0cfd5b4e89 Add ability to set a default post expiry (#321) 
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/321
 2022-11-28 13:34:54 +00:00
floatingghost e1e0d5d759 microblogpub federation fixes (#288) 
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/288
 2022-11-18 11:14:35 +00:00
floatingghost c6e63aaf6b Backend settings sync (#226) 
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/226
 2022-10-06 16:22:15 +00:00
Tusooa Zhu 2aa8e66527 Fix User.get_or_fetch/1 with usernames starting with http 2022-09-11 20:29:05 +01:00
Hélène 0b14f02ed2 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-11 19:54:37 +01:00
floatingghost 92ba2802fb generate-keys-at-registration-time (#181) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/181
 2022-08-24 14:36:33 +00:00
floatingghost 645f0390bc Prepare for ubuntu22 murdering openssl (#120) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/120
 2022-07-27 21:48:13 +00:00
FloatingGhost 516d155558 open up functions in user 2022-07-24 17:56:48 +01:00
floatingghost 4c47992686 bugfix/follow-state (#104) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/104
 2022-07-23 18:58:45 +00:00
FloatingGhost 0f132b802d purge chat and shout endpoints 2022-07-21 11:29:28 +01:00
floatingghost 729f45ccd2 purge ldap authenticator (#92) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/92
 2022-07-20 12:49:13 +00:00
floatingghost dc9f66749c remove all endpoints marked as deprecated (#91) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/91
 2022-07-20 12:00:58 +00:00
sfr 058bf96798 implement Move activities (#45) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/45
Co-authored-by: sfr <sol@solfisher.com>
Co-committed-by: sfr <sol@solfisher.com>
 2022-07-04 16:29:39 +00:00
FloatingGhost 1ecdb19de5 Refactor ES on top of search behaviour 2022-06-30 16:28:31 +01:00
Tusooa Zhu 72bdb0640f Allow user to register with custom language 2022-06-29 20:46:51 +01:00
Tusooa Zhu 7726148472 Send emails i18n'd using backend-stored user language 2022-06-29 20:45:19 +01:00
Ilja a20d2847e2 After code review 
Use patern matching to see if someone was superuser before
 2022-06-29 20:43:41 +01:00
Ilja 1048bc1bb9 Delete report notifs when demoting from superuser 
When someone isn't a superuser any more, they shouldn't see the reporsts any more either.
Here we delete the report notifications from a user when that user gets updated from being a superuser to a non-superuser.
 2022-06-29 20:43:41 +01:00
FloatingGhost 0f6bece60d Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop 2022-01-08 21:45:12 +00:00
FloatingGhost 0d012ebea1 Revert "Merge branch 'remove/mastofe' into 'develop'" 
This reverts commit 6b3842cf50, reversing
changes made to 6b1282a829.
 2022-01-08 21:44:37 +00:00
FloatingGhost 12a171844b Merge remote-tracking branch 'upstream/develop' into develop 2021-12-30 18:05:22 +00:00
marcin mikołajczak de006443f0 MastoAPI: Profile directory 2021-12-26 02:35:17 +00:00
Alex Gleason bd853199d9 Merge branch 'v2-suggestions' into 'develop' 
V2 suggestions

See merge request pleroma/pleroma!3547
 2021-12-19 17:31:17 +00:00
FloatingGhost 703f53c08f Search through users and hashtags as well 2021-12-14 13:55:14 +00:00
Alex Gleason 6c0484d571
AdminAPI: suggest a user through the API 2021-11-26 15:19:01 -06:00
Alex Gleason b17360cd7c
v2 Suggestions: rudimentary API response 2021-11-26 14:34:10 -06:00
Alibek Omarov 04aca335aa nodeinfo: report activeMonth and activeHalfyear users fields 2021-11-15 17:01:30 +01:00
Haelwenn 92a8ff59aa Merge branch 'from/develop/tusooa/add-remove-emails' into 'develop' 
Allow users to remove their emails if instance does not need email to register

See merge request pleroma/pleroma!3522
 2021-10-06 05:44:44 +00:00