sn0w/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
13709 commits 13 branches 64 tags 302 MiB
Commit graph

417 commits

Author SHA1 Message Date
Alex Gleason
cbce880076
Merge remote-tracking branch 'upstream/develop' into aliases 2020-12-30 17:10:02 -06:00
lain
c9d73af74d Cachex: Unify arity of callback function 2020-12-21 12:03:58 +01:00
lain
713612c377 Cachex: Make caching provider switchable at runtime. 
Defaults to Cachex.
 2020-12-18 17:44:46 +01:00
Ivan Tashkinov
f1b07a2b2b OAuth form user remembering feature. Local MastoFE login / logout fixes. 2020-11-28 21:51:06 +03:00
Ivan Tashkinov
12a5981cc3 Session token setting on token exchange. Auth-related refactoring. 2020-11-25 21:47:23 +03:00
Ivan Tashkinov
e164c37139 [#2301] Proper handling of User.is_discoverable: users appear in in-service search but are hidden from external services like search bots. 2020-11-19 19:30:02 +03:00
Egor Kislitsyn
fb41bd1a85 Hide reactions from muted and blocked users 2020-11-16 22:50:14 +04:00
lain
dd2b3a8da9 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes 2020-11-04 16:51:42 +01:00
lain
329aa19c9f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain 2020-11-04 15:05:01 +01:00
Egor Kislitsyn
fa902867c0
Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination 2020-10-29 15:35:42 +04:00
Egor Kislitsyn
76c4e80e5a
Merge branch 'develop' into mutes-blocks-pagination 2020-10-19 15:40:03 +04:00
Ivan Tashkinov
9ea31b373f Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11 2020-10-17 17:53:47 +03:00
Mark Felder
fb056ce05b Merge branch 'develop' into refactor/discoverable_user_field 2020-10-15 16:39:01 -05:00
Alex Gleason
83770b7b39
Merge remote-tracking branch 'upstream/develop' into aliases 2020-10-14 12:33:24 -05:00
feld
2013705690 Merge branch 'feature/gen-magic' into 'develop' 
Use libmagic via majic

Closes #1736

See merge request pleroma/pleroma!2534
 2020-10-14 17:31:45 +00:00
Mark Felder
ed61002815 Undo API breaking changes 2020-10-14 11:03:17 -05:00
Mark Felder
b001237b79 Finish undoing API breakage 2020-10-14 10:44:18 -05:00
Alex Gleason
755f58168b
Merge remote-tracking branch 'upstream/develop' into restrict-domain 2020-10-13 19:26:04 -05:00
Alex Gleason
7d8f610720
Merge remote-tracking branch 'upstream/develop' into aliases 2020-10-13 19:25:18 -05:00
Egor Kislitsyn
6734abcbd4
Add pagination for Mutes 2020-10-13 21:58:18 +04:00
Egor Kislitsyn
33f4f39b1c
Add pagination for Blocks 2020-10-13 21:39:41 +04:00
Mark Felder
b738f70953 Merge branch 'develop' into feature/gen-magic 2020-10-13 10:08:38 -05:00
Mark Felder
64553ebae2 Merge branch 'develop' into chore/elixir-1.11 2020-10-13 09:54:53 -05:00
Mark Felder
409f694e4f Merge branch 'develop' into refactor/locked_user_field 2020-10-13 09:54:29 -05:00
Mark Felder
4ead0d564f Merge branch 'develop' into refactor/discoverable_user_field 2020-10-13 09:54:11 -05:00
Mark Felder
8bacdc3680 Change user.discoverable field to user.is_discoverable 2020-10-13 09:45:08 -05:00
Mark Felder
9968b7efed Change user.locked field to user.is_locked 2020-10-13 09:31:13 -05:00
Alexander Strizhakov
1d0e130cb3
fixes after rebase 2020-10-13 16:44:02 +03:00
Alexander Strizhakov
9f4fe5485b
alias alphabetically order 2020-10-13 16:43:59 +03:00
Alexander Strizhakov
011525a3d1
EnsurePublicOrAuthenticatedPlug module name 2020-10-13 16:43:57 +03:00
Alexander Strizhakov
a6d8cef33e
OAuthScopesPlug module name 2020-10-13 16:43:54 +03:00
Alexander Strizhakov
4b1863ca4e
RateLimiter module name 2020-10-13 16:43:53 +03:00
Mark Felder
04b514c567 Merge branch 'develop' into feature/gen-magic 2020-10-09 11:26:10 -05:00
Alex Gleason
3f9263fb16
Merge remote-tracking branch 'upstream/develop' into restrict-origin 2020-10-08 17:24:09 -05:00
Alex Gleason
77b1ea68a7
Merge remote-tracking branch 'upstream/develop' into aliases 2020-10-08 15:44:48 -05:00
Mark Felder
ed6511a086 Lint 2020-10-07 15:28:29 -05:00
Mark Felder
636c00037d Fix duplicate @doc entries 2020-10-07 09:58:45 -05:00
Roman Chvanikov
8f5589cf66 Merge develop 2020-09-23 13:56:50 +03:00
Alex Gleason
3104367931
Merge remote-tracking branch 'upstream/develop' into email-fix-develop 2020-09-22 13:37:02 -05:00
Alex Gleason
23d5d7cf59
Fix #2172 HTTP error on password reset 2020-09-21 14:09:26 -05:00
Mark Felder
55562ca936 Merge branch 'develop' into feature/gen-magic 2020-09-10 16:05:22 -05:00
Roman Chvanikov
91b9985e1c Pass expires_in param from status controller 2020-09-08 15:26:06 +03:00
feld
43b07c31cb Merge branch 'fix/2095-deactivated-account-reset' into 'develop' 
Disallow password resets for deactivated accounts

Closes #2095

See merge request pleroma/pleroma!2935
 2020-09-08 13:53:47 +03:00
Roman Chvanikov
c56e3d4f3b Add expires_in param for account mutes 2020-09-08 13:26:44 +03:00
feld
d1a6f67b1d Merge branch 'fix/2095-deactivated-account-reset' into 'develop' 
Disallow password resets for deactivated accounts

Closes #2095

See merge request pleroma/pleroma!2935
 2020-09-02 17:11:24 +00:00
lain
581f382e71 ListController: DRY up stuff. 2020-09-02 18:32:00 +02:00
Mark Felder
cbf7f0e029 Disallow password resets for deactivated accounts. 
Ensure all responses to password reset events are identical.
 2020-09-02 09:09:13 -05:00
Haelwenn (lanodan) Monnier
d872858046
Fix removing an account from a list 
Mastodon (Frontend) changed a different method for deletes,
keeping old format as mastodon documentation is too loose
 2020-09-01 12:49:32 +02:00
lain
cfc99fe05c TimelineController: Keys are atoms now. 
Closes #2078
Closes #2070
 2020-08-26 15:37:30 +02:00
Ivan Tashkinov
95529ab709 [#2046] Defaulted pleroma/restrict_unauthenticated basing on instance privacy setting (i.e. restrict on private instances only by default). 2020-08-14 20:55:45 +03:00
lain
66122a11b5 AccountController: Build the correct update activity. 
Will fix federation issues.
 2020-08-10 10:33:05 +02:00
Alex Gleason
4af1b80381
Clean up account aliases 2020-08-07 17:37:15 -05:00
Alex Gleason
cc196e2cd5
Merge remote-tracking branch 'upstream/develop' into restrict-domain 2020-08-05 13:08:31 -05:00
Ivan Tashkinov
27b0a8b155 [#1985] Prevented force login on registration if account approval and/or email confirmation needed. 
Refactored login code in OAuthController, reused in AccountController. Added tests.
 2020-07-31 14:13:38 +03:00
Haelwenn
87fe31fb5c Merge branch '1993-confirm-users-on-registration' into 'develop' 
AccountController: Don't explicitly ask to keep users unconfirmed.

Closes #1993

See merge request pleroma/pleroma!2809
 2020-07-30 20:01:04 +00:00
lain
c25c21dd22 AccountController: Don't explicitly ask to keep users unconfirmed. 
Confirmation is set in User.register_changeset based on the config
settings.
 2020-07-29 11:47:03 +02:00
Alex Gleason
3b7c454418
Let favourites and emoji reactions optionally be hidden 2020-07-28 14:58:30 -05:00
feld
51627a10e5 Merge branch 'unblock-domain-via-query' into 'develop' 
Allow unblocking a domain via query params

Closes #1971

See merge request pleroma/pleroma!2783
 2020-07-23 20:06:11 +00:00
Mark Felder
4bfad0b483 Support blocking via query parameters as well and document the change. 2020-07-23 12:59:40 -05:00
Ivan Tashkinov
6f5f7af607 [#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated. 
Made `Pleroma.Web.MastodonAPI.AccountView.render("show.json", _)` demand :for or :force option in order to prevent incorrect rendering of empty map instead of expected user representation with truish :restrict_unauthenticated setting.
 2020-07-22 19:06:00 +03:00
Egor Kislitsyn
bdb3375933
Allow unblocking a domain via query params 2020-07-21 16:06:46 +04:00
Alex Gleason
afa8b469ed
Allow restricting public timeline by instance 2020-07-18 19:35:07 -05:00
Haelwenn (lanodan) Monnier
d29b8997f4
MastoAPI: fix & test giving MRF reject reasons 2020-07-15 15:25:33 +02:00
lain
b39eb6ecc5 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information 2020-07-10 12:26:53 +02:00
lain
8ca1f3e8c6 Merge branch '1723-token-fixes' into 'develop' 
AccountController: Return scope in proper format.

Closes #1723

See merge request pleroma/pleroma!2694
 2020-07-09 13:10:05 +00:00
Haelwenn
bdc7b60610 Merge branch '1925-muting-reblogs' into 'develop' 
AccountController: Fix muting / unmuting reblogs.

Closes #1925

See merge request pleroma/pleroma!2732
 2020-07-09 12:10:26 +00:00
lain
6d688f14fa Merge branch 'bugfix/status-deletion' into 'develop' 
#1920 fix activity deletion

See merge request pleroma/pleroma!2721
 2020-07-09 09:37:52 +00:00
lain
6335b32aa8 Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop' 
[#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting

Closes #1895

See merge request pleroma/pleroma!2731
 2020-07-08 10:55:03 +00:00
Ivan Tashkinov
a6495f4a68 [#1895] credo fix. 2020-07-08 12:54:23 +03:00
lain
c0385cf47a AccountController: Fix muting / unmuting reblogs. 2020-07-08 11:52:29 +02:00
Ivan Tashkinov
3f8370a285 [#1895] Applied code review suggestion. 2020-07-08 12:36:44 +03:00
Ivan Tashkinov
3e08e77151 [#1895] Made hashtag timeline respect :restrict_unauthenticated instance setting. 2020-07-07 20:37:11 +03:00
lain
59cf78e412 AccountController: Allow removal / reset of user images. 2020-07-07 16:53:03 +02:00
lain
74b88c0a8b Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information 2020-07-06 11:27:06 +02:00
Roman Chvanikov
fc1f34b851 Delete activity before sending response to client 2020-07-06 00:01:25 +03:00
lain
c2a052a346 Merge branch 'features/mastoapi-2.9.0-status_text' into 'develop' 
MastoAPI 2.9.0: status text on deletion

See merge request pleroma/pleroma!2690
 2020-07-03 15:06:33 +00:00
lain
d3efb50262 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text 2020-07-03 16:44:31 +02:00
lain
945e75c8e8 SearchController: Trim query. 2020-07-03 16:36:55 +02:00
lain
e3b5559780 AccountController: Make setting accepts_chat_messages possible. 2020-07-03 15:54:25 +02:00
lain
59540131c1 Credo fixes. 2020-06-29 14:09:03 +02:00
lain
e374872fe7 AccountOperation: Correctly describe create response. 2020-06-29 13:49:48 +02:00
Haelwenn (lanodan) Monnier
244655e884
MastoAPI: Show source field when deleting 2020-06-26 19:52:20 +02:00
lain
f378e93bf4 AccountController: Return scope in proper format. 2020-06-26 16:15:27 +02:00
lain
8cfb58a8c0 AccountController: Extract blocking to CommonAPI. 2020-06-25 11:44:04 +02:00
lain
2c603f2009 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator 2020-06-23 10:17:12 +02:00
lain
59bdef0c33 Merge branch 'feature/1739-account-endpoints' into 'develop' 
account visibility in masto api

Closes #1739

See merge request pleroma/pleroma!2488
 2020-06-22 12:37:10 +00:00
lain
b05f795326 Credo fixes 2020-06-22 14:02:29 +02:00
lain
e785cd5cae ActivityPub: Remove update and switch to pipeline. 2020-06-22 13:59:45 +02:00
Sergey Suprunenko
b63646169d
Add support for bot field in update_credentials 2020-06-19 21:18:07 +02:00
Ivan Tashkinov
5237a2df9f [#1873] Fixes missing :offset pagination param support. Added pagination support for hashtags search. 2020-06-19 16:14:06 +03:00
rinpatch
4ec2fb967e Merge branch 'features/users-raw_bio' into 'develop' 
User: Add raw_bio, storing unformatted bio

See merge request pleroma/pleroma!2326
 2020-06-17 10:34:23 +00:00
href
39f7fc5b8e Update majic & call plug before OpenApiSpex 2020-06-16 19:00:54 +02:00
href
f124f68205 Switch from gen_magic to majic, use Majic.Plug, remove Pleroma.MIME 2020-06-16 15:27:27 +02:00
Haelwenn
4115701f71 Merge branch 'recipients-experiments' into 'develop' 
ActivityPub: Don't show announces of your own objects in timeline.

See merge request pleroma/pleroma!2637
 2020-06-12 16:57:13 +00:00
Ivan Tashkinov
2188097066 [#1794] Fixes URI query handling for hashtags extraction in search. 2020-06-12 14:25:41 +03:00
Ivan Tashkinov
b28cec4271 [#1794] Fixes URI query handling for hashtags extraction in search. 2020-06-11 16:05:14 +03:00
lain
9e411372d0 ActivityPub: Don't show announces of your own objects in timeline. 2020-06-10 12:10:09 +02:00
lain
3b5282bef2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-06-08 11:19:18 +02:00
lain
7d66dd180a Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-06-08 10:18:10 +02:00
Haelwenn (lanodan) Monnier
e1b07402ab
User: Add raw_bio, storing unformatted bio 
Related: https://git.pleroma.social/pleroma/pleroma/issues/1643
 2020-06-06 16:23:16 +02:00