nocebo/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
14021 commits 3 branches 74 tags 313 MiB
Commit graph

1477 commits

Author SHA1 Message Date
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
79d2d3f609
Merge branch 'develop' into hide-muted-reactions 2020-11-17 18:29:52 +04:00
Mark Felder
b1466661eb Use absolute URLs to thumbnail and background in /api/v1/instance 2020-11-16 21:29:15 +00:00
Egor Kislitsyn
fb41bd1a85 Hide reactions from muted and blocked users 2020-11-16 22:50:14 +04:00
lain
0d149502fe Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into 'develop' 
fixes 2034 Make notifs view work for reports

Closes #2034

See merge request pleroma/pleroma!2912
 2020-11-13 13:35:47 +00:00
Ilja
70e4b86250 Make notifs view work for reports 
* These are the first small steps for issue 2034 "Reports should send a notification to admins".
* I added a new type of notification "pleroma:report" to the the database manually (a migration will need to be written later)
* I added the new type to the notification_controller
* I made the view return the notification. It doesn't include the report itself (yet)
 2020-11-13 13:35:46 +00:00
Mark Felder
2254e5e595 Render blurhashes in Mastodon API 2020-11-11 12:51:13 -06: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
5db4c823b2 Merge branch 'restrict-domain' into 'develop' 
View a remote server's timeline

See merge request pleroma/pleroma!2713
 2020-11-04 14:54:53 +00: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
lain
1cfc3278c0 Poll View: Always return voters_count. 2020-11-04 10:14:00 +01:00
lain
c37118e6f2 Conversations: A few refactors 2020-11-03 13:56:12 +01:00
Alibek Omarov
d63ec02f31 ConversationView: fix formatting 2020-10-30 13:59:53 +01:00
Alibek Omarov
9b93eef715 ConversationView: fix last_status.account being empty, fix current user being included in group conversations 2020-10-30 13:59:53 +01:00
Alibek Omarov
241bd061fc ConversationView: add current user to conversations, according to Mastodon behaviour 2020-10-30 12:58:51 +01:00
Haelwenn
131f3219e6 Merge branch 'issue/2069' into 'develop' 
[#2069] unread_conversation_count

See merge request pleroma/pleroma!2939
 2020-10-29 23:39:15 +00: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
Roman Chvanikov
4987ee6256 Merge branch 'develop' into feature/expire-mutes 2020-09-20 19:27:27 +03:00
Ivan Tashkinov
60b025b782 [#2074] OAuth scope checking in Streaming API. 2020-09-19 19:16:55 +03:00
rinpatch
608017b7df Merge branch 'fix/streaming-termination-errors' into 'develop' 
Fix two pseudo-errors in websocket handler

Closes #2131

See merge request pleroma/pleroma!2982
 2020-09-17 19:50:51 +03:00
Ivan Tashkinov
d9fb5bc08a Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream 2020-09-17 17:14:20 +03:00
Ivan Tashkinov
a781f41f96 [#2497] Media preview proxy: misc. improvements (static param support, dynamic fifo pipe path), refactoring. 2020-09-16 22:30:42 +03:00
Roman Chvanikov
c5830ac037 Merge develop 2020-09-13 12:24:57 +03:00
Alex Gleason
9733c9d065
Merge remote-tracking branch 'upstream/develop' into chat-moderation 2020-09-11 14:13:38 -05:00
Alex Gleason
f88dc1937e
MastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1 2020-09-11 14:09:50 -05:00
Ivan Tashkinov
0bda85857e Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy 
# Conflicts:
#	lib/pleroma/instances/instance.ex
 2020-09-11 17:19:58 +03:00
Mark Felder
55562ca936 Merge branch 'develop' into feature/gen-magic 2020-09-10 16:05:22 -05:00
Alexander Strizhakov
9bf1065a06 schedule activity expiration in Oban 2020-09-10 21:50:40 +03:00
rinpatch
01fa68fe45 Websocket handler: fix never matching code on failed auth 
`:cowboy_req.reply` does not return tuples since 2.0, see
https://ninenines.eu/docs/en/cowboy/2.4/manual/cowboy_req.reply/
 2020-09-10 21:26:52 +03:00
rinpatch
e16e8f9816 Websocket handler: do not raise if handler is terminated before switching protocols 
Closes #2131
 2020-09-10 21:14:23 +03:00
rinpatch
cb06e98da2 websocket handler: Do not log client ping frames as errors 2020-09-10 21:14:23 +03: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
rinpatch
ea4b6c64d6 Merge branch 'feat/rich-media-improvements' into 'develop' 
Rich media improvements

See merge request pleroma/pleroma!2944
 2020-09-08 13:00:49 +03:00
Ivan Tashkinov
60c925380d [#2497] Added support for enforcing output format for media proxy preview, used for avatar_static & header_static (AccountView). 2020-09-03 20:13:29 +03:00
Mark Felder
85446cc30c Merge branch 'develop' into media-preview-proxy 2020-09-03 10:34:06 -05: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
119e11f455 Merge branch 'bugfix/mastoapi-lists' into 'develop' 
Fix removing an account from a list

Closes #2103

See merge request pleroma/pleroma!2940
 2020-09-02 17:03:45 +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
rinpatch
d48fc90978 StatusView: Start fetching rich media cards as soon as possible 2020-09-02 16:45:54 +03: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
rinpatch
126461942b User table: ensure bio is always a string 
Gets rid of '|| ""' in multiple places and fixes #2067
 2020-09-01 10:45:42 +03:00
Maksim Pechnikov
0d5088c2b8 remove unread_conversation_count from User 2020-09-01 09:37:08 +03:00
Mark Felder
3737f38432 Merge branch 'develop' into feld-2168-media-preview-proxy 2020-08-30 11:28:45 -05:00
Mark Felder
67c79394e8 Support static avatars and header images with Mediaproxy Preview 2020-08-27 17:15:23 -05:00
lain
cfc99fe05c TimelineController: Keys are atoms now. 
Closes #2078
Closes #2070
 2020-08-26 15:37:30 +02:00
Mark Felder
479578b148 Merge branch 'develop' into feld-2168-media-preview-proxy 2020-08-25 11:57:23 -05:00
Haelwenn (lanodan) Monnier
36c125a071
Pipeline Ingestion: Event 2020-08-20 21:49:26 +02:00
Ivan Tashkinov
27e7999a15 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy 2020-08-18 18:02:09 +03: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
Ivan Tashkinov
2def3cbf41 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy 
# Conflicts:
#	config/config.exs
#	mix.lock
 2020-08-11 15:13:29 +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
1a5a7ba6e8
Merge remote-tracking branch 'upstream/develop' into aliases 2020-08-07 16:35:15 -05:00
lain
34cbe9f44a Merge branch 'features/poll-validation' into 'develop' 
Poll and votes pipeline ingestion

Closes #1362 and #1852

See merge request pleroma/pleroma!2635
 2020-08-07 10:44:06 +00:00
Ivan Tashkinov
1298a2ea2c Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy 
# Conflicts:
#	mix.lock
 2020-08-07 09:38:05 +03:00
Alex Gleason
cc196e2cd5
Merge remote-tracking branch 'upstream/develop' into restrict-domain 2020-08-05 13:08:31 -05:00
lain
f889400d05 Questions: Move fixes to validators. 2020-08-05 14:51:33 +02:00
lain
70522989d9 Apply 1 suggestion(s) to 1 file(s) 2020-08-05 11:14:58 +00:00
MK Fain
f341a8e142 Update filter_view.ex to return whole_word actual value 2020-08-05 02:01:27 +00:00
lain
878c7f3f30 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation 2020-08-04 15:28:41 +02:00
Haelwenn (lanodan) Monnier
ac2598307d
Merge remote-tracking branch 'pleroma/develop' into features/poll-validation 2020-07-31 13:57:21 +02: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
Alex Gleason
d8a01c9432
Merge remote-tracking branch 'upstream/develop' into hide-reactions 2020-07-29 12:43:39 -05:00
lain
d9bf2c58df Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users-on-registration 2020-07-29 14:42:09 +02: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
Alex Gleason
6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval 2020-07-26 15:46:14 -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
Haelwenn
6100b90209 Merge branch '1976-status-view-fixes' into 'develop' 
StatusView: Handle badly formatted emoji reactions.

Closes #1976

See merge request pleroma/pleroma!2788
 2020-07-23 16:58:36 +00:00
Ivan Tashkinov
9ea51a6de5 [#2791] AccountView: renamed :force option to :skip_visibility_check. 2020-07-23 15:08:30 +03: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
Lain Soykaf
0cb9e1da74 StatusView: Handle badly formatted emoji reactions. 2020-07-22 14:44:06 +02:00
Egor Kislitsyn
bdb3375933
Allow unblocking a domain via query params 2020-07-21 16:06:46 +04:00
Ivan Tashkinov
bdf57b8ef4 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy 
# Conflicts:
#	config/config.exs
#	lib/pleroma/web/media_proxy/media_proxy.ex
#	mix.lock
#	test/web/media_proxy/media_proxy_test.exs
 2020-07-19 20:05:37 +03:00
Alex Gleason
afa8b469ed
Allow restricting public timeline by instance 2020-07-18 19:35:07 -05:00
Alex Gleason
d0eb43b58b
Add account aliases 2020-07-17 16:17:49 -05:00
Mark Felder
20a496d2cb Expose the post formats in /api/v1/instance 2020-07-17 10:45:41 -05:00
Alex Gleason
9ce95fa68f
Use approval_required in /api/v1/instance 2020-07-15 17:04:30 -05:00
Haelwenn (lanodan) Monnier
d29b8997f4
MastoAPI: fix & test giving MRF reject reasons 2020-07-15 15:25:33 +02:00
Haelwenn (lanodan) Monnier
173f69c854
question_validator: fix for mastodon poll expiration 
Mastodon activities do not have a "closed" field, this could be seen on
https://pouet.it/users/lanodan_tmp/statuses/104345126997708380
which runs Mastodon 3.1.4 (SDF runs 3.1.2)
 2020-07-15 11:39:56 +02:00
Haelwenn (lanodan) Monnier
4644a8bd10
Fix multiple-choice poll detection 2020-07-15 11:39:55 +02:00
Alex Gleason
51ab8d0128
Add account_approval_required instance setting 2020-07-12 20:27:58 -05: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
lain
f4469dc741 Merge branch 'features/favicons' into 'develop' 
Add support for remote favicons

See merge request pleroma/pleroma!2261
 2020-07-09 13:09:31 +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
Haelwenn (lanodan) Monnier
312fc55f14
Add [:instances_favicons, :enabled] setting, defaults to false 2020-07-08 06:28:40 +02:00
Haelwenn (lanodan) Monnier
013e2c5057
Use instances table instead of Cachex 2020-07-08 06:28:39 +02:00
Haelwenn (lanodan) Monnier
6a679d80c9
Move get_favicon to Pleroma.Instances, use / 2020-07-08 06:28:39 +02:00
Haelwenn (lanodan) Monnier
f6d09fafee
Add support for remote favicons 2020-07-08 06:28:39 +02: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
lain
cc8b4e48d9 InstanceView: Add chat limit, description limit 2020-07-06 11:12:37 +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
3250228be9 AccountView: Add 'accepts_chat_messages' to view. 2020-07-03 13:07:33 +02:00
Mark Felder
d44ec2bf4c Remove camelCase from the keys 2020-07-02 12:55:08 -05:00
Ivan Tashkinov
61180ab6f4 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy 
# Conflicts:
#	config/config.exs
#	lib/pleroma/web/media_proxy/media_proxy.ex
#	lib/pleroma/web/media_proxy/media_proxy_controller.ex
 2020-07-02 16:36:54 +03:00
Mark Felder
5a8e0208b1 Add fields limits to instance metadata, add tests 2020-06-30 15:25:10 -05:00
Mark Felder
0883a706dc Merge branch 'develop' into activation-meta 2020-06-30 15:09:03 -05: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
lain
577da132da Merge branch '1031-parent-visible' into 'develop' 
Resolve "Add `pleroma.parent_visible` to the status view"

Closes #1031

See merge request pleroma/pleroma!2679
 2020-06-29 08:39:51 +00: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
35f6770436 StatusView: Add pleroma.parent_visible 2020-06-24 13:29:08 +02:00
lain
98af7b59e4 Merge branch 'update-validator' into 'develop' 
Update validator

See merge request pleroma/pleroma!2668
 2020-06-23 18:10:33 +00:00
Haelwenn
c7d69e9256 Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop' 
Moving mrf settings from instance to separate mrf group

Closes #1631

See merge request pleroma/pleroma!2320
 2020-06-23 16:38:27 +00:00
lain
2c603f2009 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator 2020-06-23 10:17:12 +02:00
Mark Felder
df5e048cbb Do not need a function to provide fallback value with default defined in config.exs 2020-06-22 17:39:02 -05:00
lain
46f7e51b27 Merge branch 'add-muted-to-notifications' into 'develop' 
Add `pleroma.is_muted` property to notifications

Closes #1812

See merge request pleroma/pleroma!2670
 2020-06-22 15:40:09 +00:00
Egor Kislitsyn
7e6f43c0d7
Add is_muted to notifications 2020-06-22 19:03:04 +04: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
ac0344dd24
Only accounts with Service actor_type are considered as bots 2020-06-19 21:19:00 +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
Alexander Strizhakov
ed189568f3
moving mrf settings from instance to separate group 2020-06-16 18:32:18 +03:00
href
f124f68205 Switch from gen_magic to majic, use Majic.Plug, remove Pleroma.MIME 2020-06-16 15:27:27 +02:00
lain
b7df7436c8 Conversations: Return last dm for conversation, not last message. 2020-06-15 12:27:13 +02:00
eugenijm
b15cfc3d36 Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page 2020-06-14 18:27:11 +03:00
Egor Kislitsyn
520367d6fd Fix atom leak in Rich Media Parser 2020-06-13 12:08:46 +03: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
lain
ca0e6e702b ChatMessageReference -> Chat.MessageReference 2020-06-06 11:51:10 +02:00
Egor Kislitsyn
b02df1803e
Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys 2020-06-05 23:15:10 +04:00
lain
a8ca030d85 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-06-05 16:53:56 +02:00
Haelwenn
d74985af23 Merge branch 'features/apc2s-pagination' into 'develop' 
Fix AP C2S pagination

Closes #866 and #751

See merge request pleroma/pleroma!2491
 2020-06-05 14:52:09 +00:00
Haelwenn
54bae06b4f Create Pleroma.Maps.put_if_present(map, key, value, value_fun // &{:ok, &1}) 
Unifies all the similar functions to one and simplify some blocks with it.
 2020-06-05 14:48:02 +00:00
Egor Kislitsyn
317e2b8d61
Use atoms as keys in ActivityPub.fetch_* functions options 2020-06-04 21:36:26 +04:00
lain
f3ccd50a33 ChatMessageReferences: Adjust views 2020-06-03 12:49:53 +02:00
feld
6c1c2cddec Merge branch 'fix/1794-hashtag-search-results' into 'develop' 
[#1794] Improvements to hashtags extraction from search query

Closes #1794

See merge request pleroma/pleroma!2611
 2020-06-02 16:30:03 +00:00
lain
37542a9dfa Activity: Remove notifications-related functions. 2020-06-02 14:22:16 +02:00
lain
127ccc4e1c NotificationController: Don't return chat_mentions by default. 2020-06-02 14:05:53 +02:00
lain
805ab86933 Notifications: Make notifications save their type. 2020-06-02 13:24:34 +02:00
lain
8e1db6a835 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-06-02 10:43:13 +02:00
rinpatch
6fb900a496 Merge branch 'user-updates' into 'develop' 
AccountController: Federate user account changes.

Closes pleroma-support#33 and #1801

See merge request pleroma/pleroma!2617
 2020-06-01 20:48:11 +00:00
lain
d4d4b92f75 TimelineController: Only return Create in public timelines. 2020-06-01 13:17:56 +02:00
lain
9460983032 AccountController: Federate user account changes. 
Hotfixy commit, will be moved to the pipeline.
 2020-06-01 13:03:22 +02:00
Alex Gleason
954acdda20
Add account_activation_required to /api/v1/instance 2020-05-31 11:36:49 -05:00
lain
6ff079ca9f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-30 12:31:12 +02:00
lain
b004c427a0 Merge branch 'conversation-pagination' into 'develop' 
Conversation pagination

See merge request pleroma/pleroma!2601
 2020-05-30 10:02:37 +00:00
Steven Fuchs
6d4b80822b Conversation pagination 2020-05-30 10:02:37 +00:00
Ivan Tashkinov
24f40b8a26 [#1794] Fixed search query splitting regex to deal with Unicode. Adjusted a test. 2020-05-30 10:29:08 +03:00
Ivan Tashkinov
c181e555db [#1794] Improvements to hashtags extraction from search query. 2020-05-29 22:03:14 +03:00
Haelwenn (lanodan) Monnier
b3b367b894
Bugfix: Reuse Controller.Helper pagination for APC2S 2020-05-29 16:14:45 +02:00