7024 Commits

Author	SHA1	Message	Date
lain	0efa8aa0b9	Transmogrifier: For follows, create notifications last. ... As the notification type changes depending on the follow state, the notification should not be created and streamed out before the state settles. For this reason, the notification creation has been delayed until it's clear if the user has been followed or not. This is a bit hacky but it will be properly rewritten using the pipeline soon.	2020-06-05 12:26:07 +02:00
lain	cc8a7dc205	SideEffects / ChatView: Add an unread cache. ... This is to prevent wrong values in the stream.	2020-06-05 12:01:33 +02:00
lain	aa2ac76510	Notification: Don't break on figuring out the type of old EmojiReactions	2020-06-04 20:40:46 +02:00
lain	d44da91bbf	SubscriptionOperation: Let chat mentions through.	2020-06-04 20:28:33 +02:00
Egor Kislitsyn	317e2b8d61	Use atoms as keys in ActivityPub.fetch_* functions options	2020-06-04 21:36:26 +04:00
lain	56dfa0e0fb	Transmogrifier: Update notification after accepting.	2020-06-04 19:22:49 +02:00
lain	00748e9650	ChatMessageReferences: Change seen -> unread	2020-06-04 17:14:42 +02:00
minibikini	b57e4ad1ab	Merge branch 'develop' into 'openapi/admin/relay' ... # Conflicts: # lib/pleroma/web/admin_api/controllers/admin_api_controller.ex	2020-06-04 13:29:32 +00:00
lain	b952f3f379	WebPush: Push out chat message notications.	2020-06-04 14:49:10 +02:00
Egor Kislitsyn	70f054b083	Merge branch 'develop' into openapi/admin/relay	2020-06-04 13:30:14 +04:00
Egor Kislitsyn	b4d5bdd6f1	Merge branch 'develop' into openapi/admin/config	2020-06-04 13:28:00 +04:00
stwf	5677b21e82	clean up	2020-06-03 17:24:35 -04:00
stwf	3b8180d7d1	add status_net/config	2020-06-03 16:34:03 -04:00
stwf	dbcc1b105e	encode data properly	2020-06-03 16:34:03 -04:00
stwf	29ae5bb771	preload data into index.html	2020-06-03 16:34:03 -04:00
lain	e46aecda55	Notification: Fix notifications backfill for compacted activities	2020-06-03 20:51:59 +02:00
lain	b3407344d3	ChatController: Add function to mark single message as read.	2020-06-03 19:21:23 +02:00
lain	c020fd4352	ChatMessageReferenceView: Return read status as unread.	2020-06-03 18:58:58 +02:00
Egor Kislitsyn	c16315d055	Add OpenAPI spec for AdminAPI.ReportController	2020-06-03 19:17:05 +04:00
Egor Kislitsyn	9d572f2f66	Move report actions to AdminAPI.ReportController	2020-06-03 19:17:04 +04:00
lain	fb4ae9c720	Streamer, SideEffects: Stream out ChatMessageReferences ... Saves us a few calles to fetch things from the DB that we already have.	2020-06-03 16:45:04 +02:00
Haelwenn	18b050dfd1	Merge branch 'openapi/update-admin-api/status' into 'develop' ... Update OpenAPI spec for AdminAPI.StatusController See merge request pleroma/pleroma!2624	2020-06-03 14:04:12 +00:00
lain	903955b189	FollowingRelationship: Remove meaningless change	2020-06-03 14:40:44 +02:00
lain	7f5c5b11a5	Chats: Remove unread from the db, calculate from unseen messages.	2020-06-03 14:26:50 +02:00
lain	73127cff75	Credo fixes.	2020-06-03 13:17:29 +02:00
lain	2591745fc2	ChatMessageReferences: Move tests	2020-06-03 12:56:39 +02:00
Egor Kislitsyn	8a43611e01	Use AdminAPI.StatusView in api/admin/users	2020-06-03 14:53:46 +04:00
lain	f3ccd50a33	ChatMessageReferences: Adjust views	2020-06-03 12:49:53 +02:00
lain	aa22fce8f4	ChatMessageReference: Introduce and switch in chat controller.	2020-06-03 12:30:12 +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
Egor Kislitsyn	7922e63825	Update OpenAPI spec for AdminAPI.StatusController	2020-06-02 19:08:09 +04:00
Egor Kislitsyn	68cb152a08	Merge branch 'develop' into openapi/admin/relay	2020-06-02 18:50:37 +04:00
lain	879304dcd9	Merge branch 'replies-domain-block' into 'develop' ... Replies domain block Closes #1650 See merge request pleroma/pleroma!2622	2020-06-02 14:14:23 +00:00
lain	5da38c15cd	Merge branch 'openapi/admin/oauth-apps' into 'develop' ... Add OpenAPI spec for AdminAPI.OAuthAppContoller See merge request pleroma/pleroma!2582	2020-06-02 14:13:24 +00:00
lain	6977500ef7	Merge branch 'tagline' into 'develop' ... Update default instance description See merge request pleroma/pleroma!2600	2020-06-02 14:10:53 +00:00
lain	022d975a39	Merge branch 'openapi/admin/invites' into 'develop' ... Add OpenAPI spec for AdminAPI.InviteController See merge request pleroma/pleroma!2585	2020-06-02 14:10:21 +00:00
lain	2860c66e88	Merge branch 'feature/embeddable-posts' into 'develop' ... Add embeddable posts Closes #1288 See merge request pleroma/pleroma!2319	2020-06-02 14:04:34 +00:00
lain	2c6ebe709a	Credo fixes	2020-06-02 15:14:52 +02:00
lain	6cd2fa2a4c	Migrations: Add a migration to backfill notification types.	2020-06-02 15:13:19 +02:00
lain	38dce485c4	Notification: Add function to backfill notification types	2020-06-02 14:50:10 +02:00
lain	904295d53b	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-06-02 14:28:01 +02: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	cd2abcc0e3	Merge branch 'fix/invisible-repeats' into 'develop' ... Do not include activities of invisible users unless explicitly requested Closes #1833 See merge request pleroma/pleroma!2620	2020-06-02 11:32:03 +00:00
lain	805ab86933	Notifications: Make notifications save their type.	2020-06-02 13:24:34 +02:00
rinpatch	165a4b2a69	Do not include activities of invisible users unless explicitly requested ... Closes #1833	2020-06-02 13:34:12 +03:00
lain	d111eae798	Merge branch 'feature/status-by-id-account-view' into 'develop' ... another view for account in admin-fe status_show Closes #1783 See merge request pleroma/pleroma!2543	2020-06-02 08:49:24 +00:00
lain	8e1db6a835	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-06-02 10:43:13 +02:00
Alexander Strizhakov	19f468c5bc	replies filtering for blocked domains	2020-06-02 09:00:10 +03: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
Alexander Strizhakov	7e6ec778d9	exclude replies on blocked domains	2020-06-01 21:17:32 +03:00
Egor Kislitsyn	6b84c62d4a	Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts	2020-06-01 17:38:57 +04:00
lain	af9090238e	CommonAPI: Newlines -> br for chat messages.	2020-06-01 15:14:22 +02:00
Egor Kislitsyn	a7627bdc7a	Merge remote-tracking branch 'origin/develop' into global-status-expiration	2020-06-01 15:48:51 +04:00
lain	8ff3425828	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-06-01 13:34:13 +02: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
Haelwenn	e96765df6b	Merge branch 'chore/bump-hackney' into 'develop' ... mix.lock: update hackney to 1.16.0 Closes #1612 See merge request pleroma/pleroma!2614	2020-05-30 15:51:19 +00:00
rinpatch	0cb7b0ea84	hackney adapter helper: support tlsv1.3 and remove custom opts ... - partitial_chain is no longer exported, but it seems to be the default anyway. - The bug that caused sni to not be sent automatically seems to be fixed - https://github.com/benoitc/hackney/issues/612	2020-05-30 15:36:55 +03: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	8bdf18d7c1	CommonAPI: Linkify chat messages.	2020-05-30 12:30:31 +02:00
lain	2c9465cc51	SafeText: Let through basic html.	2020-05-30 12:17:18 +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	78c80a261a	Merge remote-tracking branch 'remotes/origin/develop' into fix/1794-hashtag-search-results	2020-05-30 08:51:38 +03:00
rinpatch	d23b3701d8	Merge branch 'bugfix/csp-unproxied' into 'develop' ... http_security_plug.ex: Fix non-proxied media See merge request pleroma/pleroma!2610	2020-05-29 21:23:49 +00:00
rinpatch	109af93227	Apply suggestion to lib/pleroma/plugs/http_security_plug.ex	2020-05-29 21:15:07 +00:00
rinpatch	660d49227b	Merge branch 'connect-src' into 'develop' ... Add blob: to connect-src CSP, fixes #1827 Closes #1827 See merge request pleroma/pleroma!2608	2020-05-29 19:26:54 +00:00
Ivan Tashkinov	c181e555db	[#1794] Improvements to hashtags extraction from search query.	2020-05-29 22:03:14 +03:00
Alex Gleason	d38f28870e	Add blob: to connect-src CSP	2020-05-29 11:08:17 -05:00
lain	219d2b3146	Merge branch 'fix-streaming' into 'develop' ... Fix argument error in streamer See merge request pleroma/pleroma!2609	2020-05-29 15:42:43 +00:00
feld	81db758e8e	Merge branch 'mix/database-vacuum-options' into 'develop' ... Database vacuum mix task See merge request pleroma/pleroma!2599	2020-05-29 15:33:35 +00:00
kPherox	de0e262839	Fix argument error in streamer ... `Repo.exists` can't use `nil` as it is unsafe. Use parent object instead of activity because currently Announce activity's context is null.	2020-05-30 00:31:18 +09:00
Haelwenn (lanodan) Monnier	da1e31fae3	http_security_plug.ex: Fix non-proxied media	2020-05-29 17:20:09 +02:00
Haelwenn (lanodan) Monnier	a43b435c0a	AP C2S: allow limit & order on outbox & read_inbox	2020-05-29 16:14:45 +02:00
Haelwenn (lanodan) Monnier	2c18830d0d	Bugfix: router: allow basic_auth for outbox	2020-05-29 16:14:45 +02:00
Haelwenn (lanodan) Monnier	b3b367b894	Bugfix: Reuse Controller.Helper pagination for APC2S	2020-05-29 16:14:45 +02:00
lain	3898dd69a6	SideEffects: Ensure a chat is present before streaming something out.	2020-05-29 16:05:02 +02:00
lain	767ce8b803	StreamerView: Actually send Chats, not ChatMessages.	2020-05-29 16:02:45 +02:00
lain	863c02b25d	SideEffects: Stream out chat messages.	2020-05-29 15:44:03 +02:00
lain	c86a88edec	Streamer: Add a chat message stream.	2020-05-29 15:24:41 +02:00
lain	9848978109	Merge branch 'fix-relay-repeat-notification' into 'develop' ... Fix relay repeat notification See merge request pleroma/pleroma!2590	2020-05-29 10:42:49 +00:00
lain	af6d01ec93	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-05-29 12:36:17 +02:00
kPherox	228ff3760e	Use User.is_internal_user? instead	2020-05-29 19:07:05 +09:00
kPherox	9df5b1e6ae	Don't make relay announce notification	2020-05-29 19:06:38 +09:00
rinpatch	396bc69aee	Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop' ... Fix profile emojis bypassing mediaproxy and harden CSP Closes #1810 See merge request pleroma/pleroma!2596	2020-05-29 09:46:31 +00:00
rinpatch	27180611df	HTTP Security plug: make starting csp string generation more readable	2020-05-29 12:32:48 +03:00
Egor Kislitsyn	06f20e9181	Add OpenApi spec to AdminAPI.ConfigController	2020-05-28 23:11:12 +04:00
Egor Kislitsyn	d1ee3527ef	Move config actions to AdminAPI.ConfigController	2020-05-28 22:23:15 +04:00
lain	1d30608e20	Merge branch 'fix/1557-gets-local-pack' into 'develop' ... get-packs for local generated pack Closes #1557 See merge request pleroma/pleroma!2604	2020-05-28 17:08:30 +00:00
lain	f6ddf0cc50	Merge branch 'feature/1792-update-actor-type' into 'develop' ... Validate actor type See merge request pleroma/pleroma!2593	2020-05-28 16:58:28 +00:00
Alex Gleason	d4a18d44fe	Update default instance description	2020-05-28 11:56:30 -05:00
Alexander Strizhakov	ae05792d2a	get-packs for local generated pack	2020-05-28 19:41:34 +03:00
Mark Felder	9eea800026	Refactor notification settings	2020-05-28 10:16:09 -05:00
Mark Felder	92fba24c74	Alpha sort	2020-05-27 17:17:06 -05:00
Mark Felder	30f96b19c1	Abstract out the database maintenance. I'd like to use this from AdminFE too.	2020-05-27 16:40:51 -05:00
Mark Felder	0d57e06626	Make clearer that this is time and resource consuming	2020-05-27 16:31:37 -05:00
Mark Felder	73ca57e4f1	Make it obvious a full vacuum can take a while	2020-05-27 16:27:29 -05:00
Mark Felder	a2f57bd82b	Permit easy access to vaccum full and analyze via a mix task	2020-05-27 16:27:07 -05:00
Mark Felder	95f6240889	Fix minor spelling error	2020-05-27 14:34:37 -05:00
rinpatch	29ff6d414b	HTTP security plug: Harden img-src and media-src when MediaProxy is enabled	2020-05-27 21:41:19 +03:00
rinpatch	455a402c8a	HTTP Security plug: rewrite &csp_string/0 ... - Directives are now separated with ";" instead of " ;", according to https://www.w3.org/TR/CSP2/#policy-parsing the space is optional - Use an IO list, which at the end gets converted to a binary as opposed to ++ing a bunch of arrays with binaries together and joining them to a string. I doubt it gives any significant real world advantage, but the code is cleaner and now I can sleep at night. - The static part of csp is pre-joined to a single binary at compile time. Same reasoning as the last point.	2020-05-27 21:31:47 +03:00
rinpatch	8f6d428880	AccountView: Use mediaproxy URLs for emojis ... Also use atom keys in emoji maps instead of binaries Closes #1810	2020-05-27 19:44:02 +03:00
kPherox	48fd9be65a	Exclude post actor from to of relay announce	2020-05-27 23:51:15 +09:00
rinpatch	d35be02e70	Merge branch 'refactor-add-mention-step-one' into 'develop' ... Fix ObjectView calling into strange functions Closes #1807 See merge request pleroma/pleroma!2580	2020-05-27 14:17:12 +00:00
rinpatch	91f73a7592	Merge branch 'notification-fixes' into 'develop' ... Notification performance fixes See merge request pleroma/pleroma!2595	2020-05-27 13:45:14 +00:00
Alexander Strizhakov	047a11c48f	Apply suggestion to lib/pleroma/web/admin_api/controllers/admin_api_controller.ex	2020-05-27 10:55:42 +00:00
Egor Kislitsyn	c6290be682	Fix typo	2020-05-27 14:42:21 +04:00
lain	b8e029b5ea	Notification: Actually preload objects.	2020-05-27 12:41:06 +02:00
lain	b9e2678b9e	Merge branch 'fav-speedup' into 'develop' ... ActivityPub: Change ordering to `nulls last` in favorites query See merge request pleroma/pleroma!2594	2020-05-27 08:02:00 +00:00
lain	7e13200869	ActivityPub: Change ordering to nulls last in favorites query ... This makes it use our existing index and speeds up the query.	2020-05-27 09:46:12 +02:00
Alexander Strizhakov	3249141588	validate actor type	2020-05-27 10:14:22 +03:00
rinpatch	cf139b06a3	Merge branch 'fav-speedup' into 'develop' ... Fix favorites query performance See merge request pleroma/pleroma!2591	2020-05-26 16:33:13 +00:00
rinpatch	3601c0015c	Merge branch '1808-pleroma-sucks' into 'develop' ... Resolve "Don't fail message ingestions when we can't update a user" Closes #1808 See merge request pleroma/pleroma!2576	2020-05-26 15:57:01 +00:00
rinpatch	ed08da9135	Merge branch '1813-throttling' into 'develop' ... Mastodon API Controllers: Use the correct params for rate limiting. Closes #1813 See merge request pleroma/pleroma!2586	2020-05-26 15:55:09 +00:00
lain	d8d99fd4cf	Activity.Queries: Use correct actor restriction.	2020-05-26 17:46:16 +02:00
Egor Kislitsyn	2069ec5006	Fix Oban warnings	2020-05-26 16:11:42 +04:00
lain	51bc6674f6	Mastodon API Controllers: Use the correct params for rate limiting.	2020-05-26 13:45:54 +02:00
Egor Kislitsyn	fca48154a2	Add AdminAPI.InviteView	2020-05-26 15:21:33 +04:00
Egor Kislitsyn	2a4f965191	Add OpenAPI spec for AdminAPI.InviteTokenController	2020-05-26 15:03:07 +04:00
Egor Kislitsyn	95ebfb9190	Move invite actions to AdminAPI.InviteTokenController	2020-05-26 15:03:07 +04:00
Alexander Strizhakov	8f08384d80	another view for account in admin-fe status_show	2020-05-26 13:48:39 +03:00
Ivan Tashkinov	d7a57004ef	[#1501] Made user feed contain public and unlisted activities.	2020-05-25 23:27:47 +03:00
Egor Kislitsyn	0ba1f2631a	Add OpenAPI spec for AdminAPI.OAuthAppContoller	2020-05-25 22:04:06 +04:00
lain	dbd07d29a3	Streamer: Don't crash on streaming chat notifications	2020-05-25 17:27:45 +02:00
lain	6bd7070b00	Transmogrifier: Use a simpler way to get mentions.	2020-05-25 15:08:43 +02:00
lain	5fef405208	User: Change signature of get_users_from_set	2020-05-25 15:06:35 +02:00
Egor Kislitsyn	cbcd592300	Add OpenAPI spec for AdminAPI.RelayController	2020-05-25 16:51:16 +04:00
lain	f20dff451e	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1808-pleroma-sucks	2020-05-25 14:01:16 +02:00
lain	ee35bb5ac2	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-05-25 13:57:27 +02:00
lain	ec470c4c77	Merge branch 'openapi/admin/status' into 'develop' ... Add OpenAPI spec for AdminAPI.StatusController See merge request pleroma/pleroma!2566	2020-05-25 11:40:54 +00:00
lain	d0c26956da	User: Don't error out if we want to refresh a user but can't	2020-05-25 12:46:14 +02:00
rinpatch	7bc2ec0aa2	Merge branch 'mastodon-migration-compat' into 'develop' ... Add compatibility routes for converted mastodon instances Closes #1797 See merge request pleroma/pleroma!2572	2020-05-24 19:05:57 +00:00
lain	ddbbefeb2e	Merge branch 'feature/configure-filename-truncate' into 'develop' ... Configurable filename truncation threshold Closes #1799 See merge request pleroma/pleroma!2573	2020-05-22 16:05:35 +00:00
Roman Chvanikov	5d60b25e69	Apply suggestion to lib/pleroma/web/common_api/utils.ex	2020-05-22 15:44:10 +00:00
Roman Chvanikov	cc82229ba7	Add filename_display_max_length config	2020-05-22 18:19:25 +03:00
lain	91c8467582	OStatusController: Add Mastodon activity compat route.	2020-05-22 17:11:59 +02:00
lain	355aa3bdc7	ActivityPubController: Add Mastodon activity compat route.	2020-05-22 17:06:12 +02:00
lain	8a4bd9e5d1	OStatusController: Add Mastodon compatibility route for objects.	2020-05-22 16:47:22 +02:00
rinpatch	1fa7aa9fc5	Merge branch 'emoji-react-better-errors' into 'develop' ... EmojiReactionController: Return more appropriate error. See merge request pleroma/pleroma!2569	2020-05-22 14:36:08 +00:00
Egor Kislitsyn	ba106aa9c8	Fix notifications mark as read API	2020-05-22 18:15:36 +04:00
lain	ca755f9a73	ActivityPubController: Add Mastodon compatibility route.	2020-05-22 16:15:29 +02:00
lain	bcb549531f	EmojiReactionController: Return more appropriate error.	2020-05-22 14:38:28 +02:00
Haelwenn	7b02bfca51	Merge branch 'announce-validator' into 'develop' ... Announce validator See merge request pleroma/pleroma!2567	2020-05-22 05:47:53 +00:00
Haelwenn	a57e7f3503	Merge branch '1113-op-mentioning' into 'develop' ... CommonAPI: Change public->private implicit addressing. Closes #1113 See merge request pleroma/pleroma!2563	2020-05-22 05:22:07 +00:00
lain	e0d1a942a6	Merge branch 'issue/1707' into 'develop' ... [#1707] fixed `mix pleroma.instance gen` See merge request pleroma/pleroma!2565	2020-05-21 14:32:49 +00:00
lain	ab1154e13f	Merge branch 'admin-logo-upload' into 'develop' ... Ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image See merge request pleroma/pleroma!2388	2020-05-21 14:30:34 +00:00
lain	578ed3a37f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-05-21 15:35:13 +02:00
lain	a42a0716ec	Merge branch 'features/emoji_stealer' into 'develop' ... MRF.StealEmojiPolicy: New Policy See merge request pleroma/pleroma!2385	2020-05-21 13:31:49 +00:00
lain	f166316f50	Merge branch 'openapi/pleroma-api/pleroma' into 'develop' ... Add OpenAPI spec for PleromaAPI.PleromaAPIController See merge request pleroma/pleroma!2564	2020-05-21 13:30:09 +00:00
lain	283fb1e05b	Merge branch 'issue/749' into 'develop' ... [#749] unsubscribes of friends when user deactivated See merge request pleroma/pleroma!2513	2020-05-21 13:27:44 +00:00
Egor Kislitsyn	45d2c4157f	Add OpenAPI spec for AdminAPI.StatusController	2020-05-21 17:23:12 +04:00
lain	cc0d462e91	Attachments: Have the mediaType on the root, too.	2020-05-21 15:08:56 +02:00
lain	814c3e5171	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-05-21 15:00:05 +02:00
lain	cdc6ba8d7b	AnnounceValidator: Check for announcability	2020-05-21 13:58:18 +02:00
lain	c76267afb9	Credo fixes.	2020-05-21 13:31:52 +02:00
lain	23e248694d	Announcements: Fix all tests.	2020-05-21 13:16:21 +02:00
lain	d9d425708e	SideEffects: Builed out Announce effects.	2020-05-21 12:43:09 +02:00
Egor Kislitsyn	9de9760aa6	Move status actions to AdminAPI.StatusController	2020-05-21 13:52:30 +04:00
Maksim Pechnikov	9bc5e18ade	rename mix task: pleroma.user unsubscribe -> pleroma.user deactivate	2020-05-21 08:06:57 +03:00
eugenijm	b7fc61e17b	Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE	2020-05-21 04:41:42 +03:00
Maksim Pechnikov	c96f425cb0	fixed mix pleroma.instance gen	2020-05-20 21:30:41 +03:00
lain	39031f4860	Pipeline: Don't federate if federation is disabled.	2020-05-20 16:36:55 +02:00
lain	e42bc5f557	Announcements: Handle through common pipeline.	2020-05-20 15:44:37 +02:00
lain	265746b21f	Merge branch 'openapi/pleroma-api/emojis' into 'develop' ... Add OpenAPI spec for EmojiPackController See merge request pleroma/pleroma!2549	2020-05-20 12:08:28 +00:00
lain	c7cdc553ff	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into announce-validator	2020-05-20 14:02:40 +02:00
lain	423ea497bb	Merge branch 'feature/1734-user-deletion' into 'develop' ... User deletion Closes #1734 See merge request pleroma/pleroma!2493	2020-05-20 11:43:49 +00:00
lain	eb5f428565	CommonAPI: Change public->private implicit addressing. ... This will not add the OP to the `to` field anymore when going from public to private.	2020-05-20 13:38:47 +02:00
Egor Kislitsyn	26f01744bc	Add background_image to InstanceOperation	2020-05-20 15:18:58 +04:00
Egor Kislitsyn	5ba6e1c322	Move notification actions to PleromaAPI.NotificationController	2020-05-20 15:15:13 +04:00
Egor Kislitsyn	f3fc8b22b1	Move conversation actions to PleromaAPI.ConversationController	2020-05-20 15:15:13 +04:00
Egor Kislitsyn	9a5de0f454	Move reaction actions to EmojiReactionController	2020-05-20 15:15:13 +04:00
Egor Kislitsyn	490a3a34b6	Add OpenAPI spec for PleromaAPI.PleromaAPIController	2020-05-20 15:15:13 +04:00
Haelwenn	94ba5a7802	Merge branch 'exposed-background-image' into 'develop' ... InstanceView: Expose background image link. See merge request pleroma/pleroma!2545	2020-05-20 10:53:54 +00:00
lain	6dd1575c64	Merge branch 'issue/1509' into 'develop' ... [#1509] purge media from cache after delete See merge request pleroma/pleroma!2539	2020-05-20 10:35:36 +00:00
lain	8a6ddf26ac	InstanceOperation: Add background image to example	2020-05-20 12:12:07 +02:00
Haelwenn	5a149e5788	Merge branch 'openapi/pleroma-api/scrobble' into 'develop' ... Add OpenAPI spec for PleromaAPI.ScrobbleController See merge request pleroma/pleroma!2559	2020-05-20 04:00:46 +00:00
Egor Kislitsyn	47ed9ee441	Fix summary	2020-05-19 17:29:58 +04:00
lain	be322541c8	User.Query: Remove superfluous distinct	2020-05-19 14:36:34 +02:00
Egor Kislitsyn	6609714d66	Move Scrobble views to ScrobbleView	2020-05-19 16:26:06 +04:00
Egor Kislitsyn	524d04d921	Add OpenAPI spec for PleromaAPI.ScrobbleController	2020-05-19 16:26:06 +04:00
lain	a985bd57b4	User.Query: Speed up recipients query.	2020-05-19 14:11:32 +02:00
Egor Kislitsyn	e4c720f14c	Fix typo	2020-05-19 14:59:50 +04:00
Haelwenn	58ccd2bbfd	Merge branch 'openapi/pleroma-api/mascot' into 'develop' ... Add OpenAPI spec for MascotController See merge request pleroma/pleroma!2553	2020-05-19 09:41:57 +00:00
Maksim Pechnikov	41f8f17260	fix api/v1/accounts/update_credentials	2020-05-19 09:42:41 +03:00
Maksim Pechnikov	5f0a3ac74d	added tests	2020-05-19 06:05:09 +03:00
lain	d19c716770	AttachmentValidator: Handle empty mediatypes	2020-05-18 20:17:28 +02:00
Egor Kislitsyn	fe5d423b43	Add OpenAPI spec for MascotController	2020-05-18 22:01:18 +04:00
Egor Kislitsyn	45c3a72404	[OpenAPI] Use BooleanLike in all request bodies	2020-05-18 20:58:59 +04:00
lain	be4db41d71	ChatMessageValidator: Allow one message in an array, too.	2020-05-18 18:45:33 +02:00
lain	0d417e005d	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-05-18 18:38:32 +02:00
Ivan Tashkinov	5735b5c8be	Fixed missing support for with_muted param in direct timeline.	2020-05-18 19:00:00 +03:00
Egor Kislitsyn	aef31c69df	Rename EmojiAPIController to EmojiPackController	2020-05-18 19:43:25 +04:00
Egor Kislitsyn	8bde8dfec2	Cleanup Pleroma.Emoji.Pack	2020-05-18 19:43:23 +04:00
Egor Kislitsyn	6e4de715b3	Add OpenAPI spec for PleromaAPI.EmojiAPIController	2020-05-18 19:28:46 +04:00
lain	0d5bce018d	AnnounceValidator: Validate for existing announce	2020-05-18 16:54:10 +02:00
lain	17a8342c1e	ObjectValidators: Add basic Announce validator.	2020-05-18 16:45:11 +02:00
lain	7d381b16b7	Transmogrifier Test: Extract Announce handling.	2020-05-18 14:48:37 +02:00
Alexander Strizhakov	215daabdb4	copyright update	2020-05-18 15:15:51 +03:00
lain	188b32145e	InstanceView: Expose background image link. ... This will make it easier for more clients to support this feature.	2020-05-18 13:29:30 +02:00
lain	96f7b1b140	Merge branch 'show-media-endpoint-fixes' into 'develop' ... MediaController OAuth scope assignments fix See merge request pleroma/pleroma!2541	2020-05-18 10:57:59 +00:00
Roman Chvanikov	01bd6a1e54	Merge branch 'develop' into feature/admin-api-status-count-per-instance	2020-05-18 11:56:27 +03:00
Alexander Strizhakov	1671864d88	return :visible instead of boolean	2020-05-18 10:34:50 +03:00
Alexander Strizhakov	b1aa402229	removing 410 status	2020-05-18 10:34:50 +03:00
Alexander Strizhakov	e7bc2f980c	account visibility	2020-05-18 10:34:49 +03:00
Ivan Tashkinov	9b76565264	MediaController: enforced owner-only access in :show action. ... Improved error response on denied access (now 403). Adjusted tests.	2020-05-18 09:51:53 +03:00
Maksim Pechnikov	c33a4315fb	updated docs	2020-05-18 06:48:19 +03:00
lain	baf051a59e	SideEffects: Don't update unread count for actor in chatmessages.	2020-05-17 12:22:26 +02:00
lain	9c17109765	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-05-17 12:14:49 +02:00
lain	8bfd9710ae	Pleroma Authenticator: Also update passwords here.	2020-05-17 11:53:17 +02:00
lain	bfdd90f6d7	AuthenticationPlug: Also update crypt passwords.	2020-05-17 11:40:25 +02:00
lain	baef35bcc8	Authentication Plug: Update bcrypt password on login.	2020-05-17 10:31:01 +02:00
lain	4b28d812cf	Merge branch 'restricted-relations-embedding' into 'develop' ... Restricted support for embedded relationships See merge request pleroma/pleroma!2456	2020-05-17 07:26:51 +00:00
Ivan Tashkinov	af9dfdce6b	MediaController OAuth scope assignments fix. ... Typo fix (`def get_media` instead of `def show`).	2020-05-17 08:46:43 +03:00
Maksim Pechnikov	3f8d68bdf3	added example cache purge script	2020-05-17 05:56:20 +03:00
lain	d96f8f17e8	Merge branch 'features/mastoapi_v2_media' into 'develop' ... MastodonAPI: /api/v2/media endpoints See merge request pleroma/pleroma!2439	2020-05-16 17:13:38 +00:00
lain	d15aa9d950	Merge branch 'develop' into 'remove-twitter-api' ... # Conflicts: # lib/pleroma/web/nodeinfo/nodeinfo_controller.ex	2020-05-16 17:07:09 +00:00
lain	2dcb26a6e5	CommonAPI: Unblock a user even if we don't have an activity.	2020-05-16 12:28:24 +02:00
Maksim Pechnikov	cb40602a16	added media proxy invalidation	2020-05-15 21:39:42 +03:00
lain	5633637862	Merge branch 'fix/digest-task-otp' into 'develop' ... Fix digest mix task on OTP releases See merge request pleroma/pleroma!2526	2020-05-15 14:22:59 +00:00
Alexander Strizhakov	3c29f4f957	returning partial chain	2020-05-15 16:16:02 +03:00
lain	f012c3a202	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-05-15 13:33:04 +02:00
lain	1d18721a3c	Chats: Add updated_at to Schema and docs.	2020-05-15 13:18:41 +02:00
Egor Kislitsyn	e090191d03	[OpenAPI] Mark all not required request fields as nullable	2020-05-15 14:55:41 +04:00
rinpatch	e455ca3f3e	Merge branch 'feature/database-configuration-whitelist' into 'develop' ... Database configuration whitelist See merge request pleroma/pleroma!2522	2020-05-14 16:07:37 +00:00
lain	4157c459b8	Merge branch 'bcrypt-auth' into 'develop' ... Handle bcrypt passwords for Mastodon migration See merge request pleroma/pleroma!2527	2020-05-14 14:36:56 +00:00
Alex Gleason	5b0f27d23d	Pbkdf2.verify_pass --> AuthenticationPlug.checkpw	2020-05-14 08:57:38 -05:00
Egor Kislitsyn	bb03dfdb03	Do not require description in update action	2020-05-14 16:29:32 +04:00
Egor Kislitsyn	0f885b4b86	Fix OpenAPI spec	2020-05-14 16:18:30 +04:00
Stephanie Wilde-Hobbs	20cbfb5cb5	Allow whitelisting whole groups	2020-05-14 12:43:53 +01:00
lain	3342846ac2	ChatView: Add update_at field.	2020-05-14 13:20:28 +02:00
Steph	5c6f575315	Style fixes	2020-05-14 12:15:48 +01:00
Haelwenn (lanodan) Monnier	099e314a1b	Add OpenAPISpex for MediaController	2020-05-14 12:13:25 +02:00
lain	39ec1af993	Merge branch 'openapi/pleroma-api/accounts' into 'develop' ... Add OpenAPI spec for PleromaAPI.AccountController See merge request pleroma/pleroma!2528	2020-05-14 09:25:18 +00:00
lain	359d7b0a6d	Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex	2020-05-14 09:09:11 +00:00
lain	1c2629328d	Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex	2020-05-14 09:07:09 +00:00
Haelwenn (lanodan) Monnier	cb363f0183	MastodonAPI: /api/v2/media endpoints	2020-05-14 10:14:28 +02:00
Haelwenn (lanodan) Monnier	e688d4ee69	MRF.StealEmojiPolicy: New Policy ... Inspired by https://git.pleroma.social/moonman/emoji-stealer-mrf/-/blob/master/steal_emoji_policy.ex	2020-05-14 09:59:56 +02:00
Alex Gleason	249e009c5e	Add pleroma_internal as an internal field	2020-05-13 16:14:24 -05:00
Roman Chvanikov	8a383707ae	Merge develop	2020-05-13 19:56:40 +03:00
Ivan Tashkinov	8062d590dd	[#2456] OpenAPI-related tweaks. Removed support for with_relationships param in GET /api/v1/accounts/search.	2020-05-13 18:56:45 +03:00
Alex Gleason	9cbf17d59f	Handle bcrypt passwords for Mastodon migration	2020-05-13 10:53:56 -05:00
Egor Kislitsyn	6802dc28ba	Add OpenAPI spec for PleromaAPI.AccountController	2020-05-13 19:06:46 +04:00
lain	0f0acc740d	Chat: Allow posting without content if an attachment is present.	2020-05-13 15:31:28 +02:00
Ivan Tashkinov	59b6d5f2aa	[#2456] Changed embed_relationships param to with_relationships.	2020-05-13 15:08:07 +03:00
lain	06cad239e5	InstanceView: Add pleroma chat messages to nodeinfo	2020-05-13 14:05:22 +02:00
Michael Weiss	ae3b0b4c0d	Fix digest mix task on OTP releases ... This is based on #2191, credit belongs to @rinpatch.	2020-05-13 13:34:03 +02:00
lain	3cff4e24cd	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-05-13 12:44:16 +02:00
Egor Kislitsyn	bcadbf964a	Add OpenAPI spec for SuggestionController	2020-05-13 14:15:24 +04:00
Ivan Tashkinov	33b798425f	[#2456] Post-merge fix.	2020-05-13 12:50:52 +03:00
Ivan Tashkinov	fd2fb2bb2e	Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding ... # Conflicts: # lib/pleroma/web/mastodon_api/controllers/status_controller.ex # lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex # test/web/mastodon_api/controllers/timeline_controller_test.exs # test/web/mastodon_api/views/status_view_test.exs	2020-05-13 12:42:36 +03:00
lain	156c8a5088	Merge branch 'openapi/statuses' into 'develop' ... Add OpenAPI spec for StatusController See merge request pleroma/pleroma!2521	2020-05-13 09:34:30 +00:00
lain	1307d6ca3c	Merge branch 'openapi/timelines' into 'develop' ... Add OpenAPI spec for TimelineController See merge request pleroma/pleroma!2506	2020-05-13 09:33:37 +00:00
Alex Gleason	b46811a074	Upgrade Comeonin to v5 ... https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md	2020-05-12 17:14:59 -05:00
Egor Kislitsyn	79ad12064d	Fix format	2020-05-13 01:59:17 +04:00
lain	3f13437a9c	User: Truncate bios when updating a remote user.	2020-05-13 00:33:38 +03:00
lain	a8abf1ada6	ActivityPub: Fix non-federating blocks.	2020-05-13 00:33:30 +03:00
minibikini	cb1a3e196c	Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex	2020-05-12 21:23:43 +00:00
minibikini	5a2333925c	Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex	2020-05-12 21:23:36 +00:00
minibikini	822e9c09aa	Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex	2020-05-12 21:23:21 +00:00
minibikini	40646a7e0e	Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex	2020-05-12 21:14:52 +00:00
minibikini	0bb164a3e1	Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex	2020-05-12 21:12:22 +00:00
minibikini	648cc0d72d	Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex	2020-05-12 21:09:26 +00:00
Egor Kislitsyn	7803a85d2c	Add OpenAPI spec for StatusController	2020-05-13 00:25:21 +04:00
Stephanie Wilde-Hobbs	a2fcfc78c9	Filter config descriptions by config whitelist	2020-05-12 21:07:33 +01:00
lain	ec5e057802	Transmogrifier: On incoming follow accept, update follow counts.	2020-05-12 23:05:57 +03:00
href	40d0775c7f	Reorder alias	2020-05-12 21:27:54 +02:00
href	37c2deb3dd	Expand and authorize streams in Streamer directly (backport from !2519)	2020-05-12 21:14:46 +02:00
Ivan Tashkinov	bfb48e3db6	[#2456] OpenAPI: added embed_relationships param definition.	2020-05-12 20:55:01 +03:00
rinpatch	2b18b8a263	Merge branch 'streamer-get-topic' into 'develop' ... Expand and authorize streams in Streamer directly See merge request pleroma/pleroma!2519	2020-05-12 17:02:57 +00:00
rinpatch	24c8c13640	Merge branch '1757-blocks-breaking-on-disabled-outgoing-blocks' into 'develop' ... ActivityPub: Fix non-federating blocks. Closes #1757 See merge request pleroma/pleroma!2514	2020-05-12 16:45:46 +00:00
rinpatch	4cc71aad65	Merge branch '1748-remote-following-follower-count' into 'develop' ... Transmogrifier: On incoming follow accept, update follow counts. Closes #1748 See merge request pleroma/pleroma!2515	2020-05-12 16:44:58 +00:00
Ivan Tashkinov	63a1a82f38	[#2456] Added support for embed_relationships param, nailed down endpoints which should support it. Fixed :source_mutes relationships subset fetching.	2020-05-12 19:14:35 +03:00
Stephanie Wilde-Hobbs	620247a015	Add database configuration whitelist	2020-05-12 17:12:27 +01:00
href	e6d8cacf2d	Expand and authorize streams in Streamer directly	2020-05-12 18:04:47 +02:00
lain	c0ea5c60e4	ChatController: Don't return chats for user you've blocked.	2020-05-12 16:43:04 +02:00
rinpatch	8308611279	Startup: suggest updating OTP when the version is too low for gun ... I've seen quite a few people wonder what to do when presented with this error message.	2020-05-12 17:30:39 +03:00
lain	ec72cba43e	Chat Controller: Add basic error handling.	2020-05-12 13:23:09 +02:00
lain	dcb5cda324	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-05-12 13:13:43 +02:00
lain	b5aa204eb8	ChatController: Support deletion of chat messages.	2020-05-12 13:13:03 +02:00
lain	ca31af473c	Transmogrifier: On incoming follow accept, update follow counts.	2020-05-12 12:29:37 +02:00
lain	d0ba1844b0	ActivityPub: Fix non-federating blocks.	2020-05-12 10:52:46 +02:00
Maksim Pechnikov	63477d07ad	unsubscribes of friends when user deactivated	2020-05-12 08:14:42 +03:00
rinpatch	f8190aea5e	Merge branch 'fix/issue-1676' into 'develop' ... [#1676] fixed 'source' object in verify_credentials See merge request pleroma/pleroma!2492	2020-05-11 22:30:36 +00:00
lain	f28ed36b4d	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-05-11 17:14:58 +02:00
href	e2b15e8ad3	Fix streamer timeout (closes #1753). ... Cowboy handles automatically responding to the client's ping, but doesn't automatically send a :ping frame to the client.	2020-05-11 16:51:34 +02:00
lain	5367a00257	Deletion: Handle the case of pruned objects.	2020-05-11 15:06:23 +02:00
Egor Kislitsyn	3bde0fa3f6	Add OpenAPI spec for TimelineController	2020-05-11 15:43:03 +04:00
lain	fdb98715b8	Chat: Fix wrong query.	2020-05-11 10:58:14 +02:00
lain	8d5597ff68	ChatController: Add GET /chats/:id	2020-05-10 13:26:14 +02:00
lain	172d9b1193	Chat: Add last_message to schema.	2020-05-10 13:08:01 +02:00
lain	f335e1404a	ChatView: Add the last message to the view.	2020-05-10 13:00:01 +02:00
lain	c272669909	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-05-10 12:32:57 +02:00
lain	1054e89762	ChatOperation: Add media id to example	2020-05-10 12:30:24 +02:00
Ivan Tashkinov	b960a9430d	[#2456] credo fix.	2020-05-10 09:35:12 +03:00
Ivan Tashkinov	b0d0d8f91b	Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding	2020-05-10 09:17:16 +03:00
Ivan Tashkinov	aee88d11be	[#2456] Removed support for embedded relationships in account view.	2020-05-10 09:16:48 +03:00
Roman Chvanikov	f3f8ed9e19	Set sum types in query	2020-05-10 09:13:24 +03:00
rinpatch	3d9a7cf0cc	healthcheck: report real amount of memory allocated by beam ... as opposed to memory currently in use	2020-05-10 02:11:33 +03:00
lain	f7c28ae544	Webfinger: Request account info with the acct scheme	2020-05-10 02:09:36 +03:00
lain	45df70e691	AP C2S: Restrict creation to Notes for now.	2020-05-10 02:06:38 +03:00
Ivan Tashkinov	ac4250a18c	[#2456] Clarified skip_relationships option (and its default of false) for MastodonAPI.AccountView.	2020-05-09 19:03:07 +03:00
Ivan Tashkinov	14a49a0483	[#2456] Dropped support for embedded pleroma/account/relationship in statuses and notifications.	2020-05-09 18:05:44 +03:00
Roman Chvanikov	56819f7f06	Use index on refresh_counter_cache	2020-05-09 13:13:26 +03:00
Roman Chvanikov	4f26539717	Fix credo warning	2020-05-09 11:59:49 +03:00
Roman Chvanikov	01b06d6dbf	Show progress in refresh_counter_cache task	2020-05-09 11:43:31 +03:00
Roman Chvanikov	942093683a	Merge branch 'develop' into feature/admin-api-status-count-per-instance	2020-05-09 11:31:34 +03:00
Roman Chvanikov	cbe383ae83	Update stats admin endpoint	2020-05-09 11:30:37 +03:00
Roman Chvanikov	39d2f2118a	update counter_cache logic	2020-05-09 01:20:50 +03:00
rinpatch	30eaef9d61	healthcheck: report real amount of memory allocated by beam ... as opposed to memory currently in use	2020-05-08 23:57:47 +03:00
Ivan Tashkinov	b2924ab1fb	Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding	2020-05-08 21:37:55 +03:00
lain	03529f6a05	Transmogrifier: Don't modify attachments for chats.	2020-05-08 18:26:35 +02:00
rinpatch	570940a3fd	Merge branch 'bugfix/fix-like-notifications' into 'develop' ... Notifications: Simplify recipient calculation for some Activities. See merge request pleroma/pleroma!2486	2020-05-08 15:00:43 +00:00
Alexander Strizhakov	287f781808	user deletion	2020-05-08 17:11:17 +03:00
lain	d0bf8cfb8f	Credo fixes.	2020-05-08 14:11:58 +02:00
lain	7637ef4203	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-05-08 13:13:37 +02:00
lain	fbcc53760e	Merge branch 'feature/emojireactvalidator' into 'develop' ... Move EmojiReacts to the Pipeline. See merge request pleroma/pleroma!2473	2020-05-08 10:41:41 +00:00
Maksim Pechnikov	4d71c4b805	fixed 'source' object in verify_credentials	2020-05-08 12:35:34 +03:00
lain	6acbe45eb2	Builder: Extract common features of likes and reactions.	2020-05-08 11:30:31 +02:00
lain	0cf43391f2	Merge branch 'issue/1276-2' into 'develop' ... [#1276] added an endpoint for getting unread notification count See merge request pleroma/pleroma!2392	2020-05-08 09:23:01 +00:00
lain	218a22c9a3	Merge branch 'fix/privacy-notification' into 'develop' ... Privacy option affects all push notifications, not just Direct Messages Closes #1745 See merge request pleroma/pleroma!2485	2020-05-08 09:04:24 +00:00
Maksim Pechnikov	b078e0567d	Merge branch 'develop' into issue/1276-2	2020-05-08 08:51:09 +03:00
Haelwenn	769d95644d	Merge branch 'feature/restrict-c2s' into 'develop' ... AP C2S: Restrict creation to `Note`s for now. See merge request pleroma/pleroma!2472	2020-05-07 22:29:16 +00:00
lain	ef55d24054	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator	2020-05-07 18:53:34 +02:00
rinpatch	bef08b85e5	Merge branch 'feature/undo-validator-reduced' into 'develop' ... Move Undo (except undo follow) to the common pipeline See merge request pleroma/pleroma!2489	2020-05-07 14:28:10 +00:00
lain	516ff945ce	Merge branch 'openapi/search' into 'develop' ... Add OpenAPI spec for SearchController See merge request pleroma/pleroma!2484	2020-05-07 13:38:34 +00:00
rinpatch	eb1f2fcbc6	Streamer: Fix wrong argument order when rendering activities to authenticated user ... Closes #1747	2020-05-07 16:13:24 +03:00
lain	d11eea62b1	Credo fixes	2020-05-07 15:09:37 +02:00
lain	fb2d284d28	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-05-07 15:05:40 +02:00
lain	7ac0cffb34	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator	2020-05-07 15:03:12 +02:00
lain	788b7e7bbd	Merge fixes.	2020-05-07 14:52:37 +02:00
lain	f0c22df226	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced	2020-05-07 14:45:20 +02:00
lain	8ae4d64d47	Apply suggestion to lib/pleroma/notification.ex	2020-05-07 11:01:52 +00:00
lain	3f867d8e9b	Apply suggestion to lib/pleroma/web/api_spec/operations/search_operation.ex	2020-05-07 10:48:09 +00:00
lain	f57fa2a00d	Notifications: Simplify recipient calculation for some Activities. ... Fixes the 'getting notfications for other people's posts' bug.	2020-05-07 12:43:30 +02:00
Egor Kislitsyn	dc4a448f48	Add OpenAPI spec for SearchController	2020-05-07 14:04:48 +04:00
Egor Kislitsyn	cdca62e8d4	Add schema for Tag	2020-05-07 14:04:07 +04:00
lain	4c92dfb73e	Merge branch 'openapi/polls' into 'develop' ... Add OpenAPI spec for PollController See merge request pleroma/pleroma!2476	2020-05-07 09:19:45 +00:00
lain	4061841846	Merge branch 'streamer-worker-registry' into 'develop' ... Streamer rework See merge request pleroma/pleroma!2426	2020-05-07 09:13:32 +00:00
href	9491ba3e49	Streamer rework	2020-05-07 09:13:32 +00:00
Maksim	3d0c567fbc	Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController	2020-05-07 08:14:54 +00:00
Mark Felder	a2580adc91	Hide the sender when privacy option is enabled	2020-05-06 16:42:27 -05:00
Mark Felder	57736c1833	Privacy option affects all push notifications, not just Direct Messages	2020-05-06 16:30:05 -05:00
lain	1748e26948	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-05-06 17:36:08 +02:00
rinpatch	473b0d9f3d	Merge branch 'feature/delete-validator' into 'develop' ... Move deletions to the common pipeline Closes #1497 See merge request pleroma/pleroma!2441	2020-05-06 14:32:58 +00:00
lain	fc9d0b6eec	Credo fixes.	2020-05-06 16:31:21 +02:00
lain	20baa2eaf0	ChatMessages: Add attachments.	2020-05-06 16:12:36 +02:00
Maksim Pechnikov	bd261309cc	added unread_notifications_count for /api/v1/accounts/verify_credentials	2020-05-06 15:08:38 +03:00
Maksim Pechnikov	8b97b6f5ba	Merge branch 'develop' into issue/1276-2	2020-05-06 14:47:50 +03:00
Egor Kislitsyn	06c69c0a0a	Fix description	2020-05-06 14:18:19 +04:00
lain	205313e541	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-05-06 11:44:30 +02:00
lain	07e7c80bc9	Merge branch 'plug-if-unless-func-options-refactoring' into 'develop' ... Refactoring of :if_func / :unless_func plug options See merge request pleroma/pleroma!2446	2020-05-06 09:14:05 +00:00
lain	a716543267	Merge branch 'openapi/subscriptions' into 'develop' ... Add OpenAPI spec for SubscriptionController See merge request pleroma/pleroma!2444	2020-05-06 09:10:17 +00:00
lain	61ea8f1f5a	Merge branch 'openapi/markers' into 'develop' ... Add OpenAPI spec for MarkerController See merge request pleroma/pleroma!2386	2020-05-06 09:06:50 +00:00
lain	df846eda71	Merge branch 'bugfix/sensitive_object' into 'develop' ... Transmogrifier.set_sensitive/1: Keep sensitive set to true Closes #954 See merge request pleroma/pleroma!2470	2020-05-06 09:04:13 +00:00
lain	c3f1ce80eb	Merge branch 'fix/1726-user-pagination' into 'develop' ... Pagination fix for service users filters in admin api Closes #1726 See merge request pleroma/pleroma!2452	2020-05-06 09:01:42 +00:00
lain	0a88bf6a9d	Merge branch 'openapi/follow_requests' into 'develop' ... Add OpenAPI spec for FollowRequestController See merge request pleroma/pleroma!2448	2020-05-06 09:00:39 +00:00
lain	957172a307	Merge branch 'openapi/filters' into 'develop' ... Add OpenAPI spec for FilterController See merge request pleroma/pleroma!2382	2020-05-06 08:51:10 +00:00
lain	f84c8f2f0d	Merge branch 'feature/1728-webfinger-acct-scheme' into 'develop' ... Webfinger: Request account info with the acct scheme Closes #1728 See merge request pleroma/pleroma!2465	2020-05-06 08:46:45 +00:00
lain	1ee34d4acb	Merge branch 'openapi/instance' into 'develop' ... Add OpenAPI spec for InstanceController See merge request pleroma/pleroma!2450	2020-05-06 08:46:14 +00:00
lain	7fdc7078ae	Merge branch 'openapi/lists' into 'develop' ... Add OpenAPI spec for ListController See merge request pleroma/pleroma!2453	2020-05-06 08:43:21 +00:00
lain	76c1a7a34b	Merge branch 'openapi/conversations' into 'develop' ... Add OpenAPI spec for ConversationController See merge request pleroma/pleroma!2445	2020-05-06 08:40:04 +00:00
Maksim Pechnikov	fb38b7339c	Merge branch 'develop' into issue/1276-2	2020-05-06 05:55:39 +03:00
Egor Kislitsyn	332e016bcd	Add OpenAPI spec for ScheduledActivityController	2020-05-05 23:42:24 +04:00
Egor Kislitsyn	6ba25d1197	Add Attachment schema	2020-05-05 23:42:24 +04:00
lain	9637cded21	Chat: Fix missing chat id on second 'get'	2020-05-05 20:07:47 +02:00
Egor Kislitsyn	0a1394cc1a	Add OpenAPI spec for PollController	2020-05-05 20:14:22 +04:00
lain	92caae5923	Undoing: Move undoing blocks to the pipeline everywhere.	2020-05-05 18:02:24 +02:00
lain	a3bb2e5474	Undoing: Move undoing announcements to the pipeline everywhere.	2020-05-05 16:42:34 +02:00
lain	b34debe615	Undoing: Move undoing reactions to the pipeline everywhere.	2020-05-05 16:17:09 +02:00
Egor Kislitsyn	3a45952a3a	Add OpenAPI spec for ConversationController	2020-05-05 17:44:46 +04:00
Egor Kislitsyn	32ca9f2c59	Render mastodon-like errors in FilterController	2020-05-05 17:41:16 +04:00
Egor Kislitsyn	46aae346f8	Move single used schemas to Filter operation schema	2020-05-05 17:41:01 +04:00
Egor Kislitsyn	7e7a3e1544	Add OpenAPI spec for FilterController	2020-05-05 17:41:01 +04:00
lain	42a2acac46	Merge branch 'feature/1720-status-view' into 'develop' ... Admin API fetch status by id Closes #1720 See merge request pleroma/pleroma!2475	2020-05-05 13:40:12 +00:00
Egor Kislitsyn	ec1e4b4f1a	Add OpenAPI spec for FollowRequestController	2020-05-05 17:40:00 +04:00
minibikini	42a4a863f1	Apply suggestion to lib/pleroma/web/api_spec/operations/instance_operation.ex	2020-05-05 17:24:40 +04:00
minibikini	3817f179d7	Apply suggestion to lib/pleroma/web/api_spec/operations/instance_operation.ex	2020-05-05 17:24:40 +04:00
minibikini	b5189d2c50	Apply suggestion to lib/pleroma/web/api_spec/operations/instance_operation.ex	2020-05-05 17:24:40 +04:00
Egor Kislitsyn	88a14da817	Add OpenAPI spec for InstanceController	2020-05-05 17:24:16 +04:00
Alexander Strizhakov	e7d8ab8303	admin_api fetch status by id	2020-05-05 16:18:56 +03:00
lain	a3071f0231	Undoing: Move undoing likes to the pipeline everywhere.	2020-05-05 15:08:41 +02:00
Egor Kislitsyn	f2bf4390f4	Fix descriptions for List API spec	2020-05-05 17:05:35 +04:00
Egor Kislitsyn	5ec6aad567	Add OpenAPI spec for ListController	2020-05-05 17:05:34 +04:00
Egor Kislitsyn	babcae7130	Move single used schemas to Marker operation schema	2020-05-05 16:45:34 +04:00
Egor Kislitsyn	8096565653	Add OpenAPI spec for MarkerController	2020-05-05 16:44:16 +04:00
Egor Kislitsyn	d861b0790a	Add OpenAPI spec for SubscriptionController	2020-05-05 16:43:00 +04:00
lain	f1da8882f9	UndoValidator: Add UndoValidator.	2020-05-05 14:17:47 +02:00
rinpatch	33f2976020	Merge branch 'feature/1737-magic-key-field' into 'develop' ... User, Webfinger: Remove OStatus vestiges Closes #1737 See merge request pleroma/pleroma!2471	2020-05-05 12:10:10 +00:00
rinpatch	5482a1f6ef	Merge branch 'openapi/validation-plug' into 'develop' ... Ignore unexpected query params and ENUM values Closes #1719 See merge request pleroma/pleroma!2468	2020-05-05 12:08:58 +00:00
lain	d201527004	Apply suggestion to lib/pleroma/web/web_finger/web_finger.ex	2020-05-05 11:17:44 +00:00
Egor Kislitsyn	decaa64f75	Merge branch 'develop' into global-status-expiration	2020-05-05 14:28:54 +04:00
lain	db55dc9445	ActivityPub: Remove react_with_emoji.	2020-05-05 12:28:28 +02:00
lain	ad771546d8	Transmogrifier: Move emoji reactions to common pipeline.	2020-05-05 12:11:46 +02:00
lain	f21f538293	LikeValidator: Add defaults for recipients back in.	2020-05-05 10:38:59 +02:00
lain	c297667f16	Merge branch 'fix/issue-1729' into 'develop' ... Only update follower/following stats for actor types of users and bots. Closes #1565 and #1729 See merge request pleroma/pleroma!2464	2020-05-05 08:21:39 +00:00
lain	2cb3f8a8cf	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator	2020-05-05 10:19:01 +02:00
lain	6400998820	AP C2S: Restrict creation to Notes for now.	2020-05-05 10:12:37 +02:00
lain	f897da2115	WebFinger: Add back in subscribe_address. ... It's used for remote following.	2020-05-05 09:36:38 +02:00
lain	8bed6ea922	User, Webfinger: Remove OStatus vestiges ... Mainly the `magic_key` field	2020-05-05 09:25:09 +02:00
Haelwenn (lanodan) Monnier	bf0e41f0da	Transmogrifier.set_sensitive/1: Keep sensitive set to true	2020-05-04 23:36:00 +02:00
Egor Kislitsyn	e55fd530bc	Render better errors for ENUM validation	2020-05-04 22:33:34 +04:00
Egor Kislitsyn	f070b5569c	Add a config option to enable strict validation	2020-05-04 22:33:05 +04:00
Egor Kislitsyn	4b9ab67aa8	Ignore unexpected ENUM values in query string	2020-05-04 21:46:25 +04:00
lain	c23cb8d37a	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-05-04 19:24:04 +02:00
minibikini	bfbff7d826	Apply suggestion to lib/pleroma/web/api_spec/cast_and_validate.ex	2020-05-04 16:38:23 +00:00
Egor Kislitsyn	d08c63500b	Ignore unexpected query params	2020-05-04 20:16:44 +04:00
lain	3559dd1085	Transmogrifier: Rely on LikeValidator.	2020-05-04 17:18:38 +02:00
lain	0f9bed022f	LikeValidator: Fix up context.	2020-05-04 17:18:17 +02:00
lain	e03c301ebe	LikeValidator: Fix up missing recipients.	2020-05-04 17:08:31 +02:00
lain	13ab8defc0	Pipeline: Move transctioning to common pipeline.	2020-05-04 14:34:19 +02:00
lain	ec24c70db8	ActivityPub: Don't fetch Application follower counts.	2020-05-04 14:22:54 +02:00
lain	b04328c3de	ChatController: Add mark_as_read	2020-05-04 13:10:36 +02:00
lain	30590cf46b	CommonAPI: Refactor for readability	2020-05-04 12:53:40 +02:00
lain	57e6f2757a	ChatOperation: Make simple schema into inline schema	2020-05-04 12:47:23 +02:00
lain	dcf535fe77	Credo fixes.	2020-05-04 11:32:11 +02:00
lain	651935f137	Schemas: Refactor to our naming scheme.	2020-05-04 11:08:00 +02:00
lain	c40afe5ba0	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-05-04 10:43:20 +02:00
Maksim Pechnikov	fe7a0d660e	Merge branch 'develop' into issue/1276-2	2020-05-04 06:08:49 +03:00
lain	9249742f13	Types.Recipients: Simplify reducer.	2020-05-03 15:28:24 +02:00
lain	a35b76431c	Credo fixes.	2020-05-03 14:58:24 +02:00
lain	a7966f2080	Webfinger: Request account info with the acct scheme	2020-05-03 13:48:01 +02:00
lain	1974d0cc42	DeleteValidator: The deleted activity id is an object id	2020-05-03 13:02:57 +02:00
lain	6fb96f64c1	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator	2020-05-03 12:55:29 +02:00
lain	4dfc617cdf	Transmogrifier: Don't fetch actor that's guaranteed to be there.	2020-05-03 12:51:28 +02:00
Lain Soykaf	f20a1a27ef	DeleteValidator: Improve code readability	2020-05-03 12:19:01 +02:00
Mark Felder	370e313e2d	Only update follower/following stats for actor types of users and bots.	2020-05-02 13:28:10 -05:00
rinpatch	3126f8a334	Merge branch 'feature/1710-consolidate-instance-info' into 'develop' ... Feature/1710 consolidate instance info Closes #1710 See merge request pleroma/pleroma!2430	2020-05-02 16:44:55 +00:00
eugenijm	441e28f365	Dismiss the follow request notification on rejection	2020-05-02 19:16:27 +03:00
eugenijm	66a8e1312d	Mastodon API: do not create a following relationship if the corresponding follow request doesn't exist when calling POST /api/v1/follow_requests/:id/authorize	2020-05-02 19:05:13 +03:00
rinpatch	e55876409b	Deactivate local users on deletion instead of deleting the record ... Prevents the possibility of re-registration, which allowed to read DMs of the deleted account. Also includes a migration that tries to find any already deleted accounts and insert skeletons for them. Closes pleroma/pleroma#1687	2020-05-02 19:05:13 +03:00
rinpatch	c75840f7b8	Merge branch 'follow-request-notifications' into 'develop' ... Follow request notifications enforcement See merge request pleroma/pleroma!2451	2020-05-02 18:59:12 +03:00
rinpatch	7b05933677	Merge branch '1559-follow-request-notifications' into 'develop' ... [#1559] Support for "follow_request" notifications Closes #1559 See merge request pleroma/pleroma!2354	2020-05-02 18:59:12 +03:00
Ivan Tashkinov	2d07ed7747	[#1732] Made AP C2S :followers and :following endpoints serve on no auth ... (as for related :api pipeline endpoints).	2020-05-02 18:28:04 +03:00
rinpatch	9e3ec58280	Merge branch 'follow-request-notifications' into 'develop' ... Follow request notifications enforcement See merge request pleroma/pleroma!2451	2020-05-02 12:24:49 +00:00
Haelwenn	0dfb5ad0ad	Merge branch 'bugfix/static-fe.css' into 'develop' ... static-fe.css: Restore and move to /priv/static/static-fe See merge request pleroma/pleroma!2458	2020-05-02 06:37:33 +00:00
Haelwenn (lanodan) Monnier	c6ddfa8f95	static-fe.css: Restore and move to /priv/static/static-fe	2020-05-02 08:28:42 +02:00
Ivan Tashkinov	cf5ca7e45b	Merge remote-tracking branch 'remotes/origin/develop' into follow-request-notifications	2020-05-02 07:39:19 +03:00
rinpatch	c18ef452b0	OpenAPI: Add follow_request to notification types ... Closes #1731	2020-05-01 23:14:20 +03:00
rinpatch	2646fdea22	signature.ex: Remove the use of ObjectID type ... It is not in stable yet	2020-05-01 22:56:18 +03:00
rinpatch	b6ca8cc539	Merge branch 'bugfix/1727-fix-signature-decoding' into 'develop' ... Bugfix/1727 fix signature decoding Closes #1727 See merge request pleroma/pleroma!2454	2020-05-01 22:10:42 +03:00
rinpatch	85105f7aae	OpenAPI: Remove max pagination limit from the spec ... In an ideal world clients wouldn't try to request more than the max hardcoded limit, but SubwayTooter does.	2020-05-01 21:33:34 +03:00
Ivan Tashkinov	d5cdc907e3	Restricted embedding of relationships where applicable (statuses / notifications / accounts rendering). ... Added support for :skip_notifications for accounts listing (index.json). Adjusted tests.	2020-05-01 18:45:24 +03:00
lain	3453e54e6b	MappedSignatureToIdentityPlug: Fix.	2020-05-01 15:58:47 +02:00
lain	a912f72a36	Signature: Handle non-ap ids in key ids. ... Mastodon and Gab sometimes send the format `acct:name@server`.	2020-05-01 15:54:38 +02:00
lain	3370bb0e46	Merge branch 'openapi/notifications' into 'develop' ... Add OpenAPI spec for NotificationController See merge request pleroma/pleroma!2437	2020-05-01 13:09:36 +00:00
lain	607e06c245	Merge branch 'openapi/reports' into 'develop' ... Add OpenAPI spec for ReportController See merge request pleroma/pleroma!2434	2020-05-01 12:48:56 +00:00
lain	44fbd09709	Merge branch 'issue/1577' into 'develop' ... [#1577] fix mediaType of object See merge request pleroma/pleroma!2372	2020-05-01 12:38:46 +00:00
lain	1ead5f49b8	AdminApiController: Use common pipeline for user deletion.	2020-05-01 14:30:39 +02:00
lain	ebbd9c7f36	AdminAPIController: Refactor.	2020-05-01 14:22:39 +02:00
lain	51f1dbf0a2	User deletion mix task: Use common pipeline.	2020-05-01 14:05:25 +02:00
lain	2008fa9c7f	Merge branch 'fix/captcha' into 'develop' ... Fix account registration when captcha is enabled but not provided Closes #1712 See merge request pleroma/pleroma!2438	2020-05-01 11:47:58 +00:00
lain	ab01863abf	Merge branch 'feature/delete-validator' of git.pleroma.social:pleroma/pleroma into feature/delete-validator	2020-05-01 13:35:42 +02:00
lain	5f42e6629d	DeleteValidator: Only allow deletion of certain types.	2020-05-01 13:34:47 +02:00
rinpatch	138e6ece1b	Merge branch 'following-relationships-optimizations' into 'develop' ... FollowingRelationship storage & performance optimizations See merge request pleroma/pleroma!2332	2020-05-01 14:31:26 +03:00
Alexander Strizhakov	ecf37b46d2	pagination fix for service users filters	2020-05-01 14:31:24 +03:00
Ivan Tashkinov	92efb888c7	Made follow request notifications non-optional (removed config switch).	2020-05-01 09:51:41 +03:00
Maksim Pechnikov	a92c713d9c	Merge branch 'develop' into issue/1276-2	2020-05-01 06:21:59 +03:00
Haelwenn	fb9ec885cc	Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop' ... Added need_reboot endpoint to admin api Closes #1677 See merge request pleroma/pleroma!2373	2020-05-01 01:38:25 +03:00
lain	a4afeed426	Uploads: Sandbox them in the CSP.	2020-05-01 01:37:26 +03:00
Mark Felder	8cf4e1619e	Fix Oban not receiving :ok from RichMediaHelper job	2020-05-01 01:11:51 +03:00
Ivan Tashkinov	862d4886c9	[#1682] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when password is provided. Refactored plugs skipping functionality.	2020-05-01 01:00:37 +03:00
rinpatch	da4923f2e5	Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop' ... Enforcement of OAuth scopes check for authenticated API endpoints See merge request pleroma/pleroma!2349	2020-05-01 00:58:40 +03:00
lain	1ebf8db2a5	Merge branch 'fix-object_age_policy' into 'develop' ... Fix ObjectAgePolicy See merge request pleroma/pleroma!2404	2020-05-01 00:55:37 +03:00
Haelwenn	2ff3b85326	Merge branch 'bugfix/1670-user-count' into 'develop' ... Stats: Ignore internal users for user count. Closes #1670 See merge request pleroma/pleroma!2414	2020-05-01 00:55:37 +03:00
Haelwenn	bf4b5f3856	Merge branch 'fix/follow-and-blocks-import' into 'develop' ... Fix follower/blocks import when nicknames starts with @ Closes #1698 See merge request pleroma/pleroma!2416	2020-05-01 00:55:37 +03:00
lain	2e58fe08cd	CommonAPI: Don't make repeating announces possible	2020-05-01 00:55:34 +03:00
Alex Gleason	6e0b046771	Let blob: pass CSP	2020-05-01 00:40:09 +03:00
eugenijm	78391a00c5	Mastodon API: do not create a following relationship if the corresponding follow request doesn't exist when calling POST /api/v1/follow_requests/:id/authorize	2020-05-01 00:39:23 +03:00
rinpatch	61889e00fc	Deactivate local users on deletion instead of deleting the record ... Prevents the possibility of re-registration, which allowed to read DMs of the deleted account. Also includes a migration that tries to find any already deleted accounts and insert skeletons for them. Closes pleroma/pleroma#1687	2020-05-01 00:38:58 +03:00
Lain Soykaf	93f64aba78	Merge branch 'develop' of ssh://git.pleroma.social/pleroma/pleroma into feature/delete-validator	2020-04-30 22:44:31 +02:00
lain	32b8386ede	DeleteValidator: Don't federate local deletions of remote objects. ... Closes #1497	2020-04-30 21:23:18 +02:00
lain	a81342a234	Merge branch 'dismiss-notification-on-follow-request-rejection' into 'develop' ... Dismiss the follow request notification on rejection See merge request pleroma/pleroma!2447	2020-04-30 18:38:52 +00:00
lain	999d639873	ActivityPub: Remove delete function. ... This is handled by the common pipeline now.	2020-04-30 20:13:47 +02:00
lain	3b443cbc1d	User: Use common pipeline to delete user activities	2020-04-30 20:08:25 +02:00
lain	5da08c2b73	SideEffects: Fix comment	2020-04-30 19:53:30 +02:00
lain	500f5ec14e	SideEffects: On deletion, reduce the reply count cache	2020-04-30 19:47:13 +02:00
lain	60db58a1c6	Credo fixes.	2020-04-30 18:38:37 +02:00
lain	ab60ee1776	SideEffects: On deletion, reduce the User note count.	2020-04-30 18:19:39 +02:00
lain	c832d96fc9	SideEffects: Stream out deletes.	2020-04-30 17:58:09 +02:00
lain	4500fdc04c	DeleteValidator: Add internal helper field after validation.	2020-04-30 17:53:02 +02:00
eugenijm	bef34568f0	Dismiss the follow request notification on rejection	2020-04-30 18:38:19 +03:00
Ivan Tashkinov	2c4844237f	Refactoring of :if_func / :unless_func plug options (general availability). Added tests for Pleroma.Web.Plug.	2020-04-30 18:19:51 +03:00
Alexander Strizhakov	4a487e4d0b	fix for auth check	2020-04-30 17:50:57 +03:00
lain	14c6672193	AP C2S: Use common pipelin for deletes.	2020-04-30 16:49:41 +02:00
lain	fdd8e7f276	CommonAPI: Use common pipeline for deletions.	2020-04-30 16:15:38 +02:00
lain	417eed4a2b	SideEffects: Handle deletions.	2020-04-30 15:57:27 +02:00
lain	1fb383f368	DeleteValidator: Deleting a user is valid.	2020-04-30 15:42:30 +02:00
lain	4dc5302f45	Transmogrifier: Handle incoming deletes for non-user objects.	2020-04-30 15:26:23 +02:00
Alexander Strizhakov	36abeedf9f	error rename	2020-04-30 16:09:22 +03:00
Alexander Strizhakov	ddb757f743	emoji api packs changes in routes with docs update	2020-04-30 16:09:18 +03:00
Alexander Strizhakov	342f55fb92	refactor emoji api with fixes	2020-04-30 15:45:52 +03:00
lain	db184a8eb4	DeleteValidator: Mastodon sends unaddressed deletes.	2020-04-30 14:37:14 +02:00
Alexander Strizhakov	5839e67eb8	return data only for updated emoji	2020-04-30 15:24:02 +03:00
lain	42ce7c5164	ObjectValidator: Add actor fetcher.	2020-04-30 14:13:08 +02:00
lain	64bb72f98a	Typo fix.	2020-04-30 13:57:47 +02:00
lain	ad2182bbd2	Apply suggestion to lib/pleroma/web/api_spec/schemas/chat_message_create_request.ex	2020-04-30 11:38:26 +00:00
lain	4c4344b7b1	Merge branch '1364-no-pushes-from-blocked-domains-users' into 'develop' ... [#1364] [FIX] Disabled notifications on activities from blocked domains (unless actors are followed) See merge request pleroma/pleroma!2367	2020-04-30 10:29:46 +00:00
Egor Kislitsyn	9c1adb35de	Merge branch 'develop' into openapi/notifications	2020-04-30 13:52:07 +04:00
Egor Kislitsyn	1898054da4	Merge branch 'develop' into openapi/reports	2020-04-30 13:51:27 +04:00
rinpatch	8cf3a32463	Add exlude_replies to OpenAPI spec for account timelines	2020-04-30 00:49:59 +03:00
lain	b68d56c816	Apply suggestion to lib/pleroma/web/api_spec/schemas/chat_message_response.ex	2020-04-29 19:49:13 +00:00
lain	145d35ff70	Apply suggestion to lib/pleroma/web/pleroma_api/controllers/chat_controller.ex	2020-04-29 19:49:03 +00:00
lain	589ce1e96b	Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex	2020-04-29 19:47:16 +00:00
lain	89a6c34081	Apply suggestion to lib/pleroma/chat.ex	2020-04-29 18:14:34 +00:00
Egor Kislitsyn	39a78998d0	Change Pleroma.CaptchaTest to be a regular module instead of GenServer	2020-04-29 21:26:07 +04:00
Egor Kislitsyn	7b0c8f0fde	Add tests for account registration with captcha enabled and improve errors	2020-04-29 21:26:07 +04:00
Egor Kislitsyn	2f77842bd3	Fix account registration when captcha is enabled but not provided	2020-04-29 21:26:07 +04:00
lain	503de4b8df	ObjectValidator: Add validation for Deletes.	2020-04-29 19:09:51 +02:00
lain	78c864cbee	LikeValidator: Use Recipients Type.	2020-04-29 19:08:36 +02:00
lain	b8056e69e0	Object Validator Types: Add Recipients.	2020-04-29 19:08:08 +02:00
lain	20587aa931	Chat message creation: Check actor.	2020-04-29 14:53:53 +02:00
lain	a88734a0a2	Transmogrifier: Fetch missing actors for chatmessages.	2020-04-29 14:25:33 +02:00
lain	53e3063bd0	Transmogrifier: Remove ChatMessageHandling module.	2020-04-29 13:52:23 +02:00
lain	e055b8d203	Pipeline: Always run common_pipeline in a transaction for now.	2020-04-29 13:45:50 +02:00
lain	67659afe48	ChatOperation: Refactor.	2020-04-29 13:34:43 +02:00
lain	0c491b904d	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-04-29 13:19:04 +02:00
Egor Kislitsyn	5238ae3dd3	Add OpenAPI spec for NotificationController	2020-04-28 21:27:54 +04:00
Ivan Tashkinov	4c0e53367a	[#2349] Post-merge fix.	2020-04-28 20:04:25 +03:00
Ivan Tashkinov	908cf22a6c	Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks ... # Conflicts: # lib/pleroma/web/mastodon_api/controllers/account_controller.ex	2020-04-28 19:56:20 +03:00
lain	dedffd100c	Pipeline: Unify, refactor, DRY.	2020-04-28 17:29:54 +02:00
lain	abd0928229	CreateChatMessageValidator: Validate object existence	2020-04-28 16:45:28 +02:00
lain	6aa116eca7	Create activity handling: Flip it and reverse it ... Both objects and create activities will now go through the common pipeline and will be validated. Objects are now created as a side effect of the Create activity, rolling back a transaction if it's not possible to insert the object.	2020-04-28 16:26:19 +02:00
Egor Kislitsyn	560f2c1979	Add OpenAPI spec for ReportController	2020-04-28 16:50:37 +04:00
lain	b5dc59c8fa	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-04-28 14:16:21 +02:00
rinpatch	12bb7fc0dc	Merge branch 'openapi/account' into 'develop' ... Add OpenAPI specs for AccountController See merge request pleroma/pleroma!2374	2020-04-28 11:57:16 +00:00
lain	f8e56d4271	SideEffects: Use Object.normalize to get the object.	2020-04-28 13:43:58 +02:00
lain	906cf53ab9	Recipient Type: Cast all elements as ObjectIDs.	2020-04-28 13:38:02 +02:00
Egor Kislitsyn	764b4f95a8	Merge branch 'develop' into global-status-expiration	2020-04-28 14:13:53 +04:00
lain	9994768312	Merge branch 'mongoose-secure' into 'develop' ... mongoose auth endpoint worked for deactivated accounts See merge request pleroma/pleroma!2432	2020-04-28 09:18:59 +00:00
Maksim Pechnikov	ea5142b94b	convert markdown content to html	2020-04-28 09:32:43 +03:00
fence	5ff20793e7	formating	2020-04-28 01:29:31 +02:00
Egor Kislitsyn	dda65f7799	Move single used schemas to operation schema	2020-04-27 22:55:05 +04:00
fence	cc1e2e8d0f	requested changes to mongoose_im_controller.ex	2020-04-27 19:11:03 +02:00
Egor Kislitsyn	2efc00b3cf	Use json_response_and_validate_schema/2 in tests to validate OpenAPI schema	2020-04-27 20:46:52 +04:00
fence	5c7cc10917	add tests for deactivated users for mongoose auth	2020-04-27 18:31:00 +02:00
fence	a626cb682c	secure mongoose auth endpoint	2020-04-27 17:55:33 +02:00
lain	3d040b1a87	Credo fixes.	2020-04-27 17:55:29 +02:00
lain	ad82a216ff	Chat API: Align more to Pleroma/Mastodon API.	2020-04-27 17:48:34 +02:00
lain	49e673dfea	ChatView: Add actor_account_id	2020-04-27 16:08:03 +02:00
lain	3635a9c9c2	InstanceController: Add extensions to /api/v1/instance	2020-04-27 14:28:08 +02:00
lain	00e956528b	Credo fixes.	2020-04-27 14:02:11 +02:00
lain	15ba3700af	Chat Schemas: Inline unimportant Schemas.	2020-04-27 12:45:59 +02:00
Egor Kislitsyn	f1ca917bb0	Merge branch 'develop' into openapi/account	2020-04-27 14:33:00 +04:00
lain	c86143ed73	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-04-27 12:07:08 +02:00
Alex Gleason	1bd9749a8f	Let blob: pass CSP	2020-04-26 00:29:42 -05:00
Ivan Tashkinov	e16437ff19	[#1706] Formatting fix.	2020-04-25 18:42:08 +03:00
Ivan Tashkinov	0d05e1fe39	[#1706] Prevented error on unresolved activity actors for timeline actions.	2020-04-25 18:24:10 +03:00
Ivan Tashkinov	b4139cc547	[#2409] Made GET /api/v1/accounts/:id/favourites auth-optional, adjusted tests.	2020-04-24 22:25:27 +03:00
rinpatch	8addbd948c	Merge branch 'bugfix/announce-race-condition' into 'develop' ... Announcements: Prevent race condition. See merge request pleroma/pleroma!2423	2020-04-24 16:58:24 +00:00
lain	c30b3b2dc5	Merge branch 'reply-filtering-refactor' into 'develop' ... Reply filtering refactor See merge request pleroma/pleroma!2424	2020-04-24 16:32:13 +00:00
lain	d89cd0a197	Reply Filtering: Refactor.	2020-04-24 18:25:26 +02:00
lain	d862c7156a	Merge branch 'openapi-improvements' into 'develop' ... Support validation for inline OpenAPI schema and automatic tests for examples Closes #1696 See merge request pleroma/pleroma!2421	2020-04-24 16:10:43 +00:00
Egor Kislitsyn	c56c0a3d23	Merge branch 'develop' into global-status-expiration	2020-04-24 18:37:58 +04:00
Ivan Tashkinov	00e62161f6	[#2409] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints.	2020-04-24 16:52:38 +03:00
Alexander	6e625a427c	reply filtering	2020-04-24 15:43:49 +03:00
lain	cb12585098	Announcements: Prevent race condition.	2020-04-24 14:37:53 +02:00
lain	1df6af2a4c	Credo fixes.	2020-04-24 13:59:48 +02:00
lain	bbf8554c97	ActivitPub: Remove like function. ... We don't need another way to build likes.	2020-04-24 13:48:13 +02:00
Egor Kislitsyn	f362836742	Support validation for inline OpenAPI schema and automatic tests for examples	2020-04-24 15:16:15 +04:00
Ivan Tashkinov	89f38d94c7	[#2409] Fixed before-action callback results persistence.	2020-04-23 21:47:33 +03:00
lain	1e28d34592	ChatMessage: Correctly ingest emoji tags.	2020-04-23 16:19:49 +02:00
lain	ec7335535d	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-04-23 15:47:08 +02:00
rinpatch	1b5f8d19ee	Merge branch 'bugfix/repeating-announce' into 'develop' ... CommonAPI: Don't make repeating announces possible See merge request pleroma/pleroma!2418	2020-04-23 12:40:38 +00:00
lain	7d38197894	CommonAPI: Don't make repeating announces possible	2020-04-23 13:33:30 +02:00
rinpatch	25eec6d72d	Merge branch 'bugfix/null-scheduled-at' into 'develop' ... StatusController: Ignore nil scheduled_at parameters. Closes #1699 See merge request pleroma/pleroma!2412	2020-04-23 11:22:30 +00:00
Egor Kislitsyn	9cf4c4fa73	Remove vapidPublicKey from Nodeinfo	2020-04-23 14:12:42 +04:00
lain	850377a7b8	Merge branch 'bugfix/1629-fav-race-condition' into 'develop' ... SideEffects: Run in transaction. Closes #1629 See merge request pleroma/pleroma!2417	2020-04-22 19:26:32 +00:00
lain	1bcbdc7a9f	SideEffects: Use less cryptic syntax.	2020-04-22 21:21:21 +02:00
Haelwenn	af27e4dffd	Merge branch 'bugfix/1670-user-count' into 'develop' ... Stats: Ignore internal users for user count. Closes #1670 See merge request pleroma/pleroma!2414	2020-04-22 17:37:09 +00:00
lain	f5bda09de6	Stats: Use invisible property for filtering.	2020-04-22 19:02:22 +02:00
Ivan Tashkinov	e7fb593d13	Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users ... # Conflicts: # CHANGELOG.md	2020-04-22 20:00:51 +03:00
lain	e62173dfc8	SideEffects: Run in transaction. ... This fixes race conditions.	2020-04-22 18:40:53 +02:00
Egor Kislitsyn	1b06a27746	Update Flake ID description	2020-04-22 20:20:19 +04:00
Egor Kislitsyn	6c26feed01	Merge branch 'develop' into openapi/account	2020-04-22 20:18:12 +04:00
Ivan Tashkinov	0062116e07	Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks ... # Conflicts: # lib/pleroma/web/mastodon_api/controllers/account_controller.ex	2020-04-22 18:51:59 +03:00
Ivan Tashkinov	2958a7d246	Fixed OAuth restrictions for :api routes. Made auth info dropped for :api routes if OAuth check was neither performed nor explicitly skipped.	2020-04-22 18:50:25 +03:00
Haelwenn	28f8fcf8b0	Merge branch 'fix/follow-and-blocks-import' into 'develop' ... Fix follower/blocks import when nicknames starts with @ Closes #1698 See merge request pleroma/pleroma!2416	2020-04-22 15:46:04 +00:00
Haelwenn	468cc977be	Merge branch 'bugfix/following-fix-status-code' into 'develop' ... AccountController: Use code 400 for self-follow. Closes #1674 See merge request pleroma/pleroma!2413	2020-04-22 15:33:04 +00:00
Haelwenn	238058ecae	Merge branch 'bugfix/1543-streaming-boosts' into 'develop' ... Streamer: Stream boosts to the boosting user. Closes #1543 See merge request pleroma/pleroma!2415	2020-04-22 15:31:51 +00:00
Ivan Tashkinov	b03aeae8b9	Apply suggestion to lib/pleroma/notification.ex	2020-04-22 15:31:41 +00:00
Egor Kislitsyn	6db52c3b36	Fix Oban warning ... Warning example: [warn] Expected Elixir.Pleroma.Workers.BackgroundWorker.perform/2 to return :ok, {:ok, value}, or {:error, reason}. Instead received: [error: "not found @user@server.party", error: "not found "] The job will be considered a success.	2020-04-22 19:27:28 +04:00
Egor Kislitsyn	e7771424a8	Fix blocks import	2020-04-22 19:27:28 +04:00
Egor Kislitsyn	88b82e5c3e	Fix follow import	2020-04-22 19:27:28 +04:00
lain	7a3a88a13e	Streamer: Stream boosts to the boosting user.	2020-04-22 17:21:13 +02:00
Haelwenn	1855c597c2	Merge branch 'feature/voters-count' into 'develop' ... Polls: Persist and show voters' count Closes #1702 See merge request pleroma/pleroma!2411	2020-04-22 15:12:19 +00:00
Haelwenn	2e73c19edc	Merge branch 'worker-messages' into 'develop' ... Worker messages Closes #1705 See merge request pleroma/pleroma!2410	2020-04-22 15:09:10 +00:00
Karol Kosek	452072ec95	static_fe: Add microformats2 classes	2020-04-22 16:02:40 +02:00
lain	8b88e2a6e2	Stats: Ignore internal users for user count.	2020-04-22 15:31:37 +02:00
lain	5b39526198	AccountController: Use code 400 for self-follow.	2020-04-22 15:04:26 +02:00
lain	69ecc39038	Merge branch 'fix/1689-fix-migrate-to-db' into 'develop' ... Fix migrate to db config Closes #1689 See merge request pleroma/pleroma!2394	2020-04-22 12:41:31 +00:00
lain	c10485db16	StatusController: Ignore nil scheduled_at parameters.	2020-04-22 14:26:19 +02:00
lain	5102468d0f	Polls: Persist and show voters' count	2020-04-22 14:06:39 +02:00
lain	923513b641	Federator: Return proper values for jobs	2020-04-22 13:28:52 +02:00
lain	f719a5b23a	WebPush: Return proper values for jobs.	2020-04-22 13:28:34 +02:00
lain	2e62a63749	ChatMessageValidator: Validation changes ... Don't validate if the recipient is blocking the actor.	2020-04-22 12:48:52 +02:00
Egor Kislitsyn	11433cd38d	Add OpenAPI schema for FlakeID	2020-04-21 23:54:45 +04:00
Egor Kislitsyn	f0238d010a	Improve OpenAPI schema ... - Removes unneeded wrapping in examples - Adds `:format` attributes	2020-04-21 23:30:24 +04:00
lain	66c2eb670b	ChatController: Validate parameters.	2020-04-21 18:23:00 +02:00
lain	97ad0c4597	Chats: Add API specs.	2020-04-21 17:51:06 +02:00
Ivan Tashkinov	f685cbd309	Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.	2020-04-21 16:29:19 +03:00
lain	a185b5455f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-04-21 14:24:27 +02:00
lain	3c828016d9	Merge branch 'openapi/custom-emojis' into 'develop' ... Add OpenAPI spec for CustomEmojiController See merge request pleroma/pleroma!2375	2020-04-21 10:13:50 +00:00
lain	5165287ff4	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-04-21 12:00:33 +02:00
Ivan Tashkinov	bb5d0eafa4	Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users ... # Conflicts: # CHANGELOG.md	2020-04-21 08:20:50 +03:00
rinpatch	e57c1b60e4	Merge branch 'accept-deletes' into 'develop' ... Always accept deletions through SimplePolicy, add :reject_deletes group See merge request pleroma/pleroma!2371	2020-04-20 18:30:01 +00:00
rinpatch	7e456ac7f6	Merge branch 'router-cleanup' into 'develop' ... Cleanup and DRY the Router See merge request pleroma/pleroma!2406	2020-04-20 18:29:03 +00:00
Egor Kislitsyn	364eecc49f	Merge branch 'develop' into global-status-expiration	2020-04-20 20:37:56 +04:00
Alex Gleason	bedc558809	Merge remote-tracking branch 'upstream/develop' into accept-deletes	2020-04-20 10:15:40 -05:00
Alex Gleason	b54c8813d6	Add :reject_deletes option to SimplePolicy	2020-04-20 10:11:06 -05:00
Egor Kislitsyn	ed3974af24	Add OpenAPI spec for AccountController.identity_proofs operation	2020-04-20 18:40:02 +04:00
Egor Kislitsyn	736fead494	Merge branch 'develop' into openapi/account	2020-04-20 18:40:02 +04:00
lain	28165dad3a	Merge branch 'cleanup-subscription-controller' into 'develop' ... Cleanup SubscriptionController See merge request pleroma/pleroma!2393	2020-04-20 13:01:17 +00:00
Ilja	8b4de61d64	Fix ObjectAgePolicyTest ... The policy didn't block old posts as it should. * I fixed it and tested on a test server * I added the settings to description so that this information is shown in nodeinfo * TODO: I didn't work TTD and still need to fix the tests	2020-04-20 12:59:16 +00:00
Egor Kislitsyn	258d897579	Cleanup and DRY the Router	2020-04-20 16:39:20 +04:00
lain	b5df4a98e4	ChatMessageView: Support emoji.	2020-04-20 14:38:53 +02:00
lain	7e53da250e	ChatMessage: Support emoji.	2020-04-20 14:08:54 +02:00
lain	b836d3d104	ChatMessageValidator: Require published field	2020-04-20 13:14:59 +02:00
lain	139b9d1338	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-04-20 12:37:17 +02:00
lain	970b74383b	Credo fixes.	2020-04-20 12:29:19 +02:00
lain	5b6818b3e5	CommonAPI: Obey local limit for chat messages.	2020-04-20 12:08:47 +02:00
lain	ce23673ca1	ChatMessageValidator: Don't validate messages that are too long.	2020-04-20 11:45:11 +02:00
rinpatch	918a8094fc	Merge branch '1559-follow-request-notifications' into 'develop' ... [#1559] Support for "follow_request" notifications Closes #1559 See merge request pleroma/pleroma!2354	2020-04-19 21:45:20 +00:00
Haelwenn	79445ae5d2	Merge branch 'bugfix/1697-user_emoji_miration' into 'develop' ... migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo Closes #1697 See merge request pleroma/pleroma!2403	2020-04-18 06:59:23 +00:00
Haelwenn	24f760c2f7	Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex	2020-04-17 22:48:37 +00:00
Haelwenn (lanodan) Monnier	eb61564005	migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo	2020-04-17 23:57:22 +02:00
Ivan Tashkinov	66f55106bd	[#1682] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when password is provided. Refactored plugs skipping functionality.	2020-04-17 21:21:10 +03:00
Egor Kislitsyn	163341857a	Improve OpenAPI errors	2020-04-17 19:27:22 +04:00
lain	c845820911	Notifications: Create a chat notification.	2020-04-17 16:55:01 +02:00
rinpatch	e0d7847bc5	Merge branch 'sideeffects-test' into 'develop' ... SideEffects: Test for notification creation. See merge request pleroma/pleroma!2399	2020-04-17 14:03:04 +00:00
lain	8c2c325598	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-04-17 15:51:24 +02:00
lain	26d9c83316	SideEffects: Test for notification creation.	2020-04-17 15:50:15 +02:00
rinpatch	6936854878	Merge branch 'bugfix/1695-user_emoji_miration' into 'develop' ... migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering Closes #1695 See merge request pleroma/pleroma!2398	2020-04-17 13:40:25 +00:00
lain	372614cfd3	ChatView: Add a mastodon api representation of the recipient.	2020-04-17 15:37:54 +02:00
Ivan Tashkinov	6e6f95c6ae	Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications ... # Conflicts: # CHANGELOG.md	2020-04-17 16:23:58 +03:00
Haelwenn (lanodan) Monnier	46f051048f	migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering	2020-04-17 14:32:15 +02:00
lain	d45ae64858	ChatController: Use OAuth scopes.	2020-04-17 13:04:46 +02:00
Alexander Strizhakov	6cda360fea	don't restart postgrex	2020-04-17 12:45:13 +03:00
Haelwenn	a17bfb5fab	Merge branch 'feature/1584-client-captcha-options' into 'develop' ... Creating trusted app from adminFE & mix task Closes #1584 See merge request pleroma/pleroma!2252	2020-04-17 09:19:35 +00:00
Haelwenn	d8142ee6fe	Merge branch 'fix/1694-transfer-task-fix' into 'develop' ... Fix for logger configuration Closes #1694 See merge request pleroma/pleroma!2396	2020-04-17 09:02:10 +00:00
Haelwenn	9c76d70a47	Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop' ... Added need_reboot endpoint to admin api Closes #1677 See merge request pleroma/pleroma!2373	2020-04-17 08:55:46 +00:00
Alexander Strizhakov	304ea09f4c	fix for logger configuration	2020-04-17 08:42:48 +03:00
rinpatch	badd888ccb	Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop' ... Enforcement of OAuth scopes check for authenticated API endpoints See merge request pleroma/pleroma!2349	2020-04-16 21:58:57 +00:00
rinpatch	28bcde5d98	Merge branch 'fix/1691-feed-render' into 'develop' ... Fix for use of `published` field from different entities Closes #1691 See merge request pleroma/pleroma!2395	2020-04-16 18:38:58 +00:00
rinpatch	942d7467ca	Merge branch 'develop' into features/remove-user-source_data	2020-04-16 21:28:52 +03:00
lain	f8c3ae7a62	ChatController: Handle pagination.	2020-04-16 18:43:31 +02:00
lain	e983f70884	ChatMessagesHandling: Strip HTML of incoming messages.	2020-04-16 17:50:24 +02:00
Alexander Strizhakov	4d330d9df1	fix for use of published from different entities	2020-04-16 18:05:36 +03:00
rinpatch	252528a4b9	Merge branch 'refactor/remove-upgrade-changeset' into 'develop' ... Remove User.upgrade_changeset in favor of remote_user_creation See merge request pleroma/pleroma!2368	2020-04-16 14:59:11 +00:00
rinpatch	77ee64b993	user: remove blank?	2020-04-16 17:54:57 +03:00
lain	41fdcb7282	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-04-16 15:28:08 +02:00
lain	ca598e9c27	AccountView: Return user ap_id.	2020-04-16 15:27:35 +02:00
lain	e2ced04917	ChatMessages: Better validation.	2020-04-16 15:21:47 +02:00
Alexander Strizhakov	72ef6cc4f2	added need_reboot endpoint to admin api	2020-04-16 16:03:26 +03:00
lain	3d4eca5dd4	CommonAPI: Escape HTML for chat messages.	2020-04-16 12:56:29 +02:00
Egor Kislitsyn	cf4ebba774	Cleanup SubscriptionController	2020-04-15 23:14:47 +04:00
Maksim Pechnikov	4b3b1fec4e	added an endpoint for getting unread notification count	2020-04-15 21:19:43 +03:00
Ivan Tashkinov	bde1189c34	[#2349] Made :skip_plug/2 prevent plug from being executed even if explicitly called. Refactoring. Tests.	2020-04-15 21:19:16 +03:00
lain	6ace22b56a	Chat: Add views, don't return them in timeline queries.	2020-04-15 18:23:16 +02:00
Ivan Tashkinov	bedf92e064	Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement	2020-04-15 19:20:34 +03:00
Haelwenn	b1c1d2e5e1	Merge branch 'fix/1659-rate-limiter' into 'develop' ... remote_ip plug adds remote_ip_found flag Closes #1659 See merge request pleroma/pleroma!2390	2020-04-15 15:26:55 +00:00
Egor Kislitsyn	65f04b7806	Fix credo warning	2020-04-15 17:16:32 +04:00
Egor Kislitsyn	16f4787bf7	Add a TODO note	2020-04-15 16:51:37 +04:00
Egor Kislitsyn	0e647ff55a	Abstract pagination params in OpenAPI spec	2020-04-15 16:45:45 +04:00
lain	44bfb491ea	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-04-15 14:41:43 +02:00
Alexander Strizhakov	22bde21c4f	remote_ip plug adds remote_ip_found flag	2020-04-15 15:27:34 +03:00
Egor Kislitsyn	8ed162b655	Fix formatting	2020-04-15 15:57:00 +04:00
minibikini	5a2e45a218	Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex	2020-04-15 11:29:10 +00:00
minibikini	81a4c15816	Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex	2020-04-15 10:48:52 +00:00
minibikini	a45bd91d4e	Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex	2020-04-15 10:48:32 +00:00
minibikini	bfa26b0937	Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex	2020-04-15 10:30:19 +00:00
minibikini	a794ba655f	Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex	2020-04-15 10:27:01 +00:00
minibikini	a7feca1604	Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex	2020-04-15 10:26:53 +00:00
minibikini	d3e876aeee	Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex	2020-04-15 10:26:44 +00:00
lain	6bc76df287	Uploads: Sandbox them in the CSP.	2020-04-15 12:05:22 +02:00
rinpatch	96eae62995	Merge branch 'fix/openapi-form-mimetype' into 'develop' ... openapi: add application/x-www-form-urlencoded to body types Closes #1683 See merge request pleroma/pleroma!2387	2020-04-14 22:01:24 +00:00
rinpatch	cc4ff19e34	openapi: add application/x-www-form-urlencoded to body types ... Closes #1683	2020-04-15 00:49:21 +03:00
Ivan Tashkinov	f7e623c11c	[#1364] Resolved merge conflicts with develop.	2020-04-14 20:19:08 +03:00
Ivan Tashkinov	0cda80f266	Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users ... # Conflicts: # lib/pleroma/notification.ex	2020-04-14 20:10:02 +03:00
Mark Felder	3bf78f2be7	Fix Oban not receiving :ok from RichMediaHelper job	2020-04-14 11:43:53 -05:00
lain	4576520461	Revert "Merge branch 'issue/1276' into 'develop'" ... This reverts merge request !1877	2020-04-14 16:32:22 +00:00
Egor Kislitsyn	247e6fcb90	Merge branch 'develop' into openapi/account	2020-04-14 19:45:22 +04:00
feld	bf3afbc1a1	Merge branch 'logger-configuration' into 'develop' ... Fix for logger configuration through admin-fe See merge request pleroma/pleroma!2365	2020-04-14 15:11:25 +00:00
lain	5fc6ce30ac	Merge branch 'chore/spelling' into 'develop' ... Fix spelling in log message See merge request pleroma/pleroma!2378	2020-04-14 13:07:57 +00:00
lain	2eae5793cd	Merge branch 'fix/issue_1679' into 'develop' ... [#1679] fixed logs See merge request pleroma/pleroma!2379	2020-04-14 11:08:33 +00:00
Ivan Tashkinov	650853fc89	Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users ... # Conflicts: # lib/pleroma/notification.ex	2020-04-14 11:58:38 +03:00
Haelwenn	60cc7d6c9a	Merge branch 'issue/1276' into 'develop' ... [#1276] An endpoint for getting unread notification count Closes #1276 See merge request pleroma/pleroma!1877	2020-04-14 06:38:56 +00:00
Maksim Pechnikov	c4e7ed660c	fix logger message	2020-04-14 08:43:47 +03:00
Mark Felder	f3725b8fc4	Fix spelling	2020-04-13 17:04:43 -05:00
Egor Kislitsyn	4dca712e90	Add OpenAPI spec for DomainBlockController	2020-04-13 22:44:52 +04:00
Maksim Pechnikov	a16b3dbcbf	Merge branch 'develop' into issue/1276	2020-04-13 21:19:27 +03:00
Egor Kislitsyn	c28aaf9d82	Add OpenAPI spec for CustomEmojiController	2020-04-13 21:21:04 +04:00
Egor Kislitsyn	7e0b42d99f	Add specs for AccountController.mutes, AccountController.blocks, AccountController.mutes, AccountController.endorsements	2020-04-13 18:17:09 +04:00
Egor Kislitsyn	ab185d3ea4	Add spec for AccountController.follows	2020-04-13 18:17:09 +04:00
Egor Kislitsyn	68a979b824	Add specs for AccountController.block and AccountController.unblock	2020-04-13 18:17:08 +04:00
Egor Kislitsyn	e4195d4a68	Add specs for AccountController.mute and AccountController.unmute	2020-04-13 18:17:08 +04:00
Egor Kislitsyn	aa958a6dda	Add spec for AccountController.unfollow	2020-04-13 18:17:08 +04:00
Egor Kislitsyn	854780c72b	Add spec for AccountController.follow	2020-04-13 18:17:08 +04:00