4011 commits

Author	SHA1	Message	Date
Maksim Pechnikov	d7808b5db4	added code\path fields without html tags in ets	2019-08-30 07:30:54 +03:00
feld	7853b3f17d	Fix AntiFollowbotPolicy when trying to follow a relay	2019-08-30 00:38:03 +00:00
Haelwenn	d9d7765383	Merge branch 'fix-osada-follow' into 'develop' ... Transmogrifier: Fix follow handling when the actor is an object. Closes #1211 See merge request pleroma/pleroma!1604	2019-08-28 07:10:35 +00:00
lain	b770ed1d99	CommonAPI: Support emoji reactions.	2019-08-27 17:56:28 -05:00
lain	f017260cdc	Merge remote-tracking branch 'origin/develop' into reactions	2019-08-27 16:38:51 -05:00
lain	66519f2100	Merge branch 'list-controller' into 'develop' ... Extract list actions from `MastodonAPIController` into `ListController` See merge request pleroma/pleroma!1600	2019-08-27 21:15:54 +00:00
Maxim Filippov	5e4fde1d3d	Filter logs by date	2019-08-27 20:48:16 +03:00
Maksim	ffcd742aa0	Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex	2019-08-27 17:37:19 +00:00
lain	c30cc039e4	Transmogrifier: Use Containment.get_actor to get actors.	2019-08-27 12:22:30 -05:00
Maksim Pechnikov	00abe099cd	added tests for ActivityPub.like\unlike	2019-08-27 16:21:03 +03:00
rinpatch	eb1739c596	Remove most of TwitterAPIController	2019-08-27 12:29:19 +03:00
lain	a0b21c8928	Transmogrifier: Handle incoming emoji reactions.	2019-08-26 16:47:31 -05:00
lain	6e1ec4c5da	ActivityPub: Basic EmojiReactions.	2019-08-26 16:29:51 -05:00
lain	3da65292b3	Transmogrifier: Fix follow handling when the actor is an object.	2019-08-26 14:34:52 -05:00
Egor Kislitsyn	4194abbc8f	Move mastodon_api/*_controller.ex to mastodon_api/controllers/	2019-08-26 19:37:57 +07:00
Egor Kislitsyn	30510ade0e	Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests	2019-08-26 19:37:54 +07:00
Egor Kislitsyn	4d82bc8b0b	Extract MastodonAPI.MastodonAPIController.errors/2 to MastodonAPI.FallbackController	2019-08-26 19:16:40 +07:00
kPherox	8ca4f145a5	Extract if block into private function	2019-08-26 17:09:32 +09:00
kaniini	6dc24422dc	Merge branch 'issue/1177' into 'develop' ... [#1177] fixed unfollow for relay actor See merge request pleroma/pleroma!1589	2019-08-25 19:43:27 +00:00
Maxim Filippov	37dd3867bb	Log admin/moderator actions	2019-08-25 19:39:37 +00:00
kPherox	b15e226593	Change to delete empty name field	2019-08-25 07:34:15 +09:00
kPherox	705b5adfc4	Fix type of fields_attributes ... Convert tuple list to map list when parameters is `:urlencoded` or `:multipart`	2019-08-25 07:34:14 +09:00
kPherox	45e21a9df4	Rename fields to fields_attributes	2019-08-25 07:34:11 +09:00
lain	90986667ce	Merge branch 'admin-create-users' into 'develop' ... user creation admin api will create multiple users See merge request pleroma/pleroma!1170	2019-08-24 16:04:19 +00:00
lain	efb8818e9e	Activity Expiration: Switch to 'expires_in' system.	2019-08-24 17:22:48 +02:00
Maksim Pechnikov	654d291b6d	update tests	2019-08-24 17:41:53 +03:00
Maksim Pechnikov	6062017493	put_resp_header("content-type", "application/activity+json") -> put_resp_content_type("application/activity+json")	2019-08-24 17:17:17 +03:00
lain	cc6c0b4ba6	Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration	2019-08-24 15:48:33 +02:00
Ivan Tashkinov	581123f8bb	[#1149] Introduced quantum job scheduler. Documentation & config changes.	2019-08-23 18:28:23 +03:00
Maksim Pechnikov	8dc6a6b210	fix /inbox for Relay	2019-08-22 22:48:07 +03:00
Maksim Pechnikov	399ca9133b	fix test	2019-08-22 21:54:37 +03:00
Maksim Pechnikov	f95b67c933	Merge branch 'develop' into issue/1177	2019-08-22 21:13:03 +03:00
Ivan Tashkinov	7101ba1a21	Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue	2019-08-22 21:01:28 +03:00
Ivan Tashkinov	256ff09aa8	[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue ... # Conflicts: # lib/pleroma/application.ex # lib/pleroma/scheduled_activity_worker.ex # lib/pleroma/web/federator/retry_queue.ex # lib/pleroma/web/oauth/token/clean_worker.ex # test/user_test.exs # test/web/federator_test.exs	2019-08-22 20:59:58 +03:00
Egor Kislitsyn	a79ebac592	Improve AP routes rate limit	2019-08-22 16:03:43 +07:00
Maksim Pechnikov	64bfb41c55	fixed unfollow for relay actor	2019-08-22 06:57:55 +03:00
Sachin Joshi	37229af15f	remove old user create and delete routes for admin	2019-08-22 00:15:00 +05:45
lain	f740d786a3	Merge branch 'rate-limit-ap-routes' into 'develop' ... [#1174] Rate limit AP routes See merge request pleroma/pleroma!1586	2019-08-21 16:45:20 +00:00
lain	74f7f308f8	Merge branch 'fix/admin-api-user-deletion' into 'develop' ... Fix deactivated user deletion See merge request pleroma/pleroma!1546	2019-08-20 19:34:47 +00:00
Egor Kislitsyn	8d899d6197	Add :ap_routes rate limit	2019-08-20 22:10:36 +07:00
lain	8340fe8fcc	Merge branch 'digest-template' into 'develop' ... Improve digest email template See merge request pleroma/pleroma!1565	2019-08-20 12:55:51 +00:00
lain	ef43016b2c	Merge branch 'feature/custom-fields' into 'develop' ... Add custom profile fields See merge request pleroma/pleroma!1488	2019-08-20 12:44:14 +00:00
Maxim Filippov	5171aa5b4d	Refactor check_actor_is_active	2019-08-19 20:36:25 +03:00
kaniini	18c8c8d176	Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop' ... Hide muted theads from home/public timelines unless `with_muted` is set See merge request pleroma/pleroma!1575	2019-08-18 21:57:55 +00:00
lain	7ab2dbbdb6	Merge branch 'pleroma-conversations' into 'develop' ... Extended Pleroma Conversations See merge request pleroma/pleroma!1535	2019-08-16 12:55:33 +00:00
Egor Kislitsyn	158231cd20	Add configurable colors and logo for the digest template	2019-08-16 18:32:25 +07:00
rinpatch	1ad71592ad	Parallelize template rendering	2019-08-15 18:05:50 +03:00
rinpatch	a4a3e3becd	Hide muted theads from home/public timelines unless with_muted is set	2019-08-15 17:37:30 +03:00
Maxim Filippov	ec969eec51	Merge branch 'develop' into 'fix/admin-api-user-deletion' ... # Conflicts: # CHANGELOG.md	2019-08-14 22:45:32 +00:00
Maxim Filippov	2b94ae3b39	Do not check if actor is active when deleting a user	2019-08-15 01:35:29 +03:00
rinpatch	bd5ad0af78	Cache follow state	2019-08-15 00:47:30 +03:00
rinpatch	31d576de0c	Merge branch 'misc-otp-issues' into 'develop' ... Misc OTP issues See merge request pleroma/pleroma!1567	2019-08-14 19:22:15 +00:00
rinpatch	dc902ad3df	Merge branch 'fix/http-signatures-post' into 'develop' ... activitypub: publisher: add (request-target) to http signature when POSTing See merge request pleroma/pleroma!1569	2019-08-14 19:16:52 +00:00
kaniini	1754f8ce6d	Apply suggestion to lib/pleroma/web/activity_pub/publisher.ex	2019-08-14 19:05:44 +00:00
Ariadne Conill	5bb418a90d	activitypub: publisher: add (request-target) to http signature when POSTing	2019-08-14 19:01:51 +00:00
Ariadne Conill	626e094589	MRF: fix up unserializable option lists in describe implementations	2019-08-14 18:54:17 +00:00
Ivan Tashkinov	8778c16dac	Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue	2019-08-14 21:44:50 +03:00
stwf	574856ef01	streamline Streamer pings	2019-08-14 11:58:32 -04:00
stwf	15ef521009	Isolate OAuth.Token.CleanWorker	2019-08-14 11:57:50 -04:00
stwf	51bdf0cab6	use default child_specs	2019-08-14 11:55:17 -04:00
lain	d3af9e19ed	Conversations: Load relations in one query.	2019-08-14 17:01:11 +02:00
lain	f73212b2a3	Conversation: Render new participation on update.	2019-08-14 15:56:15 +02:00
lain	df81abb68c	Conversations: Use correct oauth paths for extended api.	2019-08-14 15:55:43 +02:00
Egor Kislitsyn	4b7f1c6995	Improve digest email template	2019-08-14 20:46:05 +07:00
lain	560dbad538	Merge remote-tracking branch 'origin/develop' into pleroma-conversations	2019-08-14 15:30:40 +02:00
Egor Kislitsyn	e457fcc479	Add :max_remote_account_fields config option	2019-08-14 14:58:06 +07:00
Egor Kislitsyn	f7bbf99caa	Use info.fields instead of source_data for remote users	2019-08-14 14:52:54 +07:00
Egor Kislitsyn	7d6f8a7fd7	Linkify custom fields values in ActivityPub.UserViewx	2019-08-14 14:52:54 +07:00
Egor Kislitsyn	5178f960c3	Support user attachment update in Transmogrifier	2019-08-14 14:52:54 +07:00
Egor Kislitsyn	88598c9baf	Add profile custom fields to ActivityPub.UserView	2019-08-14 14:52:54 +07:00
Egor Kislitsyn	a22f540fc4	Add custom fields to TwitterAPI.UserView	2019-08-14 14:52:54 +07:00
Egor Kislitsyn	e0ac5c7a66	Add custom profile fields	2019-08-14 14:52:54 +07:00
kaniini	5c35d2f1d8	Merge branch 'preload-user-timelines' into 'develop' ... Preload thread mutes/bookmarks in user_statuses See merge request pleroma/pleroma!1563	2019-08-14 01:04:07 +00:00
kaniini	fe42844bda	Merge branch 'get-context-optimizations' into 'develop' ... Preload thread mutes/bookmarks in get_context See merge request pleroma/pleroma!1562	2019-08-14 01:03:54 +00:00
rinpatch	8202f1634a	Preload thread mutes/bookmarks in user_statuses	2019-08-14 03:02:09 +03:00
rinpatch	f4e087ee48	Preload thread mutes/bookmarks in get_context ... Also removes filtering for creates (was done on the database side already) and filtering for the requested activity (moved to the database side) from application side.	2019-08-14 02:36:54 +03:00
rinpatch	9ef31767f2	Merge branch 'feature/mrf-vocabulary' into 'develop' ... MRF Vocabulary See merge request pleroma/pleroma!1559	2019-08-13 22:51:15 +00:00
kaniini	c3a54cc34d	Merge branch 'feature/mrf-describe' into 'develop' ... MRF describe API See merge request pleroma/pleroma!1561	2019-08-13 22:46:19 +00:00
Ariadne Conill	abfbcfdcb3	mrf_vocabulary: add describe API support	2019-08-13 22:39:26 +00:00
Ariadne Conill	4244e17de0	fix credo	2019-08-13 22:36:24 +00:00
Haelwenn	47c20ab796	Merge branch 'fix/mastoapi-more-object-preloads' into 'develop' ... Mastodon API: Preloading and normalization optimizations See merge request pleroma/pleroma!1558	2019-08-13 22:32:49 +00:00
rinpatch	46d7bef7e7	Nicer formatting for safe_render errors	2019-08-14 01:15:18 +03:00
Ariadne Conill	f305e97eeb	nodeinfo: use MRF.describe() instead of hardcoded MRF transparency stuff	2019-08-13 22:09:02 +00:00
Ariadne Conill	c574b7a1fc	MRF: add describe() to all modules, add base MRF configuration to base describe()	2019-08-13 22:08:58 +00:00
Ariadne Conill	694bc43123	MRF: add describe() for gathering and describing the MRF configuration	2019-08-13 21:26:24 +00:00
Maksim	fea4d89e9f	tests for Web/ActivityPub/Relay	2019-08-13 21:12:59 +00:00
Maksim	04da1166db	tests for /web/mastodon_api/mastodon_api.ex	2019-08-13 21:12:37 +00:00
Ariadne Conill	3fdbeb7087	MRF: add vocabulary policy module	2019-08-13 20:55:38 +00:00
rinpatch	c1b6952d2a	Mastodon API: Preloading and normalization optimizations ... - Try to normalize the activity instead of object wherever possible - Put the `user` key on non-home timelines as well so bookmarks and thread mutes are preloaded there as well - Skip trying to get the user when rendering mentions if the id == as:Public or user's follower collection - Preload the object when getting replied to activities and do not crash if it's not present This almost solves the problem of Pleroma hammering the db with a lot of queries when rendering timelines, the things left are 1. When rendering mentions and the user is not in cache, save it for later and request all uncached users in one go 2. Somehow get rid of needing to get the latest follow activity to detect the value of `requested` in a relationship. (create a database view for user relationship and cache it maybe?)	2019-08-13 20:34:34 +03:00
Ivan Tashkinov	0e1c481a94	[#1149] Added more oban workers. Refactoring.	2019-08-13 20:20:26 +03:00
Ariadne Conill	f46cd7e9c7	config: remove legacy activitypub accept_blocks setting ... Anyone who is interested in dropping blocks can write their own MRF policy at this point. This setting predated the MRF framework. Disabling the side effect (unsubscription) is still a config option per policy.	2019-08-13 02:15:21 +00:00
lain	511ccea5aa	ConversationView: Align parameter names with other views.	2019-08-12 14:23:06 +02:00
lain	60231ec7bd	Conversation: Add endpoint to get a conversation by id.	2019-08-12 13:58:04 +02:00
lain	23c46f7e72	Conversations: Use 'recipients' for accounts in conversation view. ... According to gargron, this is the intended usage.	2019-08-12 12:51:08 +02:00
rinpatch	92479c6f48	Do not fetch the reply object in fix_type unless the object has the ... `name` key and use a depth limit when fetching it	2019-08-11 22:49:55 +03:00
Ariadne Conill	9cfc289594	MRF: ensure that subdomain_match calls are case-insensitive	2019-08-10 21:19:26 +00:00
kaniini	84808e1697	Merge branch 'develop' into 'fix/hide-follows-counters' ... # Conflicts: # CHANGELOG.md	2019-08-10 18:49:04 +00:00
Sergey Suprunenko	af4cf35e20	Strip internal fields including likes from incoming and outgoing activities	2019-08-10 18:47:40 +00:00
rinpatch	0802a08871	Mastodon API: Fix thread mute detection ... It was calling CommonAPI.thread_muted? with post author's account instead of viewer's one.	2019-08-10 16:27:46 +03:00
Maxim Filippov	dfae61c25c	Fix deactivated user deletion	2019-08-09 23:05:28 +03:00
Ivan Tashkinov	267262491e	Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue	2019-08-09 20:09:56 +03:00
Ivan Tashkinov	b7fad8d395	[#1149] Oban jobs implementation for :federator_incoming and :federator_outgoing queues.	2019-08-09 20:08:01 +03:00
rinpatch	409bcad54b	Mastodon API: Set follower/following counters to 0 when hiding ... followers/following is enabled We are already doing that in AP representation, so I think we should do it here as well for consistency.	2019-08-09 16:53:55 +03:00
lain	29807ef6a5	Merge branch 'feature/digest-email' into 'develop' ... Feature/digest email See merge request pleroma/pleroma!1078	2019-08-08 14:38:33 +00:00
lain	a2b98f6d58	Merge remote-tracking branch 'origin/develop' into pleroma-conversations	2019-08-08 16:04:20 +02:00
Thibaut Girka	9c0da1009a	Return profile URL in MastodonAPI's url field	2019-08-07 21:40:53 +00:00
Thibaut Girka	089d53a961	Simplify logic to mention.js url field ... `User.profile_url` already fallbacks to ap_id	2019-08-07 20:55:37 +00:00
Thibaut Girka	a10c840aba	Return profile URL when available instead of actor URI for MastodonAPI mention URL ... Fixes #1165	2019-08-07 20:29:30 +00:00
Haelwenn	aa718ab8f6	Merge branch 'fix/object-reembeds' into 'develop' ... Do not rembed the object after updating it Closes #1142 See merge request pleroma/pleroma!1538	2019-08-06 22:14:00 +00:00
rinpatch	4f1b9c54b9	Do not rembed the object after updating it	2019-08-07 01:02:29 +03:00
rinpatch	03ad31328c	OStatus Announce Representer: Do not depend on the object being embedded ... in the Create activity	2019-08-07 00:23:58 +03:00
rinpatch	73d8d5c49f	Stop depending on the embedded object in restrict_favorited_by	2019-08-07 00:12:42 +03:00
Maksim	139b196bc0	[#1150] fixed parser TwitterCard	2019-08-06 20:19:28 +00:00
Maksim	bdc9a7222c	tests for CommonApi/Utils	2019-08-05 15:37:05 +00:00
lain	d6fe220e32	Linting.	2019-08-05 16:11:23 +02:00
lain	b64b6fee2a	CommonAPI: Replies to conversations also get the correct context id.	2019-08-05 15:33:22 +02:00
lain	3af6d14da7	Pleroma Conversations API: Add a way to set recipients.	2019-08-05 15:09:19 +02:00
Sergey Suprunenko	e8ad116c2a	Do not add the "next" key to likes.json if there is no more items	2019-08-04 17:13:06 +00:00
Haelwenn (lanodan) Monnier	a035ab8c1d	templates/layout/app.html.eex: Style anchors ... [ci skip]	2019-08-03 23:18:22 +02:00
kaniini	86fffe9c27	Merge branch 'patch-2' into 'develop' ... Add preferredUsername to service actors so Mastodon can resolve them See merge request pleroma/pleroma!1526	2019-08-03 18:55:09 +00:00
Thibaut Girka	1fce56c7df	Refactor	2019-08-03 18:37:20 +00:00
Thibaut Girka	16cfb89240	Only add preferredUsername to service actor json when the underlying user actually has a username	2019-08-03 18:28:08 +00:00
Alexander Strizhakov	de0f3b73dd	Admin fixes	2019-08-03 18:16:09 +00:00
Sergey Suprunenko	8b2fa31fed	Handle MRF rejections of incoming AP activities	2019-08-03 18:12:38 +00:00
Thibaut Girka	a187dbb326	Add preferredUsername to service actors so Mastodon can resolve them	2019-08-03 17:24:57 +00:00
lain	eee98aaa73	Pleroma API: Add endpoint to get conversation statuses.	2019-08-02 19:53:08 +02:00
feld	d93d777915	Fix/mediaproxy whitelist base url	2019-08-02 17:07:09 +00:00
Roman Chvanikov	9d4f34fbcb	Merge branch 'develop' into feature/digest-email	2019-08-02 18:16:04 +03:00
lain	56b1c3af13	CommonAPI: Extend api with conversation replies.	2019-08-02 15:05:27 +02:00
lain	5ff8f07ca9	Merge branch 'feature/hide-follows-remote' into 'develop' ... Refactor Follows/Followers counter syncronization and set hide_followers/hide_follows for remote users See merge request pleroma/pleroma!1411	2019-08-02 11:23:07 +00:00
Ivan Tashkinov	23d279e03e	[#1149] Replaced RetryQueue with oban-based retries.	2019-08-01 17:28:00 +03:00
kaniini	6c06529cd4	Merge branch 'fix/disallow-ostatus-follows-locked' into 'develop' ... Disallow following locked accounts over OStatus See merge request pleroma/pleroma!1512	2019-07-31 19:13:56 +00:00
rinpatch	813c686dd7	Disallow following locked accounts over OStatus	2019-07-31 22:05:12 +03:00
Maksim	6eb33e7303	test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id	2019-07-31 18:35:15 +00:00
Ariadne Conill	f72e0b7cad	ostatus: explicitly disallow protocol downgrade from activitypub ... This closes embargoed bug #1135.	2019-07-31 18:17:31 +00:00
Maksim	58443d0cd6	tests for TwitterApi/UtilController	2019-07-31 15:14:36 +00:00
lain	7483679a7b	StatusView: Return direct conversation id.	2019-07-31 15:12:29 +02:00
rinpatch	c88a5d3251	Merge branch 'develop' into feature/hide-follows-remote	2019-07-31 14:12:29 +03:00
Alexander Strizhakov	51b3b6d816	Admin changes	2019-07-30 16:36:05 +00:00
Ariadne Conill	3850812503	twitter api: utils: rework do_remote_follow() to use CommonAPI ... Closes #1138	2019-07-29 20:00:57 +00:00
kaniini	5835069215	Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'" ... This reverts merge request !1504	2019-07-29 19:42:26 +00:00
Ariadne Conill	5795a890e9	markdown: clean up html generated by earmark	2019-07-29 19:09:58 +00:00
lain	1dfde4151c	Merge branch 'refactor/use-constants' into 'develop' ... refactoring: begin to use constants See merge request pleroma/pleroma!1500	2019-07-29 16:30:47 +00:00
Eugenij	0bee2131ce	Add mailerEnabled to the NodeInfo metadata	2019-07-29 16:17:40 +00:00
Sergey Suprunenko	c0e258cf21	Redirect not logged-in users to the MastoFE login page on private instances	2019-07-29 16:17:22 +00:00
Maksim	159bbec570	added tests for OstatusController	2019-07-29 05:02:20 +00:00
Ariadne Conill	b93498eb52	constants: add as_public constant and use it everywhere	2019-07-29 02:43:19 +00:00
Ariadne Conill	492d854e7a	transmogrifier: use User.delete() instead of handrolled user deletion code for remote users ... Closes #1104	2019-07-28 21:32:04 +00:00
Sachin Joshi	242f5c585e	add account confirmation email resend in mastodon api	2019-07-28 20:30:10 +00:00
Maksim	6b77a88365	[#1097] added redirect: /pleroma/admin -> /pleroma/admin/	2019-07-26 20:27:38 +00:00
rinpatch	41e0304757	Merge branch 'develop' into feature/hide-follows-remote	2019-07-25 18:43:30 +03:00
kaniini	19835be067	Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop' ... Fix remote follow from /ostatus_subscribe Closes #1103 See merge request pleroma/pleroma!1472	2019-07-24 19:29:01 +00:00
Sergey Suprunenko	b20020da16	Show the url advertised in the Activity in the Status JSON response	2019-07-24 19:28:21 +00:00
kPherox	ac27b94ffa	Change to not require magic-public-key on WebFinger	2019-07-25 00:21:32 +09:00
Maksim	55341ac717	tests WebFinger	2019-07-24 15:13:10 +00:00
Eugenij	4504135894	Add domain_blocking to the relationship API (GET /api/v1/accounts/relationships)	2019-07-24 15:12:27 +00:00
Mike Verdone	2c83eb0b15	Revert "squash! Expose expires_at datetime in mastoAPI only for the activity actor" ... This reverts commit 2981821db8.	2019-07-24 17:09:59 +02:00
Mike Verdone	2981821db8	squash! Expose expires_at datetime in mastoAPI only for the activity actor ... NOTE: rewrite the commit msg	2019-07-24 16:51:09 +02:00
Roman Chvanikov	d2da3d30f3	Merge branch 'develop' into feature/digest-email	2019-07-24 16:37:52 +03:00
Mike Verdone	3cb471ec06	Expose expires_at datetime in mastoAPI only for the activity actor ... In the "pleroma" section of the MastoAPI for status activities you can see an expires_at item that states when the activity will expire, or nothing if the activity will not expire. The expires_at date is only visible to the person who posted the activity. This is the conservative approach in case some attacker decides to write a logger for expiring posts. However, in the future of OCAP, signed requests, and all that stuff, this attack might not be that likely. Some other pleroma dev should remove the restriction in the code at that time, if they're satisfied with the security implications of doing so.	2019-07-24 14:47:22 +02:00
Mike Verdone	36012ef6c1	Require that ephemeral posts live for at least one hour ... If we didn't put some kind of lifetime requirement on these, I guess you could annoy people by sending large numbers of ephemeral posts that provoke notifications but then disappear before anyone can read them.	2019-07-24 14:46:08 +02:00
Mike Verdone	704960b3c1	Add support for activity expiration to common and Masto API ... The "expires_at" parameter accepts an ISO8601-formatted date which defines when the activity will expire. At this point the API will not give you any feedback about if your post will expire or not.	2019-07-24 14:45:14 +02:00
sadposter	f5d574f4ed	check both item and parent domain blocks	2019-07-24 11:35:16 +01:00
Sadposter	48bd3be9cb	move domain block check to with block	2019-07-24 11:11:33 +01:00
Sadposter	4af4f6166b	honour domain blocks on streaming notifications	2019-07-24 11:09:06 +01:00
kaniini	9c6357324e	Merge branch 'feature/admin-api-user-statuses' into 'develop' ... Admin API: Endpoint for fetching latest user's statuses See merge request pleroma/pleroma!1413	2019-07-23 23:59:21 +00:00
Ariadne Conill	d3bdb8e704	rich media: parser: splice the given URL into the result	2019-07-23 23:51:29 +00:00
Maxim Filippov	f46805bb40	Merge branch 'develop' into feature/admin-api-user-statuses	2019-07-24 02:42:28 +03:00
Maxim Filippov	03471151d6	AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses)	2019-07-24 01:51:36 +03:00
kaniini	bd265acf91	Merge branch 'chore/adminapi-deprecated-endpoints' into 'develop' ... Router: Remove deprecated AdminAPI endpoints See merge request pleroma/pleroma!1466	2019-07-23 19:48:34 +00:00
Haelwenn (lanodan) Monnier	90be91b0e0	Router: Remove deprecated AdminAPI endpoints	2019-07-23 21:35:25 +02:00
Alexander Strizhakov	5e72554f3c	Admin config fix	2019-07-23 19:17:00 +00:00
Maksim	c49a09ed88	tests for Pleroma.Web.ActivityPub.Publisher	2019-07-23 19:15:48 +00:00
Mark Felder	6a79bb12c3	Fix function	2019-07-23 13:53:05 -05:00
Mark Felder	fd287387a0	Do not notify subscribers for messages from users which are replies to others	2019-07-23 13:14:26 -05:00
kPherox	e818381042	Use User.get_or_fetch/1 instead of OStatus.find_or_make_user/1	2019-07-23 19:47:27 +09:00
Alexander Strizhakov	b70e659304	Feature/1087 wildcard option for blocks	2019-07-22 14:33:58 +00:00
Haelwenn	674ad5e1df	Merge branch 'hardening/stop-misusing-sharedinbox' into 'develop' ... activitypub: publisher: align sharedinbox usage with AP specification rules See merge request pleroma/pleroma!1464	2019-07-22 11:01:35 +00:00
Sadposter	f712ee879a	Bugfix: muted/blocked user notification streaming	2019-07-22 02:43:55 +00:00
Sergey Suprunenko	05b5af8075	Add tests for users tasks and PleromaAuthenticator	2019-07-22 02:43:15 +00:00
Sadposter	a5d6287ba8	Hide blocked users from interactions	2019-07-22 02:42:29 +00:00
Ariadne Conill	56019d53a8	activitypub: publisher: align sharedinbox usage with AP specification rules ... While debugging the follow breakage, I observed that our sharedInbox usage did not match the rules in the specification. Accordingly, I have better aligned our usage of sharedInbox with the rules outlined in the ActivityPub specification.	2019-07-22 02:38:31 +00:00
kaniini	a00aab3402	Merge branch 'fix/rich-media-ttl-fallback' into 'develop' ... Fix rich media parser failing when no TTL can be found by image TTL setters See merge request pleroma/pleroma!1460	2019-07-21 16:05:58 +00:00
rinpatch	3368174785	Fix rich media parser failing when no TTL can be found by image TTL ... setters	2019-07-21 18:22:22 +03:00
Ariadne Conill	bc6c5c513a	router: ensure the AP sharedinbox path is registered first	2019-07-21 03:52:06 +00:00
rinpatch	196cad46f3	Resolve merge conflicts	2019-07-20 22:04:47 +03:00
Roman Chvanikov	8292331b35	Merge branch 'develop' into feature/digest-email	2019-07-20 16:41:58 +03:00
Roman Chvanikov	36049f08ef	Merge develop	2019-07-20 01:03:25 +03:00
feld	93df0796f0	Merge branch 'feature/matstodon-statuses-by-name' into 'develop' ... Feature/matstodon statuses by name See merge request pleroma/pleroma!1211	2019-07-19 21:59:18 +00:00
Mark Felder	9169f331b6	Merge branch 'develop' into feature/matstodon-statuses-by-name	2019-07-19 16:55:10 -05:00
kaniini	33729bbb28	Merge branch 'feature/richmedia-ttl' into 'develop' ... add the rich media ttl based on image exp time See merge request pleroma/pleroma!1438	2019-07-19 21:36:36 +00:00
kaniini	716afc83ce	Merge branch 'refactor/http-signature-plug' into 'develop' ... http signature plug: separation of concerns See merge request pleroma/pleroma!1449	2019-07-19 16:57:24 +00:00
Maksim	c2e2aadc42	#1110 fixed /api/pleroma/healthcheck	2019-07-19 16:20:23 +00:00
Sachin Joshi	de9906ad56	change the structure of image ttl parsar	2019-07-19 11:43:42 +05:45
Maxim Filippov	9570a5be40	Merge branch 'develop' into feature/admin-api-user-statuses	2019-07-18 23:38:38 +03:00
Ariadne Conill	184fa61fb3	plugs: add MappedSignatureToIdentityPlug	2019-07-18 15:38:45 +00:00
Maksim	b6b748d3e7	tests for Uploader with webhook	2019-07-18 12:30:18 +00:00
kaniini	1e48af9acf	Merge branch 'feature/instance-fetch-actor' into 'develop' ... instance fetch service actor See merge request pleroma/pleroma!1440	2019-07-17 19:45:40 +00:00
Eugenij	4bf2bb9cff	Fix password reset for non-test env ... Fixes `Plug.Conn.NotSentError` that causes a 5xx error in response instead of 404 and 400. Fixes pattern matching error caused by different response format in test and non-test env: `Pleroma.Emails.Mailer.deliver_async` returns :ok when PleromaJobQueue is enabled and `{:ok, _}` when it's disabled. In tests, it's disabled.	2019-07-17 18:09:31 +00:00
Ariadne Conill	cf9cb953d5	activitypub: represent internal fetch actor	2019-07-17 17:34:57 +00:00
Ariadne Conill	d930e5d5c3	activitypub: introduce internal fetch service actor	2019-07-17 17:14:08 +00:00
Ariadne Conill	0a6f6e1b5b	webfinger: allow resolution of usernames with dots in them (internal actors)	2019-07-17 16:59:29 +00:00
Ariadne Conill	a9d6a12bb3	activitypub: controller: rework the way the relay actor is presented so the code can be reused	2019-07-17 16:33:08 +00:00
Ariadne Conill	4885473be2	user: refactor get_or_create_instance_user() into get_or_create_service_actor_by_id()	2019-07-17 16:03:05 +00:00
kaniini	ce73d5f6a5	Merge branch 'feature/mention-mrf' into 'develop' ... Add MRF MentionPolicy for dropping posts which mention specific actors See merge request pleroma/pleroma!1439	2019-07-17 15:28:41 +00:00
RX14	96a2890a9e	Add MRF MentionPolicy for dropping posts which mention specific actors	2019-07-17 15:16:55 +01:00
Alexander Strizhakov	10f82c88b8	mastoapi password reset ... added rate limit to password reset configure rate limit in runtime	2019-07-16 21:44:50 +00:00
Sachin Joshi	18234cc44e	add the rich media ttl based on image exp time	2019-07-17 00:20:34 +05:45
Ivan Tashkinov	889dc17abd	[#1094] Rate-limited follow & unfollow actions.	2019-07-16 19:18:30 +03:00
Roman Chvanikov	9bca70b10a	Merge develop	2019-07-16 16:19:19 +03:00
Eugenij	520ee6c591	Add pleroma.deactivated to the Account entity (Mastodon API)	2019-07-16 11:14:46 +00:00
Eugenij	c4ca142e14	Add the blocked_by attribute to the relationship API (GET /api/v1/accounts/relationships)	2019-07-16 11:04:11 +00:00
Egor Kislitsyn	70439494af	Fix typo	2019-07-16 14:56:07 +07:00
rinpatch	996fd58ac4	Merge branch 'bugfix/poll-id-as-string' into 'develop' ... Status View: Poll ids are strings. See merge request pleroma/pleroma!1430	2019-07-16 06:06:22 +00:00
lain	1ed24bcc76	Status View: Poll ids are strings. ... All ids in mastodon are strings, in general.	2019-07-16 12:47:40 +09:00
Mark Felder	ffb4eb9779	Merge branch 'develop' into feature/matstodon-statuses-by-name	2019-07-15 17:10:27 -05:00
feld	9f987dd017	Merge branch 'match-file-name' into 'develop' ... try to always match the filename for proxy url See merge request pleroma/pleroma!1405	2019-07-15 22:04:58 +00:00
Sergey Suprunenko	b74300bc7a	Add more tests for MastodonAPIController and CommonAPI	2019-07-15 19:47:23 +00:00
kaniini	ee5250ae56	Merge branch 'sha512-crypt' into 'develop' ... detect and use sha512-crypt for stored password hash. See merge request pleroma/pleroma!1422	2019-07-15 16:13:17 +00:00
Sachin Joshi	1d906ffa82	Merge branch 'develop' into match-file-name ... # Conflicts: # lib/pleroma/web/media_proxy/media_proxy_controller.ex	2019-07-15 21:30:56 +05:45
Maksim	c32384c1ea	tests for Pleroma.Signature	2019-07-15 13:01:22 +00:00
Egor Kislitsyn	de13c9bb8f	List messages must be visible for mentioned users	2019-07-15 14:54:40 +07:00
Egor Kislitsyn	d86a97abfb	Add an explanation comment to Publisher.publish/2	2019-07-15 14:20:31 +07:00
Egor Kislitsyn	64a946643e	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	2019-07-15 14:11:54 +07:00
Egor Kislitsyn	a87c313309	Support list visibility in StatusView	2019-07-15 14:00:29 +07:00
Maksim	fa17879c20	added tests for Web.MediaProxy	2019-07-14 21:01:32 +00:00
Sergey Suprunenko	dce8ebc9ea	Unfollow should also unsubscribe	2019-07-14 19:25:03 +00:00
Roman Chvanikov	c729883936	Merge branch 'develop' into feature/digest-email	2019-07-14 21:43:30 +03:00
Ariadne Conill	739bbe0d3b	security: detect object containment violations at the IR level ... It is more efficient to check for object containment violations at the IR level instead of in the protocol handlers. OStatus containment is especially a tricky situation, as the containment rules don't match those of IR and ActivityPub. Accordingly, we just always do a final containment check at the IR level before the object is added to the IR object graph.	2019-07-14 17:47:08 +00:00
Moonman	f98f7ad1b9	detect and use sha512-crypt for stored password hash.	2019-07-14 09:48:42 -07:00
Alexander Strizhakov	e7c39b7ac8	Feature/1072 muting notifications	2019-07-14 13:29:31 +00:00
Alex S	f4447d82b8	parsers configurable	2019-07-14 09:21:56 +03:00
rinpatch	0c2dcb4c69	Add follow information refetching after following/unfollowing	2019-07-14 01:58:39 +03:00
rinpatch	183da33e00	Add tests for fetch_follow_information_for_user and check object type ... when fetching the page	2019-07-14 00:56:02 +03:00
Maxim Filippov	418ae6638d	Merge branch 'develop' into feature/admin-api-user-statuses	2019-07-14 00:39:06 +03:00
Maxim Filippov	a9459ff98f	Admin API: Endpoint for fetching latest user's statuses	2019-07-14 00:37:26 +03:00
rinpatch	d06d1b751d	Use atoms when updating user info	2019-07-14 00:21:35 +03:00
rinpatch	e5b850a991	Refactor fetching follow information to a separate function	2019-07-13 23:56:10 +03:00
Ariadne Conill	80c46d6d8b	nodeinfo: implement MRF transparency exclusions	2019-07-13 18:53:14 +00:00
rinpatch	e8fa477793	Refactor Follows/Followers counter syncronization ... - Actually sync counters in the database instead of info cache (which got overriden after user update was finished anyway) - Add following count field to user info - Set hide_followers/hide_follows for remote users based on http status codes for the first collection page	2019-07-13 19:27:49 +03:00
Ivan Tashkinov	d72876c57d	[#1041] Minor refactoring.	2019-07-13 15:21:50 +03:00
Ivan Tashkinov	369e9bb42f	[#1041] Rate-limited status actions (per user and per user+status).	2019-07-13 14:49:39 +03:00
rinpatch	095117a58c	Merge branch 'develop' into fix/ap-hide-follows	2019-07-12 21:43:06 +03:00
rinpatch	97b79efbcd	ActivityPub Controller: Actually pass for_user to following/followers ... views and give 403 errors when trying to request hidden follower pages when unauthenticated	2019-07-12 20:54:20 +03:00
Sachin Joshi	f8e3ae6154	try to always match the filename for proxy url	2019-07-12 22:56:14 +05:45
Maksim	92055941bd	Pleroma.Web.Metadata - tests	2019-07-12 16:42:54 +00:00
rinpatch	1f6ac7680d	ActivityPub User view: Following/Followers refactoring ... - Render the collection items if the user requesting == the user rendered - Do not render the first page if hide_{followers,follows} is set, just give the URI to it	2019-07-12 19:41:55 +03:00
Mark Felder	360e4cdaa2	Move these to pleroma namespace in Mastodon API	2019-07-12 11:25:58 -05:00
Sachin Joshi	6a6c4d134b	preserve the original path/filename (no encoding/decoding) for proxy	2019-07-12 21:05:01 +05:45
Roman Chvanikov	eae991b06a	merge develop	2019-07-12 18:08:27 +03:00
Eugenij	4198c3ac39	Extend Pleroma.Pagination to support offset-based pagination, use async/await to execute status and account search in parallel	2019-07-11 13:55:31 +00:00
Alexander Strizhakov	846ad9a463	admin api configure changes	2019-07-11 13:02:13 +00:00
kaniini	e4e3fd7e55	Merge branch 'fix/1019-refactor' into 'develop' ... Fix/1019 refactor See merge request pleroma/pleroma!1397	2019-07-11 13:01:11 +00:00
Egor Kislitsyn	9e06873d58	Add list to Visibility	2019-07-11 19:29:24 +07:00
Egor Kislitsyn	958fb9aa80	Add "listMessage"	2019-07-11 16:36:08 +07:00
Egor Kislitsyn	182f7bbb11	Merge branch 'develop' into feature/addressable-lists	2019-07-11 13:26:59 +07:00
Haelwenn (lanodan) Monnier	252e129b1e	MastoAPI: Add categories to custom emojis ... Note: This isn’t in a release yet, can be seen in mastofe on the rebase/glitch-soc branch.	2019-07-10 17:02:37 +02:00
Alex S	beba7bbc85	removing synchronization worker	2019-07-10 17:42:18 +03:00
Alex S	f8786fa6f2	adding following_address field to user	2019-07-10 17:42:18 +03:00
Sergey Suprunenko	ff55e3c16f	Create mentions only for explicitly mentioned users	2019-07-10 13:29:50 +00:00
Egor Kislitsyn	5104f65b69	Wrap error messages into gettext helpers	2019-07-10 18:10:09 +07:00
Egor Kislitsyn	26a6871609	Add translation helpers	2019-07-10 18:10:09 +07:00
Egor Kislitsyn	0d54a571ca	Add SetLocalePlug	2019-07-10 18:08:03 +07:00
Maksim	008c55e4e9	add test for search_controller/ 100% coverage	2019-07-10 08:28:03 +00:00
Sergey Suprunenko	2d2b50ccca	Send and handle "Delete" activity for deleted users	2019-07-10 05:16:08 +00:00
feld	93a0eeab16	Add license/copyright to all project files	2019-07-10 05:13:23 +00:00
Maksim	bb8065a1fd	tests MRF filters	2019-07-10 05:12:21 +00:00
Roman Chvanikov	371d39e160	Merge develop	2019-07-09 21:21:09 +03:00
kaniini	670a77ecbc	Merge branch 'feature/allow-user-query-via-id' into 'develop' ... Admin API: Allow querying user by ID See merge request pleroma/pleroma!1380	2019-07-09 17:53:41 +00:00
kaniini	1417627d07	Merge branch 'remove-avatar-header' into 'develop' ... Ability to reset avatar, profile banner and backgroud See merge request pleroma/pleroma!1187	2019-07-09 17:51:41 +00:00
Mark Felder	9a9b60cfbc	Merge branch 'develop' into feature/allow-user-query-via-id	2019-07-09 12:49:04 -05:00
kaniini	1179a13533	Merge branch 'features/sec-websocket-protocol-header' into 'develop' ... Features: MastoAPI streaming Sec-WebSocket-Protocol header See merge request pleroma/pleroma!1381	2019-07-09 16:52:22 +00:00
Haelwenn	1ab4e35f27	Merge branch 'enable-ogp-by-default' into 'develop' ... Do not crash if metadata fails to render and enable OGP and TwitterCard by default Closes #1034 See merge request pleroma/pleroma!1388	2019-07-09 16:07:20 +00:00
feld	167f810ff1	Merge branch 'proxy-error' into 'develop' ... make sure the url used by proxy is same as original url See merge request pleroma/pleroma!1383	2019-07-09 16:00:44 +00:00
Haelwenn	95c085174d	Merge branch 'test-speedup' into 'develop' ... Testing: Don't federate in testing. See merge request pleroma/pleroma!1391	2019-07-09 15:35:28 +00:00
Mark Felder	31a59d6f23	Merge branch 'develop' into proxy-error	2019-07-09 10:18:30 -05:00
rinpatch	376a55c97f	Merge branch '161-incoming-replies-depth-limit' into 'develop' ... [#161] Limited replies depth on incoming federation (memory leaks fix) Closes #161 See merge request pleroma/pleroma!1361	2019-07-09 14:15:10 +00:00
lain	abe2e8881f	Testing: Don't federate in testing.	2019-07-09 15:30:51 +09:00
rinpatch	44b2e1fdad	Formatting	2019-07-08 14:05:57 +03:00
rinpatch	9e58d3c624	FallbackRedirector: Do not crash on Metadata rendering errors	2019-07-08 12:59:49 +03:00
rinpatch	7f609ee8f4	OGP/TwitterCard: Add fallbacks in case the attachment key is nonexistent	2019-07-08 12:16:32 +03:00
rinpatch	72b88c82bc	Mastodon API: Fix embedded relationships not being rendered inside of statuses	2019-07-08 12:07:08 +03:00
Sachin Joshi	f5ad430974	make sure the url used by proxy is same as origin url ... encoding or decoding it breaks some of the signed url	2019-07-07 14:13:40 +05:45
Haelwenn (lanodan) Monnier	e174614eb9	MastoAPI Streaming: Keep compatibility with access_token	2019-07-07 08:49:29 +02:00
KokaKiwi	a7885748c7	MastoAPI streaming: Replace access_token with Sec-WebSocket-Protocol	2019-07-06 20:29:17 +02:00
Ivan Tashkinov	ad8d86e7c6	Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit	2019-07-06 10:17:06 +03:00
Maxim Filippov	6c50fbcd14	Admin API: Allow querying user by ID	2019-07-05 19:33:53 +03:00
Eugenij	15eb1235ed	Expose skip_thread_containment in nodeinfo	2019-07-03 18:35:57 +00:00
Eugenij	5184b0f41a	Use fallback values for search queries ... This is to make sure the entire request doesn't return a 500 error if user or status search times out.	2019-07-03 10:19:51 +00:00
Eugenij	ab50c6b3ca	Add fallback value to the admin report view. ... This is to avoid 500 error when the reported user no longer exists in the database.	2019-07-02 01:27:00 +00:00
Roman Chvanikov	d2cb18b2a3	Merge branch 'develop' into feature/digest-email	2019-06-30 21:23:35 +03:00
Ivan Tashkinov	a799418573	[#161] Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit ... # Conflicts: # CHANGELOG.md	2019-06-30 16:05:00 +03:00
Ivan Tashkinov	2b9d914089	[#161] Refactoring, documentation.	2019-06-30 15:58:50 +03:00
Eugenij	1f76740e10	Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses)	2019-06-30 09:08:46 +00:00
rinpatch	4c60a562a7	Fix not being able to pin unlisted posts ... Closes #1038	2019-06-29 22:27:42 +03:00
Ivan Tashkinov	5b7b1040b3	[#161] Limited replies depth on incoming federation in order to prevent memory leaks on recursive replies fetching.	2019-06-29 20:04:50 +03:00
kaniini	d1549a6375	Merge branch 'feature/merge-mastodon-admin-views-for-reports' into 'develop' ... Merge admin and mastodon user views for reports See merge request pleroma/pleroma!1346	2019-06-29 00:12:09 +00:00
William Pitcock	034986e1fd	MRF: add mediaproxy warming policy	2019-06-28 23:19:20 +00:00
Roman Chvanikov	657277ffc0	Resolve conflicts	2019-06-29 00:52:50 +03:00
Maxim Filippov	452ca5250d	Merge admin and mastodon user views for reports	2019-06-28 15:15:32 +03:00
kaniini	0369a5db16	Merge branch 'idempotency-plug' into 'develop' ... Add IdempotencyPlug and use it in all of the api Closes #1003 See merge request pleroma/pleroma!1339	2019-06-27 04:20:17 +00:00
Alexander Strizhakov	c6705144a2	don't delete config settings on admin update	2019-06-27 04:19:44 +00:00
Egor Kislitsyn	889a9c3a3f	Polish IdempotencyPlug	2019-06-27 01:53:58 +07:00
Egor Kislitsyn	0b8aeac0f3	Remove previous idempotency implementation from post_status	2019-06-26 18:49:14 +07:00
Egor Kislitsyn	74132e3715	Enable IdempotencyPlug for the all API	2019-06-26 18:42:49 +07:00
Sergey Suprunenko	d53fb55bb7	Return correct response when reply to a direct message is not direct itself	2019-06-26 10:59:27 +00:00
kaniini	24bcc209f9	Merge branch 'refactoring/fix_render_view' into 'develop' ... Fix Controller.render/4 deprecation See merge request pleroma/pleroma!1337	2019-06-26 05:34:26 +00:00
Maksim Pechnikov	5c0f646cef	fix validate_page_url	2019-06-26 06:27:17 +03:00
Roman Chvanikov	a7a54068f9	Fix Controller.render/4 deprecation	2019-06-26 03:28:02 +03:00
Maksim Pechnikov	4ad15ad2a9	add ignore hosts and TLDs for rich_media	2019-06-25 22:25:37 +03:00
Maksim Pechnikov	0276cf5a02	fix validate_url for private ip	2019-06-25 17:44:24 +03:00
Maksim	a0c4ebb4d7	[#184] small refactoring reset password	2019-06-24 19:01:56 +00:00
Sergey Suprunenko	2c63c67512	Rework user deletion	2019-06-24 18:59:12 +00:00
Eugenij	f2c03425b0	Broadcast conversation update when DM is deleted	2019-06-24 07:14:04 +00:00
kaniini	27b9605de0	Merge branch 'rich_media_titles_two' into 'develop' ... Rich media titles two See merge request pleroma/pleroma!1325	2019-06-23 05:43:11 +00:00
Alex S	982cad0268	support for config groups	2019-06-23 08:16:16 +03:00
Sachin Joshi	a0c65bbd6c	Merge branch 'develop' into 'remove-avatar-header' ... # Conflicts: # CHANGELOG.md	2019-06-23 03:25:50 +00:00
Alex S	410add1c30	support for tuples with more than 2 values	2019-06-22 17:30:53 +03:00
lain	0e415921cd	Rich Media Parser: Do not return just a title if nothing else is there.	2019-06-22 16:22:59 +02:00
lain	58c4d5312b	Revert "Revert "Merge branch 'fix/ogp-title' into 'develop'"" ... This reverts commit b6af80f769.	2019-06-22 15:12:57 +02:00
Alex S	f0fccb7578	fix for int and modules	2019-06-22 09:01:30 +03:00
kaniini	55742d978d	Merge branch 'feature/mrf-anti-link-spam' into 'develop' ... implement anti link spam MRF See merge request pleroma/pleroma!1307	2019-06-21 22:56:54 +00:00
kaniini	e3534f5b3c	Merge branch 'oauth_secure_redirect' into 'develop' ... OAuth security improvements (`redirect_uri` listing enforcement) See merge request pleroma/pleroma!1302	2019-06-21 22:31:12 +00:00
William Pitcock	127a5a7d65	change the anti-link-spam MRF implementation to use old_user? instead of the previous name	2019-06-21 22:27:14 +00:00
feld	b6af80f769	Revert "Merge branch 'fix/ogp-title' into 'develop'" ... This reverts merge request !1277	2019-06-21 11:36:32 +00:00
William Pitcock	21dacd4b15	unbreak polls	2019-06-19 16:33:49 +00:00
William Pitcock	736d8ad6be	implement anti link spam MRF	2019-06-19 15:58:32 +00:00
rinpatch	df2dab69a7	Merge branch 'begone-the-dot-hack' into 'develop' ... Remove the dot hack when posting from Mastodon API and add proper errors when the post exceeds character limits See merge request pleroma/pleroma!1298	2019-06-19 10:22:23 +00:00
lain	966317e052	Merge branch 'deps/update-auto-linker' into 'develop' ... Deps: Update auto_linker See merge request pleroma/pleroma!1300	2019-06-18 20:47:36 +00:00
Ivan Tashkinov	64bc7ac619	Minor edit (comment).	2019-06-18 17:15:26 +03:00
Ivan Tashkinov	9f45f93949	Added more redirect_uri checks to prevent redirect to not explicitly listed URI.	2019-06-18 17:00:49 +03:00
rinpatch	f30a3241d2	Deps: Update auto_linker	2019-06-18 16:08:18 +03:00
rinpatch	c7acca2abb	Mastodon API: Sanitize display names ... Closes #1000	2019-06-18 14:12:11 +03:00
rinpatch	c4e4f7d0e4	Add proper error handling for when the post exceeds character limits	2019-06-18 05:05:05 +03:00
rinpatch	dce27de733	Mastodon API: Remove the dot hack	2019-06-18 05:04:41 +03:00
rinpatch	49a49d3763	Merge branch 'removing-test-errors' into 'develop' ... Removing test errors See merge request pleroma/pleroma!1296	2019-06-17 14:16:23 +00:00
Haelwenn	c34327b22e	Merge branch 'fix/sanitize-report-content' into 'develop' ... Sanitize HTML in ReportView Closes #990 See merge request pleroma/pleroma!1293	2019-06-16 18:05:00 +00:00
Alex S	0f59265a50	salmon fix ... removed some ownership sandbox error	2019-06-16 20:10:12 +08:00
Maksim	a04bf131e0	[#570] add user:notification stream	2019-06-16 10:33:25 +00:00
rinpatch	bf6aa6f1a8	Fix report content stopping to be nullable	2019-06-16 13:06:12 +03:00
rinpatch	44de34d170	Credo fixes	2019-06-16 01:35:45 +03:00
rinpatch	641bcaa44e	Sanitize HTML in ReportView ... Closes #990	2019-06-16 01:30:32 +03:00
lain	135c196769	Merge branch 'bugfix/980-polls-double-vote' into 'develop' ... MastodonAPI Controller: Band-Aid double vote problem. See merge request pleroma/pleroma!1275	2019-06-15 15:13:48 +00:00
lain	37ee6c6e2c	Merge branch 'update/phoenix-and-plug' into 'develop' ... Update Phoenix See merge request pleroma/pleroma!1290	2019-06-15 15:09:14 +00:00
kaniini	52b1b0e45d	Merge branch '963_oob_oauth_redirect_fix' into 'develop' ... [#963] No redirect on OOB OAuth authorize request with existing authorization See merge request pleroma/pleroma!1276	2019-06-15 13:45:50 +00:00
Mark Felder	9b908697dd	OEmbed.OEmbedController does not exist in the Pleroma codebase. It was removed in commit 92c5640f ... and this leftover artifact breaks compiling now.	2019-06-15 07:04:01 -05:00
lain	a440cf856d	Mastodon API: Return the token needed for the chat.	2019-06-15 10:59:35 +02:00
rinpatch	62ffc00a5d	Merge branch 'feature/add-background-image-to-mastoapi' into 'develop' ... AccountView: Add user background. See merge request pleroma/pleroma!1280	2019-06-14 16:49:28 +00:00
Alexander Strizhakov	c2ca1f22a2	it is changed in compile time ... we can't change module attributes and endpoint settings in runtime	2019-06-14 15:45:05 +00:00
Maksim	ee4ed87fb4	[#948] /api/v1/account_search added optional parameters (limit, offset, following)	2019-06-14 11:39:57 +00:00
lain	eac298083f	MastodonAPI: Add a way to update the background image.	2019-06-14 11:19:22 +02:00
lain	5965efb216	AccountView: Add user background.	2019-06-13 19:08:05 +02:00
Egor Kislitsyn	a12f8e13c8	Improve <title> fallback; Add a test	2019-06-13 15:02:46 +07:00
Mark Felder	7363a0ea8a	Revert "Only run Floki if title is missing from the map" ... This reverts commit 97d2b1a45a.	2019-06-12 18:32:28 -05:00
Mark Felder	97d2b1a45a	Only run Floki if title is missing from the map	2019-06-12 18:27:35 -05:00
Mark Felder	097fdf6a5d	Attempt to use <title> from HTML as a fallback	2019-06-12 17:56:51 -05:00
Ivan Tashkinov	4b2c29016c	[#963] No redirect on OOB OAuth authorize request with existing authorization. OAuth-related refactoring.	2019-06-12 21:30:06 +03:00
lain	966543379d	MastodonAPI Controller: Band-Aid double vote problem.	2019-06-12 16:36:23 +02:00
Egor Kislitsyn	bf22ed5fbd	Update auto_linker dependency	2019-06-12 15:53:33 +07:00
lain	63ab3c30eb	Merge branch 'feature/rate-limiter' into 'develop' ... Feature/Rate Limiter Closes #943 See merge request pleroma/pleroma!1266	2019-06-11 11:32:01 +00:00
Egor Kislitsyn	ad04d12de6	Replace MastodonAPIController.account_register/2 rate limiter	2019-06-11 16:06:03 +07:00
Egor Kislitsyn	bc8f059367	Add rate limiting for search endpoints	2019-06-11 14:28:39 +07:00
rinpatch	d020f68e87	Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched	2019-06-07 20:40:38 +03:00
Roman Chvanikov	01fe5abad1	Resolve conflicts	2019-06-07 01:20:50 +03:00
rinpatch	92213fb87c	Replace Mix.env with Pleroma.Config.get(:env) ... Mix.env/0 is not availible in release environments such as distillery or elixir's built-in releases.	2019-06-06 23:59:51 +03:00
kaniini	3f6da9c45a	Merge branch 'bugfix/377-stuck-follow-request' into 'develop' ... Bugfix/377 stuck follow request Closes #377 See merge request pleroma/pleroma!1250	2019-06-05 15:52:40 +00:00
kaniini	a511d2f900	Merge branch 'improve-search' into 'develop' ... [#943] Contain search for unauthenticated users See merge request pleroma/pleroma!1220	2019-06-05 15:51:32 +00:00
lain	e1370ba131	Utils: Use update_follow_state_for_all when appropriate.	2019-06-05 16:51:28 +02:00
lain	ad19bfc7fe	Utils: Split update_follow_state and update_follow_state_for_all.	2019-06-05 16:43:35 +02:00
lain	076c9ae40e	User: Remove superfluous maybe_follow.	2019-06-05 14:24:31 +02:00
lain	3115b64cfe	Transmogrifier: Add tests for incoming follows to locked accounts.	2019-06-05 14:10:46 +02:00
Egor Kislitsyn	ddd4a09b72	Fix merge conflict	2019-06-05 17:55:00 +07:00
Egor Kislitsyn	cfa5572d28	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	2019-06-05 17:53:15 +07:00
Ivan Tashkinov	3eefb274f4	OAuth consumer: tests fix, comments, Keycloak config notes.	2019-06-05 13:02:13 +03:00
Egor Kislitsyn	93397fce3d	Contain search for unauthenticated users	2019-06-05 16:37:43 +07:00
kaniini	e4babb1c9f	Merge branch 'explicit-addressing' into 'develop' ... Explicit addressing See merge request pleroma/pleroma!1239	2019-06-05 08:28:20 +00:00
Egor Kislitsyn	6ba9055b51	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	2019-06-05 12:54:30 +07:00
Roman Chvanikov	b1b1a270e8	Fix conflict	2019-06-05 02:45:21 +03:00
lain	18c35d84fd	NodeInfo: Add explicit addressing to nodeinfo.	2019-06-04 17:14:25 +02:00
Maksim Pechnikov	1e7bb69a95	update ActivityPub#fetch_activities_query	2019-06-04 15:21:18 +03:00
Maksim Pechnikov	d3d1704e84	Merge branch 'develop' into issue/941	2019-06-04 15:06:58 +03:00
Maksim Pechnikov	0acfcf6c52	update ActivityPub#fetch_activities_query	2019-06-04 15:04:36 +03:00
rinpatch	17383861ed	Fix CommonAPI.vote returning tuples inside of the activity array instead of just activities	2019-06-04 13:38:32 +03:00
rinpatch	29b022bb59	Restrict get_existing_votes to only get Create activities	2019-06-04 12:42:10 +03:00
Egor Kislitsyn	9ce928d823	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	2019-06-04 16:28:23 +07:00
lain	4cab98b7bf	Merge remote-tracking branch 'origin/develop' into explicit-addressing	2019-06-04 11:23:46 +02:00
William Pitcock	37a4ba0624	utils: access inReplyTo as an explicit string when fetching poll results`	2019-06-04 08:45:03 +00:00
Maksim Pechnikov	4f2e359687	Merge branch 'develop' into issue/941	2019-06-04 09:49:08 +03:00
William Pitcock	1c6cf0a348	nodeinfo: add pollLimits to metadata	2019-06-04 06:19:44 +00:00
kaniini	9f0d0d0805	Merge branch 'feature/mrf-subchain' into 'develop' ... MRF: subchain policy See merge request pleroma/pleroma!1233	2019-06-04 05:49:54 +00:00
kaniini	9d2563a3de	Merge branch 'generic-fe-settings' into 'develop' ... Generic settings store for frontend user settings See merge request pleroma/pleroma!1221	2019-06-04 05:43:43 +00:00
Roman Chvanikov	3e17610587	Add task to test emails	2019-06-04 02:48:21 +03:00
Mark Felder	6ef145b4fc	Merge branch 'develop' into feature/digest-email	2019-06-03 15:29:53 -05:00
Maksim Pechnikov	f13d6c7f78	update api to set skip_thread_containment	2019-06-03 21:02:57 +03:00
eugenijm	f2c4c99e03	Remove repeated scope lists	2019-06-03 19:18:21 +03:00
lain	80d4d83aac	CommonAPI: Add explicit addressing.	2019-06-03 18:17:08 +02:00
eugenijm	243d8ed94e	Use workaround for the heavy checkmark symbol in iOS	2019-06-03 18:28:36 +03:00
Mark Felder	f4e2595592	Merge branch 'develop' into update-oauth-template	2019-06-03 09:12:17 -05:00
Maksim Pechnikov	080e1aa70e	add option skip_thread_containment	2019-06-03 16:13:37 +03:00
rinpatch	dc91bcc0af	Merge branch 'develop' into feature/polls-2-electric-boogalo	2019-06-03 13:16:17 +03:00
lambda	314758c25b	Merge branch 'align-mastodon-conversations' into 'develop' ... Mastodon Conversations API: Align to Mastodon behavior See merge request pleroma/pleroma!1215	2019-06-03 09:48:37 +00:00
rinpatch	026b245dbc	Merge branch 'develop' into feature/polls-2-electric-boogalo	2019-06-03 11:14:52 +03:00
rinpatch	5bd41fef8b	Change query order in fetch_activities_for_context_query to make poll vote exclusion work	2019-06-03 10:58:37 +03:00
rinpatch	1fd8e19d76	Remove a TODO comment as the tests for poll view were written	2019-06-02 23:46:17 +03:00
rinpatch	2fe3a20638	Make error message about author's inability to vote more sensible	2019-06-02 23:33:15 +03:00
rinpatch	e3c460353d	Refresh the object in CommonAPI.vote instead of MastoAPI controller	2019-06-02 23:24:48 +03:00
William Pitcock	561a21986d	formatting	2019-06-02 10:29:15 +00:00
William Pitcock	4087ccdab8	mrf: add subchain policy	2019-06-02 10:07:42 +00:00
William Pitcock	edf772d41e	mrf: allow a policy chain to be specified when filtering	2019-06-02 09:44:42 +00:00
kaniini	5402d04e3c	Merge branch 'feature/notification-control-part-2' into 'develop' ... notification controls, part 2 See merge request pleroma/pleroma!1204	2019-06-02 08:25:37 +00:00
rinpatch	6bc9e5c020	Mastodon API: Refresh the object before rendering it after voting	2019-06-01 21:41:49 +03:00
rinpatch	444406167b	Mastodon API: actually check for poll votes	2019-06-01 21:41:23 +03:00
rinpatch	65db5e9f52	Resolve merge conflicts	2019-06-01 16:29:58 +03:00
rinpatch	300d94c628	Add poll votes ... Also in this commit by accident: - Fix query ordering causing exclude_poll_votes to not work - Do not create notifications for Answer objects	2019-06-01 16:17:46 +03:00
Sachin Joshi	ad5263c647	Merge remote-tracking branch 'upstream/develop' into admin-create-users	2019-06-01 11:42:37 +05:45
Sachin Joshi	5534d4c676	make bulk user creation from admin works as a transaction	2019-06-01 11:17:53 +05:45
kaniini	e706b42f51	Merge branch 'bugfix/visibility-indicator-litepub-dm' into 'develop' ... visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility See merge request pleroma/pleroma!1230	2019-06-01 03:39:13 +00:00
Sergey Suprunenko	2bbc2a801f	Remove all follower collections but actor's from "cc"	2019-06-01 03:26:45 +00:00
William Pitcock	f2efe24cf8	visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility	2019-06-01 03:24:08 +00:00
Haelwenn (lanodan) Monnier	5d3ece2861	Remove now useless flavours switching	2019-06-01 01:44:10 +02:00
Haelwenn (lanodan) Monnier	aa9f52edd2	mastodon_api_controller.ex: Remove vanilla from supported_flavours	2019-06-01 01:44:10 +02:00
lambda	2993361075	Merge branch 'hotfix/leaking-lists' into 'develop' ... Mastodon API: Fix lists leaking private posts See merge request pleroma/pleroma!1222	2019-05-31 13:26:48 +00:00
lain	7861974ab2	MastodonAPI: Add extension to set and get pleroma_settings_store.	2019-05-31 14:50:18 +02:00
lain	aaad85c4d9	AccountView: settings -> settings_store	2019-05-31 14:49:46 +02:00
lain	eb2963bc43	User: Add settings store to Info, AccountView ... This is to provide a generic frontend settings storage mechanism for all kinds of frontends.	2019-05-31 14:27:15 +02:00
rinpatch	d9c0650ff9	Mastodon API: Fix lists leaking private posts ... Our previous list visibility resolver grabbed posts if either follower collection of the user in a list who is followed is in `to` or if follower collection of the user in a list was in `cc`. This not only missed unlisted posts but also lead to leaking private posts when `fix_explicit_addressing` mistakingly started putting follower collections to `cc` (also fixed in this MR). Reported by @kurisu@iscute.moe via a DM	2019-05-31 15:25:17 +03:00
rinpatch	a9eaa55885	Fix fix_explicit_addressing moving follower collection to cc and add tests for it	2019-05-31 14:17:05 +03:00
lain	97fb50d9fa	Mastodon Conversation API: Don't return own account in 'accounts'.	2019-05-31 11:27:14 +02:00
Sergey Suprunenko	1690be991e	Replace missing non-nullable Card attributes with empty strings	2019-05-30 21:03:31 +00:00
lambda	91ac8b075b	Merge branch 'use-pleroma-config' into 'develop' ... Use Pleroma.Config everywhere See merge request pleroma/pleroma!1214	2019-05-30 13:16:08 +00:00
Egor Kislitsyn	99f70c7e20	Use Pleroma.Config everywhere	2019-05-30 15:33:58 +07:00
kaniini	6aec0d1b58	Revert "Merge branch 'feature/search-authenticated-only' into 'develop'" ... This reverts merge request !1209	2019-05-29 22:10:16 +00:00
Mark Felder	e7edfd9fec	Permit fetching statuses from API with nickname or id	2019-05-29 12:20:18 -05:00
Roman Chvanikov	ce47017c89	Merge develop	2019-05-29 18:18:22 +03:00
Mark Felder	672fddb721	Default search limit should be 40 ... https://docs.joinmastodon.org/api/rest/search/	2019-05-29 08:06:26 -05:00
William Pitcock	0159a6dbe9	router: require oauth_read for searching ... Search calls are generally expensive and allow unauthenticated users to crawl the instance for user profiles or posts which contain specified keywords. An adversary can build a distributed search engine which not only will consume significant instance resources, but also can be used for undesirable purposes such as datamining. Accordingly, require authenticated access to use the search API endpoints. This acts as a nice balance as it allows guest users to make use of most functionality available in Pleroma FE while ensuring that Pleroma instances are reasonably protected from resource exhaustion. It also removes Pleroma as a potential vector in distributed search engines.	2019-05-29 10:58:45 +00:00
Sachin Joshi	1452a96ad6	ability to set and reset avatar, profile banner and backgroud in Mastodon API	2019-05-27 15:31:01 +05:45
lambda	5bb843ceec	Merge branch 'refactor/die-httpoison-die' into 'develop' ... remove @httpoison, @ostatus and @websub compile-time constants See merge request pleroma/pleroma!1203	2019-05-26 13:33:11 +00:00
William Pitcock	79503ce90f	mrf: simple policy: fix matching imported activitypub and ostatus statuses	2019-05-26 02:01:24 +00:00
William Pitcock	59a703fcbe	twitter api: user view: expose user notification settings under pleroma object	2019-05-25 05:31:13 +00:00
William Pitcock	56fd7dbdd7	remove @websub and @ostatus module-level constants	2019-05-25 04:43:11 +00:00
William Pitcock	9bec891eb4	kill @httpoison	2019-05-25 04:24:21 +00:00
Aaron Tinio	9415932af5	Keep nodeinfo available when not federating	2019-05-25 08:15:12 +08:00
feld	f916e4cdd9	Move the Cache Control header test to its own file ... We can consolidate our cache control header tests here	2019-05-24 20:33:55 +00:00
Egor Kislitsyn	f333041a0a	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	2019-05-24 21:05:57 +07:00
rinpatch	8b2d39c1ec	Change the order of preloading when fetching activities for context	2019-05-23 14:03:16 +03:00
Sachin Joshi	0c53d91f3b	fix merge conflict	2019-05-23 09:45:12 +02:00
rinpatch	e6b175ed6c	Fix credo issues	2019-05-22 21:57:46 +03:00
William Pitcock	baf72d6c58	mrf: simple policy: add the ability to strip avatars and banners from user profiles	2019-05-22 18:53:12 +00:00
William Pitcock	60f882b09f	activitypub: run user objects through MRF filters	2019-05-22 18:53:12 +00:00
William Pitcock	75b6c4b004	mrf: defang policy modules for filtering user profile objects	2019-05-22 18:53:12 +00:00
rinpatch	ac7702f800	Exclude Answers from fetching by default	2019-05-22 21:52:12 +03:00
rinpatch	19c90d47c4	Normalize poll votes to Answer objects	2019-05-22 21:17:57 +03:00
Maksim	620908a2db	[#699] add worker to clean expired oauth tokens	2019-05-22 15:44:50 +00:00
lambda	ff363f70b5	Merge branch 'refactor/keys' into 'develop' ... move key generation functions into Pleroma.Keys module See merge request pleroma/pleroma!1186	2019-05-22 06:28:16 +00:00
William Pitcock	1344c85e2f	salmon: fix credo	2019-05-22 05:58:51 +00:00
rinpatch	cdac5efd10	Merge branch 'bugfix/account_view_source.note' into 'develop' ... MastoAPI AccountView: fill source.note with plaintext version of note Closes #926 See merge request pleroma/pleroma!1189	2019-05-22 05:39:01 +00:00
Haelwenn (lanodan) Monnier	0e2c215a00	MastoAPI AccountView: fill source.note with plaintext version of note ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/926	2019-05-22 07:22:19 +02:00
Sachin Joshi	17bfd000d7	Ability to reset avatar, profile banner and backgroud	2019-05-22 06:47:18 +02:00
kaniini	79c2cef2fb	Merge branch 'mongooseim-support' into 'develop' ... MongooseIM: Add basic integration endpoints. See merge request pleroma/pleroma!1172	2019-05-22 04:06:54 +00:00
William Pitcock	045803346d	move key generation functions into Pleroma.Keys module	2019-05-22 03:58:15 +00:00
Aaron Tinio	3ab9255eda	Respond with a 404 Not implemented JSON error message ... when requested API is not implemented	2019-05-22 07:15:52 +08:00
rinpatch	63b0b7190c	MastoAPI: Add GET /api/v1/polls/:id	2019-05-21 20:40:35 +03:00
rinpatch	5f67c26baf	Accept strings in expires_in because sasuga javascript	2019-05-21 17:30:51 +03:00
rinpatch	0407ffe75f	Change validation error status codes to be more appropriate	2019-05-21 17:12:38 +03:00
rinpatch	ee68244141	Do not stream out poll replies	2019-05-21 16:58:15 +03:00
rinpatch	d7c4d029c8	Restrict poll replies when fetching activiites for context	2019-05-21 14:35:20 +03:00
rinpatch	f28747858b	Actual vote count in poll view	2019-05-21 14:27:09 +03:00
rinpatch	a53d062730	Fix posting non-polls from mastofe	2019-05-21 14:19:03 +03:00
rinpatch	aafe30d94e	Handle poll votes	2019-05-21 14:12:10 +03:00
rinpatch	3f96b3e4b8	Enforce poll limits and add error handling for MastodonAPI's post endpoint	2019-05-21 10:54:20 +03:00
rinpatch	76a7429bef	Add poll limits to /api/v1/instance and initial state	2019-05-21 09:13:10 +03:00
kaniini	d4847b17ca	Merge branch 'refactor/add-virtual-thread-muted-field' into 'develop' ... Add virtual :thread_muted? field Closes #901 See merge request pleroma/pleroma!1178	2019-05-20 23:30:19 +00:00
Aaron Tinio	eb02edcad9	Add virtual :thread_muted? field ... that may be set when fetching activities	2019-05-21 00:35:46 +08:00
Sadposter	daeae8e2e7	Move default mascot configuration to config/	2019-05-20 16:12:55 +01:00
Sadposter	e81f0fc6d4	Add mascot get/set tests	2019-05-20 12:58:06 +01:00
Sadposter	54e9cb5c2d	Add API endpoints for a custom user mascot	2019-05-20 12:39:23 +01:00
Aaron Tinio	2375e9a95b	Add report filtering to MRF.SimplePolicy	2019-05-20 06:02:50 +08:00
rinpatch	6430cb1bf7	Restrict poll replies from fetch queries by default	2019-05-19 17:44:18 +03:00
rinpatch	1d90f9b969	Remove tags/mentions/rich text from poll options because Mastodon and ... add custom emoji	2019-05-19 17:06:44 +03:00
rinpatch	5ece901af3	Resolve merge conflicts and remove IO.inspects	2019-05-18 13:37:38 +03:00
rinpatch	fd920c8973	Mastodon API: Add support for posting polls	2019-05-18 13:29:28 +03:00
William Pitcock	c4a55e167a	add Changelog entry	2019-05-17 23:00:14 +00:00
William Pitcock	dc08159538	also suppress link previews from posts marked #nsfw	2019-05-17 22:13:24 +00:00
William Pitcock	0da1233e8e	rich media: suppress link previews if post is marked as sensitive	2019-05-17 18:49:43 +00:00
William Pitcock	78588dbd80	mrf: simple policy: mark all posts instead of posts with media as sensitive if they match media_nsfw	2019-05-17 18:49:10 +00:00
Egor Kislitsyn	3b71612d3d	Improve Pleroma.Web.ActivityPub.ActivityPub.maybe_update_cc/3	2019-05-18 01:17:14 +07:00
lain	075eecec90	Linting.	2019-05-17 18:32:30 +02:00
lain	f959bf7aa6	MongooseIM: Add basic integration endpoints.	2019-05-17 18:21:11 +02:00
Egor Kislitsyn	557f0e33a7	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	2019-05-17 19:57:14 +07:00
Egor Kislitsyn	f2936e0a07	Add ap_id to List	2019-05-17 19:56:37 +07:00
lain	412a3d8a0f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index	2019-05-17 12:26:59 +02:00
lambda	1dcdcd8871	Merge branch 'bugfix/903-mastoapi-relationship-requested' into 'develop' ... MastoAPI account_view.ex: requested is false when following is true Closes #903 See merge request pleroma/pleroma!1169	2019-05-17 10:07:51 +00:00
lambda	46684db84d	Update account_view.ex	2019-05-17 09:53:44 +00:00
rinpatch	642a67dd44	Render polls in statuses	2019-05-17 11:44:47 +03:00
Alexander Strizhakov	7ed682213f	Fix/902 random compile failing	2019-05-17 07:25:20 +00:00
Sachin Joshi	5c028b8f92	user creation admin api will create multiple users	2019-05-17 12:21:58 +05:45
Haelwenn (lanodan) Monnier	68c75a08e8	MastoAPI account_view.ex: requested is false when following is true ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/903	2019-05-17 07:44:09 +02:00
Aaron Tinio	70235ce840	Fix typo: s/"tags"/"tag"/g	2019-05-17 09:02:34 +08:00
Sergey Suprunenko	e2b3a27204	Add Reports to Admin API	2019-05-16 19:09:18 +00:00
feld	e190b3022b	Merge branch 'fix/domain-unblocked-reblogs' into 'develop' ... Fix domain-unblocked reblogs Closes #892 See merge request pleroma/pleroma!1157	2019-05-16 18:57:14 +00:00
Mark Felder	ebb0482116	Merge branch 'develop' into conversations-import	2019-05-16 13:11:17 -05:00
lambda	fde30aee43	Merge branch 'feature/sql-thread-sat' into 'develop' ... SQL thread visibility solver See merge request pleroma/pleroma!971	2019-05-16 13:44:22 +00:00
Egor Kislitsyn	fc7246d715	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	2019-05-16 17:54:24 +07:00
William Pitcock	c31026423c	publisher: use the correct queue name for outgoing federation	2019-05-16 04:41:27 +00:00
Aaron Tinio	793f1834d2	Use named binding to conditionally join object	2019-05-16 06:25:14 +08:00
Aaron Tinio	2b6119dfbf	Restrict reblogs of activities from blocked domains	2019-05-16 05:53:51 +08:00
rinpatch	62e42b03ab	Handle incoming Question objects	2019-05-15 20:10:16 +03:00
William Pitcock	a591ab6112	activity pub: remove Ecto SQL query dumps	2019-05-15 16:56:46 +00:00
William Pitcock	31db31c587	activitypub: visibility: use SQL thread_visibility() function instead of manually walking the thread	2019-05-15 15:54:10 +00:00
William Pitcock	de114ffbb0	activitypub: remove contain_timeline()	2019-05-15 15:53:06 +00:00
William Pitcock	0387f52138	activitypub: add restrict_thread_visibility()	2019-05-15 15:53:06 +00:00
lain	f168a1cbdc	Merge remote-tracking branch 'origin/develop' into conversations-import	2019-05-15 17:47:29 +02:00
kaniini	62516be9c4	Merge branch 'fix/public-option-not-working' into 'develop' ... Fix public option not working Closes #873 See merge request pleroma/pleroma!1143	2019-05-15 15:42:21 +00:00
lambda	4440e23547	Merge branch 'chore/extricate-http-signatures' into 'develop' ... switch to pleroma/http_signatures library See merge request pleroma/pleroma!1155	2019-05-15 15:37:31 +00:00
lain	7a92e701b9	CommonAPI: Visibility refactor.	2019-05-15 16:35:33 +02:00
lain	cbb3451023	CommonAPI: Refactor visibility, forbid public to private replies.	2019-05-15 16:30:08 +02:00
lain	f1e67bdc31	Search: Add optional rum indexing / searching.	2019-05-15 15:28:01 +02:00
Sachin Joshi	ee22fff5ac	remove deprecated PleromaFE configuration	2019-05-15 15:29:59 +05:45
Egor Kislitsyn	a7a8f3bc2c	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	2019-05-15 14:31:24 +07:00
Aaron Tinio	70c81b95d0	Pipe requests to public endpoints through EnsurePublicOrAuthenticatedPlug	2019-05-15 05:09:32 +08:00
William Pitcock	071f78733a	switch to pleroma/http_signatures library	2019-05-14 20:03:13 +00:00
lambda	692919c7d2	Merge branch 'refactor/use-job-queue-everywhere' into 'develop' ... use job queue everywhere Closes #862 See merge request pleroma/pleroma!1142	2019-05-14 15:27:34 +00:00
William Pitcock	ac3a3abf6b	clean up follow/block imports a little	2019-05-14 15:07:38 +00:00
Maksim	52297920e7	Refactoring oauth response.	2019-05-14 14:49:45 +00:00
Egor Kislitsyn	e82e73478e	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	2019-05-14 19:00:07 +07:00
Egor Kislitsyn	5e2b491276	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	2019-05-14 18:15:56 +07:00
Mark Felder	bbacdf2352	Bump Mastodon API level	2019-05-13 15:52:16 -05:00
Mark Felder	498bfdf403	Switch to Jason over Poison	2019-05-13 15:37:38 -05:00
William Pitcock	69a9e0563c	user: migrate follow/blocks import to job queue	2019-05-13 19:36:00 +00:00
William Pitcock	57d11ac9db	activitypub: move post rich media fetching to job queue	2019-05-13 19:36:00 +00:00
lambda	b14a314ce7	Merge branch 'feature/federator-behaviours' into 'develop' ... federator modularization (outgoing) See merge request pleroma/pleroma!1140	2019-05-13 18:58:04 +00:00
Alexander Strizhakov	a2be420f94	differences_in_mastoapi_responses.md: fullname & bio are optionnal ... [ci skip]	2019-05-13 18:35:45 +00:00
Sachin Joshi	7701a4c841	Make irreversible field default to false in filters	2019-05-14 00:13:15 +05:45
Egor Kislitsyn	23276e8d68	Use pseudo ap id of a list in BCC	2019-05-13 16:15:14 +07:00
William Pitcock	44b182732e	nodeinfo: gather supported protocol names from federation modules	2019-05-12 19:15:29 +00:00
William Pitcock	28f7f4c6de	webfinger: build the response based on enabled federation modules	2019-05-12 19:05:03 +00:00
William Pitcock	55fa4b812a	federator: websub removal	2019-05-12 05:04:24 +00:00
William Pitcock	c23276a59a	activitypub: publisher: fixups	2019-05-12 05:04:24 +00:00
William Pitcock	fedaca15a3	websub: adapt to work as a federator publishing module	2019-05-12 05:04:24 +00:00
William Pitcock	179293e51c	salmon: refactor to work as a federator publishing module	2019-05-12 05:04:21 +00:00
William Pitcock	2aee62a456	federator: publisher: only attempt publishing if we know the activity is representable	2019-05-12 05:04:16 +00:00
William Pitcock	69158f1065	ostatus: only as:Public activities are representable	2019-05-12 05:04:16 +00:00
William Pitcock	85377c0b67	federator: move activitypub relaying to the AP publisher module	2019-05-12 05:04:16 +00:00
William Pitcock	676752bb83	federator: hook up Publisher.publish()	2019-05-12 05:04:16 +00:00
William Pitcock	f7a6a37c4e	federator: remove no longer used :publish_single_ap	2019-05-12 05:04:16 +00:00
William Pitcock	10695a28d2	federator: publisher: add publish() wrapper	2019-05-12 05:04:16 +00:00
William Pitcock	0afc8d7856	federator: publisher: integrate job queue, simplify publish_one logic	2019-05-12 05:04:16 +00:00
William Pitcock	ef1f9e8d4e	activitypub: split out outgoing federation into a federation module	2019-05-12 05:04:11 +00:00
William Pitcock	e7d292f80e	federator: add publisher module defining a contract for publishing behaviours	2019-05-12 03:08:50 +00:00
kaniini	131f883207	Merge branch 'fix/ostatus-activity-representer-depends-on-emebeded-objects' into 'develop' ... Fix get_in_reply_to in OStatus' activity representer depending on embedded objects See merge request pleroma/pleroma!1129	2019-05-11 16:52:26 +00:00
lain	01c45ddc9e	Search: Use RUM index.	2019-05-11 11:26:46 +02:00
Sachin Joshi	f01f995816	make url uniform in admin api	2019-05-11 14:46:00 +05:45
Roman Chvanikov	f1f7a11222	Merge develop	2019-05-11 14:45:54 +07:00
feld	c953ae8c3d	Initial bundle of basic AdminFE ... Due to CSP headers we only allow connecting to self. If you want to host AdminFE on a separate domain without CSP headers you will be able to connect to any public Pleroma host.	2019-05-11 01:34:17 +00:00
rinpatch	1d78e42fd4	Remove get_in_reply_to calls in some functions because the result is unused and it does not have any side-effects	2019-05-10 13:49:34 +03:00
Francis Dinh	2a54e8c1f5	Use "repeated" instead of "retweeted" for repeated statuses in Twitter API ... This makes it consistent with the language used in Pleroma FE (at least in English). Resolves https://git.pleroma.social/pleroma/pleroma-fe/issues/533	2019-05-09 19:58:34 -04:00
rinpatch	e4523c3010	Fix get_in_reply_to in OStatus' activity representer depending on embedded objects	2019-05-09 22:27:00 +03:00
lain	a33bec7d58	Conversations: Import order, import as read.	2019-05-09 16:39:28 +02:00
lain	e6d7f8d223	Credo fixes.	2019-05-08 18:19:20 +02:00
lain	a4598b5e8b	Visibility: Make it more resilient.	2019-05-08 18:08:50 +02:00
lain	920bd47055	ActivityPub: Remove leftover printf debugging.	2019-05-08 17:40:24 +02:00
lain	fcf2f38d20	Conversations: Add a function to 'import' old DMs.	2019-05-08 17:37:00 +02:00
Alexander Strizhakov	bfeb33e951	Merge develop ... Merge conflict in lib/pleroma/activity.ex	2019-05-08 14:34:36 +00:00
Maksim	799e1f48b5	Refactoring functions for dealing with oauth scopes.	2019-05-08 10:52:13 +00:00
Roman Chvanikov	b6b5b16ba4	Merge develop	2019-05-08 17:08:06 +07:00
kaniini	14deed7f7d	Merge branch 'refactor/preload-bookmarks-with-activities' into 'develop' ... Optimize bookmarks by preloading them with activities Closes #861 See merge request pleroma/pleroma!1121	2019-05-07 19:37:41 +00:00
William Pitcock	d64c3b604e	twitterapi: use order constraint to force descending order	2019-05-07 19:33:25 +00:00
William Pitcock	6020ff3fb6	activitypub: add optional order constraint to timeline query builder	2019-05-07 19:33:22 +00:00
rinpatch	4c5125dedc	Remove bookmarks assoc and add a fake bookmark assoc instead	2019-05-07 19:33:22 +00:00
rinpatch	3a7c14645e	- Actually use preloaded bookmarks in views ... - Preload bookmarks in bookmark timeline - Rework bookmark preload tests	2019-05-07 19:33:22 +00:00
rinpatch	f841eb7cdb	Preload bookmarks wherever the object is preloaded	2019-05-07 19:33:22 +00:00
rinpatch	06947c9147	Remove bookmarks assoc	2019-05-07 19:33:22 +00:00
kaniini	a1a0df19c4	Merge branch 'docs/MRF-modules' into 'develop' ... Documentation: MRF Modules See merge request pleroma/pleroma!1122	2019-05-07 16:15:27 +00:00
lambda	238dd72fad	Merge branch 'conversations_three' into 'develop' ... Conversations once more. See merge request pleroma/pleroma!1119	2019-05-07 14:43:21 +00:00
Egor Kislitsyn	1557b99beb	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	2019-05-07 16:51:11 +07:00
Maksim	1040caf096	fix format ... Modified-by: Maksim Pechnikov <parallel588@gmail.com>	2019-05-06 17:51:03 +00:00
Alexander Strizhakov	ce6ca0fefe	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion	2019-05-06 16:45:22 +00:00
Haelwenn (lanodan) Monnier	e41a2f98d5	mrf/tag_policy.ex: Add some documentation ... mrf_tag:disable-remote-subscription exact way of working is quite unclear to me. Is it the requester that is denied if they have a tag, or is it the requestee if they have one?	2019-05-06 04:53:11 +02:00
Haelwenn (lanodan) Monnier	af62ace954	Add short documentation on every MRF Policy	2019-05-06 04:49:50 +02:00
rinpatch	d089ff2460	Merge branch 'fix/embeded-relationship-in-follows' into 'develop' ... Fix embeded relationships in Mastodon API See merge request pleroma/pleroma!1118	2019-05-03 20:36:13 +00:00
Haelwenn (lanodan) Monnier	b5ad1715b2	MastoAPI: profile update with emoji_map	2019-05-03 16:41:23 +02:00
Haelwenn (lanodan) Monnier	46bbf9e1cf	TwitterAPI: profile update with emoji_map	2019-05-03 16:30:24 +02:00
Haelwenn (lanodan) Monnier	85434669bb	Web.TwitterAPI.UserView: Also view local user emojis	2019-05-03 16:27:51 +02:00
Haelwenn (lanodan) Monnier	2f76a40d02	formatter.ex: Add get_emoji_map/1	2019-05-03 16:27:50 +02:00
Haelwenn (lanodan) Monnier	d70af32127	Pleroma.User: remove emojify on parse_bio	2019-05-03 16:27:50 +02:00
lain	c42ded13a2	Credo fixes.	2019-05-03 13:53:17 +02:00
feld	acb04306b6	Standardize construction of websocket URL ... This follows up on the change made in d747bd98	2019-05-03 11:45:04 +00:00
lain	a0c755cc4a	MastodonApi: Bump api level.	2019-05-03 13:40:43 +02:00
lain	81d1aa424d	Streamer: Stream out Conversations/Participations.	2019-05-03 13:39:14 +02:00
rinpatch	38b79461df	Fix embeded relationships in Mastodon API ... Currently some endpoints render accounts without for user resulting in embedded relationship being empty. It causes bugs in followers/following tab in pleroma-fe but I fixed it for other endpoints as well just in case	2019-05-03 00:49:17 +03:00
Mark Felder	3c4cab9be1	Merge branch 'develop' into update-oauth-template	2019-05-01 12:32:17 -05:00
Mark Felder	9a98f48ec3	Remove incorrect statement about valid characters	2019-05-01 12:29:48 -05:00
lain	45f790becc	Merge remote-tracking branch 'origin/develop' into conversations_three	2019-05-01 18:40:41 +02:00
Maksim	c854bff8f5	Refactored Pleroma.Web.Auth.Authenticator	2019-05-01 13:28:04 +00:00
Egor Kislitsyn	a3dc02d282	Add addressable lists	2019-05-01 16:11:17 +07:00
Alex S	f11e7037c2	test fixes	2019-05-01 16:09:53 +07:00
Alex S	bdfa3a6fa8	Merging with develop ... Conflicts: lib/pleroma/web/activity_pub/transmogrifier.ex lib/pleroma/user.ex	2019-05-01 12:29:33 +07:00
rinpatch	ce4825c1dc	Do not normalize objects in stream_out unless the activity type is ... Create Saves quite a bit of time with delete activities because they would always query the db	2019-04-30 20:21:28 +03:00
Roman Chvanikov	0f0cc2703b	Merge develop	2019-04-30 20:17:52 +07:00
lain	b0951a8849	WebPush: Use Object.normalize, rewrite tests so they test reality.	2019-04-29 18:15:30 +02:00
rinpatch	0fd176b990	Merge branch 'fix/add-default-scope-mastoapi' into 'develop' ... Add default_scope to /api/v1/update_credentials See merge request pleroma/pleroma!1100	2019-04-29 06:45:18 +00:00
kaniini	292c69481b	Merge branch 'regression/rights-only-for-admin' into 'develop' ... Fix `rights` in TwitterAPI's user entity being present only for Admins/Moderators See merge request pleroma/pleroma!1102	2019-04-28 23:05:14 +00:00
rinpatch	61ca2f7a4e	Fix rights in TwitterAPI's user entity being present only for ... Admins/Moderators In !1093 I reused `maybe_with_role` for `rights` object, however I missed that `maybe_with_role` is called only for admins/moderators.	2019-04-28 19:42:43 +03:00
rinpatch	ce3789e39a	Add default_scope to /api/v1/update_credentials	2019-04-27 23:55:54 +03:00
rinpatch	c3e9fcf098	Fix bookmarks depending on embeded object and move checking if the ... status is bookmarked to SQL	2019-04-27 23:06:46 +03:00
kaniini	002ea343f8	Merge branch 'feature/bbcode' into 'develop' ... BBCode support (backend) See merge request pleroma/pleroma!1097	2019-04-27 07:44:24 +00:00
William Pitcock	501af917b5	add support for bbcode	2019-04-26 22:35:02 +00:00
lambda	4de5fef1f8	Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop' ... Feature/807 bookmark endpoint extension Closes #807 See merge request pleroma/pleroma!1059	2019-04-26 11:59:47 +00:00
kaniini	48f68fd133	Merge branch 'feature/mastoapi-new-config' into 'develop' ... Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API This patch: - Fixes `rights` in TwitterAPI ignoring `show_role` - Fixes exposing default scope of the user to anyone in Mastodon API - Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674) Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs See merge request pleroma/pleroma!1093	2019-04-26 02:41:35 +00:00
Mark Felder	24c3e2db2c	Add mediaproxy whitelist capability	2019-04-25 18:11:47 -05:00
rinpatch	dfc8425659	Move settings to Source subentity	2019-04-25 10:31:14 +03:00
Alex S	a825056d4d	test fixes	2019-04-25 14:09:57 +07:00
Alex S	85953c0836	fixes for tests	2019-04-25 13:46:40 +07:00
Alex S	3c2ae80008	unused	2019-04-25 13:42:10 +07:00
Egor Kislitsyn	c157e27a00	Merge branch 'develop' into feature/disable-account	2019-04-25 13:41:10 +07:00
Alex S	1258128f4f	favourites add bookmark display	2019-04-25 13:38:24 +07:00
Alex S	73d01857e3	bookmarks in separate table	2019-04-25 13:38:24 +07:00
William Pitcock	0fd0ffcd76	activitypub: transmogrifier: send reject follow if following does not succeed	2019-04-25 00:48:45 +00:00
rinpatch	4baea6e6d9	Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API ... This patch: - Fixes `rights` in twitterapi ignoring `show_role` - Fixes exposing default scope of the user to anyone in Mastodon API - Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674) Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs	2019-04-24 20:01:42 +03:00
Sergey Suprunenko	9dd36e5bcb	Extend Mastodon API with public endpoint for getting Favorites timeline of any user (#789)	2019-04-23 02:47:43 +00:00
kaniini	10c40e13d2	Merge branch 'mastoapi/add-in-reply-to-screen-name' into 'develop' ... Add `in_reply_to_account_acct` to MastoAPI status entity See merge request pleroma/pleroma!1086	2019-04-23 02:43:53 +00:00
kaniini	aa9d378985	Merge branch 'fix/normalize-activities' into 'develop' ... Normalize acitvities instead of objects inside them See merge request pleroma/pleroma!1085	2019-04-23 02:43:26 +00:00
Alex S	d35246c449	added healthcheck setting to instance config	2019-04-22 17:00:06 +07:00
rinpatch	f60d072bbb	Add pleroma.in_reply_to_account_acct to MastoAPI status entity	2019-04-22 11:54:27 +03:00
rinpatch	d21d921def	Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading	2019-04-22 11:27:29 +03:00
Egor	b9cdf6d3b9	Use User.get_cached* everywhere	2019-04-22 07:20:43 +00:00
Alexander Strizhakov	88f0be9693	Feature/826 healthcheck endpoint	2019-04-22 07:19:53 +00:00
Egor Kislitsyn	e8c2f9a73a	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	2019-04-22 13:08:30 +07:00
kaniini	7fcbda702e	Merge branch 'rework-emoji-management' into 'develop' ... Remove finmoji and add a way to download emojis in packs Closes #817 and #821 See merge request pleroma/pleroma!1073	2019-04-22 02:07:19 +00:00
Roman Chvanikov	4908e0eeee	Fix Credo warning	2019-04-21 23:24:33 +07:00
Roman Chvanikov	eeb093631c	Fix Credo warning	2019-04-21 23:19:36 +07:00
Roman Chvanikov	e56afefef9	Refactor conversation function in MastodonAPIController to use a View	2019-04-21 23:14:27 +07:00
Roman Chvanikov	2662bea4e0	Add accounts and last_status to conversation read response	2019-04-21 20:26:13 +07:00
Ivan Tashkinov	9256d2d4b4	[#923] Refactored OAuthController#authorize definitions, added test.	2019-04-21 10:51:32 +03:00
eugenijm	375fd21055	Set correct values in the MastoAPI reblog status view	2019-04-21 05:40:22 +03:00
Roman Chvanikov	24073f829f	Refactor query to return only 1 message instead of 20	2019-04-21 00:40:41 +07:00
Roman Chvanikov	724311e151	Fix Credo warnings	2019-04-20 19:57:43 +07:00
Roman Chvanikov	60f213bb1a	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email	2019-04-20 19:43:06 +07:00
Roman Chvanikov	64a2c6a041	Digest emails	2019-04-20 19:42:19 +07:00
Ekaterina Vaartis	52ed287e87	Fix incorrect multiple emoji tag handling introduced in initial impl	2019-04-20 11:17:17 +03:00
eugenijm	fa48532387	Handle reblogs on the first follow request in MastoAPI	2019-04-20 04:39:49 +03:00
kaniini	9da8b287f8	Merge branch 'feature/database-compaction' into 'develop' ... database compaction See merge request pleroma/pleroma!473	2019-04-19 16:55:33 +00:00
Alexander Strizhakov	ada384207b	typo fix ... docs for RelMe provider	2019-04-19 07:50:21 +00:00
lambda	218d96a26b	Merge branch '923_oauth_consumer_refactoring_ci' into 'develop' ... OAuth consumer params handling refactoring See merge request pleroma/pleroma!1047	2019-04-19 07:49:26 +00:00
rinpatch	f9865cf943	Stream out deletes, mistakingly removed when resolving merge conflicts	2019-04-19 00:47:02 +03:00
Haelwenn	eba3db0966	Merge branch 'bugfix/filter-boosted-blocks' into 'develop' ... activitypub: fix filtering of boosts from blocked users See merge request pleroma/pleroma!1074	2019-04-18 18:29:57 +00:00
Mark Felder	1aa4994f6d	Do not require authentication for user search in MastoAPI	2019-04-18 12:44:25 -05:00
rinpatch	83589ca6a5	Merge branch 'develop' into feature/database-compaction	2019-04-18 12:56:38 +03:00
rinpatch	ac04311b3f	Fix search in TwitterAPI	2019-04-18 10:24:06 +03:00
rinpatch	6069d0fd36	Fix object search depending on embeded object	2019-04-18 09:28:20 +03:00
rinpatch	e31a22043b	Fix media timeline depending on embeded object and add some guards	2019-04-18 08:31:08 +03:00
rinpatch	2abc09570f	Use the preloaded object in tag queries	2019-04-18 01:37:04 +03:00
William Pitcock	36f78c6dcd	activitypub: fix filtering of boosts from blocked users	2019-04-17 22:27:59 +00:00
William Pitcock	2140e164d7	activitypub: properly filter out transitive activities concerning blocked users	2019-04-17 20:05:09 +00:00
rinpatch	35ac672b8d	Remove containment tests from transmogrifier and fix thread visibility solver	2019-04-17 17:59:15 +03:00
rinpatch	8e4d950f31	Remove updating reply count for embeded objects	2019-04-17 15:54:09 +03:00
rinpatch	a53b917e7f	oof	2019-04-17 14:55:26 +03:00
rinpatch	ad681877df	Make credo happy	2019-04-17 14:52:01 +03:00
rinpatch	e641651e2b	Fix unbookmarking	2019-04-17 14:27:02 +03:00
rinpatch	b09ae02c04	Added some more normalization calls all in mastodon api controller	2019-04-17 13:04:58 +03:00
rinpatch	462028688b	Fix pinned posts relying on embded objects	2019-04-17 12:34:19 +03:00
rinpatch	627e5a0a49	Merge branch 'develop' into feature/database-compaction	2019-04-17 12:22:32 +03:00
Ivan Tashkinov	128aae05f3	[#923] Minor semantic adjustment.	2019-04-17 11:33:21 +03:00
kaniini	02a53d00c9	Merge branch 'fix/remote-follow-auth' into 'develop' ... Fix: remote follows should not ask user to log-in again for authorization See merge request pleroma/pleroma!1060	2019-04-16 18:40:56 +00:00
Haelwenn	cde7711b12	Merge branch 'bugfix/relax-spam-protection' into 'develop' ... activitypub: allow indirect messages from users being followed at a personal inbox See merge request pleroma/pleroma!1069	2019-04-16 18:38:11 +00:00
Normandy	d4a749cfb2	Handle new-style mastodon follow lists ... Fixes https://git.pleroma.social/pleroma/pleroma/issues/814	2019-04-16 18:35:38 +00:00
William Pitcock	750b369d04	activitypub: allow indirect messages from users being followed at a personal inbox	2019-04-16 18:31:12 +00:00
Hakurei Reimu	6e26ac10a3	make Pleroma.Endpoint use extra_cookie_attrs in config	2019-04-16 22:20:56 +08:00
lain	76999c73a7	Conversation: Add accounts to output.	2019-04-15 22:28:42 +02:00
lain	0da985182f	Conversation: Return full status object, id is a string.	2019-04-15 21:58:58 +02:00
lambda	56956de6fa	Merge branch 'fix/status-reblogged' into 'develop' ... Assign reblogged in the Mastodon reblog status view Closes #812 See merge request pleroma/pleroma!1057	2019-04-15 10:26:23 +00:00
lambda	f358295cbe	Merge branch 'unfollow-oneself' into 'develop' ... Consistent response for self follow/unfollow Closes #819 See merge request pleroma/pleroma!1061	2019-04-15 10:24:37 +00:00
eugenijm	27d78dc526	Use User.get_cached_by*	2019-04-15 12:37:49 +03:00
rinpatch	5d73dca064	Remove inReplyToStatusId	2019-04-15 11:50:36 +03:00
eugenijm	507e7821e3	Handle follow/unfollow directed to themselves	2019-04-15 10:21:18 +03:00
eugenijm	679a8ef629	Assign reblogged in the Mastodon reblog status view	2019-04-14 11:35:15 +03:00
Egor	f9af90c5aa	Revert "simplify mentions escape" ... This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1.	2019-04-12 19:25:53 +00:00
lambda	184ae60b21	Merge branch 'bugfix/pleroma-email-naming' into 'develop' ... Make the filename and module name of Pleroma.Emails.* orthogonal See merge request pleroma/pleroma!1029	2019-04-12 10:41:09 +00:00
lambda	0a09692c7d	Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop' ... Features: mastoapi-2.6.0 `min_id` pagination Closes #351 See merge request pleroma/pleroma!976	2019-04-12 09:34:12 +00:00
lambda	57d5ff57d6	Merge branch 'fix/732-password-align' into 'develop' ... password reset page labels align See merge request pleroma/pleroma!986	2019-04-12 09:13:30 +00:00
Alexander Strizhakov	711ade961e	adding destroy multiple for mastofe	2019-04-12 02:28:46 +00:00
Alexander Strizhakov	e03d24af96	in_reply_to_id - null	2019-04-12 02:21:32 +00:00
kaniini	31c06dba5a	Merge branch 'fix/hackney_max_body_param' into 'develop' ... Add `with_body: true` to requests relying on `max_body: val` Closes #778 See merge request pleroma/pleroma!1049	2019-04-11 17:54:31 +00:00
Roman Chvanikov	4615e56219	Add with_body: true to requests relying on max_body: val	2019-04-12 00:16:33 +07:00
Mark Felder	d6d5f46bae	Update OAuth web template	2019-04-11 16:02:38 +00:00
Egor Kislitsyn	db4badc6aa	move user disable into deactivation	2019-04-11 17:22:42 +07:00
Egor Kislitsyn	0f2f7d2cec	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	2019-04-11 15:51:52 +07:00
Ivan Tashkinov	c3f12cf3c3	[#923] OAuth consumer params handling refactoring. ... Registration and authorization-related params are wrapped in "authorization" in order to reduce edge cases number and simplify handling logic.	2019-04-10 21:40:38 +03:00
lain	c352a0aba6	Conversations: Make tests run.	2019-04-10 17:48:31 +02:00
lain	280172f6f6	Conversations: Create or bump on inserting a dm.	2019-04-10 16:33:45 +02:00
lambda	e5d553aa45	Merge branch 'feature/767-multiple-use-invite-token' into 'develop' ... Feature/767 multiple use invite token See merge request pleroma/pleroma!1032	2019-04-10 10:10:08 +00:00
Sadposter	be8350baa2	Merge branch 'develop' into feature/user-status-subscriptions	2019-04-10 10:44:54 +01:00
lambda	c8440b5e0c	Merge branch 'fix/emoji-api-nonsense' into 'develop' ... Change response format of /api/pleroma/emoji so it makes sense See merge request pleroma/pleroma!1038	2019-04-10 06:22:51 +00:00
Haelwenn (lanodan) Monnier	9c1b36856b	s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/	2019-04-10 06:33:20 +02:00
Haelwenn (lanodan) Monnier	cae0231731	s/Pleroma.AdminEmail/Pleroma.Emails.AdminEmail/	2019-04-10 06:33:20 +02:00
Haelwenn (lanodan) Monnier	1791ee8ec4	s/Pleroma.Mailer/Pleroma.Emails.Mailer/	2019-04-10 06:33:19 +02:00
kaniini	0ab563d334	Merge branch 'hotfix/fix_undefined_summary' into 'develop' ... transmogrifier.ex: Add fix_summary/1 See merge request pleroma/pleroma!1039	2019-04-10 02:10:47 +00:00
kaniini	97395e013e	Merge branch 'notification-pleroma-settings' into 'develop' ... Notification controls Closes #738 See merge request pleroma/pleroma!988	2019-04-10 02:10:31 +00:00
Haelwenn (lanodan) Monnier	cf9ba8fe1b	transmogrifier.ex: Add fix_summary/1 ... MRF.KeywordPolicy assumes that summary is present in a activity, and this would probably simplify code elsewhere too anyway.	2019-04-10 02:32:04 +02:00
rinpatch	b57b43027c	Change response format of /api/pleroma/emoji to the one that actually makes sense	2019-04-09 23:20:31 +03:00
Sadposter	589629cf3e	Used cached user resources in subscriptions	2019-04-08 15:56:14 +01:00
lain	a9f805c871	Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations	2019-04-08 14:10:51 +02:00
Egor Kislitsyn	9abf832b03	Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush	2019-04-08 18:48:10 +07:00
lambda	e19590c93f	Merge branch 'improve_upgrade_user_from_ap_id' into 'develop' ... Improve Transmogrifier.upgrade_user_from_ap_id/2 See merge request pleroma/pleroma!1019	2019-04-08 11:42:20 +00:00
lambda	fd45cab9ec	Merge branch 'twitter_oauth' into 'develop' ... OAuth consumer (sign in / sign up with external provider) See merge request pleroma/pleroma!923	2019-04-08 11:41:50 +00:00
Alexander Strizhakov	36c0a10fdf	adding language tag	2019-04-08 11:03:10 +00:00
lambda	23067908de	Merge branch 'feature/770-add-emoji-tags' into 'develop' ... Feature/770 add emoji tags See merge request pleroma/pleroma!998	2019-04-08 09:50:00 +00:00
Egor Kislitsyn	c3d5c3513a	Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush	2019-04-08 16:46:59 +07:00
Egor Kislitsyn	a1a854646e	Merge branch 'develop' into use-jobs-in-webpush	2019-04-08 16:29:20 +07:00
Ivan Tashkinov	bffddf5e31	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # docs/config.md # test/support/factory.ex	2019-04-08 12:20:26 +03:00
lambda	b4da2bc1d0	Merge branch 'develop' into 'improve_upgrade_user_from_ap_id' ... # Conflicts: # config/config.exs # docs/config.md	2019-04-08 09:18:01 +00:00
lambda	b177e1e7f3	Merge branch 'scheduled-activities' into 'develop' ... Scheduled activities See merge request pleroma/pleroma!989	2019-04-08 09:08:18 +00:00
Alex S	012bb5dcc9	renaming expire_at -> expires_at ... keyword style change	2019-04-08 16:01:28 +07:00
Sadposter	76fdfd1c7f	Add check on activity visibility in sub notification	2019-04-07 15:11:29 +01:00
Alex S	56c75aec12	credo fix	2019-04-07 20:59:53 +07:00
Alex S	b810aac117	added docs to docs/api/admin_api.md ... code style and little renamings	2019-04-07 19:48:52 +07:00
Ivan Tashkinov	e3328bc138	[#923] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring.	2019-04-07 11:08:37 +03:00
feld	fb2040d061	Merge branch 'fix/deactivated-user-error' into 'develop' ... Return 403 for deactivated user on token request Closes #785 See merge request pleroma/pleroma!1031	2019-04-06 22:19:30 +00:00
eugenijm	2056efa714	Add scheduler for sending scheduled activities to the queue	2019-04-06 23:56:29 +03:00
eugenijm	fc92a0fd8d	Added limits and media attachments for scheduled activities.	2019-04-06 23:55:58 +03:00
eugenijm	b3870df51f	Handle scheduled_at on status creation.	2019-04-06 23:55:58 +03:00
eugenijm	7bf622ce73	Add scheduled activities	2019-04-06 23:55:58 +03:00
eugenijm	7aa53d52bd	Return 403 on oauth token exchange for a deactivated user	2019-04-06 23:27:55 +03:00
Sadposter	c05fe4da0a	Document subscription endpoints, fix typos ... Also adds a quick error case on the subscription endpoints to avoid 500s	2019-04-06 16:20:06 +01:00
feld	9aeac7dcca	Merge branch 'feature/prometheus' into 'develop' ... Upstream: Metrics and debugging See merge request pleroma/pleroma!1020	2019-04-06 14:51:46 +00:00
Alex S	a53d591ac5	code style	2019-04-06 20:47:05 +07:00
Alex S	7410aee886	Merge develop to 770-add-emoji-tags ... Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs	2019-04-06 20:34:00 +07:00
Alex S	dcc54f8cfa	admin api endpoints for invites	2019-04-06 20:25:19 +07:00
Alex S	47b07cec49	token -> invite renaming	2019-04-06 20:24:22 +07:00
Alex S	be54e40890	twitter api registration ... fix for twitter api tests	2019-04-06 17:18:59 +07:00
Sergey Suprunenko	325a268017	Redirect to the referer url after mastofe authorization	2019-04-05 23:36:42 +00:00
Mark Felder	b5a2d384f7	Redundant Repo.get_by usage was recently removed from the codebase	2019-04-05 11:41:41 -05:00
Roger Braun	7895ee37fa	Add user following / unfollowing to the admin api.	2019-04-05 11:27:07 -05:00
Sadposter	9ca91cbb87	Change relationship direction of subscriptions	2019-04-05 17:02:07 +01:00
Sadposter	d35f6551c1	Move subscriptions endpoint to be under /pleroma	2019-04-05 17:02:02 +01:00
Sadposter	d56866c824	Add subscribed status to user view ... Added in pleroma extensions, but can be moved whenever	2019-04-05 15:30:31 +01:00
Sadposter	316fe20d86	Make subscriptions the same direction as blocks ... That being, user - subscribes to -> users, rather than user - has subscribers -> users	2019-04-05 15:30:26 +01:00
Sadposter	23c4f49494	Fix subscription endpoint return formats	2019-04-05 15:30:24 +01:00
Sadposter	007762e767	Add notification checks	2019-04-05 15:30:23 +01:00
Sadposter	79910ce5cc	Add API endpoints and user column for subscription	2019-04-05 15:30:18 +01:00
Egor Kislitsyn	1c2e4f88d1	fix credo	2019-04-05 19:46:28 +07:00
Egor Kislitsyn	f1712cd2f1	Use PleromaJobQueue in Pleroma.Web.Push	2019-04-05 19:38:44 +07:00
rinpatch	f0f30019e1	Refactor html caching functions to have a key instead of a module, use more correct terminology and fix summaries in mastoapi	2019-04-05 15:19:44 +03:00
Ivan Tashkinov	47a236f753	[#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme.	2019-04-05 15:12:02 +03:00
Ivan Tashkinov	3e7f2bfc2f	[#923] OAuthController#callback adjustments (with tests).	2019-04-05 09:19:17 +03:00
Ivan Tashkinov	45765918c3	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # mix.exs	2019-04-04 23:43:08 +03:00
Ivan Tashkinov	f7cd9131d4	[#923] OAuth consumer controller tests. Misc. improvements.	2019-04-04 22:41:03 +03:00
href	bc3618a38d	Set up telemetry and prometheus	2019-04-04 11:30:43 -05:00
Egor Kislitsyn	cfa6e7289f	Improve Transmogrifier.upgrade_user_from_ap_id/2	2019-04-04 16:10:43 +07:00
Haelwenn (lanodan) Monnier	af0065a71f	mastodon_api_controller.ex: Add pleroma-tan to initial_state	2019-04-04 09:07:25 +02:00
rinpatch	79cb34a4b0	Fix preview not being usable in form data	2019-04-02 23:07:16 +03:00
Haelwenn	0cb94cfa94	Merge branch 'fix-slow-relationships' into 'develop' ... ActivityPub Utils: Greatly speed up the follow / block activity fetching. See merge request pleroma/pleroma!1011	2019-04-02 18:43:48 +00:00
lambda	256b492a58	Merge branch 'bugfix/wrong-date-format' into 'develop' ... Support activities with dates in the Unix timestamp format Closes #763 See merge request pleroma/pleroma!1004	2019-04-02 14:18:23 +00:00
lambda	a79ce94dd4	Merge branch 'feature/fake-statuses' into 'develop' ... Add fake status submit See merge request pleroma/pleroma!995	2019-04-02 14:17:43 +00:00
lain	39bcf93007	Merge remote-tracking branch 'origin/develop' into fix-slow-relationships	2019-04-02 16:10:38 +02:00
lain	fd07745d1b	ActivityPub Utils: Greatly speed up the follow / block activity fetching.	2019-04-02 16:08:55 +02:00
Alex S	fa8483cb80	Merging develop into feature/770-add-emoji-tags ... Conflict test/web/twitter_api/util_controller_test.exs	2019-04-02 20:39:52 +07:00
lambda	180b87257c	Merge branch 'bugfix/share-mastodon' into 'develop' ... [OStatus] adds status to pleroma instance if the url given is a status See merge request pleroma/pleroma!1002	2019-04-02 12:47:40 +00:00
lambda	b95cf3d490	Merge branch 'get_by_id' into 'develop' ... Replace `Repo.get_by` with existing functions See merge request pleroma/pleroma!1010	2019-04-02 12:43:28 +00:00
Alex S	9e0567ec52	Merge develop into feature/770-add-emoji-tags	2019-04-02 19:16:29 +07:00
rinpatch	fdb4357e9b	Rename fake param to preview and make the tests check that the object was not inserted to the db	2019-04-02 14:31:18 +03:00
Ivan Tashkinov	37925cbe78	Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # lib/pleroma/web/oauth/oauth_controller.ex # lib/pleroma/web/router.ex	2019-04-02 14:05:34 +03:00
lambda	091baf9316	Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop' ... MastoAPI 2.6.0 `force_login` option Closes #734 See merge request pleroma/pleroma!999	2019-04-02 10:57:38 +00:00
Ivan Tashkinov	590c935d95	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # mix.exs	2019-04-02 13:50:12 +03:00
Egor Kislitsyn	88d3cb44c3	replace Repo.get_by(User, nickname: nickname) with User.get_by_nickname(nickname)	2019-04-02 17:47:02 +07:00
Egor Kislitsyn	1b3d921921	change Repo.get(User, id) => User.get_by_id(id)	2019-04-02 17:01:26 +07:00
Egor Kislitsyn	4212527928	change Repo.get(Activity, id) => Activity.get_by_id(id)	2019-04-02 16:50:31 +07:00
Sergey Suprunenko	3db9235150	Ignore dates in wrong formats	2019-04-02 11:32:36 +02:00
Sachin Joshi	f20e8d28de	add support for all status type (ostatus) and replase case with if	2019-04-02 12:18:00 +05:45
Ivan Tashkinov	aac48d0cc6	Merge remote-tracking branch 'remotes/upstream/develop' into features/mastoapi/2.6.0-conversations	2019-04-02 09:19:10 +03:00
Sachin Joshi	6386c1c9c1	fetch url for OStatus to know if it is a/c or status	2019-04-02 10:26:09 +05:45
Haelwenn (lanodan) Monnier	f56eef8d8c	router: Add fake identity proof endpoint	2019-04-02 01:53:38 +02:00
Sergey Suprunenko	b6f9f7b8aa	Handle dates in the Unix timestamp format (Fixes #763)	2019-04-01 22:45:24 +02:00
Sachin Joshi	1d01e8e656	[OStatus] adds status to pleroma instance if the url given is a status	2019-04-01 22:26:58 +05:45
Ivan Tashkinov	6910fb371b	Fixed local MastoFE authentication / force_login option.	2019-04-01 17:25:25 +03:00
Ivan Tashkinov	cbe09d94d1	Added force_login authentication option (previously applied by default).	2019-04-01 14:46:50 +03:00
Alex S	3601f03147	Adding tag to emoji ets table ... changes in apis	2019-04-01 17:17:57 +07:00
rinpatch	fe5145eeaa	Move putting fake attribute to lib/pleroma/web/activity_pub/utils.ex	2019-04-01 12:25:53 +03:00
rinpatch	975482f091	insert object defaults for fake activities and make credo happy	2019-04-01 12:16:51 +03:00
rinpatch	d866b59eea	oof	2019-04-01 11:58:08 +03:00
rinpatch	45ba10bf47	Fix the issue with HTML scrubber	2019-04-01 11:55:59 +03:00
Ivan Tashkinov	804173fc92	[#923] Minor code readability fix.	2019-04-01 09:45:44 +03:00
Ivan Tashkinov	eadafc88b8	[#923] Deps config adjustment (no override for httpoison), code analysis issues fixes.	2019-04-01 09:28:56 +03:00
Ivan Tashkinov	baffdcc480	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # mix.exs	2019-04-01 08:49:32 +03:00
rinpatch	cd387f8693	Add a fake option to lazy_put_actvity_defaults	2019-03-30 13:57:54 +03:00
rinpatch	1bb4d5d65b	Implement fake status submit	2019-03-29 21:59:04 +03:00
Egor	9a39d1d846	Replace Pleroma.Jobs with pleroma_job_queue	2019-03-29 12:46:05 +00:00
Haelwenn (lanodan) Monnier	c8abef373b	mastodon_api_controller.ex: fallback to first for min_id	2019-03-28 17:23:21 +01:00
Haelwenn (lanodan) Monnier	6b407872b4	mastodon_api_controller.ex: Use min_id in link header instead of since_id	2019-03-28 17:23:21 +01:00
Haelwenn (lanodan) Monnier	6f15224053	activity_pub.ex: Move limit/max_id restrictions to Pagination helpers	2019-03-28 17:18:59 +01:00
eugenijm	cd90695a34	Add PUT /api/pleroma/notification_settings endpoint	2019-03-28 18:55:16 +03:00
eugenijm	10c81fc902	Add user show endpoint for Pleroma admin API	2019-03-27 21:44:15 +03:00
Alex S	3ca6c4f443	password reset page labels align	2019-03-27 22:37:20 +06:30
Ivan Tashkinov	20e0f36605	Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth	2019-03-27 15:41:40 +03:00
Ivan Tashkinov	2a95014b9d	[#923] OAuth consumer improvements, fixes, refactoring.	2019-03-27 15:39:35 +03:00
lambda	926bf114b7	Merge branch 'feature/more-user-filters' into 'develop' ... Add more user filters + move search to its own module See merge request pleroma/pleroma!982	2019-03-27 11:33:13 +00:00
rinpatch	ce6d64bbd8	Fix missing announces in MastoAPI home timeline ... Closes #762	2019-03-27 12:28:53 +03:00
Maxim Filippov	3cf7539bca	Add more user filters + move search to its own module	2019-03-27 03:51:59 +05:00
eugenijm	a4ab60ac54	Add vapid_key to the POST /api/v1/apps response	2019-03-26 23:27:37 +03:00
eugenijm	691d1208b5	Add GET /api/v1/apps/verify_credentials	2019-03-26 21:53:28 +03:00
lambda	ff3b09f6b3	Merge branch 'fix/ap-icon' into 'develop' ... Do not federate instance avatar Closes #759 See merge request pleroma/pleroma!977	2019-03-26 16:12:50 +00:00
lambda	c6ab5ebe7c	Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop' ... Mastodon 2.7.2 instance attributes (registrations, languages) See merge request pleroma/pleroma!979	2019-03-26 16:01:52 +00:00
lain	10a7a4a868	AP UserView: Refactor banner / avatar display code, add test.	2019-03-26 16:59:28 +01:00
lambda	9e3899bf36	Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop' ... Mastodon-based auth error messages. User#auth_active?/1 refactoring. See merge request pleroma/pleroma!978	2019-03-26 15:13:55 +00:00
lambda	21ff78cd40	Merge branch 'replies-count' into 'develop' ... Increment replies_count (MastoAPI) Closes #756 See merge request pleroma/pleroma!974	2019-03-26 14:49:09 +00:00
rinpatch	406d19331f	Remove ActivityRepresenter	2019-03-26 17:16:21 +03:00
Ivan Tashkinov	eef1042b16	Mastodon 2.7.2 instance attributes (registrations, languages).	2019-03-26 16:27:17 +03:00
eugenijm	568e348588	Increment replies_count on replies (MastoAPI)	2019-03-26 15:27:04 +03:00
Ivan Tashkinov	b0759f821b	Comments split.	2019-03-26 15:24:29 +03:00
Ivan Tashkinov	263ca3dea2	Mastodon-based auth error messages. Defaulted User#auth_active?/1 to true.	2019-03-26 15:09:06 +03:00
Mark Felder	c410296120	Try sending an empty map	2019-03-25 19:00:35 -05:00
Mark Felder	6f090f981b	Attempt to fix incorrect federation of default instance avatars	2019-03-25 18:47:04 -05:00
kaniini	63ffa4842c	Merge branch 'fix/mastoapi-liked' into 'develop' ... Serve non-public activities in /api/v1/favourites Closes #648 See merge request pleroma/pleroma!970	2019-03-25 02:24:27 +00:00
rinpatch	a7f58b3c13	Serve non-public activities in /api/v1/favourites ... Fixes #648	2019-03-25 02:15:45 +03:00
rinpatch	750de7d842	Merge branch 'features/mrf-keyword-nil-summary' into 'develop' ... mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil See merge request pleroma/pleroma!968	2019-03-24 15:02:13 +00:00
Haelwenn (lanodan) Monnier	eab9425cc4	mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil	2019-03-24 15:47:50 +01:00
William Pitcock	debf7f016d	ostatus: use preload objects with Object.normalize() when opportunistic	2019-03-23 03:05:57 +00:00
William Pitcock	8c70156157	activitypub: object view: use preloaded object when possible	2019-03-23 03:05:14 +00:00
William Pitcock	ce47eb8b29	activitypub: when fetching objects, use the preloaded object from the synthesized activity	2019-03-23 03:05:10 +00:00
William Pitcock	07cdd9ed02	streamer: use the preloaded object if possible	2019-03-23 02:29:01 +00:00
William Pitcock	c62220c500	rich media: helpers: only crawl Create activities	2019-03-23 02:28:59 +00:00
William Pitcock	4cedf45423	relay: use preloaded object since we always have it	2019-03-23 02:28:56 +00:00
William Pitcock	e430a71d37	ostatus: fetch preloaded object in note handler for testsuite	2019-03-23 01:17:26 +00:00
William Pitcock	73efe95368	activitypub: allow skipping preload in some cases (like certain tests where the preload is obnoxious)	2019-03-23 01:09:12 +00:00
William Pitcock	ba7299fc87	activitypub: add missing with_preloaded_object()	2019-03-23 00:53:35 +00:00
William Pitcock	e4307cadc8	activitypub: splice in the child object if we have one	2019-03-23 00:40:08 +00:00
William Pitcock	a6973a668e	formatting	2019-03-23 00:28:16 +00:00
William Pitcock	b3bf523c09	rich media: use optimized Object.normalize()	2019-03-23 00:22:57 +00:00
William Pitcock	e75e43b949	common api: use the optimized Object.normalize whenever possible	2019-03-23 00:22:14 +00:00
William Pitcock	9aea7cc224	activitypub: preload child objects when fetching timelines	2019-03-23 00:10:17 +00:00
rinpatch	1b33986bfa	Fix text being nullable in TwitterAPI	2019-03-23 00:10:50 +03:00
lambda	fee360e581	Merge branch 'safe-mentions' into 'develop' ... NodeInfo: Return safe_dm_mentions feature flag. See merge request pleroma/pleroma!964	2019-03-22 11:03:56 +00:00
lain	e2afce34b6	NodeInfo: Return safe_dm_mentions feature flag.	2019-03-22 11:57:20 +01:00
kaniini	1c3d3d0c2b	Merge branch 'safe-mentions' into 'develop' ... Add safe dm mode option. See merge request pleroma/pleroma!958	2019-03-22 00:50:24 +00:00
William Pitcock	3cc2554fa3	mastodon api: add conversation_id extension (ref #674)	2019-03-21 23:25:41 +00:00
William Pitcock	fea3696799	common api: move context functions from twitterapi	2019-03-21 23:24:04 +00:00
rinpatch	b92a16aa00	Merge branch 'ecto-3-migration' into 'develop' ... Ecto 3.0.7 (ecto_sql 3.0.5) migration See merge request pleroma/pleroma!957	2019-03-21 16:24:57 +00:00
lain	bf27190f7f	UtilController: Return state of safe dm mentions.	2019-03-21 16:20:58 +01:00
lain	8468f3f6d4	Add safe dm mode option.	2019-03-20 21:09:36 +01:00
Ivan Tashkinov	af68a42ef7	[#923] Support for multiple OAuth consumer strategies.	2019-03-20 20:25:48 +03:00
rinpatch	9a7b817c9a	Ecto 3.0.5 migration ... kms	2019-03-20 15:59:54 +03:00
Ivan Tashkinov	e17a9a1f66	[#923] Nickname & email selection for external registrations, option to connect to existing account.	2019-03-20 10:35:31 +03:00
William Pitcock	1685e4258f	transmogrifier: upgrade: when upgrading OStatus users to AP, ensure we always use the fake collection	2019-03-19 18:39:33 +00:00
William Pitcock	cd055983c3	transmogrifier: when determining followers collection URI, we may need to fetch the actor	2019-03-19 18:04:57 +00:00
William Pitcock	d487b753c3	activitypub: transmogrifier: do not allow missing lists to be interpreted as nil	2019-03-19 17:30:25 +00:00
William Pitcock	798da28812	activitypub: transmogrifier: ensure as:Public activities are delivered to followers	2019-03-19 17:27:42 +00:00
Ivan Tashkinov	8d21859717	[#923] External User registration refactoring, password randomization.	2019-03-18 18:09:53 +03:00
Ivan Tashkinov	26b6354095	[#923] Support for multiple (external) registrations per user via Registration.	2019-03-18 17:23:38 +03:00
Zachary Dunn	5ba14c664b	Fix missing end brace	2019-03-18 14:05:10 +00:00