pleroma

Author	SHA1	Message	Date
Haelwenn	b2ba307f4d	Merge branch 'from/upstream-develop/tusooa/2871-fix-local-public' into 'develop' local only fixes Closes #2871 See merge request pleroma/pleroma!3660	2022-08-02 05:39:50 +00:00
Haelwenn	7299795eb4	Merge branch 'from/upstream-develop/tusooa/backup-without-email' into 'develop' Allow users to create backups without providing email address See merge request pleroma/pleroma!3665	2022-08-02 05:23:49 +00:00
Haelwenn	5ef2dc317d	Change test case wording	2022-07-31 21:34:23 +00:00
tusooa	c80096522c	Merge branch 'develop' into 'from/develop/tusooa/emit-move' # Conflicts: # CHANGELOG.md # test/pleroma/user_test.exs	2022-07-31 21:32:49 +00:00
marcin mikołajczak	5d3d6a58f7	Use `duration` param for mute expiration duration Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2022-07-31 17:22:34 +02:00
Haelwenn	0814d0e0cb	Merge branch 'fix/proper-emoji-qualification' into 'develop' Emoji: implement full-qualifier using combinations See merge request pleroma/pleroma!3709	2022-07-28 04:46:15 +00:00
Haelwenn	0f9f3d2897	Merge branch 'from/upstream-develop/tusooa/2384-pagination' into 'develop' Make mutes and blocks behave the same as other lists Closes #2384 See merge request pleroma/pleroma!3693	2022-07-28 04:37:10 +00:00
Hélène	fb3f6e1975	EmojiReactValidator: use new qualification method	2022-07-25 16:49:23 +02:00
Hélène	388bbc4978	EmojiReactValidator: fix emoji qualification Tries fully-qualifying emoji when receiving them, by adding the emoji variation sequence to the received reaction emoji. This issue arises when other instance software, such as Misskey, tries reacting with emoji that have unqualified or minimally qualified variants, like a red heart. Pleroma only accepts fully qualified emoji in emoji reactions, and refused those emoji. Now, Pleroma will attempt to properly qualify them first, and reject them if checks still fail. This commit contains changes to tests proposed by lanodan. Co-authored-by: Haelwenn <contact+git.pleroma.social@hacktivis.me>	2022-07-24 13:36:06 +02:00
Tusooa Zhu	997f08b350	Make AntiLinkSpamPolicy history-aware	2022-07-24 00:18:09 -04:00
Tusooa Zhu	d877d2a4e7	Make HashtagPolicy history-aware	2022-07-24 00:02:39 -04:00
Tusooa Zhu	82c8fc1ede	Make NoEmptyPolicy work with Update	2022-07-23 23:24:25 -04:00
Tusooa Zhu	46a5c06853	Make NormalizeMarkup history-aware	2022-07-23 22:50:38 -04:00
Tusooa Zhu	fc7ce5f93c	Make NoPlaceholderTextPolicy history-aware	2022-07-23 22:41:04 -04:00
Tusooa Zhu	dce7e42928	Make MediaProxyWarmingPolicy history-aware	2022-07-23 22:34:03 -04:00
Tusooa Zhu	0a337063e1	Make ForceMentionsInContent history-aware	2022-07-23 22:23:57 -04:00
Tusooa Zhu	cd19537f39	Make EnsureRePrepended history-aware	2022-07-23 17:48:39 -04:00
Tusooa Zhu	eba9b0760f	Make MRF Keyword history-aware	2022-07-23 15:56:36 -04:00
tusooa	301ce5bc62	Merge branch 'mute-expiration' into 'develop' MastoAPI: Show mutes expiration date See merge request pleroma/pleroma!3682	2022-07-23 00:34:15 +00:00
Haelwenn	cfb21d011f	Revert "Merge branch 'fix/emoji-react-qualification' into 'develop'" This reverts merge request !3684	2022-07-22 23:19:49 +00:00
FloatingGhost	09e0304b9c	Add test for broken owncast federation	2022-07-22 20:30:45 +02:00
tusooa	c589b8445f	Merge branch 'birthday_fix' into 'develop' Allow to unset birthday See merge request pleroma/pleroma!3702	2022-07-21 21:27:16 +00:00
Haelwenn	454f892f37	Merge branch 'fix/emoji-react-qualification' into 'develop' EmojiReactValidator: fix emoji qualification See merge request pleroma/pleroma!3684	2022-07-21 17:45:47 +00:00
Tusooa Zhu	4350a205a4	Merge remote-tracking branch 'upstream/develop' into HEAD	2022-07-21 13:44:16 -04:00
Haelwenn	1f18ab36b5	Merge branch 'resolve/notice-compatibility-routes-nginx' into 'develop' Document way to do notice compatibility routes with Nginx reverse-proxy, fixes #2900 Closes #2900 See merge request pleroma/pleroma!3701	2022-07-20 16:57:05 +00:00
Ilja	ba31af021c	Fix flaky/erratic tests in Pleroma.Config.TransferTaskTest There were async calls happening, so they weren't always finished when assert happened.	2022-07-20 13:26:26 +02:00
marcin mikołajczak	fb268c4378	Allow to unset birthday Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2022-07-17 19:46:29 +02:00
Haelwenn	bb4860e222	Merge branch 'from/upstream-develop/tusooa/config-translatable' into 'develop' Translatable config descriptions Closes pleroma-meta#65 See merge request pleroma/pleroma!3695	2022-07-17 17:34:21 +00:00
Sean King	64e16e6a4b	Document way to do notice compatibility routes with Nginx reverse-proxy instead	2022-07-16 23:44:37 -06:00
tusooa	8aba7c08d1	Merge branch 'notification_types' into 'develop' MastoAPI: Use `types` for filtering notifications See merge request pleroma/pleroma!3648	2022-07-17 03:17:43 +00:00
marcin mikołajczak	597f56b4c4	Use :utc_datetime Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2022-07-16 16:28:22 +02:00
Tusooa Zhu	8371fd8ca2	Implement settings api	2022-07-16 01:20:25 -04:00
Tusooa Zhu	1d7e8d6e01	Pass in msgctxt for config translation strings	2022-07-14 17:41:33 -04:00
Ilja	c045a49909	Add privilege for announcements	2022-07-14 08:40:26 +02:00
Ilja	44d14e8a9c	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into fine_grained_moderation_privileges	2022-07-14 07:07:19 +02:00
Tusooa Zhu	36f6d92d98	Add tests for translator compiler	2022-07-13 18:31:01 -04:00
marcin mikołajczak	9022d855cd	Check refute User.following? Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2022-07-13 22:57:42 +02:00
tusooa	fdc71f6051	Merge branch 'short-description' into 'develop' Add short_description instance field Closes #2865 See merge request pleroma/pleroma!3651	2022-07-13 04:42:24 +00:00
Tusooa Zhu	eb2a1652bf	Add tests for short_description	2022-07-13 00:40:46 -04:00
Tusooa Zhu	c1874bc8f9	Make mutes and blocks behave the same as other lists	2022-07-12 19:03:18 -04:00
tusooa	311fda32f3	Merge branch 'fix/case-sensitivity-restricted-nicknames-blacklisted-domains' into 'develop' Make checking blacklisted domains and restricted nicknames case-insensitive Closes #2894 and #2888 See merge request pleroma/pleroma!3687	2022-07-11 04:04:36 +00:00
Haelwenn	420da14b61	Merge branch 'from/upstream-develop/tusooa/2830-remote-fo-mp' into 'develop' Pass remote follow avatar into media proxy Closes #2830 See merge request pleroma/pleroma!3690	2022-07-10 16:19:16 +00:00
Sean King	3cf6c2b7ea	Use is_binary instead of is_bitstring for restricted nicknames tests	2022-07-09 23:39:35 -06:00
Tusooa Zhu	2efc0ffcf0	Pass remote follow avatar into media proxy	2022-07-10 00:12:53 -04:00
Tusooa Zhu	04ded94a50	Fix remote emoji in subject disappearing after edits	2022-07-09 18:00:42 -04:00
Ilja	26080b4b5c	Fix rate_limiter_test.exs test "it restricts based on config values" It used a timer to sleep. But time also goes on when doing other things, so depending on hardware, the timings could be off. I slightly changed the tests so we still test what we functionally want. Instead of waiting until the cache expires I now have a function to expire the test and use that. That means we're not testing any more if the cache really expires after a certain amount of time, but that's the responsability of the dependency imo, so shouldn't be a problem. I also changed `Pleroma.Web.Endpoint, :http, :ip` to `127.0.0.1` because that's the setting people typically have, and I see no reason to do it differently. Especially since it's an exernal ip, which may come over as weird or suspicious to people.	2022-07-09 07:19:18 +02:00
marcin mikołajczak	3ed39e3109	Add test Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2022-07-08 21:28:23 +02:00
marcin mikołajczak	0b16ce79f9	Add test for rendering mute expiration date Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2022-07-08 20:59:58 +02:00
Claudio Maradonna	21d9091f5e	ipfs: replacing single quotes with double quotes	2022-07-08 10:06:46 +02:00
Tusooa Zhu	11a6e88420	Test that Question updates are viable	2022-07-07 15:22:04 -04:00
Tusooa Zhu	069554e925	Guard against outdated Updates It is possible for an earlier Update to be received by us later. For this, we now (1) only allows Updates to poll counts if there is no updated field, or the updated field is the same as the last updated date or creation date; (2) does not allow updating anything if the updated field is older than the last updated date or creation date; (3) allows updating updatable fields otherwise (normal updates); (4) if only the updated field is changed, it does not create a new history item on its own.	2022-07-07 15:11:29 -04:00
Claudio Maradonna	5e097eb91d	ipfs: better tests with @ilja suggestions	2022-07-07 06:29:17 +02:00
Claudio Maradonna	254f2ea854	ipfs: remove unused alias fix analysis job	2022-07-07 06:29:15 +02:00
Claudio Maradonna	98f268e5ec	ipfs: small refactor and more tests	2022-07-07 06:29:15 +02:00
Claudio Maradonna	7c1af86f97	ipfs: refactor final_url generation. add tests for final_url fix lint	2022-07-07 06:29:13 +02:00
Claudio Maradonna	44659ecd65	ipfs: revert to String.replace for cid placeholder ipfs: fix lint	2022-07-07 06:29:12 +02:00
Claudio Maradonna	43dfa58ebd	added tests for ipfs uploader. adapted changelog.md accordingly. improved ipfs uploader with external suggestions fix lint description.exs	2022-07-07 06:29:10 +02:00
Tusooa Zhu	f84ed44cea	Fix cannot get full history on object fetch	2022-07-06 01:19:53 -04:00
Sean King	0d4aceb9b0	Make checking blacklisted domains and restricted nicknames case-insenstive	2022-07-05 20:36:47 -06:00
Ilja	f88ed1df75	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into fine_grained_moderation_privileges	2022-07-05 12:05:19 +02:00
Ilja	6ef38c6523	Improve tests after code review	2022-07-05 08:57:50 +02:00
Haelwenn	29f4ab640b	Merge branch 'from/upstream-develop/tusooa/report-too-long' into 'develop' Fix long report notes giving errors on creation See merge request pleroma/pleroma!3679	2022-07-04 05:21:20 +00:00
Haelwenn	8c78fef56f	EmojiReactValidator: apply lanodan's suggestions These changes make the encoding for the fully-qualified heart emoji very visible in editors.	2022-07-04 00:25:54 +00:00
Tusooa Zhu	5ce118d970	Validate object data for incoming Update activities In Create validator we do not validate the object data, but that is because the object itself will go through the pipeline again, which is not the case for Update. Thus, we added validation for objects in Update activities.	2022-07-03 20:21:46 -04:00
Tusooa Zhu	4367489a3e	Pass history items through ObjectValidator for updatable object types	2022-07-03 20:02:52 -04:00
Tusooa Zhu	4edc867b87	Merge branch 'develop' into 'from/upstream-develop/tusooa/edits' # Conflicts: # lib/pleroma/constants.ex	2022-07-03 22:24:57 +00:00
Haelwenn	de37583c49	Merge branch 'image_description_from_exif_data' into 'develop' Use EXIF data of image for image description See merge request pleroma/pleroma!3535	2022-07-03 21:14:25 +00:00
Haelwenn	a15b45a589	Merge branch 'bugfix/mime-validation-no-list' into 'develop' Bugfix: Validate mediaType only by it's format See merge request pleroma/pleroma!3597	2022-07-03 21:04:41 +00:00
Haelwenn	6b937d1473	Merge branch 'from/upstream-develop/tusooa/server-announcements' into 'develop' Server announcements (1st pass) See merge request pleroma/pleroma!3643	2022-07-03 20:58:20 +00:00
Ilja	42d4bd3a5d	Rename pipelines and add forgotten tags I renamed some tags before, but forgot to rename the pipelines I also had some tags which I forgot to add to the config, description, etc. These have now been done/added	2022-07-02 08:55:14 +02:00
Ilja	c0e4b1b3e2	Fix typo's priviledge \|-> privilege	2022-07-02 07:52:39 +02:00
Ilja	56227ef7ba	Descriptions from exif data with only whitespeces are considered empty I noticed that pictures taken with Ubuntu-Touch have whitespace in one of the fields This should just be ignored imo	2022-07-01 13:47:23 +02:00
Ilja	4a9ed319b8	Change test pictures The previous pictures were labeled as public domain, but are actually a collage of pictures under other licenses. I now replaced them with a jpeg of simply a white pixel.	2022-07-01 12:15:02 +02:00
Ilja	81afaee374	Better way of getting keys I used keyword_list[:key], but if the key doesn't exist, it will return nil. I actually expect a list and further down the code I use that list. I believe the key should always be present, but in case it's not, it's better to return an empty list instead of nil. That way the code wont fail further down the line.	2022-07-01 12:15:02 +02:00
Ilja	d0d48a9e88	Add deprecation warnings	2022-07-01 12:15:02 +02:00
Ilja	8303af84ce	Rename the Exiftool module No migrations or checks yet	2022-07-01 12:15:02 +02:00
Ilja	551721e41a	Rename the new module	2022-07-01 12:13:46 +02:00
Ilja	cd316d7269	Use EXIF data of image to prefill image description During attachment upload Pleroma returns a "description" field. Pleroma-fe has an MR to use that to pre-fill the image description field, <https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1399> * This MR allows Pleroma to read the EXIF data during upload and return the description to the FE * If a description is already present (e.g. because a previous module added it), it will use that * Otherwise it will read from the EXIF data. First it will check -ImageDescription, if that's empty, it will check -iptc:Caption-Abstract * If no description is found, it will simply return nil, just like before * When people set up a new instance, they will be asked if they want to read metadata and this module will be activated if so This was taken from an MR i did on Pleroma and isn't finished yet.	2022-07-01 12:13:46 +02:00
Ilja	37fdf148b0	Rename privilege tags I first focussed on getting things working Now that they do and we know what tags there are, I put some thought in providing better names I use the form <what_it_controls>_<what_it_allows_you_to_do> :statuses_read => :messages_read :status_delete => :messages_delete :user_read => :users_read :user_deletion => :users_delete :user_activation => :users_manage_activation_state :user_invite => :users_manage_invites :user_tag => :users_manage_tags :user_credentials => :users_manage_credentials :report_handle => :reports_manage_reports :emoji_management => :emoji_manage_emoji	2022-07-01 10:28:09 +02:00
Hélène	11f9f2ef27	EmojiReactValidator: fix emoji qualification Tries fully-qualifying emoji when receiving them, by adding the emoji variation sequence to the received reaction emoji. This issue arises when other instance software, such as Misskey, tries reacting with emoji that have unqualified or minimally qualified variants, like a red heart. Pleroma only accepts fully qualified emoji in emoji reactions, and refused those emoji. Now, Pleroma will attempt to properly qualify them first, and reject them if checks still fail.	2022-06-28 21:33:57 +02:00
Tusooa Zhu	014096aeef	Make outbound transmogrifier aware of edit history	2022-06-25 11:20:46 -04:00
Tusooa Zhu	5321fd0012	Do not put meta[:object_data] for local Updates	2022-06-25 10:03:19 -04:00
Tusooa Zhu	9c6dae942d	Fix local updates causing emojis to be lost	2022-06-25 09:23:09 -04:00
Tusooa Zhu	e98579b1da	Verify that formerRepresentation provided in Update is used	2022-06-25 01:17:09 -04:00
Tusooa Zhu	40953a8f5c	Reuse formerRepresentations from remote if possible	2022-06-25 01:03:46 -04:00
Tusooa Zhu	ee07383191	Use meta[:object_data] in SideEffects for Update	2022-06-24 10:28:58 -04:00
Tusooa Zhu	01321c88b5	Convert incoming Updated object into Pleroma format	2022-06-24 10:25:22 -04:00
Ilja	4e4eb81749	Add nodes and privileges to nodeinfo I didn't add it to /api/v1/instance I was wondering if I should, but since it e.g. also didn't show staff, it felt better not to	2022-06-21 12:10:27 +02:00
Ilja	211e561e2a	Show privileges to FE I added an extra key We already had is_admin and is_moderator, now we have an extra privileges key	2022-06-21 12:10:27 +02:00
Ilja	143ea7b80a	Add deactivated status for privileged users Deactivated users are only visible to users privileged with :user_activation since fc317f3b17 Here we also make sure the users who are deactivated get the status deactivated for users who are allowed to see these users	2022-06-21 12:10:27 +02:00
Ilja	e21ef5aef3	report notifications for privileged users Instead of `Pleroma.User.all_superusers()` we now use `Pleroma.User.all_superusers(:report_handle)` I also changed it for sending emails, but there were no tests.	2022-06-21 12:10:27 +02:00
Ilja	34adea8d28	Add Pleroma.User.all_users_with_privilege/1 This should eventually replace the Pleroma.User.all_superusers/0 function * I added a new param `is_privileged` in User.query * Now we can fetch all users with a specified privilege	2022-06-21 12:10:27 +02:00
Ilja	a1c8aa4721	Remove function superuser? Everything now happens with privileged?/2	2022-06-21 12:10:27 +02:00
Ilja	eab13fed3e	Hide pleroma:report for non-privileged users Before we deleted the notifications, but that was a side effect and didn't always trigger any more. Now we just hide them when an unprivileged user asks them.	2022-06-21 12:10:27 +02:00
Ilja	e45faddb38	Revert "Delete report notifs when demoting from superuser" This reverts commit `89667189b8` and `cdc5bbe836`. This is a side effect when changing user role. The goal was to not have report notifications when someone isn't admin or moderator any more. But this won't be triggered when we change the privilege tags for a role, so we can't use this sollution any more. There was another solution to filter out report notifications during fetch. It wasn't merged because this seemed 'cleaner' at the time, but now it seems the better sollution. I'll add it in the next commit.	2022-06-21 12:10:27 +02:00
Ilja	edf0013ff3	User.visible_for/2 According to the tests, this was only used for unconfirmed accounts. So this just needed to be restricted to users with privilege :user_activation	2022-06-21 12:10:27 +02:00
Ilja	bb61cfee8d	Validator for deleting statusses is now done with priviledge instead of superuser	2022-06-21 12:10:27 +02:00
Ilja	7cf473c500	delete statusses is now privileged by :status_delete Instead of superusers, you now need a role with privilige :status_delete to delete other users statusses I also cleaned up some other stuff I saw	2022-06-21 12:10:27 +02:00
Ilja	7adfc2e0f4	Add Pleroma.User.privileged?/2 This should eventually replace Pleroma.User.superuser?/1	2022-06-21 12:10:27 +02:00
Ilja	9da81f41c6	Fix warning during test user_test.exs Fixed the warning [warning] Please change `clear_config([section], key: value)` to `clear_config([section, key], value)`	2022-06-21 12:10:27 +02:00
Ilja	c842e62675	Add last priviliges I still had three endpoints I didn't really know what to do with them. I added them under separate tags * :instance_delete * :moderation_log_read * :stats_read I also checked and these are the last changes done by MR https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3480/diffs this is trying to fix	2022-06-21 12:10:27 +02:00
Ilja	ecd42a2ce1	Add privilige :emoji_management	2022-06-21 12:10:27 +02:00
Ilja	0ee8f33250	Add privilige :status_delete It also allows to update a message, so it's not just deleting. I need a better name...	2022-06-21 12:10:27 +02:00
Ilja	34a98990db	last off :statuses_read From the endpoints left to do, I believe these should be under :statuses_read. These should be the last for that privilege for this MR	2022-06-21 12:10:27 +02:00
Ilja	4cb0dbb5dc	Mark relevant tests synchronous One of the things we do during the tests is change the config. But that's global state and different tests were interfering. E.g. one test would set `clear_config([:instance, :admin_privileges], [:statuses_read])`, but while that runs, another test may do `clear_config([:instance, :admin_privileges], [:user_invite])`. Now the code for the first test checks the setting, and it finds `:user_invite` instead of `:statuses_read`. Now the modules where this happens are marked to run synchronously, so they don't interfere with each other.	2022-06-21 12:10:27 +02:00
Ilja	cbb26262a5	Add privileges for :user_read	2022-06-21 12:10:27 +02:00
Ilja	3f26f1b30f	Add privileges for :report_handle	2022-06-21 12:10:27 +02:00
Ilja	14e697a64f	Add privileges for :user_invite	2022-06-21 12:10:27 +02:00
Ilja	e102d25d23	Add privileges for :user_activation	2022-06-21 12:10:27 +02:00
Ilja	cb60cc4e02	Add privileges for :user_tag	2022-06-21 12:10:27 +02:00
Ilja	5a65e2dac5	Remove privileged_staff Everything that was done through this setting, can now be set by giving the proper privileges to the roles.	2022-06-21 12:10:27 +02:00
Ilja	b1ff5241c2	Add priviledges for :statuses_read This was the last in :require_privileged_staff. I'll remove that in the next commit	2022-06-21 12:10:27 +02:00
Ilja	8a9144ca8b	Add priviledges for :user_credentials I only moved the ones from the :require_privileged_staff block for now	2022-06-21 12:10:27 +02:00
Ilja	9f6c364759	Add privilege :user_deletion	2022-06-21 12:10:27 +02:00
Ilja	5b19543f0a	Add new setting and Plug to allow for privilege settings for staff	2022-06-21 12:10:26 +02:00
Tusooa Zhu	44613db853	Show original status at the first of history	2022-06-11 19:52:07 -04:00
Tusooa Zhu	7451f0e81f	Send the correct update in streamer get_create_by_ap_id_with_object() seems to fetch the old object. Why this happens needs further investigation.	2022-06-11 12:02:16 -04:00
Tusooa Zhu	27f3d802f2	Expose history and source apis to anon users	2022-06-11 10:35:36 -04:00
Tusooa Zhu	c3593639ad	Fix incorrectly cached content after editing	2022-06-09 11:39:51 -04:00
Tusooa Zhu	aafd7a687d	Return the corresponding object id in attachment view	2022-06-08 11:45:24 -04:00
Tusooa Zhu	237b220d71	Add object id to uploaded attachments	2022-06-08 11:05:48 -04:00
Tusooa Zhu	532f6ae3ed	Return update notification in mastodon api	2022-06-05 16:34:42 -04:00
Tusooa Zhu	06a3998013	Create Update notifications	2022-06-05 15:02:25 -04:00
Tusooa Zhu	97eabb2047	Fix CommonAPITest	2022-06-04 13:15:07 -04:00
Tusooa Zhu	fe2d4778ee	Expose content type of status sources	2022-06-04 12:57:30 -04:00
Tusooa Zhu	72ac940618	Fix SideEffectsTest	2022-06-03 21:50:49 -04:00
Tusooa Zhu	3249ac1f12	Show edited_at in MastodonAPI/show	2022-06-03 21:47:40 -04:00
Tusooa Zhu	fdaa864083	Test that own edits are streamed	2022-06-03 21:17:16 -04:00
Tusooa Zhu	8bac8147d4	Stream out edits	2022-06-03 21:15:17 -04:00
Tusooa Zhu	b096fbba1a	Fix long report notes giving errors on creation	2022-06-02 01:28:39 -04:00
Tusooa Zhu	fa31ae50e6	Inject history when object is refetched	2022-06-01 19:49:04 -04:00
Tusooa Zhu	410e177b2a	Strip internal fields in formerRepresentation	2022-06-01 12:02:03 -04:00
Tusooa Zhu	b613a9ec6b	Implement mastodon api for editing status	2022-05-31 14:32:28 -04:00
Pierre-Louis Bonicoli	6f23fc8e08	Add tlsv1.3 to suggestions	2022-05-31 00:51:48 +02:00
marcin mikołajczak	0ecd6ba35e	AdminAPI: Allow filtering reports by rule_id Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2022-05-30 13:24:39 +02:00
marcin mikołajczak	b354d70e85	Apply, suggestions, use strings for actual Mastodon API compatibility Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2022-05-30 12:30:03 +02:00
Tusooa Zhu	393b508846	Implement viewing source	2022-05-30 00:59:23 -04:00
Tusooa Zhu	c004eb0fa2	Implement mastodon api for showing edit history	2022-05-29 23:50:31 -04:00
Tusooa Zhu	8acfe95f3e	Allow updating polls	2022-05-29 22:16:03 -04:00
Tusooa Zhu	5e8aac0e07	Record edit history for Note and Question Updates	2022-05-29 13:54:16 -04:00
Tusooa Zhu	0f6a5eb9a2	Handle Note and Question Updates	2022-05-29 12:54:57 -04:00
Tusooa Zhu	547def67a7	Allow Updates by every actor on the same origin	2022-05-29 11:36:00 -04:00
Hélène	a74ce2d77a	StealEmojiPolicy: fix String rejected_shortcodes * rejected_shortcodes is defined as a list of strings in the configuration description. As such, database-based configuration was led to handle those settings as strings, and not as the actually expected type, Regex. * This caused each message passing through this MRF, if a rejected shortcode was set and the emoji did not exist already on the instance, to fail federating, as an exception was raised, swiftly caught and mostly silenced. * This commit fixes the issue by introducing new behavior: strings are now handled as perfect matches for an emoji shortcode (meaning that if the emoji-to-be-pulled's shortcode is in the blacklist, it will be rejected), while still supporting Regex types as before.	2022-05-18 21:25:10 +02:00
marcin mikołajczak	d26aadb743	Add tests Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2022-05-16 14:06:53 +02:00
marcin mikołajczak	574db5b988	Allow submitting an array of rule_ids to /api/v1/reports Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2022-05-16 14:06:49 +02:00
marcin mikołajczak	bbf3bc2228	Add RuleTest Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2022-05-16 14:03:06 +02:00
marcin mikołajczak	bd52e2aec7	Instance rules Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2022-05-16 14:02:32 +02:00
Tusooa Zhu	6e5ef7f2eb	Test local-only in ap c2s outbox Ref: fix-local-public	2022-05-09 18:53:32 -04:00
Tusooa Zhu	38444aa92a	Allow authenticated users to access local-only posts in MastoAPI Ref: fix-local-public	2022-05-09 18:53:18 -04:00
Haelwenn	4605efe272	Merge branch 'improve_anti_followbot_policy' into 'develop' Also use actor_type to determine if an account is a bot in antiFollowbotPolicy Closes #2561 See merge request pleroma/pleroma!3498	2022-05-08 18:10:40 +00:00
Ilja	a8093732bd	Also use actor_type to determine if an account is a bot in antiFollowbotPolicy	2022-05-08 18:10:40 +00:00
Tusooa Zhu	221cb3fb81	Allow users to create backups without providing email address Ref: backup-without-email	2022-05-07 00:23:55 -04:00
Tusooa Zhu	fe933b9bf2	Prevent remote access of local-only posts via /objects Ref: fix-local-public	2022-05-06 13:54:21 -04:00
Tusooa Zhu	466568ae36	Lint Ref: fix-local-public	2022-05-06 13:54:13 -04:00
Tusooa Zhu	826deb7375	Make local-only statuses searchable Ref: fix-local-public	2022-05-06 13:54:13 -04:00
Tusooa Zhu	38af42968d	Test that anonymous users cannot see local-only posts Ref: fix-local-public	2022-05-06 13:54:12 -04:00
Tusooa Zhu	c48be59f58	Show local-only statuses in public timeline for authenticated users Ref: fix-local-public	2022-05-06 13:54:02 -04:00
Tusooa Zhu	57c030a0a7	Skip cache when /objects or /activities is authenticated Ref: fix-local-public	2022-05-06 10:23:26 +02:00
Tusooa Zhu	e2d24eda57	Allow to skip cache in Cache plug Ref: fix-local-public	2022-05-06 10:23:26 +02:00
Tusooa Zhu	fa3157df96	Skip cache when /objects or /activities is authenticated Ref: fix-local-public	2022-05-06 08:44:03 +02:00
Tusooa Zhu	4d482b765f	Allow to skip cache in Cache plug Ref: fix-local-public	2022-05-06 08:39:42 +02:00
marcin mikołajczak	9423052e92	Add "status" notification type Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2022-04-25 14:08:31 +02:00
Tusooa Zhu	be08d9305b	Fix incorrect fallback when English is set to first language	2022-04-17 22:39:52 -04:00
Ilja	5f37db330f	Fix eratic test for POST /api/pleroma/admin/reports/:id/notes It retrieved two ReportNotes and then checked one of them. But the order isn't guaranteed, while the test tested on the content of the first ReportNote. I made the test on the content more generic	2022-04-05 13:21:09 +02:00
Tusooa Zhu	7d1dae3bef	Restrict mastodon api announcements to logged-in users only	2022-04-02 02:25:13 -04:00
Sean King	4194559ea6	Fix lint errors	2022-03-20 17:26:07 -06:00
Haelwenn	d7c53da77a	Merge branch 'from/upstream-develop/tusooa/translate-pages' into 'develop' Translate backend-rendered pages See merge request pleroma/pleroma!3634	2022-03-20 18:14:37 +00:00
Haelwenn	b76340511d	Merge branch 'delete_report_notifs_when_demoting_from_superuser' into 'develop' Delete report notifs when demoting from superuser Closes #2840 See merge request pleroma/pleroma!3642	2022-03-20 18:13:19 +00:00
Sean King	d0c1997d48	Rewrite integration-test websocket client with Mint.WebSocket	2022-03-19 23:33:37 -06:00
Tusooa Zhu	0c78ab4a88	Use utc_datetime in db schema	2022-03-18 11:17:22 -04:00
Haelwenn (lanodan) Monnier	030183b35f	AttachmentValidator: Use custom ecto type and regex for "mediaType"	2022-03-17 22:37:26 +01:00
marcin mikołajczak	31ff467eff	Use `types` for filtering notifications Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2022-03-16 21:15:44 +01:00
marcin mikołajczak	ffe081bf44	Use reject_follow_request Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2022-03-16 19:18:15 +01:00
marcin mikołajczak	6754d1f272	POST /api/v1/accounts/:id/remove_from_followers Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2022-03-16 16:52:33 +01:00
Tusooa Zhu	ebcda5265b	Format announcements into html	2022-03-08 23:00:51 -05:00
Tusooa Zhu	eb1a29640f	Add pagination to AdminAPI.AnnouncementController.index	2022-03-08 21:26:05 -05:00
Tusooa Zhu	11a1996bf5	Implement update announcement admin api	2022-03-08 20:55:41 -05:00
Tusooa Zhu	881179ec72	Remove GET /api/v1/announcements/:id	2022-03-08 19:22:28 -05:00
Tusooa Zhu	d569694ae9	Show only visible announcements in MastodonAPI	2022-03-08 19:20:29 -05:00
Tusooa Zhu	cf8334dbc1	Add starts_at, ends_at and all_day parameters	2022-03-08 19:12:01 -05:00
Tusooa Zhu	fcf3c9057e	Implement visibility filtering for announcements	2022-03-08 18:21:20 -05:00
Tusooa Zhu	2b39b36e49	Implement POST /api/v1/announcements/:id/dismiss	2022-03-08 16:59:20 -05:00
Tusooa Zhu	aa1fff279e	Implement GET /api/v1/announcements/:id	2022-03-08 16:19:35 -05:00
Tusooa Zhu	5169ad8f14	Implement announcement read relationships	2022-03-08 13:09:49 -05:00
Tusooa Zhu	d7af67012f	Implement first pass of announcement admin api CCBUG: https://git.pleroma.social/pleroma/pleroma/-/issues/2836 CCBUG: https://git.pleroma.social/pleroma/pleroma/-/issues/1470	2022-03-08 01:01:27 -05:00
Haelwenn	4458db3201	Merge branch 'fix_test_get_user_apps' into 'develop' Fix test get_user_apps/1 See merge request pleroma/pleroma!3636	2022-03-06 18:40:49 +00:00
Tusooa Zhu	79ccb6b999	Support fallbacking to other languages	2022-03-06 11:43:31 -05:00
Ilja	89667189b8	Delete report notifs when demoting from superuser When someone isn't a superuser any more, they shouldn't see the reporsts any more either. Here we delete the report notifications from a user when that user gets updated from being a superuser to a non-superuser.	2022-03-06 17:36:30 +01:00
Tusooa Zhu	cd42e2bed0	Lint	2022-03-03 09:49:55 -05:00
Tusooa Zhu	aca11fb70e	Support multiple locales from userLanguage cookie	2022-03-03 02:31:36 -05:00
Tusooa Zhu	7ea330b4fe	Support multiple locales formally elixir gettext current does not fully support fallback to another language [0]. But it might in the future. We adapt it so that all languages in Accept-Language headers are received by Pleroma.Web.Gettext. User.languages is now a comma-separated list. [0]: https://github.com/elixir-gettext/gettext/issues/303	2022-03-03 02:03:44 -05:00
Tusooa Zhu	bc59da96c5	Add test for fallbacking to a general language	2022-03-02 20:04:30 -05:00
Tusooa Zhu	8de573b047	Fallback to a variant if the language in general is not supported For an example, here, zh is not supported, but zh_Hans and zh_Hant are. If the user asks for zh, we should choose a variant for them instead of fallbacking to default. Some browsers (e.g. Firefox) does not allow users to customize their language codes. For example, there is no zh-Hans, but only zh, zh-CN, zh-TW, zh-HK, etc. This provides a workaround for those users suffering from bad design decisions.	2022-03-02 19:59:11 -05:00
Tusooa Zhu	e644f8dea5	Allow user to register with custom language	2022-03-02 01:41:13 -05:00
Tusooa Zhu	0149ea4538	Send emails i18n'd using backend-stored user language	2022-03-01 22:19:13 -05:00
Tusooa Zhu	8b0c2890f9	Fix digest test	2022-03-01 20:27:45 -05:00
HJ	ee05abe052	Merge branch 'revert/notice-routes' into 'develop' Revert notice compatibility routes merge request See merge request pleroma/pleroma!3576	2022-02-26 16:24:49 +00:00
Sean King	17aa3644be	Copyright bump for 2022	2022-02-25 23:11:42 -07:00
Ilja	6ba93c2cb3	Fix test get_user_apps/1 For some reason I had a test who suddenly failed, mix test test/pleroma/web/o_auth/app_test.exs:54. A user has a list of applications and this test adds them and then sees if the list it gets back is the same as the apps it added. When I ran mix test a day before I didn't have this problem and when I pushed code today in a different MR, the pipeline succeeded (see https://git.pleroma.social/ilja/pleroma/-/jobs/205827), yet locally it failed. So it seems the test can sometimes succeed and sometimes fail, which makes it untrustworthy. The failure I see is because the returned list is in reverse order. I assume that's not per sé wrong. You just want to know if the apps you added are actually there. I fixed the test by first ordering the lists before comparing. AFAICT (and as far as that's relevant) the test got introduced in commit `cb2a072e62`	2022-02-22 18:56:26 +01:00
Tusooa Zhu	0fd3695b9c	Prefer userLanguage cookie over Accept-Language header in detecting locale https://git.pleroma.social/pleroma/pleroma-meta/-/issues/60	2022-02-21 18:02:19 -05:00
Sam Therapy	061cb749cd	Add unicode 14 support and add a test with a unicode 14 emoji	2022-02-21 12:28:33 -06:00
marcin mikołajczak	e473bcf7a0	Max media attachment count Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2022-02-06 17:41:15 +01:00
Alex Gleason	7c044a1841	FilterControllerTest: tag erratic test	2022-02-02 13:10:39 -06:00
Haelwenn (lanodan) Monnier	d1cc9e4eaf	Fix tests matching on "warn" Moving it to "warning" would break tests on 1.12.x	2022-02-02 12:45:26 -06:00
Alex Gleason	bd81af731e	Tag erratic test	2022-02-02 12:29:53 -06:00
Alex Gleason	2d77976305	Add tests for mismatched context in replies	2022-02-02 12:19:35 -06:00
Alex Gleason	5a4e3aa715	Test that a Create/Note from Roadhouse validates	2022-02-02 11:02:23 -06:00
Alex Gleason	61dfeca1cc	Test that a Note from Roadhouse validates	2022-02-02 10:38:30 -06:00
Alex Gleason	3bf257171f	ForceMentionsInContent: improve display of Markdown posts	2022-01-27 14:15:06 -06:00
Alex Gleason	27cb3d6273	ForceMentionsInContent: don't apply it to top-level posts	2022-01-26 21:24:26 -06:00
Alex Gleason	0604b0dd09	ForceMentionsInContent: don't mention self	2022-01-25 12:33:47 -06:00
Alex Gleason	0f4e0e667e	Merge branch 'recipients-inline' into 'develop' ForceMentionsInContent: wrap mentions in a span, fix the formatting See merge request pleroma/pleroma!3620	2022-01-25 17:43:39 +00:00
Alex Gleason	99e9c2c668	Merge branch 'birth-dates' into 'develop' Fix show_birthday See merge request pleroma/pleroma!3621	2022-01-25 16:59:07 +00:00
Alex Gleason	65b4d2ce84	ForceMentionsInContent: fix order of mentions	2022-01-25 10:42:34 -06:00
marcin mikołajczak	ab12a05a43	AccountView: Add test for show_birthday Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2022-01-25 17:34:36 +01:00
Alex Gleason	dd7977bb68	Merge branch 'birth-dates' into 'develop' Birth dates See merge request pleroma/pleroma!3608	2022-01-25 15:35:47 +00:00
Alex Gleason	267184b70e	ForceMentionsInContentTest: return mentions in a not terrible format	2022-01-24 20:03:43 -06:00
marcin mikołajczak	75c4fefb1c	Add a test Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2022-01-23 13:03:00 +01:00
marcin mikołajczak	e3d394eef6	Birthdays: Fix tests, add test for misskey Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2022-01-23 09:41:21 +01:00
marcin mikołajczak	0266bc3c96	Birthdays: hide_birthday -> show_birthday Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2022-01-23 09:13:33 +01:00
Alex Gleason	aaa9314f4c	Merge remote-tracking branch 'origin/develop' into birth-dates	2022-01-22 14:24:50 -06:00
Alex Gleason	66e8c6f90f	Birthdays: birth_date --> birthday	2022-01-22 13:21:55 -06:00
NEETzsche	7a015b1fe2	Make test less erratic by adding five second tolerance	2022-01-22 12:07:54 -07:00
Alex Gleason	f5d4ef50b4	FilterTest: tag erratic test	2022-01-22 12:13:09 -06:00
Alex Gleason	6ffe43af70	Merge branch 'private-pins' into 'develop' Support private pinned posts from Mastodon See merge request pleroma/pleroma!3611	2022-01-20 23:18:24 +00:00
Alex Gleason	00523bdf5e	Test pinned private statuses in AccountController	2022-01-20 16:54:43 -06:00
marcin mikołajczak	88c21b9282	Support private pinned posts from Mastodon Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2022-01-20 12:35:32 +01:00
rinpatch	a02cfd7f52	Add ForceMentionsInContentPolicy Even though latest PleromaFE supports displaying these properly, mobile apps still exist, so I think we should offer a workaround to those who want it.	2022-01-19 21:04:57 +03:00
marcin mikołajczak	dfb2808535	Birth dates: Add tests Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2022-01-18 23:15:31 +01:00
marcin mikołajczak	397f67fef8	Format code, expose instance configuration related to birth dates Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2022-01-18 18:18:38 +01:00
Alex Gleason	39c5ebb1f6	mix format	2022-01-15 12:55:12 -06:00
Alex Gleason	31148c1857	FormatterTest: fix nesting in expected output	2022-01-15 12:31:36 -06:00
Alex Gleason	db90c9e3b0	Merge remote-tracking branch 'mkfain/test-for-breaking-markdown' into linkify-0.5.2	2022-01-15 12:27:42 -06:00
marcin mikołajczak	eedf551eed	Add more tests Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2022-01-12 22:41:34 +01:00
marcin mikołajczak	0f90fd5805	WIP account endorsements Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2022-01-12 18:15:10 +01:00
Alex Gleason	cd3175c7fe	Merge branch 'fix/rich-media-test-escape-unicrud' into 'develop' Escape unicode RTL overrides in rich media parser tests See merge request pleroma/pleroma!3598	2022-01-11 13:39:23 +03:00
rinpatch	fd043b0ab3	Escape unicode RTL overrides in rich media parser tests Elixir 1.13 does not allow them in raw form anymore, resulting in errors like this when running the test: == Compilation error in file test/pleroma/web/rich_media/parser_test.exs == ** (SyntaxError) test/pleroma/web/rich_media/parser_test.exs:136:45: invalid bidirectional formatting character in string: \u202C. If you want to use such character, use it in its escaped \u202C form instead	2022-01-10 17:51:53 +03:00
Alex Gleason	2ae867842b	StreamerTest: tag erratic test	2021-12-31 10:29:50 -06:00
Sean King	ffeae7ef2c	Fix merge conflict in CHANGELOG.md	2021-12-29 18:08:50 -07: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
Tusooa Zhu	3fd13b70ec	Test that the target account is re-fetched in move_account Ref: emit-move	2021-12-28 01:11:08 -05:00
Tusooa Zhu	eb383ef8d3	Make move_account endpoint process non-existent users properly Ref: emit-move	2021-12-28 01:11:08 -05:00
Tusooa Zhu	4f44fd32ea	Federate unfollow activity in move_following properly 0: Use the CommonAPI unfollow function to make sure the unfollow activity is federated. 1: Limit the follow and unfollow to local followers only, while let the romote servers decide whether to move their followers. Ref: emit-move	2021-12-28 01:11:08 -05:00
Tusooa Zhu	e41eee5ed1	Make Move activity federate properly Ref: emit-move	2021-12-28 01:11:08 -05:00
Tusooa Zhu	54d7b4354c	Add deleting alias endpoint Ref: emit-move	2021-12-28 01:11:08 -05:00
Tusooa Zhu	c1aa3c98ac	Add get and add aliases endpoints Ref: emit-move	2021-12-28 01:11:08 -05:00
Tusooa Zhu	60081a8818	Add User.add_alias/2 and User.alias_users/1 Ref: emit-move	2021-12-28 01:11:07 -05:00
Tusooa Zhu	0af77b20c1	Implement moving account Ref: emit-move	2021-12-28 01:10:34 -05:00
Alex Gleason	5c80d4087d	PleromaAPI.AppView: add test	2021-12-27 18:52:34 -06:00
Alex Gleason	cb2a072e62	Apps: add test for get_user_apps/1	2021-12-27 18:29:03 -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	d61a5515e6	ConnectionPoolTest: tag erratic test	2021-12-27 11:27:25 -06:00
Alex Gleason	479fc5fff8	EnsureStaffPrivilegedPlug: add tests	2021-12-27 10:39:59 -06:00
Sean King	8ef1d8b566	Revert "Merge branch 'notice-routes' into 'develop'"	2021-12-26 11:02:51 -07: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	2c06eff519	Pleroma.Web.base_url() --> Endpoint.url()	2021-12-25 20:11:14 -06: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
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	9c1cb87eff	Merge branch 'erratic-tests' into 'develop' Skip erratic tests See merge request pleroma/pleroma!3572	2021-12-22 04:14:31 +00:00
Alex Gleason	2ce7dae6de	Skip erratic tests	2021-12-21 22:04:15 -06: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	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
Tusooa Zhu	8376e83f61	Lint	2021-12-17 16:52:50 -05:00
Tusooa Zhu	951d1592c7	Add test to ensure removed follower cease to have relationship with ex-followee https://git.pleroma.social/pleroma/pleroma/-/issues/2802	2021-12-17 16:44:22 -05:00
Tusooa Zhu	bfd870380c	Add test to ensure the blocked cease to have follow relationship to the blocker https://git.pleroma.social/pleroma/pleroma/-/issues/2766	2021-12-17 14:44:28 -05: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
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
Alex Gleason	8672ad6b00	TwitterAPI: allow deleting one's own account with request body	2021-12-13 17:07:29 -05:00
Alex Gleason	01cc099c8e	VideoHandlingTest: remove nil values	2021-12-07 21:55:54 -05:00
Haelwenn	992d9287d0	Apply alexgleason's suggestion(s) to 1 file(s)	2021-12-07 22:53:36 +00:00
Alex Gleason	2c96668a2c	Merge remote-tracking branch 'origin/develop' into fix-attachment-dimensions	2021-12-07 13:41:54 -05:00
Alex Gleason	335684182a	Fix VideoHandlingTest	2021-12-07 13:35:34 -05:00
Alex Gleason	3f03d71ea6	AttachmentValidator: ingest width and height	2021-12-07 12:59:03 -05:00
Alex Gleason	d9349bc52f	Transmogrifier: test fix_attachments/1	2021-12-07 01:10:47 -05: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	3892bd353b	Add test for following with subscription Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2021-12-06 21:15:03 +01:00
FloatingGhost	db46913dcc	make linter happy	2021-12-06 11:50:51 +00:00
FloatingGhost	cd8bdbc761	Make deactivated user check into a subquery Fixes #2792	2021-12-06 11:44:17 +00:00
Alex Gleason	ba2ed3c255	Fix frontend_status_plug_test.exs	2021-12-03 07:56:26 -06: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
Alex Gleason	6519f59d91	v2 Suggestions: return `is_suggested` through the API	2021-11-26 23:10:01 -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	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	cb76faece9	Update test Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2021-11-21 17:51:00 +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
Alibek Omarov	04aca335aa	nodeinfo: report activeMonth and activeHalfyear users fields	2021-11-15 17:01:30 +01:00
lain	4d341f51e1	Merge branch 'fix-tests' into 'develop' Test fixes See merge request pleroma/pleroma!3532	2021-11-15 14:31:27 +00: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
Lain Soykaf	871936b3ca	MediaProxyCacheControllerTest: Fix unstable tests. Cachex order isn't stable, so we can not depend on the order in tests. This adds some sorting to make the tests stable.	2021-11-14 11:45:38 +01:00
Lain Soykaf	2dea4a8c04	StealEmojiPolicyTest: Make mocks explicit.	2021-11-14 11:44:24 +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
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
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
Sean King	33f063204e	Add unit test for Pleroma API app controller	2021-08-28 23:18:12 -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
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
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	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
Alex Gleason	a2eacfc525	CommonAPI.Utils.make_note_data/1 --> ActivityPub.Builder.note/1	2021-08-14 11:01:06 -05:00
Ilja	5049b4272e	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.	2021-08-14 13:42:32 +02:00
Haelwenn (lanodan) Monnier	0e2aebd036	TwitterAPI: Make change_email require body params instead of query Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3503	2021-08-13 17:57:11 +02:00
Haelwenn (lanodan) Monnier	3961422f85	TwitterAPI: Make change_password require body params instead of query Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3503	2021-08-13 17:56:59 +02:00
Haelwenn (lanodan) Monnier	8baaa36a16	ObjectAgePolicy: Fix pattern matching on published Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3500	2021-08-13 17:56:46 +02:00
Haelwenn (lanodan) Monnier	61d233921c	ObjectValidator.stringify_keys: filter out nil values	2021-08-11 21:38:10 +02:00
Haelwenn	7c1243178b	Merge branch 'bugfix/change_password' into 'develop' TwitterAPI: Make change_password require body params instead of query Closes #2740 See merge request pleroma/pleroma!3503	2021-08-10 18:40:13 +00:00
Haelwenn (lanodan) Monnier	197cdebca9	TwitterAPI: Make change_email require body params instead of query	2021-08-10 20:33:00 +02:00
Haelwenn (lanodan) Monnier	09dcb2b522	TwitterAPI: Make change_password require body params instead of query Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2740	2021-08-10 20:01:11 +02:00
Haelwenn (lanodan) Monnier	c64eae40a2	ObjectAgePolicy: Fix pattern matching on published	2021-08-10 07:41:06 +02:00
Haelwenn	901204df22	Merge branch 'poll-notification' into 'develop' MastodonAPI: Support poll notification See merge request pleroma/pleroma!3484	2021-08-09 10:02:37 +00:00
Sean King	1841bd8383	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe	2021-08-06 08:08:20 -06:00
Ilja	03030b47c2	quarantine instances info Added a new field in the nodeinfo called quarantined_instances_info This holds an object like `"quarantined_instances_info":{"quarantined_instances":{"quar.inst":{"reason":"whatever reason"}}}}`	2021-08-06 07:59:53 +02:00
Ilja	47fc57bbcc	Change what nodeinfo returns without breaking backwards compatibility * Only for SimplePolicy for now * I added an extra mrf_simple_info key that has an object as value. The object contains only relevant extra info	2021-08-06 07:59:53 +02:00
Ilja	7fdc3cde06	Return maps in node_info It's easiest (and imo most proper) to use tuples {"instance, "reason"} in BE, but for FE maps like %{"instance": "instance", "reason", "reason"} are better. I changed it so that node_info returns maps now for simple_policy and quarantined instances.	2021-08-06 07:59:53 +02:00
Ilja	c0489f9fac	Fixed deprecation warning checks When a setting was deprecated, the code would stop checking for the rest of the possible deprications. This also meant that the settings weren't rewritten to the new settings for deprecated settings besides the first one.	2021-08-06 07:59:53 +02:00
Ilja	b674ba658b	make linter happy	2021-08-06 07:59:52 +02:00
Ilja	3c5a497b19	Deprecate transparency_exclusions * Give deprecation message * Rewrite configs	2021-08-06 07:59:52 +02:00
Ilja	dfeb3862da	config :mrf, :transparency_exclusions works with tumples now	2021-08-06 07:59:52 +02:00
Ilja	e0c7d77197	Deprecate and rewrite settings for quarentine settings * This is for the settings, not yet a DB migration	2021-08-06 07:59:52 +02:00
Ilja	27fe7b0274	Make quarentine work with list of tuples instead of strings	2021-08-06 07:59:52 +02:00
Ilja	dd947d9bc8	Add tests for setting `:instance, :quarantined_instances` No test was done for quarantined instances yet. I added a factory for followers_only notes and checked * That no followers only post is send when the target server is quarantined * That a followers only post is send when the target server is not quarantined	2021-08-06 07:59:52 +02:00
Ilja	4ba0beb60c	Make mrfSimple work with tuples * Changed SimplePolicy * I also grepped in test/ for ':mrf_simple' to see what other things could be affected	2021-08-06 07:58:58 +02:00
Ilja	647087d7fd	Deprectate strings for SimplePolicy When strings are detected in the simplepolicy, a warning will be given and the config will be changed to use tuples instead	2021-08-06 05:01:44 +02:00
Alex Gleason	44ede0657f	Merge remote-tracking branch 'pleroma/develop' into staff-plug	2021-08-04 11:48:57 -05:00
Alex Gleason	62bf6d67e3	Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes	2021-07-18 11:49:22 -05:00
Alex Gleason	70f1496eb8	Poll notification: only notify local users	2021-07-18 11:10:23 -05:00
Alex Gleason	0b1c05ca1e	Poll notification: trigger PollWorker through common_pipeline	2021-07-18 11:10:23 -05:00
Alex Gleason	0114754db2	MastodonAPI: Support poll notification	2021-07-17 22:19:38 -05:00
Alex Gleason	3674179b26	Merge remote-tracking branch 'pleroma/develop' into instance-deletion	2021-07-17 15:03:43 -05:00
Alex Gleason	bad79f79e6	AdminAPI.InstanceController: clean up tests, rename actions	2021-07-17 15:00:15 -05:00
Alex Gleason	54dbcfe02a	AdminAPI: add DELETE /instances/:instance to delete all content from a remote instance	2021-07-17 14:55:05 -05:00
Alex Gleason	f67d00d12b	Add Instance.delete_users_and_activities/1 to delete all content from a remote instance	2021-07-17 14:06:35 -05:00
Alex Gleason	c136dc0987	Upgrade Ecto to v3.6.2, remove deprecated ecto_explain	2021-07-17 13:53:19 -05:00
Alex Gleason	25676c84be	Create AdminAPI.InstanceController	2021-07-17 13:05:25 -05:00
feld	3f58213646	Merge branch 'admin-api-users-sort' into 'develop' AdminAPI: sort new users at the top Closes #2709 See merge request pleroma/pleroma!3481	2021-07-14 14:39:14 +00:00
Alex Gleason	1a2fe96d56	Merge remote-tracking branch 'pleroma/develop' into admin-api-users-date	2021-07-14 09:02:55 -05:00
Alex Gleason	167e14416b	AdminAPI: add date to users	2021-07-14 08:54:59 -05:00
Alex Gleason	deb3f91136	Merge remote-tracking branch 'pleroma/develop' into admin-api-users-sort	2021-07-13 22:47:47 -05:00
Alex Gleason	5e88796784	AdminAPI: sort user results by ID descending	2021-07-13 22:47:02 -05:00
Alex Gleason	1f093cb216	Moderators: reorganize :admin_api pipeline in Router	2021-07-12 22:11:32 -05:00
Alex Gleason	9bc1e79c56	Moderators: add UserIsStaffPlug	2021-07-12 21:57:52 -05:00
Haelwenn	173e977e28	Merge branch 'features/ingestion-page' into 'develop' Pipeline Ingestion: Page See merge request pleroma/pleroma!3097	2021-07-12 05:05:49 +00:00
Haelwenn (lanodan) Monnier	6dc78f5f6f	AP C2S: Remove restrictions and make it go through pipeline	2021-07-12 06:49:41 +02:00
Sean King	9758f636b2	Delete MastoFE Controller Test	2021-07-10 11:13:25 -06:00
Sean King	5d279a22b1	Merge develop branch upstream	2021-07-10 11:04:16 -06:00
Alex Gleason	99cc26bb02	Merge remote-tracking branch 'pleroma/develop' into remote-deletions	2021-06-30 02:02:30 -05:00
Alex Gleason	beb1c98ab5	Deletions: don't purge keys so Delete/Undo activities can be signed	2021-06-30 02:02:24 -05:00
Alex Gleason	43800d83f4	Deletions: allow deactivated users to be deleted	2021-06-30 01:32:28 -05:00
Alex Gleason	a7929c4d89	Deletions: preserve account status fields during purge, fix checks	2021-06-29 23:56:19 -05:00
Alex Gleason	be2da95c36	Correctly purge a remote user	2021-06-29 21:45:38 -05:00
feld	f97f305d00	Merge branch 'ecto-upgrade' into 'develop' Upgrade Ecto to v3.6.2, remove deprecated ecto_explain See merge request pleroma/pleroma!3473	2021-06-23 20:17:01 +00:00
Alex Gleason	54af527759	Upgrade Ecto to v3.6.2, remove deprecated ecto_explain	2021-06-23 13:22:32 -05:00
Haelwenn (lanodan) Monnier	fc6ab78a84	Add test on changing [:instance, :upload_limit]	2021-06-22 12:25:25 +02:00
Alex Gleason	3a03d9b65f	Merge remote-tracking branch 'pleroma/develop' into nsfw-api-mrf	2021-06-17 15:38:10 -05:00
Alex Gleason	2b3dfbb42f	NsfwApiPolicy: add tests	2021-06-17 14:36:51 -05:00
feld	406dadb56b	Merge branch 'fix/twittercard-video-dimensions' into 'develop' Generate Twittercard/OGP metadata with correct dimensions See merge request pleroma/pleroma!3456	2021-06-10 15:03:58 +00:00
Mark Felder	f37db23848	Test that videos only get image thumbnails in OGP metadata when we can produce them with Preview Proxy	2021-06-09 11:46:31 -05:00
Mark Felder	dc8fe91dec	Metadata.Utils.attachment_url/1 was used in this test too	2021-06-09 10:06:44 -05:00
Haelwenn (lanodan) Monnier	c839078a75	ObjectValidators.{Announce,EmojiReact,Like}: Fix context, actor & addressing	2021-06-09 04:23:02 +02:00
Mark Felder	d70db63084	Set the correct height/width if the data is available when generating opengraph metadata	2021-06-08 16:58:33 -05:00
Mark Felder	d4ac9445cd	Twittercard metadata for images should also include dimensions if available	2021-06-08 16:19:12 -05:00
Mark Felder	5de65ce3e8	Set the correct height/width if the data is available when generating twittercard metadata	2021-06-08 15:59:55 -05:00
feld	1175023687	Merge branch 'metadata-for-all' into 'develop' Support metadata for video files too See merge request pleroma/pleroma!3441	2021-06-08 20:30:55 +00:00
Mark Felder	3121ed1325	Blurhash varies slightly by computer generating it, so just validate it wasn't nil	2021-06-08 14:53:03 -05:00
feld	939b3bfe43	Merge branch 'improve-og-embed' into 'develop' Improve opengraph embeds See merge request pleroma/pleroma!3442	2021-06-08 19:26:17 +00:00
Mark Felder	f1abe39f6f	Update test names and verify blurhash is correctly generated for images	2021-06-08 14:05:13 -05:00
Mark Felder	1c4c73c6a0	Add test for AnalyzeMetadata upload filter fetching dimensions from a video	2021-06-08 14:02:56 -05:00
Alex Gleason	1399b82f7b	Create WrapperAuthenticator and simplify Authenticator behaviour Speeds up recompilation by reducing compile-time cycles	2021-06-07 18:18:39 -05:00
Mark Felder	017f947fc1	Channel name was incorrect. We left it as chat:public for backwards compatibility.	2021-06-07 16:10:24 -05:00
Mark Felder	a5ae0432ed	Test was named incorrectly and did not execute	2021-06-07 16:09:47 -05:00
Mark Felder	f5ef7fe43b	Fix test warnings	2021-06-07 16:06:53 -05:00
Mark Felder	264458531a	Formatting	2021-06-07 15:47:50 -05:00
Alex Gleason	fe4c4a7178	MRF: create MRF.Policy behaviour separate from MRF module Speeds up recompilation by reducing compile-time deps	2021-06-07 14:22:08 -05:00
feld	5b9e13fc0d	Merge branch 'fix/clear_config_warning' into 'develop' Fix warning for misuse of clear_config/2 See merge request pleroma/pleroma!3446	2021-06-04 20:55:21 +00:00
Mark Felder	d5daf59f88	Fix warning for misuse of clear_config/2 The old warning message was producing an improperly formatted suggestion.	2021-06-04 15:48:26 -05:00
Sean King	dc4814f0cd	Fix merge conflicts with upstream	2021-06-04 14:42:44 -06:00
Haelwenn	0c56f9de0d	Merge branch 'tests/openapi-everywhere' into 'develop' Put OpenAPI ~everywhere in tests See merge request pleroma/pleroma!3324	2021-06-04 18:53:09 +00:00
Haelwenn (lanodan) Monnier	eb7313b0d3	Pipeline Ingestion: Page	2021-06-04 20:06:33 +02:00
feld	a07310888f	Merge branch 'fix/missing-deprecation' into 'develop' Add missing deprecation warning left out of !2842 See merge request pleroma/pleroma!3444	2021-06-04 17:37:30 +00:00
Mark Felder	f58928cf1c	Add missing deprecation warning left out of !2842	2021-06-04 12:30:10 -05:00
io	2c401dafa1	Improve opengraph embeds This brings them more in line with Mastodon. - Deduplicates display name from the title and content - Removes arbitrary limits on the size of the embedded image - Removes angled double quotes from embed descriptions. These would normally just indicate that the content is a quote, but that is already implied by the content being in an embed.	2021-06-04 05:33:35 +00:00
Haelwenn (lanodan) Monnier	24d66b60a0	request_builder_test: mode :read got removed	2021-06-03 19:11:17 +02:00
Haelwenn (lanodan) Monnier	5c3a0dd26e	factory: Fix article_factory	2021-06-03 19:11:16 +02:00
Mark Felder	d9513b11d3	Forgot to move migration test when rebasing	2021-06-01 11:49:47 -05:00
Mark Felder	9ce2c017c0	We want clear_config/2 in all tests now	2021-06-01 11:49:47 -05:00
Roman Chvanikov	d7dfa6d27c	Update test for RenameInstanceChat migration	2021-06-01 11:49:47 -05:00
Mark Felder	01f796f8bb	Add a test for the migration	2021-06-01 11:49:47 -05:00
Mark Felder	d6432a65da	Move shout configuration from :instance, update docs and changelog	2021-06-01 11:49:46 -05:00
Mark Felder	ff00b354fa	Rename the non-federating Chat feature to Shout	2021-06-01 11:49:14 -05:00
Alex Gleason	c435de426d	Merge remote-tracking branch 'pleroma/develop' into cycles-constants	2021-06-01 11:33:11 -05:00
feld	0ddf492c5d	Merge branch 'cycles-base-url' into 'develop' Deprecate Pleroma.Web.base_url/0 See merge request pleroma/pleroma!3432	2021-06-01 16:15:27 +00:00
Haelwenn	c4b4258374	Merge branch 'features/validators-note' into 'develop' Pipeline Ingestion: Note Closes #290 See merge request pleroma/pleroma!2984	2021-06-01 01:51:38 +00:00
Alex Gleason	f2134e605b	Merge remote-tracking branch 'pleroma/develop' into cycles-base-url	2021-05-31 16:49:46 -05:00
Alex Gleason	51a9f97e87	Deprecate Pleroma.Web.base_url/0 Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles.	2021-05-31 16:48:03 -05:00
Alex Gleason	10dfe81479	Pleroma.Constants.as_local_public/0 --> Pleroma.Web.ActivityPub.Utils.as_local_public/0 Move as_local_public/0 to stop making modules depend on Web at compile-time	2021-05-31 13:39:15 -05:00
feld	8871ca5aa3	Merge branch 'cycles-router-api-routes' into 'develop' Recompilation speedup: Pleroma.Web.get_api_routes/0 --> Pleroma.Web.Router.get_api_routes/0 See merge request pleroma/pleroma!3419	2021-05-28 19:06:49 +00:00
feld	359ded086c	Merge branch 'simplepolicy-announce-leak' into 'develop' SimplePolicy: filter nested objects, fixes #2582 Closes #2582 See merge request pleroma/pleroma!3376	2021-05-28 19:05:13 +00:00
Alex Gleason	39127f15eb	Merge remote-tracking branch 'pleroma/develop' into cycles-router-api-routes	2021-05-28 13:51:21 -05:00
Alex Gleason	c23b81e399	Pleroma.Web.get_api_routes/0 --> Pleroma.Web.Router.get_api_routes/0 Reduce recompilation time by breaking compile-time cycles	2021-05-28 13:51:01 -05:00
Mark Felder	4694853766	Provide totalItems field for featured collections	2021-05-27 12:17:31 -05:00
Haelwenn	f34e22bba2	Merge branch 'feat/expose_email_to_self' into 'develop' Expose user email address to user/owner; not publicly. See merge request pleroma/pleroma!3412	2021-05-26 18:04:23 +00:00
Mark Felder	fe40f6f291	Switch from the deprecated "use Mix.config" to "import Config"	2021-05-20 14:02:58 -05:00
Mark Felder	05d678c070	Expose user email address to user/owner; not publicly.	2021-05-20 12:50:43 -05:00
Mark Felder	9b6b5ac196	Rename upload filter to AnalyzeMetadata	2021-05-18 15:33:33 -05:00
Alex Gleason	ff02511057	Merge remote-tracking branch 'upstream/develop' into attachment-meta	2021-05-12 20:10:52 -05:00
Alex Gleason	4c060ae733	Ingest remote attachment width/height	2021-05-12 15:38:49 -05:00
Alex Gleason	ab9eabdf20	Add SetMeta filter to store uploaded image sizes	2021-05-12 15:07:31 -05:00
Alex Gleason	cea44b6b3e	Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak	2021-05-07 12:40:45 -05:00
Alex Gleason	1a45aa1278	Merge remote-tracking branch 'pleroma/develop' into notice-routes	2021-05-05 14:50:54 -05:00
Alex Gleason	50e3750758	Add notice compatibility routes for other frontends Fixes: https://git.pleroma.social/pleroma/pleroma/-/issues/1785	2021-05-05 14:50:10 -05:00
feld	745375bdcf	Merge branch 'dont-crash-email-settings' into 'develop' Don't crash so hard when email settings are invalid Closes #2606 See merge request pleroma/pleroma!3400	2021-05-04 13:30:00 +00:00
Alex Gleason	c186b059a7	Merge remote-tracking branch 'pleroma/develop' into dont-crash-email-settings	2021-05-03 14:43:28 -05:00
Alex Gleason	c80b1aaf51	Don't crash when email settings are invalid Fixes: https://git.pleroma.social/pleroma/pleroma/-/issues/2606 Fixes: https://gitlab.com/soapbox-pub/soapbox/-/issues/4	2021-05-03 14:43:14 -05:00
Alex Gleason	926a233cc4	Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak	2021-04-30 14:21:17 -05:00
Alex Gleason	c16c7fdb87	SimplePolicy: filter string Objects	2021-04-30 14:20:54 -05:00
Alex Gleason	3d742c3c1a	SimplePolicy: filter nested objects	2021-04-30 14:20:37 -05:00
Alex Gleason	52fc59f125	Merge remote-tracking branch 'upstream/develop' into earmark	2021-04-30 13:17:03 -05:00
Alex Gleason	a8fa00ef66	Fix failing remote mentions test, valid TLDs	2021-04-30 12:55:43 -05:00
Alex Gleason	53760d2cda	Delete obsolete EarmarkRendereTests (moved to UtilsTest)	2021-04-30 12:51:18 -05:00
Alex Gleason	6727a3659f	Remove Pleroma.Formatter.minify/2	2021-04-30 12:27:06 -05:00
Alex Gleason	e7ac15905e	Merge remote-tracking branch 'upstream/develop' into oauth-token-id	2021-04-29 12:19:10 -05:00
Alex Gleason	762be6ce10	Merge remote-tracking branch 'upstream/develop' into block-behavior	2021-04-29 11:14:32 -05:00
rinpatch	15f87cf658	Merge branch 'features/ingestion-ecto-tag' into 'develop' TagValidator: New See merge request pleroma/pleroma!3244	2021-04-16 09:55:55 +00:00
rinpatch	79376b4afb	Merge branch 'feature/521-pinned-post-federation' into 'develop' Pinned posts federation Closes #521 See merge request pleroma/pleroma!3312	2021-04-16 09:53:47 +00:00
rinpatch	0ababdc068	Merge branch 'fix/2593-reading-exported-config-file' into 'develop' Reading the file, instead of config keyword in ReleaseRuntimeProvider Closes #2593 See merge request pleroma/pleroma!3381	2021-04-16 09:50:26 +00:00
Sean King	fa2e62078c	Remove MastoFE configuration stuff	2021-04-15 23:51:04 -06:00
Sean King	ca79aab0bf	Remove MastoFE settings from users table	2021-04-15 23:33:24 -06:00
Sean King	8afa3f2d1b	Remove no longer necessary unit tests for MastoFE	2021-04-15 23:12:42 -06:00
Mark Felder	f95b52255b	Revert guards on string_to_elixir_types/1, remove unnecessary assignment in test	2021-04-14 09:39:57 -05:00
Mark Felder	905efc57e9	Initial test validating the AdminAPI issue	2021-04-13 14:39:28 -05:00
Mark Felder	cdd271b065	Fix assignment / assertion	2021-04-13 10:55:54 -05:00
Mark Felder	9fbcdc15b1	Validate custom instance thumbnail set via AdminAPI produces correct URL	2021-04-13 10:52:53 -05:00
Alexander Strizhakov	681a42c359	release runtime provider fix for paths	2021-04-08 15:45:31 +03:00
Haelwenn (lanodan) Monnier	5ef4659b37	test/pleroma/web/common_api_test.exs: Strip : around emoji key-name	2021-04-05 19:25:55 +02:00
Haelwenn (lanodan) Monnier	6d6bef64bf	fetcher_test: Remove assert on fake Create having an ap_id	2021-04-05 19:19:12 +02:00
Haelwenn (lanodan) Monnier	53193b84b1	utils: Fix maybe_splice_recipient when "object" isn’t a map	2021-04-05 19:19:12 +02:00
Haelwenn (lanodan) Monnier	0b88accae6	fetcher_test: Fix missing mock function	2021-04-05 19:19:12 +02:00
Haelwenn (lanodan) Monnier	b0c778fde7	NoteHandlingTest: remove fix_explicit_addressing-related test	2021-04-05 19:19:12 +02:00
Haelwenn (lanodan) Monnier	d1205406d9	ActivityPubControllerTest: Apply same addr changes to object	2021-04-05 19:19:12 +02:00
Haelwenn (lanodan) Monnier	641184fc7a	recipients fixes/hardening for CreateGenericValidator	2021-04-05 19:19:11 +02:00
Haelwenn (lanodan) Monnier	c944932674	Pipeline Ingestion: Note	2021-04-05 19:19:11 +02:00
Haelwenn (lanodan) Monnier	e2a3365b5c	ObjectValidator.CommonFixes: Introduce fix_objects_defaults and fix_activity_defaults	2021-04-05 19:19:11 +02:00
Haelwenn (lanodan) Monnier	e56779dd8d	Transmogrifier: Simplify fix_explicit_addressing and fix_implicit_addressing	2021-04-05 19:19:11 +02:00
Haelwenn (lanodan) Monnier	5ae27c8451	pipeline_test: Fix usage of %Activity{}	2021-04-01 14:18:40 +02:00
Mark Felder	16a7ffb1ea	Fix function calls due to module name change	2021-03-30 11:10:44 -05:00
Mark Felder	bfcdcd4f69	Temp file leaked, oops	2021-03-30 11:10:44 -05:00
Mark Felder	03f38ac4eb	Prefer FollowBot naming convention vs Followbot	2021-03-30 11:10:44 -05:00
Mark Felder	fef4f3772c	More tests to validate Followbot is behaving	2021-03-30 11:10:44 -05:00
Mark Felder	f73d166785	Only need to validate a follow request is generated for now	2021-03-30 11:10:44 -05:00
Alexander Strizhakov	4d046afd27	tests for release config provider	2021-03-27 09:05:33 +03:00
Alexander Strizhakov	8857242c95	removeing corresponding add activity	2021-03-25 13:03:41 +03:00
Alexander Strizhakov	5ae9b05600	separate test file for featured collection	2021-03-25 13:03:41 +03:00
Alexander Strizhakov	8f0778166c	moving fixture into mastodon folder	2021-03-25 13:03:41 +03:00
Alexander Strizhakov	16c96966e9	not needed	2021-03-25 13:03:41 +03:00
Alexander Strizhakov	3adb43cc20	refetch user on incoming add/remove activity if featured_address is nil	2021-03-25 13:03:41 +03:00
Alexander Strizhakov	d1d2744ee3	featured_address valition in AddRemoveValidator	2021-03-25 13:03:40 +03:00
Alexander Strizhakov	ff612750b1	validator renaming & add validation for target	2021-03-25 13:03:40 +03:00
Alexander Strizhakov	17f28c0507	mastodon pins	2021-03-25 13:03:40 +03:00
Alexander Strizhakov	3ec1dbd922	Let pins federate - save object ids on pin, instead of activity ids - pins federation - removed pinned_activities field from the users table - activityPub endpoint for user pins - pulling remote users pins	2021-03-25 13:03:40 +03:00
Alex Gleason	b6a69b5efd	Return token's primary key with POST /oauth/token	2021-03-24 12:50:05 -05:00
feld	caadde3b04	Merge branch 'fix/2585-config-migration-dir' into 'develop' migrating config to tmp folder Closes #2585 See merge request pleroma/pleroma!3379	2021-03-23 17:46:52 +00:00
Alexander Strizhakov	03843a5386	migrating config to tmp folder	2021-03-23 14:29:02 +03:00
rinpatch	d3660b24d3	Copy emoji in the subject from parent post Sometimes people put emoji in the subject, which results in the subject looking broken if someone replies to it from a server that does not have the said emoji under the same shortcode. This patch solves the problem by extending the emoji set available in the summary to that of the parent post.	2021-03-22 21:20:47 +03:00
Alexander Strizhakov	d7e51206a2	respect content-type header in finger request	2021-03-19 18:53:55 +03:00
rinpatch	a9bc652ab9	Merge branch 'mediaproxy-decode' into 'develop' Simple way to decode mediaproxy URLs See merge request pleroma/pleroma!3364	2021-03-19 08:52:12 +00:00
rinpatch	f930e83fa2	Merge branch 'fix/remove_auto_nsfw' into 'develop' Remove sensitive setting #nsfw See merge request pleroma/pleroma!3223	2021-03-19 08:48:22 +00:00
rinpatch	67bde35e71	Merge branch 'bugfix/bridgy-user-icon' into 'develop' Add support for actor icon being a list (Bridgy) See merge request pleroma/pleroma!3372	2021-03-19 08:36:26 +00:00
Haelwenn	a2aa309496	Merge branch 'update_open_api_spex' into 'develop' Update OpenApiSpex dependency See merge request pleroma/pleroma!3362	2021-03-16 01:54:43 +00:00
Haelwenn (lanodan) Monnier	55bdfb075c	OpenAPI: TwitterAPI Util Controller	2021-03-15 06:47:07 +01:00
Haelwenn (lanodan) Monnier	a22c53810b	Remove deprecated /api/qvitter/statuses/notifications/read	2021-03-15 06:47:07 +01:00
Haelwenn (lanodan) Monnier	e4743847a1	OpenAPI: PleromaAPI UserImport Controller	2021-03-15 06:47:07 +01:00
Haelwenn (lanodan) Monnier	ef5de5eb39	OpenAPI: MastodonAPI Status Controller	2021-03-15 06:47:07 +01:00
Haelwenn (lanodan) Monnier	0c7c6463d1	OpenAPI: MastodonAPI Account Controller, excluding OAuth	2021-03-15 06:47:06 +01:00
Haelwenn (lanodan) Monnier	3a8404820d	Verify MastoFE Controller put_settings response	2021-03-15 06:47:06 +01:00
Haelwenn (lanodan) Monnier	e47f83cfc8	OpenAPI: MastodonAPI Conversation Controller	2021-03-15 06:47:06 +01:00
Haelwenn (lanodan) Monnier	3123ecdd6e	OpenAPI: MastodonAPI Media Controller	2021-03-15 06:47:06 +01:00
Haelwenn (lanodan) Monnier	7eecc3b61d	OpenAPI: MastodonAPI Timeline Controller	2021-03-15 06:47:06 +01:00
Haelwenn (lanodan) Monnier	b1d4b2b81e	Add support for actor icon being a list (Bridgy)	2021-03-15 06:44:05 +01:00
Ivan Tashkinov	946e0aab49	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	2021-03-10 07:48:50 +03:00
Haelwenn	7f413139fb	Merge branch 'openapi/admin/user' into 'develop' Add OpenAPI spec for AdminAPI.UserController See merge request pleroma/pleroma!3355	2021-03-10 03:24:40 +00:00
Ivan Tashkinov	92526e0230	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	2021-03-07 11:34:39 +03:00
Mark Felder	eaaa20e0f1	Make tests use it	2021-03-05 13:21:22 -06:00
Egor Kislitsyn	92ab72dbbb	Update OpenApiSpex dependency	2021-03-05 15:51:29 +04:00
Ivan Tashkinov	5856f51717	[#3213 ] ActivityPub hashtags filtering refactoring. Test fix.	2021-03-03 23:09:30 +03:00
lain	13aa98d689	Merge branch 'mergeback/2.3.0' into 'develop' Mergeback/2.3.0 See merge request pleroma/pleroma!3360	2021-03-03 15:07:50 +00:00
lain	2e296c079f	Revert "StatusController: Deactivate application support for now." This reverts commit `024c11c18d`.	2021-03-03 15:33:06 +01:00
Mark Felder	913d53b7d7	Remove useless header on the get request	2021-03-02 14:04:50 -06:00
Mark Felder	ccbf162088	Actually test viewing status after ingestion	2021-03-02 12:33:32 -06:00
Mark Felder	f0208980e4	Test both ingestion of post in the status controller and the correct response during the view	2021-03-02 12:29:16 -06:00
Egor Kislitsyn	3aae5231b2	Add OpenAPI spec for AdminAPI.UserController	2021-03-02 20:49:17 +04:00
lain	024c11c18d	StatusController: Deactivate application support for now. Some more things to discuss about, so we'll remove it from 2.3.0	2021-03-02 14:40:47 +01:00
Ivan Tashkinov	882dd46843	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	2021-03-02 08:26:30 +03:00
Alex Gleason	7ebbe11e75	user_agent_mock --> request_mock	2021-03-01 21:05:52 +01:00
Alex Gleason	1dc5794e29	Never forward the client's user-agent through the media proxy	2021-03-01 21:05:46 +01:00
Mark Felder	b1e1db82bc	Store application details in the object under the generator key, not application key	2021-03-01 11:29:10 -06:00
lain	e8d88a72cf	Merge branch 'fix/warning-in-test' into 'develop' warning fix See merge request pleroma/pleroma!3350	2021-02-28 16:53:05 +00:00
lain	4a9d3a1f28	Merge branch 'features/reports-enhancements' into 'develop' Enhance reports in Pleroma API: index, show See merge request pleroma/pleroma!3280	2021-02-28 16:45:15 +00:00
Alexander Strizhakov	f85ed1c521	warning fix	2021-02-28 19:41:25 +03:00
lain	050c4b1f14	Merge branch 'bugfix/peertube-mpegURL-object' into 'develop' Video: Handle peertube videos only stashing attachments in x-mpegURL Closes #2372 and #2535 See merge request pleroma/pleroma!3336	2021-02-28 16:18:23 +00:00
lain	e6a14e1cd1	Merge branch 'feat/client_app_details' into 'develop' Support application field See merge request pleroma/pleroma!3311	2021-02-28 16:17:34 +00:00
Haelwenn (lanodan) Monnier	3bc7d12271	Remove sensitive-property setting #nsfw, create HashtagPolicy	2021-02-27 21:26:17 +01:00
lain	d0823d7f1e	Merge branch 'frontendstatic-ignore-api-calls' into 'develop' Filter out API calls from FrontendStatic plug Closes #2261 See merge request pleroma/pleroma!3346	2021-02-27 19:40:38 +00:00
Mark Felder	d35b6254b4	Store the client application data in ActivityStreams format	2021-02-26 18:14:57 -06:00
feld	840686ecd5	Merge branch 'fix/2498-expires_in-scheduled-posts' into 'develop' expires_in in scheduled status params Closes #2498 See merge request pleroma/pleroma!3315	2021-02-26 16:49:11 +00:00
feld	2217b35bd4	Merge branch 'ecto-rollback-in-test-env' into 'develop' Possibility to run rollback in test env See merge request pleroma/pleroma!3212	2021-02-26 16:47:53 +00:00
Mark Felder	902d4e4a4a	Leave a note for future explorers	2021-02-25 13:06:43 -06:00
Mark Felder	2da71a526f	No need to filter out Mix.env() from the API routes.	2021-02-25 13:04:08 -06:00
Mark Felder	6b87dfad5d	Filter out MIX_ENV from route list and add a test	2021-02-25 09:23:10 -06:00
Ivan Tashkinov	8f88a90ca3	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework # Conflicts: # lib/pleroma/application.ex # lib/pleroma/config.ex	2021-02-23 13:58:35 +03:00
Ivan Tashkinov	77f3da0358	[#3213 ] Misc. tweaks: proper upsert in Hashtag, better feature toggle management.	2021-02-23 13:52:28 +03:00
Haelwenn (lanodan) Monnier	7fc9cd0974	Video: Handle peertube videos only stashing attachments in x-mpegURL Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2535	2021-02-21 23:41:28 +01:00
Mark Felder	63739c5a58	Tests to validate client disclosure obeys user setting	2021-02-18 17:23:17 -06:00
Mark Felder	d5ef02c7a7	Mastodon makes this field null when posting with MastoFE or if you choose to not disclose it, so it's safe to be null by default	2021-02-18 16:35:03 -06:00
Alexander Strizhakov	1e6c27181e	expires_in in scheduled status params	2021-02-18 14:59:22 +03:00
rinpatch	6d66fadea7	Remove `:auth, :enforce_oauth_admin_scope_usage` `admin` scope has been required by default for more than a year now and all apps that use the API seems to request a proper scope by now.	2021-02-17 20:47:38 +03:00
Haelwenn (lanodan) Monnier	ff72ce31ca	Enhance reports in Pleroma API: index, show	2021-02-17 18:46:53 +01:00
Haelwenn	e7b1f0f5f4	Merge branch 'feat/chat-list-pagination' into 'develop' Chats: Introduce /api/v2/pleroma/chats which implements pagination Closes #2140 See merge request pleroma/pleroma!3325	2021-02-17 15:36:59 +00:00
rinpatch	158f9f18ee	Merge branch 'remove-conversation-api' into 'develop' Add API endpoint to remove a conversation Closes #2488 See merge request pleroma/pleroma!3321	2021-02-17 15:14:27 +00:00
rinpatch	264cb2c77f	Merge branch '2510-oauth-app-tokens-further-support' into 'develop' [#2510] Improved support for app-bound OAuth tokens Closes #2510 See merge request pleroma/pleroma!3316	2021-02-17 13:08:51 +00:00
rinpatch	d7ad288c84	Chats: Introduce /api/v2/pleroma/chats which implements pagination Also removes incorrect claim that /api/v1/pleroma/chats supports pagination and deprecates it. Closes #2140	2021-02-17 16:03:24 +03:00
Ivan Tashkinov	111bfdd3a0	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	2021-02-16 23:23:49 +03:00
Ivan Tashkinov	1dac7d1462	[#3213 ] Fixed `hashtags.name` lookup (must use `citext` type to do index scan). Fixed embedded hashtags lookup (lowercasing), adjusted tests.	2021-02-15 21:13:14 +03:00
Egor Kislitsyn	cf6d3db58f	Add API endpoint to remove a conversation	2021-02-15 21:48:13 +04:00
Mark Felder	fb2a8e7ccd	Additional validation so we don't get caught off guard with a nil response if CommonAPI ever prevents us from injecting this data	2021-02-12 13:15:33 -06:00
Mark Felder	3554a65f45	Inject fake application metadata and validate it is stripped by transmogrifier	2021-02-12 13:05:12 -06:00
rinpatch	db716f860a	Merge branch 'not-used-mock' into 'develop' Not used mock See merge request pleroma/pleroma!3313	2021-02-12 08:52:04 +00:00
rinpatch	76414ad277	Merge branch 'bugfix/answer-outbox' into 'develop' Add test for Answer presence into an authenticated /outbox See merge request pleroma/pleroma!3269	2021-02-12 08:48:51 +00:00
Mark Felder	bd3d0e8b57	Use a custom oauth token so we can predict and validate the client_name and website	2021-02-11 15:53:10 -06:00
Mark Felder	333ff527fd	Validate client application metadata is retained in the object	2021-02-11 15:07:21 -06:00
Ivan Tashkinov	5992382cf8	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework # Conflicts: # CHANGELOG.md # lib/mix/tasks/pleroma/database.ex # lib/pleroma/web/templates/feed/feed/_activity.rss.eex	2021-02-11 19:31:57 +03:00
Ivan Tashkinov	df89b5019b	[#2510 ] Improved support for app-bound OAuth tokens. Auth-related refactoring.	2021-02-11 15:02:50 +03:00
Alexander Strizhakov	b5d001fc8c	not used mock	2021-02-10 18:44:49 +03:00
rinpatch	a853218701	Merge branch 'features/ap_id-c2s-authentication' into 'develop' activity_pub_controller: Add authentication to object & activity endpoints See merge request pleroma/pleroma!3295	2021-02-09 19:29:43 +00:00
feld	593c0851d9	Merge branch 'develop' into 'new-user-emails'	2021-02-08 16:01:50 -06:00
Haelwenn	a5bee1bf35	Merge branch 'feat/mrf-noemptypolicy' into 'develop' MRF NoEmptyPolicy: Deny posts from local users if there is no content or only mentions. See merge request pleroma/pleroma!3309	2021-02-08 21:49:20 +00:00
Mark Felder	55a13fc360	MRF NoEmptyPolicy: Deny posts from local users if there is no content or only mentions. Helps prevent accidental button mashes from submitting incomplete posts	2021-02-08 15:32:47 -06:00
Haelwenn (lanodan) Monnier	8c7b3b20d8	activity_pub_controller: Add authentication to object & activity endpoints	2021-02-08 20:00:47 +01:00
Ivan Tashkinov	d1c6dd97aa	[#3213 ] Partially addressed code review points. migration rollback task changes, hashtags-related config handling tweaks, `hashtags.data` deletion (unused).	2021-02-07 22:24:12 +03:00
Mark Felder	6a3e75c8e6	Lint	2021-02-05 09:00:17 -06:00
Mark Felder	c361440396	Add basic test to validate the registration email is dispatched when the others are disabled Also only check for subject as the body is a mess of html and we don't really need to prove its contents if the subject matches.	2021-02-04 17:56:46 -06:00
Mark Felder	d047372291	Merge branch 'develop' into fix/reports-from-admins	2021-02-04 12:37:20 -06:00
feld	7b67bf4e97	Merge branch 'fix/configdb-error' into 'develop' Improve error message for ConfigDB See merge request pleroma/pleroma!3289	2021-02-04 14:33:59 +00:00
Haelwenn	ea5469961a	Merge branch 'bugfix/notice-external-redirect' into 'develop' Redirect non-local activities when /notice/:id is used See merge request pleroma/pleroma!3300	2021-02-04 14:26:03 +00:00
Haelwenn (lanodan) Monnier	ecff027418	Redirect non-local activities when /notice/:id is used Related-to: https://git.pleroma.social/pleroma/pleroma/-/issues/2496	2021-02-04 15:17:40 +01:00
Mark Felder	887db076b5	Load an emoji.txt specific to the test env	2021-02-03 16:40:59 -06:00
Mark Felder	5bb5949048	Validate admin making report doesn't get their own report notification, but other admins do	2021-02-03 12:54:53 -06:00
feld	008499f65a	Merge branch 'develop' into 'fix/2412-filters' # Conflicts: # CHANGELOG.md	2021-02-03 14:23:23 +00:00
feld	c3dd860a02	Merge branch 'fix/2449-scheduled-poll-bug' into 'develop' Fix for scheduled post with poll Closes #2449 See merge request pleroma/pleroma!3294	2021-02-03 14:22:23 +00:00
feld	8d2ea95402	Merge branch 'feature/2438-users-posts-total-count' into 'develop' Feature/2438 users/instances posts total count Closes #2438 See merge request pleroma/pleroma!3270	2021-02-03 14:21:57 +00:00
Haelwenn (lanodan) Monnier	fb25231fbe	Add test for Answer presence into an authenticated /outbox	2021-02-03 12:07:18 +01:00
Ivan Tashkinov	4e14945670	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework # Conflicts: # CHANGELOG.md # lib/pleroma/web/activity_pub/activity_pub.ex	2021-02-03 09:31:38 +03:00
feld	f1f773f2c7	Merge branch 'email-stub-in-verify-credentials' into 'develop' Email-like field in /api/v1/accounts/verify_credentials (for PeerTube OAuth plugin and alike) See merge request pleroma/pleroma!3286	2021-02-02 18:35:08 +00:00
feld	d37d4106c6	Merge branch 'fix/majic-nits' into 'develop' Majic: don't fix extensions See merge request pleroma/pleroma!3287	2021-02-02 18:15:00 +00:00
Mark Felder	28d2917c3a	Merge branch 'develop' into fix/majic-nits	2021-02-02 12:01:48 -06:00
feld	d289ad8579	Merge branch 'develop' into 'fix/2411-mutes-api' # Conflicts: # CHANGELOG.md # docs/development/API/differences_in_mastoapi_responses.md	2021-02-02 17:57:58 +00:00
feld	cd5ff7a943	Merge branch 'develop' into 'feature/2164-unify-api-arguments' # Conflicts: # CHANGELOG.md	2021-02-02 17:11:38 +00:00
Alexander Strizhakov	aacd1c90b7	fix for test warnings	2021-02-01 19:33:40 +03:00
Alexander Strizhakov	0dc68c157f	fix for scheduled post with poll	2021-02-01 18:22:26 +03:00
Alexander Strizhakov	fdf1dfed56	only_remote -> remote renaming	2021-02-01 14:11:12 +03:00
Alexander Strizhakov	77f0a0af7d	more tests and update for docs and changelog	2021-02-01 14:11:12 +03:00
Alexander Strizhakov	2cb6dc5a3a	list timeline filtration by params	2021-02-01 14:11:12 +03:00
Alexander Strizhakov	b6a72680e2	added only_media flag to home timeline	2021-02-01 14:11:11 +03:00
Alexander Strizhakov	c3110c46f3	expanding filtration for home timeline added local & remote statuses filtration for home timeline	2021-02-01 14:11:11 +03:00
Ivan Tashkinov	cf4765af40	[#3213 ] ActivityPub: fixed subquery-based hashtags filtering implementation (addressed empty list options issue). Added regression test.	2021-01-31 23:06:38 +03:00
Ivan Tashkinov	1b49b8efe5	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework # Conflicts: # CHANGELOG.md	2021-01-31 20:38:58 +03:00
Ivan Tashkinov	6fd4163ab6	[#3213 ] ActivityPub: implemented subqueries-based hashtags filtering, removed aggregation-based hashtags filtering.	2021-01-31 20:37:33 +03:00
Alexander Strizhakov	c369d2b930	support for with_relationships parameter in /api/v1/mutes and /api/v1/accounts/:id endpoints	2021-01-29 08:41:21 +03:00
Ivan Tashkinov	380d0cce6b	[#3213 ] Reinstated DISTINCT clause for hashtag "any" filtering with 2+ terms. Added test.	2021-01-29 00:17:33 +03:00
Mark Felder	5fcab23aa3	Improve error message for ConfigDB	2021-01-28 14:59:23 -06:00
Mark Felder	9272cef500	Switch to a build of Majic that does not try to fix extensions by default	2021-01-28 14:03:29 -06:00
Egor Kislitsyn	a51d903e0c	Make sure active_user_count/1 counts only local users	2021-01-28 22:23:10 +04:00
Ivan Tashkinov	60b4654038	Email-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins like Peertube). Addresses https://git.pleroma.social/pleroma/pleroma-support/-/issues/56.	2021-01-28 19:49:43 +03:00
Egor Kislitsyn	bddb01bded	Add tests	2021-01-27 18:20:07 +04:00
Egor Kislitsyn	793fc77b16	Add active user count	2021-01-27 18:20:06 +04:00
lain	7f07871639	Merge branch 'chore/tests-use-clear_config' into 'develop' Convert tests to all use clear_config instead of Pleroma.Config.put See merge request pleroma/pleroma!3282	2021-01-27 11:33:27 +00:00
Alexander Strizhakov	d4158e8bf0	added total to the instance adminAPI endpoint	2021-01-27 07:45:06 +03:00
Alexander Strizhakov	6806c03e85	added total to the user statuses adminAPI endpoint	2021-01-27 07:45:02 +03:00
feld	d7af0294e6	Merge branch 'service-worker-allowed-header' into 'develop' Ability to set custom HTTP headers per each frontend See merge request pleroma/pleroma!3247	2021-01-26 18:14:01 +00:00
Mark Felder	e854c35e65	Convert tests to all use clear_config instead of Pleroma.Config.put	2021-01-26 11:58:43 -06:00
lain	229acae6c3	Merge branch 'develop' into '2435-list-multiple-users' # Conflicts: # CHANGELOG.md	2021-01-26 14:24:32 +00:00
Alexander Strizhakov	875fbaae35	support for expires_in/expires_at in filters	2021-01-26 08:27:45 +03:00
Haelwenn	250e202098	Merge branch 'fix/missing-own_votes' into 'develop' Include own_votes in the poll data See merge request pleroma/pleroma!3274	2021-01-26 00:55:05 +00:00
Mark Felder	0b19534475	Merge branch 'develop' into docs/apache-config	2021-01-25 17:00:26 -06:00
Ivan Tashkinov	694d98be55	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	2021-01-25 21:24:07 +03:00
Mark Felder	f868dcf3ac	Ensure consistent behavior between pleroma.user activate/deactivate mix tasks	2021-01-25 10:48:28 -06:00
Alexander Strizhakov	3f3d64acbf	little refactor and tests for voted & own_votes fields in polls	2021-01-25 19:46:36 +03:00
Mark Felder	5e8da27e14	Provide pleroma.user mix task for both activate and deactivate	2021-01-25 10:36:51 -06:00
Mark Felder	537ba1c5e0	Merge branch 'develop' into refactor/deactivated_user_field	2021-01-25 09:45:06 -06:00
Mark Felder	6bfd497f4a	Include own_votes in the poll data	2021-01-22 09:47:59 -06:00
Ivan Tashkinov	218c519606	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework # Conflicts: # test/pleroma/web/mastodon_api/views/status_view_test.exs	2021-01-22 10:05:28 +03:00
Mark Felder	80ccdb56f6	Make tag urls absolute	2021-01-21 16:49:19 -06:00
Mark Felder	42e49529c2	Test URL formatting	2021-01-21 14:42:16 -06:00
Mark Felder	0c485d5555	Improve description	2021-01-21 14:42:08 -06:00
eugenijm	7fcaa188a0	Allow to define custom HTTP headers per each frontend	2021-01-21 21:55:23 +03:00
eugenijm	133644dfa2	Ability to set the Service-Worker-Allowed header	2021-01-21 21:55:11 +03:00
Ivan Tashkinov	ca7f240643	[#3213 ] Ignoring of blank elements from objects.data->tag.	2021-01-21 20:50:06 +03:00
Ivan Tashkinov	c041e9c630	[#3213 ] HashtagsTableMigrator: failures handling fix, retry function. Changed default hashtags filtering strategy to non-aggregate approach.	2021-01-21 20:23:08 +03:00
Ivan Tashkinov	2634a16b4c	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework # Conflicts: # CHANGELOG.md	2021-01-21 20:20:35 +03:00
lain	ba40af054c	Merge branch 'test-cases-mox-setup' into 'develop' Mox mode setup tweak; refactoring See merge request pleroma/pleroma!3263	2021-01-21 09:03:26 +00:00
feld	2926713fe5	Merge branch 'deprecate-public_endpoint' into 'develop' Deprecate Uploaders.S3, :public_endpoint See merge request pleroma/pleroma!3251	2021-01-20 22:48:48 +00:00
Mark Felder	9988d9261c	Add bucket_namespace to be extra certain truncated_namespace works	2021-01-20 16:33:00 -06:00
Mark Felder	dfc4cb6ebd	Special handling for unconfirmed users based on instance config no longer needed.	2021-01-20 11:30:29 -06:00
Mark Felder	5d344e5c79	Only need to test if unconfirmed users are successfully deleted It's no longer possible to have an active user account with User.is_confirmed == false	2021-01-20 11:26:14 -06:00
Mark Felder	3cb4d40ebf	This scenario no longer exists. Users are auto-confirmed if confirmation not required at time of registration.	2021-01-20 11:17:13 -06:00
Ivan Tashkinov	318d6dde1c	Mox mode setup tweak; refactoring.	2021-01-19 00:23:39 +03:00
feld	958a7f6ed0	Merge branch 'fix/reblog-api' into 'develop' Fix Reblog API Closes #2423 See merge request pleroma/pleroma!3261	2021-01-18 21:19:14 +00:00
Mark Felder	28581e03ad	Merge branch 'develop' into refactor/deactivated_user_field	2021-01-18 14:58:21 -06:00
Mark Felder	44a86951a3	Merge branch 'develop' into refactor/approval_pending_user_field	2021-01-18 12:05:05 -06:00
Egor Kislitsyn	51d5951c02	Test that only author can reblog a private status	2021-01-18 21:01:00 +04:00
Egor Kislitsyn	1b79dce7bc	Fix Reblog API Do not set visibility parameter to `public` by default and let CommonAPI to infer it from status.	2021-01-18 20:15:57 +04:00
Lain Soykaf	bdfd72630f	ListController: Fix being unable to add / remove users.	2021-01-18 16:28:36 +01:00
Ivan Tashkinov	3f88e33a71	[#3251 ] Fixed wrong test-env config setting for [Pleroma.Upload]. Refactoring. Added warning to `clear_config/_` to minimize such issues in future.	2021-01-16 23:05:31 +03:00
Ivan Tashkinov	48b399cedb	[#3213 ] Refactoring of HashtagsTableMigrator. Hashtag timeline performance optimization (auto switch to non-aggregate join strategy when efficient).	2021-01-16 20:22:14 +03:00
Mark Felder	2c0fe2ea9e	Remove toggle_confirmation; require explicit state change Also cosmetic changes to make the code clearer	2021-01-15 13:11:51 -06:00
Mark Felder	d36182c088	Change user.confirmation_pending field to user.is_confirmed	2021-01-15 12:44:41 -06:00
Mark Felder	ebd7d1365b	Make setting user activation status explicit	2021-01-15 11:37:17 -06:00
Mark Felder	7516660753	Remove toggle_activation	2021-01-15 11:25:32 -06:00
Mark Felder	860b5c7804	Change user.deactivated field to user.is_active	2021-01-15 11:24:46 -06:00
Mark Felder	f7e59c28ed	Change user.approval_pending field to user.is_approved	2021-01-15 10:42:02 -06:00
Mark Felder	d0e0396528	Hack to fix tests not passing. Unclear why the filters are being set to nil. Both of these changes are needed or it doesn't work.	2021-01-14 17:49:37 -06:00
Mark Felder	0b725f5d21	Lint	2021-01-14 16:00:32 -06:00
Mark Felder	12c8ce481c	Bump Copyright year	2021-01-14 13:58:52 -06:00
Mark Felder	fb47e83adc	Add ConfigDB migration	2021-01-14 13:53:55 -06:00
Lain Soykaf	fd9a0ac329	BackupTest: Fix s3 test.	2021-01-14 20:18:45 +01:00
Lain Soykaf	c4b74c9c3f	Linting.	2021-01-14 16:01:14 +01:00
Lain Soykaf	39f3683a06	Pbkdf2: Use it everywhere.	2021-01-14 15:06:16 +01:00
Lain Soykaf	87a31c5c9b	Password -> Password.Pbkdf2	2021-01-14 14:49:39 +01:00
Ivan Tashkinov	e350898828	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	2021-01-13 22:11:16 +03:00
Mark Felder	ba234d3c73	Unnecessary duplication here	2021-01-13 12:01:01 -06:00
Mark Felder	94e5180846	Consistent style	2021-01-13 12:00:48 -06:00
Lain Soykaf	aff83eb7c1	Linting	2021-01-13 16:00:12 +01:00
lain	9106048c61	Password: Replace Pbkdf2 with Password.	2021-01-13 15:11:11 +01:00
lain	c7cd9bd591	Password: Add password module Replaces Pbkdf2.	2021-01-13 15:09:01 +01:00
Haelwenn (lanodan) Monnier	c4439c630f	Bump Copyright to 2021 grep -rl '# Copyright © .* Pleroma' * \| xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;'	2021-01-13 07:49:50 +01:00
Mark Felder	67e888498c	Switch another test to Upload.base_url/0	2021-01-12 16:42:43 -06:00
Mark Felder	e87cca97e6	Fix tests relying on old behavior. Use the Upload.base_url, Luke.	2021-01-12 16:35:10 -06:00
Mark Felder	8b28dce82a	Deprecate Pleroma.Uploaders.S3, :public_endpoint	2021-01-12 16:31:35 -06:00
feld	5453038ce9	Merge branch 'fix/backup-url-on-s3' into 'develop' Standardize base url for uploads See merge request pleroma/pleroma!3246	2021-01-12 20:54:30 +00:00
lain	e1a547d7d3	ChatMessages: Fix pagination headers. They used to contain the path parameter `id` as query param, which would break the link.	2021-01-11 15:30:40 +01:00
Mark Felder	3c936061d5	Apply Upload.base_url for S3	2021-01-08 17:32:42 -06:00
lain	5822338f3a	Merge branch 'guppe-example' into 'develop' ActivtityPub Test: Add example for guppe actor See merge request pleroma/pleroma!3243	2021-01-08 15:55:48 +00:00
Alex Gleason	e73c7fa7e5	Merge remote-tracking branch 'upstream/develop' into confirm-users	2021-01-08 07:48:19 -06:00
Alex Gleason	1b98cd8610	Remove ConfirmUserPlug	2021-01-08 07:47:55 -06:00
lain	80167e62dd	Merge branch 'fix/missing_emoji_steal_dir' into 'develop' Create dir for EmojiStealPolicy automatically See merge request pleroma/pleroma!3218	2021-01-08 13:10:49 +00:00
Alex Gleason	3342f6a7ef	Backups: render ID in API	2021-01-07 13:06:22 -06:00
lain	bd788c0939	ActivtityPub Test: Add example for guppe actor	2021-01-07 16:20:30 +01:00
lain	cf0eb0c1c5	Merge branch 'object-normalize-refactor' into 'develop' Object: Rework how Object.normalize works See merge request pleroma/pleroma!3229	2021-01-07 11:09:18 +00:00
lain	4d56aca904	Merge branch 'adminapi-user-email' into 'develop' AdminAPI: return user email See merge request pleroma/pleroma!3240	2021-01-07 10:08:02 +00:00
Alex Gleason	cc09079aea	Exclude blockers from notifications when `blockers_visible: false`	2021-01-06 15:39:14 -06:00
Alex Gleason	1438fd9583	Merge remote-tracking branch 'upstream/develop' into block-behavior	2021-01-06 15:22:35 -06:00
Alex Gleason	9f6fa5877f	Add AdminAPI.AccountViewTest	2021-01-06 11:43:07 -06:00
Alex Gleason	20af025c65	AdminAPI: return user email	2021-01-06 11:30:32 -06:00
Roger Braun	48cd336a72	allow external emoji	2021-01-06 10:13:01 -06:00
lain	07bf36142b	Resilience Test: Add notification check for killing likes.	2021-01-06 12:49:18 +01:00
lain	a24b2bc38a	Resilience Test: Add tests for killing likes.	2021-01-06 12:33:09 +01:00
Mark Felder	f9090e00e6	Add test to validate URLs to custom emojis are properly encoded	2021-01-05 13:58:49 -06:00
lain	20a269ed69	Merge branch 'fix/pagination-regression' into 'develop' Do not try to guess which pagination we need by the existence of an :offset param. Closes #2399 See merge request pleroma/pleroma!3230	2021-01-05 12:40:45 +00:00
lain	fee0c6a2cb	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-confirm-users	2021-01-05 13:33:57 +01:00
lain	e802b48d55	User: Use ObjectID type to validate also-known-as field	2021-01-05 13:10:14 +01:00
lain	f0e6cff583	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases	2021-01-05 12:42:30 +01:00
lain	bea69853a2	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-moderation-log-stuff	2021-01-05 12:19:39 +01:00
lain	95a0ae8a35	AccountControllerTest: Fix test logic	2021-01-05 11:48:40 +01:00
lain	d44850d7a5	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into object-normalize-refactor	2021-01-05 10:48:32 +01:00
lain	8e5904daa5	SideEffects.DeleteTest: asyncify. Replace Mock with Mox, mock out Logger.	2021-01-04 18:40:59 +01:00
Mark Felder	0e93775ed0	Add test to validate profile pagination works with keyset	2021-01-04 11:04:58 -06:00
lain	e1e7e4d379	Object: Rework how Object.normalize works Now it defaults to not fetching, and the option is named.	2021-01-04 13:38:31 +01:00
Alex Gleason	0ec7e9b8e9	AdminAPI: return id for moderation log entries	2021-01-01 11:59:48 -06:00
Alex Gleason	7b44605cb8	Migration to confirm previously-logged-in users	2020-12-31 14:04:51 -06:00
feld	afe9c152ab	Merge branch 'fix/reports-ordering' into 'develop' Do not reverse order of reports. We want newest ones sorted to the top. Closes #2364 See merge request pleroma/pleroma!3225	2020-12-31 19:24:49 +00:00
Mark Felder	e4791258d4	Ensure newest report is returned first in the list	2020-12-31 12:40:42 -06:00
Alex Gleason	64f0e96ff6	Automatically confirm logged-in users	2020-12-31 12:13:08 -06:00
Alex Gleason	11d40e92b7	Render AKAs in Actor endpoints	2020-12-30 18:53:27 -06:00
Alex Gleason	cbce880076	Merge remote-tracking branch 'upstream/develop' into aliases	2020-12-30 17:10:02 -06:00
Mark Felder	4c5f75f4e9	Support pagination in AdminAPI for user statuses	2020-12-30 15:18:54 -06:00
Haelwenn	3966add048	Revert "Merge branch 'features/hashtag-column' into 'develop'" This reverts merge request !2824	2020-12-28 12:02:16 +00:00
Haelwenn	b122b6ffa3	Merge branch 'features/hashtag-column' into 'develop' Insert text representation of hashtags into object["hashtags"] See merge request pleroma/pleroma!2824	2020-12-28 10:14:58 +00:00

... 12 13 14 15 16 ...

6245 Commits