6446 commits

Author	SHA1	Message	Date
FloatingGhost	829ae13572	ensure tests pass	2022-06-14 16:24:03 +01:00
FloatingGhost	4fb2251221	Allow authoring MFM	2022-06-14 15:56:12 +01:00
FloatingGhost	3f06ccc9e3	allow source from misskey	2022-06-14 10:56:18 +01:00
sn0w	60bfaed368	Allow reacting with emojis containing a number	2022-06-14 11:47:09 +02:00
FloatingGhost	0f5bea2465	Add emoji_url to notifications to allow rendering ... Ref #5	2022-06-12 13:35:14 +01:00
FloatingGhost	2abf8c982e	fix secret key failure	2022-06-11 16:48:04 +01:00
FloatingGhost	24bf8c3977	mix format	2022-06-11 16:14:31 +01:00
FloatingGhost	32fbd2e4e3	fix all tests	2022-06-11 16:14:22 +01:00
FloatingGhost	c3ed86cd1e	fix emoji controller tests	2022-06-11 14:21:50 +01:00
FloatingGhost	142646426e	fix emoji tests	2022-06-11 14:08:54 +01:00
FloatingGhost	71f4281850	fix quoting of custom emoji ... Fixes #3	2022-06-11 14:08:13 +01:00
FloatingGhost	ed58a6b070	run mix format	2022-06-10 13:41:08 +01:00
FloatingGhost	801f2b0fc5	Add capabilities for emoji reactions ... Patch from helene@p.helene.moe	2022-06-09 12:56:34 +01:00
FloatingGhost	0f2bfeaea7	Enable mediaproxy by default	2022-06-08 17:19:42 +01:00
FloatingGhost	e910f21d8d	allow undoing	2022-06-08 13:27:25 +01:00
FloatingGhost	e724da2a42	remove io.inspects	2022-06-08 12:58:12 +01:00
FloatingGhost	c5467d04e4	add outbound reacts	2022-06-08 12:36:38 +01:00
FloatingGhost	ad0b8c095c	add custom emoji reaction support	2022-06-08 02:42:44 +01:00
FloatingGhost	0f6bece60d	Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop	2022-01-08 21:45:12 +00:00
FloatingGhost	0d012ebea1	Revert "Merge branch 'remove/mastofe' into 'develop'" ... This reverts commit 6b3842cf50, reversing changes made to 6b1282a829.	2022-01-08 21:44:37 +00:00
FloatingGhost	8cc6359a85	Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop	2022-01-07 20:23:53 +00:00
FloatingGhost	25b4395830	just drop unknown tags	2022-01-07 20:14:04 +00:00
FloatingGhost	34780cf182	Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop	2022-01-07 17:36:21 +00:00
FloatingGhost	2cc6b1e1bd	Allow for varying name fields	2022-01-07 17:35:56 +00:00
FloatingGhost	5c48fe1138	make credo happy	2022-01-07 17:31:13 +00:00
FloatingGhost	92d3742072	Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop	2022-01-07 17:21:44 +00:00
FloatingGhost	9ee27fb5ec	add bookwyrm entity tests	2022-01-07 17:17:18 +00:00
FloatingGhost	680c5d8d89	Add compatibility with bookwyrm's weird entities	2022-01-07 16:51:04 +00:00
FloatingGhost	3252ed0f54	format	2021-12-30 18:05:44 +00:00
FloatingGhost	4e8ee48cff	delete activities	2021-12-30 18:05:44 +00:00
FloatingGhost	12a171844b	Merge remote-tracking branch 'upstream/develop' into develop	2021-12-30 18:05:22 +00:00
marcin mikołajczak	1657db656c	AccountController.lookup: skip auth ... Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2021-12-28 20:02:59 +01:00
marcin mikołajczak	0dd1caa841	AccountController.lookup: skip visibility check ... Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2021-12-28 18:24:48 +01:00
marcin mikołajczak	746c9daa62	Merge remote-tracking branch 'pleroma/develop' into mastodon-lookup ... Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2021-12-28 16:27:27 +01:00
marcin mikołajczak	f734579965	MastoAPI: Add GET /api/v1/accounts/lookup ... Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2021-12-28 16:11:17 +01:00
Alex Gleason	de7f84deb3	Merge branch 'apps-api-endpoint' into 'develop' ... Apps API endpoint See merge request pleroma/pleroma!3583	2021-12-28 14:38:02 +00:00
Alex Gleason	7704a722c0	AppController: remove unnecessary require Logger	2021-12-27 18:30:16 -06:00
Alex Gleason	2e4a1c56c3	AppController: test creating with and without a user	2021-12-27 18:14:15 -06:00
Alex Gleason	f5c3d45120	Merge remote-tracking branch 'origin/develop' into apps-api-endpoint	2021-12-27 18:01:25 -06:00
Alex Gleason	138f5a4517	EnsureStaffPrivilegedPlug: don't let non-moderators through	2021-12-27 17:18:26 -06:00
Alex Gleason	a3fa987611	AdminAPI: fix duplicated routes	2021-12-27 16:58:10 -06:00
Alibek Omarov	f02715c4b2	Fix lint errors	2021-12-27 03:42:03 +03:00
Alibek Omarov	f66675f349	API: fix duplicate :get_password_token route	2021-12-27 02:57:54 +03:00
Alibek Omarov	1c223331fc	API: show info about privileged staff in instance metadata	2021-12-27 02:28:09 +03:00
Alibek Omarov	cd1041c3a4	API: optionally restrict moderators from accessing sensitive data	2021-12-27 02:27:48 +03:00
Alex Gleason	913141379c	Merge branch 'profile-directory' into 'develop' ... MastoAPI: Profile directory See merge request pleroma/pleroma!3573	2021-12-26 02:35:17 +00:00
marcin mikołajczak	de006443f0	MastoAPI: Profile directory	2021-12-26 02:35:17 +00:00
Alex Gleason	db2bf55e9b	Merge remote-tracking branch 'origin/develop' into notice-routes	2021-12-25 19:57:53 -06:00
Alex Gleason	73609211a4	Merge branch 'account-notes' into 'develop' ... MastoAPI: Add user notes on accounts See merge request pleroma/pleroma!3540	2021-12-25 01:41:12 +00:00
Alex Gleason	b96a58ff28	Merge branch 'account-subscriptions' into 'develop' ... MastoAPI: accept notify param in follow request See merge request pleroma/pleroma!3555	2021-12-25 01:34:27 +00:00
marcin mikołajczak	9775955974	Merge remote-tracking branch 'origin/develop' into remote-follow-api ... Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2021-12-25 00:52:02 +01:00
Alex Gleason	d9746ae4cb	Merge branch 'from/develop/tusooa/2802-propagate-reject' into 'develop' ... Handle Reject for already-accepted Follows properly Closes #2766 and #2802 See merge request pleroma/pleroma!3568	2021-12-23 16:00:16 +00:00
Alex Gleason	3f8fc34593	Merge remote-tracking branch 'origin/develop' into moderators	2021-12-19 12:55:36 -06:00
Alex Gleason	50892a198d	Merge branch 'mkljczk-develop-patch-64464' into 'develop' ... Add "exposable_reactions" to features, if showing reactions See merge request pleroma/pleroma!3523	2021-12-19 18:51:41 +00:00
Alex Gleason	b0d2b53934	Merge branch 'manifest' into 'develop' ... Expose /manifest.json for PWA Closes #882 See merge request pleroma/pleroma!3544	2021-12-19 18:18:59 +00:00
Alex Gleason	df5359aa72	Merge branch 'replies-count' into 'develop' ... Fix replies count for remote replies See merge request pleroma/pleroma!3541	2021-12-19 17:36:25 +00:00
Alex Gleason	d1510c98d7	Merge branch 'link-headers-chats' into 'develop' ... Add link headers in ChatController.index2 See merge request pleroma/pleroma!3562	2021-12-19 17:35:50 +00:00
Alex Gleason	1ff9ffed83	Merge branch 'live-dashboard' into 'develop' ... Add Phoenix LiveDashboard See merge request pleroma/pleroma!3566	2021-12-19 17:35:14 +00:00
Alex Gleason	e4f9cb1c1b	Merge remote-tracking branch 'origin/develop' into manifest	2021-12-19 11:33:10 -06:00
Alex Gleason	bd853199d9	Merge branch 'v2-suggestions' into 'develop' ... V2 suggestions See merge request pleroma/pleroma!3547	2021-12-19 17:31:17 +00:00
Alex Gleason	7c1d804554	Merge branch 'fix-search-dos' into 'develop' ... Search: limit number of results (prevent DoS) See merge request pleroma/pleroma!3563	2021-12-19 17:30:52 +00:00
Tusooa Zhu	3d41ccc47b	Allow updating accepted follow activities in Web.ActivityPub.Utils.update_follow_state_for_all/2 ... Mastodon uses the Reject activity also for the purpose of removing a follower, in addition to reject a follow request. We should also update the original Follow activity in this case.	2021-12-17 14:17:51 -05:00
FloatingGhost	0c0ea169d4	Merge remote-tracking branch 'upstream/develop' into develop	2021-12-16 16:10:08 +00:00
Alex Gleason	e1b89fe3aa	Merge remote-tracking branch 'origin/develop' into live-dashboard	2021-12-15 19:05:36 -05:00
Alex Gleason	29d80b39f2	Add Phoenix LiveDashboard ... Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>	2021-12-15 19:05:27 -05:00
lain	6eb7d69e60	Merge branch 'delete-account-fix' into 'develop' ... TwitterAPI: allow deleting one's own account with request body Closes #2799 and #2746 See merge request pleroma/pleroma!3564	2021-12-15 21:26:45 +00:00
sadposter	8f78cb3050	Merge branch 'develop' of gitssh.ihatebeinga.live:IHBAGang/pleroma into develop	2021-12-14 14:01:09 +00:00
sadposter	5d901c337e	fix inbound federation	2021-12-14 13:58:16 +00:00
FloatingGhost	703f53c08f	Search through users and hashtags as well	2021-12-14 13:55:14 +00:00
Alex Gleason	8672ad6b00	TwitterAPI: allow deleting one's own account with request body	2021-12-13 17:07:29 -05:00
Alex Gleason	108dfd1f87	Search: limit number of results	2021-12-12 22:50:07 -06:00
sadposter	144c06487a	fix buggos	2021-12-12 20:01:07 +00:00
FloatingGhost	ee1a2fc451	fully reference es	2021-12-12 19:40:31 +00:00
FloatingGhost	67f8bdce4f	fix multi-after-transaction	2021-12-12 19:40:05 +00:00
FloatingGhost	7502da993b	pipeline it	2021-12-12 19:39:07 +00:00
sadposter	f341e68622	fix bug in inbound	2021-12-12 19:31:47 +00:00
FloatingGhost	de60b1f3c1	make search provider configurable	2021-12-12 17:35:35 +00:00
FloatingGhost	fce13cce46	add extra filters	2021-12-12 17:35:35 +00:00
FloatingGhost	449d8ff165	integrate search endpoint with ES	2021-12-12 17:35:35 +00:00
Alex Gleason	da83839dc1	AttachmentValidator: ingest width and height	2021-12-12 17:35:02 +00:00
Lain Soykaf	eb7bbe3fc8	Linting.	2021-12-12 17:35:02 +00:00
Finn Behrens	66b60f1ee2	move result into with guard	2021-12-12 17:35:02 +00:00
marcin mikołajczak	dff435488d	Add link headers in ChatController.index2 ... Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2021-12-12 17:43:18 +01:00
Alex Gleason	2c96668a2c	Merge remote-tracking branch 'origin/develop' into fix-attachment-dimensions	2021-12-07 13:41:54 -05:00
Alex Gleason	3f03d71ea6	AttachmentValidator: ingest width and height	2021-12-07 12:59:03 -05:00
Lain Soykaf	ca8c676867	Linting.	2021-12-07 12:12:23 -05:00
Finn Behrens	8af53101fb	move result into with guard	2021-12-07 09:18:53 +01:00
marcin mikołajczak	c96e52b88c	Add 'notifying' to relationship for compatibility with Mastodon ... Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2021-12-06 21:24:12 +01:00
marcin mikołajczak	64a4c147b1	MastoAPI: accept notify param in follow request ... Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2021-12-06 19:36:58 +01:00
sadposter	6a6260f64e	re-enable deactivated check	2021-12-06 12:03:16 +00:00
sadposter	ca2bd8b72b	remove deactivated_users call	2021-12-06 10:18:16 +00:00
sadposter	bb54720778	add debug	2021-12-05 21:56:11 +00:00
sadposter	c85b278f1e	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2021-12-05 15:01:23 +00:00
Alex Gleason	8286ceb465	Merge remote-tracking branch 'origin/develop' into password-reset	2021-12-03 00:11:38 -06:00
Alex Gleason	5da4f33bf1	Restore POST /auth/password	2021-12-03 00:10:57 -06:00
marcin mikołajczak	cd5fb84b76	remote_interaction API endpoint ... Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2021-12-02 16:08:44 +01:00
Alex Gleason	6519f59d91	v2 Suggestions: return is_suggested through the API	2021-11-26 23:10:01 -06:00
Alex Gleason	8dc1d2201a	Instance: add v2_suggestions feature	2021-11-26 22:45:49 -06:00
Alex Gleason	e5a7547fbe	v2 Suggestions: also filter out users you follow	2021-11-26 21:46:08 -06:00
Alex Gleason	437c1a5a52	v2 Suggestions: actually flter out dismissed suggestions	2021-11-26 21:09:37 -06:00
Alex Gleason	aee55b9a8b	v2 Suggestions: dismiss a suggestion	2021-11-26 20:19:29 -06:00
Alex Gleason	6c0484d571	AdminAPI: suggest a user through the API	2021-11-26 15:19:01 -06:00
Alex Gleason	e28d990ecb	v2 Suggestions: don't skip visibility check	2021-11-26 14:46:29 -06:00
Alex Gleason	b17360cd7c	v2 Suggestions: rudimentary API response	2021-11-26 14:34:10 -06:00
Alex Gleason	7e1caddc58	v2 Suggestions: return empty array	2021-11-25 14:57:36 -06:00
Alex Gleason	720198d569	Merge remote-tracking branch 'pleroma/develop' into manifest	2021-11-24 17:58:58 -06:00
Alex Gleason	cb9359335f	Expose /manifest.json for PWA	2021-11-24 17:50:55 -06:00
marcin mikołajczak	d64d1b1d45	Fix replies count for remote replies ... Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2021-11-23 11:31:09 +01:00
rinpatch	588bcbac55	Apply 2 suggestion(s) to 2 file(s)	2021-11-22 10:54:44 +00:00
marcin mikołajczak	8e040e098b	Lint ... Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2021-11-21 18:17:06 +01:00
marcin mikołajczak	106b5c2678	Fix a typo ... Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2021-11-21 17:36:37 +01:00
marcin mikołajczak	40414bf177	MastoAPI: Add user notes on accounts ... Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2021-11-21 16:56:26 +01:00
sadposter	a61207cf8f	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2021-11-19 13:43:24 +00:00
Alibek Omarov	04aca335aa	nodeinfo: report activeMonth and activeHalfyear users fields	2021-11-15 17:01:30 +01:00
lain	e2772d6bf1	Merge branch 'block-behavior' into 'develop' ... Configurable block visibility, fixes #2123 Closes #2123 See merge request pleroma/pleroma!3242	2021-11-15 14:27:59 +00:00
lain	6e3df11693	Merge branch 'instance-deletion' into 'develop' ... AdminAPI: endpoint to delete all content from a remote instance See merge request pleroma/pleroma!3483	2021-11-15 14:24:13 +00:00
lain	bd77243981	Merge branch 'userfeed-fe-fallback' into 'develop' ... UserController: fall back to frontend when user isn't found Closes #2730 See merge request pleroma/pleroma!3515	2021-11-15 10:48:56 +00:00
Haelwenn (lanodan) Monnier	23e91ec8dd	activity_pub_controller: Fix misleading debug warning in post_inbox_fallback	2021-11-10 01:11:35 +01:00
sadposter	eb1c7d75f4	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2021-10-16 14:08:04 +01:00
Haelwenn (lanodan) Monnier	23161526d4	object_validators: Group common fields in CommonValidations ... Notes: - QuestionValidator didn't have a :name field but that seems like a mistake - `_fields` functions can't inherit others because of some Validators - bto/bcc fields were absent in activities, also seems like a mistake (Well IIRC we don't or barely support bto/bcc anyway)	2021-10-10 02:50:06 +02:00
Haelwenn (lanodan) Monnier	a17910a6c6	CI: Bump lint stage to elixir-1.12 ... Elixir 1.12 changed formatting rules, this allows to avoid having to rollback to run `mix format`	2021-10-06 08:11:05 +02:00
Haelwenn	92a8ff59aa	Merge branch 'from/develop/tusooa/add-remove-emails' into 'develop' ... Allow users to remove their emails if instance does not need email to register See merge request pleroma/pleroma!3522	2021-10-06 05:44:44 +00:00
sadposter	bd9c9136f9	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2021-09-13 16:14:58 +01:00
marcin mikołajczak	555d7d57c9	Add "exposable_reactions" to features, if showing reactions	2021-09-09 18:35:45 +00:00
Haelwenn	6b3842cf50	Merge branch 'remove/mastofe' into 'develop' ... Remove MastoFE from Pleroma, fixes #2625 Closes #2625 See merge request pleroma/pleroma!3392	2021-09-07 16:41:53 +00:00
sadposter	c31e491e99	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2021-09-07 10:00:31 +01:00
Tusooa Zhu	198250dcef	Allow users to remove their emails if instance does not need email to register	2021-09-05 21:27:02 -04:00
Mark Felder	181282fb2e	Remove unused Logger	2021-09-01 14:56:48 -05:00
sadposter	b202cf15d6	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2021-08-30 22:04:42 +01:00
Sean King	3117c60997	Make suggested change for create_response	2021-08-29 07:25:54 -06:00
Sean King	2e59cdd80f	Fix aliases sorting	2021-08-29 07:22:03 -06:00
Sean King	33f063204e	Add unit test for Pleroma API app controller	2021-08-28 23:18:12 -06:00
Sean King	d02cf7b0cd	Fix lint	2021-08-28 18:17:09 -06:00
Sean King	a14e1c0003	Move GET /api/v1/apps to GET /api/v1/pleroma/apps	2021-08-28 18:02:36 -06:00
Sean King	eab6291094	Require follow and read OAuth scopes for GET /api/v1/apps	2021-08-28 11:13:25 -06:00
Ilja	20084329ea	Selecting MRF policies didn't work as intended any more ... * Policies were put under a new module (Pleroma.Web.ActivityPub.MRF.Policy instead of Pleroma.Web.ActivityPub.MRF), but this wasn't changed in the Pleroma.Web.ActivityPub.MRF @mrf_config_descriptions * I don't have a unit test to prevent similar problems in the future because I don't find a proper way to do it * The descriptions in the unit tests are defined in the unit tests, so if someone changes module names in the code, the tests wont see it * The list is generated in Pleroma.Docs.Generator.list_behaviour_implementations, but I can't do a check in the when clause of the function to see if the provided module is a behaviour or not. Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3509	2021-08-28 18:27:58 +02:00
Ilja	53b0dd4ecc	List available frontends also when no static/frontends folder is present yet ... * To see what front ends are installed, it ls static/frontends. When this folder doesn't exists yet, it will return an empty array. * Installing still works since the folder is created during installation already Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3510	2021-08-28 18:23:49 +02:00
Sam Therapy	09c42ce13e	Add Admin-FE menu for StealEmojiPolicy ... Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3512	2021-08-28 18:21:59 +02:00
Haelwenn	bc62a35282	Merge branch 'features/ingestion-no-nil' into 'develop' ... ObjectValidator.stringify_keys: filter out nil values See merge request pleroma/pleroma!3506	2021-08-28 16:07:35 +00:00
Haelwenn	6633ec816f	Merge branch 'admin_fe_dont_list_mrf_policies_any_more' into 'develop' ... Selecting MRF policies didn't work as intended any more Closes admin-fe#198 See merge request pleroma/pleroma!3509	2021-08-28 16:06:35 +00:00
Sean King	baa8196fc9	Fix API spec, add app schema	2021-08-26 11:55:43 -06:00
Sean King	ba6914f90a	Fix formatting in app_operation.ex	2021-08-26 11:11:37 -06:00
Sean King	6519732045	GET /api/v1/apps endpoint	2021-08-25 21:01:04 -06:00
Alex Gleason	b11dbbf403	UserController: fall back to frontend when user isn't found	2021-08-17 18:32:32 -05:00
Haelwenn	84ec0fbeaa	Merge branch 'show_frontends_also_when_no_static_frontends_folder_is_created_yet' into 'develop' ... List available frontends also when no static/frontends folder is present yet Closes admin-fe#201 See merge request pleroma/pleroma!3510	2021-08-14 18:42:12 +00:00
Ilja	f9bafc17fb	List available frontends also when no static/frontends folder is present yet ... * To see what front ends are installed, it ls static/frontends. When this folder doesn't exists yet, it will return an empty array. * Installing still works since the folder is created during installation already	2021-08-14 18:42:12 +00:00
Haelwenn	2d9f803dc6	Merge branch 'StealEmojiMRF_add_adminFE' into 'develop' ... Add Admin-FE menu for StealEmojiPolicy See merge request pleroma/pleroma!3512	2021-08-14 18:40:24 +00:00
Haelwenn	773708cfe8	Merge branch 'builder-note' into 'develop' ... CommonAPI.Utils.make_note_data/1 --> ActivityPub.Builder.note/1 See merge request pleroma/pleroma!3511	2021-08-14 18:32:40 +00:00
Alex Gleason	ba6049aa81	Builder.note/1: return {:ok, map(), keyword()} like other Builder functions	2021-08-14 11:24:55 -05:00
Sam Therapy	b901b73057	Add Admin-FE menu for StealEmojiPolicy	2021-08-14 11:08:39 -05:00