4566 Commits

Author	SHA1	Message	Date
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
rinpatch	271ea5068f	Merge branch '1851-favorites-pagination' into 'develop' ... StatusController: Correctly paginate favorites. Closes #1851 See merge request pleroma/pleroma!2636	2020-06-13 17:20:43 +00:00
href	cb7be6eef2	Remove use of atoms in MRF.UserAllowListPolicy	2020-06-13 12:08:46 +03:00
Egor Kislitsyn	520367d6fd	Fix atom leak in Rich Media Parser	2020-06-13 12:08:46 +03:00
Mark Felder	26f710b9e3	Merge branch 'develop' into preload-data	2020-06-12 16:52:52 -05: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
Egor Kislitsyn	697cf92024	Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers	2020-06-12 18:25:29 +04:00
lain	e557265a03	Merge branch 'global-status-expiration' into 'develop' ... Global status expiration See merge request pleroma/pleroma!2208	2020-06-12 14:14:09 +00:00
Mark Felder	34593d6aa5	Merge branch 'develop' into features/mix-task-reset-mfa	2020-06-12 08:43:50 -05:00
Maksim Pechnikov	f9dcf15ecb	added admin api for MediaProxy cache invalidation	2020-06-12 14:49:54 +03:00
Ivan Tashkinov	2188097066	[#1794] Fixes URI query handling for hashtags extraction in search.	2020-06-12 14:25:41 +03:00
Haelwenn (lanodan) Monnier	40970f6bb9	New mix task: pleroma.user reset_mfa <nickname>	2020-06-11 22:54:48 +02:00
Egor Kislitsyn	1f35acce54	Merge OGP parser with TwitterCard	2020-06-11 17:57:31 +04:00
Ivan Tashkinov	b28cec4271	[#1794] Fixes URI query handling for hashtags extraction in search.	2020-06-11 16:05:14 +03:00
lain	5d87405b51	ActivityPubTest: Update test for atomized parameters.	2020-06-10 16:55:30 +02:00
Thibaut Girka	570123ae21	Add test	2020-06-10 16:53:24 +02:00
rinpatch	7aa6c82937	Merge branch 'remake-remodel-dms' into 'develop' ... Chats / ChatMessages See merge request pleroma/pleroma!2429	2020-06-10 12:05:45 +00:00
lain	600e2ea073	ActivityPubTest: Make test easier to understand.	2020-06-10 12:15:56 +02:00
lain	9e411372d0	ActivityPub: Don't show announces of your own objects in timeline.	2020-06-10 12:10:09 +02:00
Egor Kislitsyn	3dd1de61a7	Add url field to AdminAPI.AccountView	2020-06-09 16:02:42 +04:00
lain	063e6b9841	StatusController: Correctly paginate favorites. ... Favorites were paginating wrongly, because the pagination headers where using the id of the id of the `Create` activity, while the ordering was by the id of the `Like` activity. This isn't easy to notice in most cases, as they usually have a similar order because people tend to favorite posts as they come in. This commit adds a way to give different pagination ids to the pagination helper, so we can paginate correctly in cases like this.	2020-06-09 10:53:40 +02:00
lain	064c4f86f3	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-06-09 09:36:07 +02:00
lain	e1bc37d118	MigrationHelper: Move notification backfilling to own module.	2020-06-09 09:20:55 +02:00
Roman Chvanikov	604a83ae3e	merge develop	2020-06-08 19:21:07 +03:00
Egor Kislitsyn	d44843e677	Restrict ActivityExpirationPolicy to Notes only	2020-06-08 17:56:34 +04:00
Egor Kislitsyn	da22119c2f	Merge branch 'develop' into global-status-expiration	2020-06-08 17:21:47 +04:00
lain	d192492658	Merge branch 'openapi/admin/relay' into 'develop' ... Add OpenAPI spec for AdminAPI.RelayController See merge request pleroma/pleroma!2579	2020-06-08 11:07:01 +00:00
lain	c450b248cc	Merge branch 'feature/delete-follow-requests-on-user-deletion' into 'develop' ... Delete outgoing pending follow requests on user deletion See merge request pleroma/pleroma!2631	2020-06-08 10:54:43 +00: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	89b85f6529	ChatController: Remove nonsensical pagination.	2020-06-08 11:09:53 +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
lain	fe2a5d0614	ChatController: Make last_read_id mandatory.	2020-06-07 20:22:08 +02:00
Sergey Suprunenko	8d9e586887	Delete pending follow requests on user deletion	2020-06-07 17:31:37 +02:00
lain	801e668a97	ChatController: Add last_read_id option to mark_as_read.	2020-06-07 15:38:33 +02:00
lain	2cdaac4330	SideEffects: Move streaming of chats to after the transaction.	2020-06-07 14:52:56 +02:00
lain	f4cf4ae16e	ChatController: Use new oauth scope *:chats.	2020-06-06 16:48:02 +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	9189b489ee	Migrations: Move Notification migration code to helper	2020-06-06 15:33:02 +02:00
lain	ca0e6e702b	ChatMessageReference -> Chat.MessageReference	2020-06-06 11:51:10 +02:00
lain	4e8c0eecd5	WebPush: Don't break on contentless chat messages.	2020-06-06 09:46:07 +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
lain	115d08a754	Pipeline: Add a side effects step after the transaction finishes ... This is to run things like streaming notifications out, which will sometimes need data that is created by the transaction, but is streamed out asynchronously.	2020-06-05 16:47:02 +02:00
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	74edd4f391	Merge branch 'remake-remodel-dms' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-06-04 19:24:07 +02:00
lain	56dfa0e0fb	Transmogrifier: Update notification after accepting.	2020-06-04 19:22:49 +02:00
lain	9a53f619e0	Apply suggestion to test/chat_message_reference_test.exs	2020-06-04 15:16:15 +00:00
lain	41503b1673	Apply suggestion to test/web/activity_pub/transmogrifier/chat_message_test.exs	2020-06-04 15:16:10 +00:00
lain	00748e9650	ChatMessageReferences: Change seen -> unread	2020-06-04 17:14:42 +02:00
stwf	a42d135cce	test fix	2020-06-04 10:51:24 -04: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
lain	5d7dda883e	SideEffectsTest: More tests.	2020-06-04 14:46:41 +02:00
Egor Kislitsyn	a8132690bd	Fix credo	2020-06-04 13:46:13 +04: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	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	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
lain	7f5c5b11a5	Chats: Remove unread from the db, calculate from unseen messages.	2020-06-03 14:26:50 +02:00
lain	2591745fc2	ChatMessageReferences: Move tests	2020-06-03 12:56:39 +02: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	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	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	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
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
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
Roman Chvanikov	b973d0b2f0	Fix config setting to not affect other tests	2020-05-30 16:47:09 +03: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
Roman Chvanikov	0a83af330b	fix unused var warning	2020-05-29 23:05:03 +03:00
Ivan Tashkinov	c181e555db	[#1794] Improvements to hashtags extraction from search query.	2020-05-29 22:03:14 +03:00
kPherox	9ca978494f	Add test for stream boosts of mastodon user	2020-05-30 00:31:20 +09: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	b3b367b894	Bugfix: Reuse Controller.Helper pagination for APC2S	2020-05-29 16:14: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
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
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
Mark Felder	4c82f657c5	Formatting	2020-05-28 13:22:28 -05: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
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
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
rinpatch	78c46fb7ba	MediaProxy test: use config macros instead of directly putting values ... They were not properly cleaned later and caused trouble for another tests	2020-05-27 19:34:56 +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
lain	b8e029b5ea	Notification: Actually preload objects.	2020-05-27 12:41:06 +02:00
Alexander Strizhakov	3249141588	validate actor type	2020-05-27 10:14:22 +03: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
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
lain	644195e31e	Merge branch '1501-include-unlisted-posts-in-user-feed' into 'develop' ... [#1501] Made user feed contain public and unlisted activities Closes #1501 See merge request pleroma/pleroma!2584	2020-05-26 10:56:40 +00: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	e32b7ae044	Skip failing :crypt test on mac	2020-05-25 23:01:37 +04: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	2c25087d20	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-05-25 16:52:03 +02:00
lain	6bd7070b00	Transmogrifier: Use a simpler way to get mentions.	2020-05-25 15:08:43 +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	5d5db7e5b7	StealEmojiPolicyTest: Clean up.	2020-05-25 14:00:18 +02:00
lain	2dff376041	StealEmojiPolicyTest: Fix flaky test.	2020-05-25 13:58:14 +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	aeb0875025	StealEmojiPolicyTest: Fix flaky test.	2020-05-25 13:48:47 +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	3bec0d2e50	Factory: Set users to be ap_enabled by default.	2020-05-25 12:59:42 +02:00
lain	0c970a9d44	UserTest: Add test for user refreshing.	2020-05-25 12:49:38 +02: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	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
Ivan Tashkinov	3a1e810aaa	[#2497] Customized exexec launch to support root operation (currently required by Gitlab CI).	2020-05-21 21:47:32 +03: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	c4a5cead51	UploadTest: Fix test.	2020-05-21 15:17:39 +02: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	bf1b221f94	Credo fixes for the credo god.	2020-05-21 14:12:32 +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
Ivan Tashkinov	6fd4f58ead	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy	2020-05-20 20:27:03 +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	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
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
lain	2328eff09c	UserTest: Hide warning in tests.	2020-05-19 14:36:13 +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
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
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	63ab2743ce	TransmogrifierTest: Fix tests.	2020-05-18 15:47:26 +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	0321a3e078	test naming fix	2020-05-18 10:34:50 +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
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
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
Ivan Tashkinov	978ccf8f97	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy	2020-05-16 16:14:50 +03:00
lain	2dcb26a6e5	CommonAPI: Unblock a user even if we don't have an activity.	2020-05-16 12:28:24 +02: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
Ivan Tashkinov	e4b12494d7	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy ... # Conflicts: # mix.lock	2020-05-14 20:19:56 +03: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
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
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
Roman Chvanikov	8a383707ae	Merge develop	2020-05-13 19:56:40 +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	da550be066	Merge branch 'fix/1742-random-failing-tests' into 'develop' ... Fix sporadically failing tests See merge request pleroma/pleroma!2524	2020-05-13 13:38:32 +00:00
lain	0f0acc740d	Chat: Allow posting without content if an attachment is present.	2020-05-13 15:31:28 +02:00
lain	06cad239e5	InstanceView: Add pleroma chat messages to nodeinfo	2020-05-13 14:05:22 +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	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
Alexander Strizhakov	fbe3d3aa5f	ignore order	2020-05-13 11:38:23 +03:00
Alexander Strizhakov	2c356a4bac	don't use async with global mocks	2020-05-13 11:38:23 +03:00
Alexander Strizhakov	12635bc156	don't use global mocks in setup callbacks	2020-05-13 11:38:22 +03:00
Alexander Strizhakov	b962b24e6f	don't run in async if tests depend on env config	2020-05-13 11:38:22 +03:00
Alexander Strizhakov	ec27f346ee	correct order for publised in assert	2020-05-13 11:38:22 +03:00
Alexander Strizhakov	e0944dee99	make test fail everytime	2020-05-13 11:38:22 +03:00
Alexander Strizhakov	712055612f	don't run tests which change env in async	2020-05-13 11:38:22 +03:00
Alexander Strizhakov	4ba913d641	{:error, :enoent} s3 fix ... s3 tests were executed before temp file was uploaded	2020-05-13 11:38:21 +03: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	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
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
href	68cca29dcf	Fix typo in test	2020-05-12 18:51:10 +02: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
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
lain	e44166b510	Credo fixes.	2020-05-12 14:44:11 +02: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	dfb90a1fd6	Transmogrifier: Add tests for certain announces	2020-05-12 12:50:48 +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
Ivan Tashkinov	1b23acf164	[#2497] Media preview proxy for images: fixes, tweaks, refactoring, tests adjustments.	2020-05-11 23:21:53 +03:00
lain	f28ed36b4d	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-05-11 17:14:58 +02:00
lain	679afb2de4	SideEffects test: Add test for favorite deletion.	2020-05-11 15:38:19 +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	1b1dfb54eb	Credo fixes.	2020-05-10 13:28:05 +02:00
lain	8d5597ff68	ChatController: Add GET /chats/:id	2020-05-10 13:26:14 +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
Ivan Tashkinov	aee88d11be	[#2456] Removed support for embedded relationships in account view.	2020-05-10 09:16:48 +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	5c368b004b	Fix refresh_counter_cache test	2020-05-09 11:49:54 +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
Ivan Tashkinov	bbdad85568	Initial implementation of image preview proxy. Media proxy tests refactoring.	2020-05-08 23:06: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	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
lain	7e9aaa0d02	Transmogrifier tests: Remove more double tests.	2020-05-08 11:43:07 +02:00
lain	f1274c3326	Transmogrifier tests: Remove double tests.	2020-05-08 11:41:13 +02:00
Maksim Pechnikov	4d71c4b805	fixed 'source' object in verify_credentials	2020-05-08 12:35:34 +03: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
Mark Felder	ea01e647df	Test Direct, Public, and Favorite notifications with privacy option	2020-05-07 09:13:43 -05: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	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
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
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
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
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	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
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	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
lain	8b2457bdbf	Transmogrifier tests: Extract Undo handling	2020-05-05 13:25:34 +02: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	142bf0957c	Transmogrifier: Extract EmojiReact tests.	2020-05-05 11:20:53 +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	6a2905ccf0	WebFinger Test: Add back test.	2020-05-05 09:55:33 +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
lain	c23cb8d37a	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-05-04 19:24:04 +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	335aabc39c	Transmogrifier tests: Extract like tests.	2020-05-04 14:45:28 +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	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	a7966f2080	Webfinger: Request account info with the acct scheme	2020-05-03 13:48:01 +02:00
lain	6c337489f4	Various testing fixes in relation to user deletion.	2020-05-03 13:01:19 +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
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	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
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
Ivan Tashkinov	cf5ca7e45b	Merge remote-tracking branch 'remotes/origin/develop' into follow-request-notifications	2020-05-02 07:39:19 +03:00
rinpatch	e7b1df7252	Fix sporadic test compilation failure caused by unused alias	2020-05-01 22:50:40 +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	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
Alexander Strizhakov	aea781cbd8	credo fix	2020-05-01 16:31:05 +03: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
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
lain	da4b79a56d	Merge branch 'tests/more-apc2s' into 'develop' ... Increase tests on AP C2S See merge request pleroma/pleroma!2449	2020-04-30 22:19:26 +00: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	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
Haelwenn (lanodan) Monnier	f1523f9acd	Increase tests on AP C2S ... Related: https://git.pleroma.social/pleroma/pleroma/-/issues/954	2020-04-30 18:56:57 +02:00
lain	ab60ee1776	SideEffects: On deletion, reduce the User note count.	2020-04-30 18:19:39 +02:00
lain	3d0dc58e2e	SideEffectsTest: Test streaming.	2020-04-30 18:10:36 +02:00
lain	315b773dd9	ObjectValidator: Refactor.	2020-04-30 17:58:31 +02:00
lain	4500fdc04c	DeleteValidator: Add internal helper field after validation.	2020-04-30 17:53:02 +02:00
lain	143353432a	StreamerTest: Separate deletion test.	2020-04-30 17:52:29 +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
lain	c9bfa51ea9	Credo fixes.	2020-04-30 15:58:37 +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	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	bd219ba7e8	Transmogrifier Tests: Extract deletion tests.	2020-04-30 14:14:00 +02: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
Egor Kislitsyn	7b0c8f0fde	Add tests for account registration with captcha enabled and improve errors	2020-04-29 21:26:07 +04:00
lain	503de4b8df	ObjectValidator: Add validation for Deletes.	2020-04-29 19:09:51 +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	e055b8d203	Pipeline: Always run common_pipeline in a transaction for now.	2020-04-29 13:45:50 +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
Maksim Pechnikov	7bd187bc5e	added test	2020-04-29 08:13:10 +03:00
Egor Kislitsyn	5238ae3dd3	Add OpenAPI spec for NotificationController	2020-04-28 21:27:54 +04: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	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	d607b4d840	mongooseim test: explicitly set password for the deactivated used	2020-04-27 19:32:58 +02:00
fence	935ca2c132	requested changes to mongoose test	2020-04-27 19:16:05 +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
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
Egor Kislitsyn	f1ca917bb0	Merge branch 'develop' into openapi/account	2020-04-27 14:33:00 +04:00
lain	d2bbea1a80	ChatControllerTest: Use new schema testing functions.	2020-04-27 12:19:27 +02:00
lain	c86143ed73	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-04-27 12:07:08 +02: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	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
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
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
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	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
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
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
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
lain	6c8390fa4d	ChatControllerTest: Credo fixes.	2020-04-21 18:32:30 +02: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
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	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
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	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
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
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
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
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
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
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
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
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
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
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
Egor Kislitsyn	1b680a98ae	Add spec for AccountController.lists	2020-04-13 18:17:07 +04:00
Egor Kislitsyn	e105cc12b6	Add spec for AccountController.following	2020-04-13 18:17:07 +04:00
Egor Kislitsyn	bd6e2b300f	Add spec for AccountController.followers	2020-04-13 18:17:07 +04:00
Egor Kislitsyn	03124c96cc	Add spec for AccountController.statuses	2020-04-13 18:17:07 +04:00
Egor Kislitsyn	278b3fa0ad	Add spec for AccountController.show	2020-04-13 18:16:07 +04:00
Egor Kislitsyn	d7d6a83233	Add spec for AccountController.relationships	2020-04-13 18:16:07 +04:00
Egor Kislitsyn	ab400b2ddb	Add specs for ActorType and VisibilityScope	2020-04-13 18:16:07 +04:00
Egor Kislitsyn	260cbddc94	Add spec for AccountController.update_credentials	2020-04-13 18:16:07 +04:00
Egor Kislitsyn	f80116125f	Add spec for AccountController.verify_credentials	2020-04-13 17:38:59 +04:00
Egor Kislitsyn	b08ded6c2f	Add spec for AccountController.create	2020-04-13 17:38:59 +04:00
Egor Kislitsyn	dc8fa04192	Merge branch 'develop' into global-status-expiration	2020-04-13 14:12:51 +04:00
Ivan Tashkinov	f00ff20768	Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users ... # Conflicts: # lib/pleroma/following_relationship.ex	2020-04-13 09:23:50 +03:00
Ivan Tashkinov	a21baf89d8	Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses	2020-04-13 09:16:51 +03:00
Alexander Strizhakov	a050f3e015	fix for logger configuration through admin-fe	2020-04-13 08:56:28 +03:00
Maksim Pechnikov	c5c09fc61b	fix mediaType of object	2020-04-13 07:02:57 +03:00
Alex Gleason	9a3c74b244	Always accept deletions through SimplePolicy	2020-04-12 20:26:35 -05:00
Ivan Tashkinov	c556efb761	[#1364] Enabled notifications on followed domain-blocked users' activities.	2020-04-12 21:53:03 +03:00
rinpatch	5e365448f3	Merge branch 'following-relationships-optimizations' into 'develop' ... FollowingRelationship storage & performance optimizations See merge request pleroma/pleroma!2332	2020-04-11 19:46:04 +00:00
rinpatch	c077ad0b33	Remove User.upgrade_changeset in favor of remote_user_creation ... The two changesets had the same purpose, yet some changes were updated in one, but not the other (`uri`, for example). Also makes `Transmogrifier.upgrade_user_from_ap_id` be called from `ActivityPub.make_user_from_ap_id` only when the user is actually not AP enabled yet. I did not bother rewriting tests that used `User.insert_or_update` to use the changeset instead because they seemed to just test the implementation, rather than behavior.	2020-04-11 22:31:46 +03:00
Ivan Tashkinov	88b16fdfb7	[#1364] Disabled notifications on activities from blocked domains.	2020-04-11 16:01:09 +03:00
Egor Kislitsyn	dd612f86ae	Merge remote-tracking branch 'origin/develop' into global-status-expiration	2020-04-10 20:00:05 +04:00
lain	64c78581fe	Chat: Only create them for valid users for now.	2020-04-10 14:47:56 +02:00
Egor Kislitsyn	7f692343c8	Merge branch 'develop' into global-status-expiration	2020-04-10 14:20:48 +04:00
Egor Kislitsyn	cf2a0574e7	Merge branch 'develop' into fix/support-conversations-pagination	2020-04-10 14:18:57 +04:00
Haelwenn	4d33e0bd50	Merge branch 'bugfix/apc2s_upload_activity' into 'develop' ... bugfix: AP C2S activity with attachments See merge request pleroma/pleroma!2316	2020-04-10 04:31:13 +00:00
Haelwenn (lanodan) Monnier	e89078ac2a	User: remove source_data	2020-04-10 06:20:03 +02:00
Haelwenn (lanodan) Monnier	3420dec494	Remove User.fields/1	2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier	9172d719cc	profile emojis in User.emoji instead of source_data	2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier	62656ab259	User: Move inbox & shared_inbox to own fields	2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier	369c03834c	formatter: Use user.uri instead of user.source_data.uri	2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier	19eedb3d04	User: Move public_key from source_data to own field	2020-04-10 06:16:18 +02:00
lain	2cc6841424	ChatController: Basic message posting.	2020-04-09 17:18:31 +02:00
lain	e8fd0dd689	ChatController: Basic support for returning messages.	2020-04-09 16:59:49 +02:00
lain	68abea313d	ChatController: Add creation and return of chats.	2020-04-09 15:13:55 +02:00
Egor Kislitsyn	d545b883eb	Add /api/v1/notifications/:id/dismiss endpoint	2020-04-09 17:08:43 +04:00
lain	d35e114acd	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-04-09 13:25:27 +02:00
lain	8e637ae1a7	CommonAPI: Basic ChatMessage support.	2020-04-09 13:20:16 +02:00
lain	4b04785071	SideEffects: Extend ChatMessage test.	2020-04-09 12:46:33 +02:00
lain	2e78686686	SideEffects: Handle ChatMessage creation.	2020-04-09 12:44:20 +02:00
lain	b87b798ca1	Merge branch 'fix/1658-invite-send' into 'develop' ... Error improvement for email_invite endpoint See merge request pleroma/pleroma!2344	2020-04-09 10:42:43 +00:00
Alexander Strizhakov	9795ff5b01	Apply suggestion to test/web/admin_api/admin_api_controller_test.exs	2020-04-09 10:17:50 +00:00
Alexander Strizhakov	365c34a7a9	Apply suggestion to test/web/admin_api/admin_api_controller_test.exs	2020-04-09 10:17:44 +00:00
lain	d2e21fbc96	Merge branch 'open-api' into 'develop' ... Add OpenAPI Closes pleroma-meta#19 See merge request pleroma/pleroma!2345	2020-04-09 09:48:56 +00:00
rinpatch	d067eaa7b3	formatter.ex: Use Phoenix.HTML for mention/hashtag generation ... Unlike concatenating strings, this makes sure everything is escaped. Tests had to be changed because Phoenix.HTML runs attributes through Enum.sort before generation for whatever reason.	2020-04-08 22:58:31 +03:00
Ivan Tashkinov	3965772b26	[#1559] Minor change (analysis).	2020-04-08 21:33:37 +03:00
Ivan Tashkinov	f35c28bf07	[#1559] Added / fixed tests for follow / follow_request notifications.	2020-04-08 21:26:22 +03:00
lain	3775683a04	ChatMessage: Basic incoming handling.	2020-04-08 15:55:43 +02:00
rinpatch	dd4d10b275	Merge branch 'fix-auto-link-for-profile-fields' into 'develop' ... Use Pleroma.Formatter.linkify/2 instead See merge request pleroma/pleroma!2352	2020-04-07 11:41:10 +00:00
Maksim Pechnikov	2b7d7bbd2d	Merge branch 'develop' into issue/1276	2020-04-07 14:09:43 +03:00
kPherox	06471940e0	Apply suggestion to test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs	2020-04-07 08:44:53 +00:00
lain	19335be24c	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-04-06 17:50:31 +02:00
lain	1d4ab06505	Merge branch 'featureflag/emoji_reactions' into 'develop' ... Add emoji reactions to features in nodeinfo See merge request pleroma/pleroma!2313	2020-04-06 12:51:35 +00:00
lain	96ee0aadbf	Merge branch 'improving-test-coverage' into 'develop' ... Tests for emoji mix task See merge request pleroma/pleroma!2350	2020-04-06 12:49:17 +00:00
lain	349b9d86dc	Merge branch 'remake-remodel-2' into 'develop' ... Ingestion Pipeline Revamp See merge request pleroma/pleroma!2315	2020-04-06 11:59:01 +00:00
Alexander Strizhakov	a43e055916	using another fn for file deletion	2020-04-06 14:27:20 +03:00
Alexander Strizhakov	b59ac37b2c	tests for emoji mix task	2020-04-06 11:13:59 +03:00
Ivan Tashkinov	fc81e5a49c	Enforcement of OAuth scopes check for authenticated API endpoints, :skip_plug plug to mark a plug explicitly skipped (disabled).	2020-04-06 10:20:44 +03:00
Ivan Tashkinov	3fa51f7272	Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses ... # Conflicts: # lib/pleroma/web/mastodon_api/views/account_view.ex # lib/pleroma/web/mastodon_api/views/status_view.ex	2020-04-02 19:38:39 +03:00
Ivan Tashkinov	aa78325117	[#2323] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.	2020-04-02 19:23:30 +03:00
lain	fd97b0e634	Chats: Basic implementation.	2020-04-02 15:19:09 +02:00
Maksim Pechnikov	dbcfac11b4	Merge branch 'develop' into issue/1276	2020-04-02 14:47:17 +03:00
Egor Kislitsyn	23219e6fb3	Add OpenAPI	2020-04-01 23:13:08 +04:00
Alexander Strizhakov	2d64500a9d	error improvement for email_invite endpoint	2020-04-01 20:26:33 +03:00
Ivan Tashkinov	98b96e45ab	Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses ... # Conflicts: # CHANGELOG.md	2020-04-01 20:08:14 +03:00
feld	ef7d2b0f11	Merge branch 'gun' into 'develop' ... Gun adapter Closes #945 See merge request pleroma/pleroma!1861	2020-04-01 17:05:09 +00:00
Ivan Tashkinov	2f2bd7fe72	Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance. ... See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.	2020-04-01 19:49:09 +03:00
rinpatch	bfec45bf74	Merge branch 'fix/1601-add-new-meta-tag' into 'develop' ... Restrict remote users from indexing Closes #1601 See merge request pleroma/pleroma!2341	2020-04-01 12:55:52 +00:00
Alexander Strizhakov	94ddbe4098	restrict remote users from indexing	2020-04-01 09:57:12 +03:00
Haelwenn (lanodan) Monnier	185520d1b4	Provide known-good user.uri, remove User.profile_url/1	2020-03-31 23:55:29 +02:00
Haelwenn (lanodan) Monnier	b30fb1f3bb	User: Fix use of source_data in profile_url/1	2020-03-31 23:54:20 +02:00
Haelwenn (lanodan) Monnier	2553400a66	Initial failing test statement against funkwhale channels	2020-03-31 23:54:20 +02:00
kPherox	dbf9d719f9	split test for update profile fields	2020-04-01 02:52:30 +09:00
lain	aebec1bac9	Validator Test: Small refactor.	2020-03-31 17:47:34 +02:00
Alexander Strizhakov	df5f89c0d6	test for default features and changelog entry	2020-03-31 18:22:25 +03:00
lain	643f15e77b	Validators: ObjectID is an http uri.	2020-03-31 16:11:38 +02:00
Alexander Strizhakov	b607ae1a1c	removing grouped reports admin api endpoint	2020-03-30 13:51:45 +03:00
Alexander Strizhakov	f497cf2f7c	Merge branch 'develop' into gun	2020-03-30 12:15:23 +03:00
Haelwenn	e999c67cee	Merge branch 'feature/funkwhale-audio' into 'develop' ... Add support for funkwhale Audio activity Closes #764 and #1624 See merge request pleroma/pleroma!2287	2020-03-29 19:18:22 +00:00
Maksim Pechnikov	dfd2c74184	Merge branch 'develop' into issue/1276	2020-03-29 06:57:34 +03:00
Ivan Tashkinov	be9d18461a	FollowingRelationship storage & performance optimizations (state turned ecto_enum-driven integer, reorganized indices etc.).	2020-03-28 18:49:03 +03:00
Ivan Tashkinov	dfbc05d496	Misc refactoring / tweaks (ThreadMute.exists?/2).	2020-03-27 08:01:03 +03:00
lain	0adaab8e75	Bump copyright dates.	2020-03-26 15:37:42 +01:00
Ivan Tashkinov	112101ca52	Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering ... # Conflicts: # lib/pleroma/thread_mute.ex	2020-03-26 09:43:58 +03:00
rinpatch	de62e633d3	Merge branch '1364-notifications-sending-control' into 'develop' ... [#1364] Ability to opt-out of notifications (in all clients) Closes #1364 See merge request pleroma/pleroma!2301	2020-03-25 18:00:24 +00:00
Ivan Tashkinov	ff1baae7e9	Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering	2020-03-25 20:41:17 +03:00
Ivan Tashkinov	460e41585c	Further preloading (more endpoints), refactoring, tests.	2020-03-25 20:33:34 +03:00
Egor Kislitsyn	9081a071ee	Add a test for accounts/update_credentials	2020-03-25 18:46:17 +04:00
Ivan Tashkinov	012d428e1f	Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control	2020-03-25 09:05:17 +03:00
Ivan Tashkinov	e743c22329	Fixed incorrect usage of "relations" as a short form of "relationships".	2020-03-25 09:04:00 +03:00
Haelwenn (lanodan) Monnier	03a18cf037	node_info_test: Bump default features list	2020-03-24 20:39:19 +01:00
Haelwenn (lanodan) Monnier	212c31c637	Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions	2020-03-24 20:32:49 +01:00
Haelwenn (lanodan) Monnier	64165d1df9	node_info_test.exs: Add test on the default feature list	2020-03-24 20:21:27 +01:00
Ivan Tashkinov	8f1d622b8d	Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering	2020-03-24 22:15:37 +03:00
Ivan Tashkinov	13cbb9f6ad	Implemented preloading of relationships with parent activities' actors for statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related).	2020-03-24 22:14:26 +03:00
feld	8eebc75c15	Merge branch 'fix/activity-deletion' into 'develop' ... Fix activity deletion Closes #1640 See merge request pleroma/pleroma!2328	2020-03-24 19:10:32 +00:00
lain	1d75d0ed7a	Merge branch 'admin-api-change-password' into 'develop' ... Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials` See merge request pleroma/pleroma!2149	2020-03-24 17:34:13 +00:00
Egor Kislitsyn	4a2538967c	Support pagination in conversations	2020-03-24 20:18:27 +04:00
Egor Kislitsyn	d1a9716a98	Fix activity deletion	2020-03-24 17:38:18 +04:00
Egor Kislitsyn	3189c44a0c	Remove some TwitterAPI endpoints	2020-03-24 15:21:40 +04:00
lain	eec1fcaf55	Home timeline tests: Add failing test for relationships	2020-03-23 15:58:55 +01:00
Alexander Strizhakov	a6ee6784bc	creating trusted app from adminFE & mix task	2020-03-23 10:44:47 +03:00
Haelwenn (lanodan) Monnier	15be6ba9c2	AccountView: fix for other forms of <br> in bio ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643	2020-03-22 16:41:01 +01:00
Egor Kislitsyn	fc2eb1fbd6	Fix formatter warnings	2020-03-20 22:16:57 +04:00
Egor Kislitsyn	80e1571610	Merge branch 'develop' into global-status-expiration	2020-03-20 22:08:34 +04:00
Alexander Strizhakov	7f9b5284fa	updating clear_config	2020-03-20 20:58:47 +03:00
Alexander Strizhakov	9bae9b1b1b	Merge branch 'develop' into gun	2020-03-20 20:47:54 +03:00
lain	d74405fc1a	Merge branch 'fix-feed-pagination' into 'develop' ... Fix for feed page pagination Closes #1605 See merge request pleroma/pleroma!2281	2020-03-20 16:57:51 +00:00
Ivan Tashkinov	1c05f539aa	Improved in-test clear_config/n applicability (setup / setup_all / in-test usage).	2020-03-20 18:33:00 +03:00
Ivan Tashkinov	0e27c274f4	Merge remote-tracking branch 'remotes/origin/develop' into clear-config-test-improvements ... # Conflicts: # test/web/mastodon_api/controllers/account_controller_test.exs	2020-03-20 18:08:23 +03:00
lain	6c1232b486	NotificationController: Fix test.	2020-03-20 15:00:28 +01:00
lain	1aa8aa7d7f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2	2020-03-20 14:52:58 +01:00
Alexander Strizhakov	fe15f0ba15	restrict_unauthenticated setting	2020-03-20 16:36:20 +03:00
Alexander Strizhakov	98a60df41f	include_types parameter in /api/v1/notifications	2020-03-20 13:18:12 +03:00
Haelwenn (lanodan) Monnier	a8aa917530	Merge remote-tracking branch 'pleroma/develop' into bugfix/apc2s_upload_activity	2020-03-19 19:25:50 +01:00
Haelwenn (lanodan) Monnier	c1fd4f6653	transmogrifier.ex: rework fix_attachment for better IR	2020-03-19 19:10:03 +01:00
lain	3c2c32b460	Merge branch 'remake-remodel' into develop	2020-03-19 18:00:55 +01:00
Haelwenn (lanodan) Monnier	f9d622d25a	WIP	2020-03-19 15:39:11 +01:00
Ivan Tashkinov	ec3719f539	Improved in-test config management functions.	2020-03-18 20:30:31 +03:00
Alexander Strizhakov	f9ecb513fa	Merge branch 'develop' into gun	2020-03-18 14:08:21 +03:00
Haelwenn (lanodan) Monnier	d3cf7e19fb	activity_pub_controller_test.exs: test posting with AP C2S uploaded media	2020-03-17 14:00:19 +01:00
Ivan Tashkinov	7438833685	[#1364] Improved notification-related tests.	2020-03-16 21:58:10 +03:00
eugenijm	13cce9c0de	Admin API: PATCH /api/pleroma/admin/users/:nickname/credentials, GET /api/pleroma/admin/users/:nickname/credentials.	2020-03-16 20:42:37 +03:00
eugenijm	d198e7fa2a	Admin API: PATCH /api/pleroma/admin/users/:nickname/change_password	2020-03-16 20:32:07 +03:00
Alexander Strizhakov	f3791add99	removing with_move parameter	2020-03-16 20:07:45 +03:00
Ivan Tashkinov	0e07c5ef57	Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control	2020-03-16 17:58:42 +03:00
Egor Kislitsyn	5ad54d1bd5	Merge remote-tracking branch 'origin/develop' into global-status-expiration	2020-03-16 16:31:15 +04:00
Alexander Strizhakov	3805e09b9c	Merge branch 'develop' into gun	2020-03-16 14:35:27 +03:00
Egor Kislitsyn	421e35b578	Merge branch 'develop' into global-status-expiration	2020-03-16 15:31:31 +04:00
Alexander Strizhakov	f0651730bd	Merge branch 'develop' into gun	2020-03-16 14:25:55 +03:00
Alexander Strizhakov	dc2ec84c0f	warnings fix	2020-03-16 14:19:36 +03:00
Alexander Strizhakov	89e4b3ebbd	fix for content-type header for tag feed	2020-03-16 12:59:18 +03:00
Alexander Strizhakov	91870c8995	adding rss for user feed	2020-03-16 12:45:31 +03:00
Alexander Strizhakov	26e2076659	fix for feed page pagination	2020-03-16 12:33:55 +03:00
rinpatch	34fd1c2c9d	Merge branch 'bugfix/earmark_renderer_test' into 'develop' ... test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex See merge request pleroma/pleroma!2300	2020-03-15 20:04:31 +00:00
Haelwenn (lanodan) Monnier	0ac6e29654	static_fe: Sanitize HTML in posts ... Note: Seems to have different sanitization with TwitterCard generator giving the following: <meta content=\"“alert(&#39;xss&#39;)”\" property=\"twitter:description\">	2020-03-15 20:44:04 +01:00
lain	fa4ec17c84	Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop' ... [#1560] Restricted AP- & OStatus-related routes for non-federating instances Closes #1560 See merge request pleroma/pleroma!2235	2020-03-15 19:15:20 +00:00
Ivan Tashkinov	7c8003c3fc	[#1364] Improved control over generation / sending of notifications. Fixed blocking / muting users notifications issue. Added tests.	2020-03-15 21:00:12 +03:00
Haelwenn	d84670b9e1	Merge branch 'f' into 'develop' ... rip out fetch_initial_posts Closes #1422 and #1595 See merge request pleroma/pleroma!2297	2020-03-15 16:14:54 +00:00
Haelwenn (lanodan) Monnier	dca21cd1d6	test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex ... Wasn't in the test suite otherwise	2020-03-15 17:07:08 +01:00
Haelwenn	67a27825b1	Merge branch 'fix/rate-limiter-remoteip-behavior' into 'develop' ... rate limiter: disable based on if remote ip was found, not on if the plug was enabled Closes #1620 See merge request pleroma/pleroma!2296	2020-03-15 14:22:10 +00:00
rinpatch	e87a32bcd7	rip out fetch_initial_posts ... Every time someone tries to use it, it goes mad and tries to scrape the entire fediverse for no visible reason, it's better to just remove it than continue shipping it in it's current state. idea acked by lain and feld on irc Closes #1595 #1422	2020-03-15 15:59:17 +03:00
Ivan Tashkinov	ecb7809e92	Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions ... # Conflicts: # lib/pleroma/plugs/static_fe_plug.ex	2020-03-14 15:37:02 +03:00
rinpatch	d88c8a9614	Merge branch 'fix/cache-control-headers' into 'develop' ... Fix Cache Control headers on media See merge request pleroma/pleroma!2295	2020-03-14 11:19:42 +00:00
rinpatch	994ac4357c	Merge branch 'fix/hashtags-streaming' into 'develop' ... Fix hashtags WebSocket streaming Closes #1593 See merge request pleroma/pleroma!2294	2020-03-13 18:50:17 +00:00
rinpatch	fc4496d4fa	rate limiter: disable based on if remote ip was found, not on if the plug was enabled ... The current rate limiter disable logic won't trigger when the remote ip is not forwarded, only when the remoteip plug is not enabled, which is not the case on most instances since it's enabled by default. This changes the behavior to warn and disable when the remote ip was not forwarded, even if the RemoteIP plug is enabled. Also closes #1620	2020-03-13 21:41:17 +03:00
rinpatch	3e0f05f08e	Merge branch 'bugfix/br-vs-newline' into 'develop' ... Formatting: Do not use \n and prefer <br> instead Closes #1374 and #1375 See merge request pleroma/pleroma!2204	2020-03-13 18:22:55 +00:00
Mark Felder	c6eb1c1b92	Merge branch 'develop' into fix/cache-control-headers	2020-03-13 12:54:06 -05:00
Mark Felder	db36b48180	Remove test verifying we preserve cache-control headers; we don't	2020-03-13 12:23:14 -05:00
Mark Felder	470090471d	Fix test to use new cache-control settings	2020-03-13 12:20:33 -05:00
rinpatch	096c5c52e0	Merge branch 'revert/cache-control' into 'develop' ... Revert "Set better Cache-Control header for static content" Closes #1613 See merge request pleroma/pleroma!2290	2020-03-13 16:25:10 +00:00
Egor Kislitsyn	fffc382f13	Fix hashtags WebSocket streaming	2020-03-13 19:30:42 +04:00
Haelwenn (lanodan) Monnier	d1379c4de8	Formatting: Do not use \n and prefer <br> instead ... It moves bbcode to bbcode_pleroma as the former is owned by kaniini and transfering ownership wasn't done in a timely manner. Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374 Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375	2020-03-13 16:07:17 +01:00
feld	802b991814	Merge branch 'exclude-posts-visible-to-admin' into 'develop' ... Exclude private and direct statuses visible to the admin when using godmode Closes #1599 See merge request pleroma/pleroma!2272	2020-03-12 20:29:51 +00:00
Alexander Strizhakov	39ed608b13	Merge branch 'develop' into gun	2020-03-12 18:31:10 +03:00
Alexander Strizhakov	1306b92997	clean up	2020-03-12 18:29:07 +03:00
Egor Kislitsyn	d1c7f8e576	Merge remote-tracking branch 'origin/develop' into global-status-expiration	2020-03-12 16:02:24 +04:00
Ivan Tashkinov	bd40880fa0	Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions ... # Conflicts: # test/web/activity_pub/activity_pub_controller_test.exs	2020-03-12 12:07:07 +03:00
feld	2019f3b3ff	Merge branch 'fix/signup-without-email' into 'develop' ... Allow account registration without an email See merge request pleroma/pleroma!2246	2020-03-11 16:53:05 +00:00
rinpatch	7cdabdc0df	Merge branch 'fix/1610-release-compilation-config-fix' into 'develop' ... Merging default release config on app start Closes #1610 See merge request pleroma/pleroma!2288	2020-03-11 15:16:18 +00:00
feld	f92c447bbc	Merge branch 'relay-list-change' into 'develop' ... Relay list shows hosts without accepted follow See merge request pleroma/pleroma!2240	2020-03-11 15:10:09 +00:00
rinpatch	c3b9fbd3a7	Revert "Set better Cache-Control header for static content" ... On furher investigation it seems like all that did was cause unintuitive behavior. The emoji request flood that was the reason for introducing it isn't really that big of a deal either, since Plug.Static only needs to read file modification time and size to determine the ETag. Closes #1613	2020-03-11 17:58:25 +03:00
Alexander Strizhakov	282a93554f	merging release default config on app start	2020-03-11 16:25:53 +03:00
Haelwenn (lanodan) Monnier	863ec33ba2	Add support for funkwhale Audio activity ... reel2bits fixture not included as it lacks the Actor fixture for it. Closes: https://git.pleroma.social/pleroma/pleroma/issues/1624 Closes: https://git.pleroma.social/pleroma/pleroma/issues/764	2020-03-11 13:46:42 +01:00
Ivan Tashkinov	5b696a8ac1	[#1560] Enforced authentication for non-federating instances in StaticFEController.	2020-03-11 14:05:56 +03:00
Ivan Tashkinov	972889550d	Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions	2020-03-11 09:15:55 +03:00
Mark Felder	5af798f246	Fix enforcement of character limits	2020-03-10 13:08:00 -05:00
Alexander Strizhakov	f39e1b9eff	add verify tls_opts only when we open connection ... for other requests tesla will add tls_opts	2020-03-10 15:54:11 +03:00
Alexander Strizhakov	426f5ee48a	tesla adapter can't be changed in adminFE	2020-03-10 15:31:44 +03:00
Ivan Tashkinov	5fc92deef3	[#1560] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring.	2020-03-09 20:51:44 +03:00
Maksim Pechnikov	edb659dc57	Merge branch 'develop' into issue/1276	2020-03-08 14:10:59 +03:00
Alexander Strizhakov	b2eb1124d1	Merge branch 'develop' into gun	2020-03-07 12:41:37 +03:00
Alexander Strizhakov	9f884a2639	tests changes	2020-03-07 11:01:37 +03:00