akkoma

Author	SHA1	Message	Date
Luna	e8c7be38fc	add tests for nodeinfo 2.0 compat and 2.1's new field	2019-02-01 14:33:14 -03:00
kaniini	0a82a7e6d6	Merge branch 'feature/split-hide-network' into 'develop' Split hide_network into hide_followers & hide_followings See merge request pleroma/pleroma!733	2019-02-01 17:05:29 +00:00
href	b3b0855456	Merge branch '534_federation_targets_reachability' into 'develop' [#534] Unreachable federation targets retirement Closes #534 See merge request pleroma/pleroma!703	2019-02-01 09:14:35 +00:00
Luna	c05928dbda	use nodeinfo 2.1, add repository field that is the only change from nodeinfo 2.0 to 2.1 also this makes the nodeinfo tests use 2.1.json instead of 2.0.json	2019-02-01 03:55:10 -03:00
href	308b35ebe2	User.follow_all: ensure its stays unique	2019-01-31 18:17:44 +01:00
William Pitcock	106475f265	test: http mocks: formatting	2019-01-31 16:30:56 +00:00
William Pitcock	3f5b784596	test: rich media: parser: add malformed data regression test	2019-01-31 16:19:53 +00:00
William Pitcock	4e76f9fde1	test: add malformed OGP data fixture	2019-01-31 16:12:35 +00:00
lambda	a43a1c6d4e	Revert "Merge branch 'spc-fix-3' into 'develop'" This reverts merge request !682	2019-01-31 12:16:23 +00:00
kaniini	4d3655c479	Merge branch 'spc-fix-3' into 'develop' Spc fix 3 See merge request pleroma/pleroma!682	2019-01-31 11:29:29 +00:00
Haelwenn	00d4333373	Merge branch 'features/glitch-soc-frontend' into 'develop' Features/glitch soc frontend See merge request pleroma/pleroma!192	2019-01-31 10:16:11 +00:00
Egor Kislitsyn	d3677d2b4d	Merge remote-tracking branch 'MAIN/develop' into feature/jobs	2019-01-31 15:07:49 +07:00
lain	c53b96a024	Fix specs.	2019-01-30 19:45:31 +01:00
lain	47ec690c54	Use race-condition free mass follow.	2019-01-30 19:33:25 +01:00
kaniini	d03a116654	Merge branch 'hj-happiness-improvement' into 'develop' New frontend configuration mechanism. Closes #445 See merge request pleroma/pleroma!700	2019-01-29 13:54:10 +00:00
Ivan Tashkinov	92753b0cd9	[#534 ] Made federation push sender be determined basing on content instead of `referer` header. Updated tests.	2019-01-29 13:12:28 +03:00
Haelwenn	ebb3496386	Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop' Rich Media support, part 2. See merge request pleroma/pleroma!719	2019-01-29 05:11:08 +00:00
William Pitcock	61d6715714	rich media: oembed: return data in the same format as the other parsers	2019-01-28 21:13:25 +00:00
Maxim Filippov	3e968f9ef2	Format	2019-01-28 21:40:08 +03:00
Maxim Filippov	50d6183893	Split hide_network into hide_followers & hide_followings	2019-01-28 21:40:08 +03:00
Egor Kislitsyn	55affbca7f	add a job queue	2019-01-28 22:17:17 +07:00
Ivan Tashkinov	d3f9e6f6fe	[#534 ] Merged `upstream/develop`.	2019-01-28 15:39:14 +03:00
Ivan Tashkinov	1d2f41642c	[#534 ] Various tweaks. Tests for Instances and Instance.	2019-01-28 15:25:06 +03:00
lain	8e8a1e1ba8	Return new-style config if old-style config is set to false. This is in preparation for 1.0. We'll be able to switch the config to the new mechanism on PleromaFE then as well.	2019-01-28 13:07:12 +01:00
lain	1825118fd4	Correctly handle invalid credentials on auth login. Closes #407	2019-01-28 11:41:47 +01:00
William Pitcock	339c26e12b	test: add status posting with OGP link preview test	2019-01-28 06:19:00 +00:00
William Pitcock	6096846f5f	API: kill /api/rich_media/parse endpoint	2019-01-28 05:53:17 +00:00
William Pitcock	020b3b29d9	test: update twitterapi tests	2019-01-28 05:53:17 +00:00
William Pitcock	364cf5369b	test: update mastodon status view tests	2019-01-28 05:53:17 +00:00
William Pitcock	132d815f1f	mastodon api: factor out status card fetching, move status card rendering to statusview, add opengraph extended data	2019-01-28 05:53:17 +00:00
Haelwenn (lanodan) Monnier	cda1470e02	[MastoAPI][GlitchAPI] Add bookmarks	2019-01-28 04:47:32 +01:00
lain	2e277dd4ad	Fix objects.	2019-01-27 21:03:15 +01:00
kaniini	5eb81d2c72	Merge branch 'features/mastoapi-multi-hashtag' into 'develop' MastodonAPI multi-hashtag See merge request pleroma/pleroma!652	2019-01-27 12:45:50 +00:00
Haelwenn (lanodan) Monnier	a65c188593	Web.MastodonAPI.AccountView: Add is_moderator and is_admin Closes: https://git.pleroma.social/pleroma/pleroma/issues/557	2019-01-27 10:33:22 +01:00
kaniini	155a884300	Merge branch 'flake-from-int' into 'develop' Flake: support integers in from_string/1 See merge request pleroma/pleroma!715	2019-01-26 16:17:50 +00:00
href	d6015338c8	Flake: support integers in from_string/1 Some previously issued stateless tokens have integer ids in them.	2019-01-26 16:58:23 +01:00
William Pitcock	1f7843b9b8	mastodon api: use OGP uri instead of page_url for deducing domain name, fix test	2019-01-26 15:24:16 +00:00
Haelwenn (lanodan) Monnier	3f64379b13	Web.MastodonAPI.MastodonAPIController: Add Rich-Media support	2019-01-26 14:18:23 +00:00
Haelwenn (lanodan) Monnier	d9f3af477d	Move definitions of RichMedia fixtures to test/support/http_request_mock.ex	2019-01-26 14:18:23 +00:00
Haelwenn (lanodan) Monnier	22f2687f17	Web.MastodonAPI.MastodonAPIControllerTest: Update for difference between all and any parameters	2019-01-26 04:46:02 +01:00
Haelwenn (lanodan) Monnier	5a84def6a6	Fix the logic in multi-hashtag TLs	2019-01-26 04:46:02 +01:00
Haelwenn (lanodan) Monnier	4ad0ad14ed	Web.ActivityPub.ActivityPub: Simplify multi-hashtag, add tests	2019-01-26 04:46:01 +01:00
Haelwenn (lanodan) Monnier	d8f446f438	Web.MastodonAPI.MastodonAPIControllerTest: Add test against multi-hashtag timeline	2019-01-26 04:46:01 +01:00
Haelwenn (lanodan) Monnier	499a4591a4	Web.ActivityPub.ActivityPubTest: test against inserting activities with content: null	2019-01-26 04:23:52 +01:00
Ivan Tashkinov	d99650270b	[#534 ] Federation reachability filtering tests.	2019-01-25 20:38:54 +03:00
lain	aa8ddfdbe2	SPC fixes: Fix activities.	2019-01-25 18:14:48 +01:00
rinpatch	a45a903480	Fix OGP provider tests	2019-01-25 10:51:06 +03:00
rinpatch	3a5b3c5a3a	Merge remote-tracking branch 'pl/develop' into oembed_provider	2019-01-25 10:40:51 +03:00
kaniini	4c99b6d35a	Merge branch 'fix/tusky-dm' into 'develop' Add actor to recipients list Closes #390 See merge request pleroma/pleroma!683	2019-01-25 05:19:32 +00:00
kaniini	c9b418e547	Merge branch 'develop' into 'oembed_provider' # Conflicts: # lib/pleroma/activity.ex	2019-01-25 05:00:47 +00:00
kaniini	4df71cd88b	Merge branch 'classic-flakeids' into 'develop' Flake Ids for Users and Activities Closes #450 See merge request pleroma/pleroma!645	2019-01-25 04:59:06 +00:00
Maxim Filippov	9274cabe01	Use correct logic to determine "attentions" list	2019-01-24 23:30:43 +03:00
William Pitcock	13d72826df	test: add anti-followbot policy tests	2019-01-24 09:50:40 +00:00
Maxim Filippov	4333fea1dc	Send "hide_network" in user_view	2019-01-23 19:47:51 +03:00
lain	2de208817c	Merge branch 'develop' into rename/pleroma_activity_consistency	2019-01-23 13:05:58 +01:00
lain	e221c681dc	New frontend configuration mechanism.	2019-01-23 12:40:57 +01:00
href	422e60ad76	2019	2019-01-23 11:26:35 +01:00
href	9d63b27dcd	Test FlakeID old id compat & Ecto type	2019-01-23 11:26:34 +01:00
href	28d77e373c	Flake Ids for Users and Activities	2019-01-23 11:26:27 +01:00
Ivan Tashkinov	34d59e4008	[#502 ] Fixed User.active_local_user_query to return users with nil or missing `info.deactivated`. Adjusted test.	2019-01-22 17:12:53 +03:00
lain	762fafe738	Fix buggy test.	2019-01-21 17:54:11 +01:00
lambda	8cd853ce0c	Merge branch '530_federator_user_info_overwrite_fix' into 'develop' [#530] Prevents user `info` from being overwritten because of race conditions Closes #530 See merge request pleroma/pleroma!691	2019-01-21 13:03:32 +00:00
lambda	69454c8345	Merge branch 'feature/dm-sanity' into 'develop' DM sanitization See merge request pleroma/pleroma!458	2019-01-21 12:35:10 +00:00
Ivan Tashkinov	789a9843da	[#530 ] Fixed test.	2019-01-21 14:30:01 +03:00
Haelwenn (lanodan) Monnier	98c8184c1f	Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1	2019-01-21 08:00:41 +01:00
Haelwenn (lanodan) Monnier	f8ab1b7427	Activity: get_all_by_object_ap_id/1 → get_all_create_by_object_ap_id/1	2019-01-21 08:00:38 +01:00
Haelwenn (lanodan) Monnier	b82c6dc536	Activity: all_by_object_ap_id/1 → get_all_by_object_ap_id/1	2019-01-21 07:49:59 +01:00
kaniini	5803672ae5	Merge branch '116-send-delete-event' into 'develop' Send delete event over Mastodon streaming api Closes #116 See merge request pleroma/pleroma!688	2019-01-20 23:06:21 +00:00
lain	cf1f35a93a	Send delete event over Mastodon streaming api Closes #116	2019-01-20 13:00:46 +01:00
lambda	501fba33d6	Merge branch 'add-custom-emoji-test' into 'develop' Add a test to ensure #39 is fixed. See merge request pleroma/pleroma!687	2019-01-20 10:58:19 +00:00
lain	be0fb5dec4	Add a test to ensure #39 is fixed.	2019-01-20 11:48:53 +01:00
lambda	f3045a179e	Merge branch 'i1t/pleroma-477_user_search_improvements' into 'develop' I1t/pleroma 477 user search improvements See merge request pleroma/pleroma!685	2019-01-20 10:24:05 +00:00
William Pitcock	cf3099231d	test: transmogrifier: verify directMessage flag is sent outbound based on declared visibility	2019-01-20 02:28:28 +00:00
William Pitcock	21ac35fcc0	tests: add tests for DM sanitizer	2019-01-20 02:27:48 +00:00
William Pitcock	8d06be35e0	activitypub: utils: add determine_explicit_mentions() and tests	2019-01-20 02:27:48 +00:00
kaniini	42612b1c8d	Merge branch 'bugfix/improve-boost-targeting' into 'develop' improve handling of non-public Announces See merge request pleroma/pleroma!681	2019-01-19 23:44:08 +00:00
kaniini	651ce1c97b	Merge branch '491_full_mentions_in_user_bio' into 'develop' [#491] Made user bio preserve full nicknames (nick@host) Closes #491 See merge request pleroma/pleroma!676	2019-01-19 07:36:58 +00:00
Maxim Filippov	0a97badddd	Format	2019-01-19 04:26:52 +03:00
Maxim Filippov	651a1d64b5	Add current user to mentioned	2019-01-19 04:25:15 +03:00
William Pitcock	31517bec12	test: add regression test for to/cc clobbering	2019-01-18 22:32:01 +00:00
Maxim Filippov	e116e55cab	Add actor to recipients	2019-01-18 22:40:52 +03:00
lain	5d4d51e6dc	Add fixes for SPC users.	2019-01-18 19:25:37 +01:00
rinpatch	74346a7035	Fix merge conflict	2019-01-18 18:31:25 +03:00
rinpatch	7bc6208b2f	Fix ostatus test	2019-01-18 10:35:52 +03:00
Ivan Tashkinov	ed8f55ab8e	[#477 ] User: FTS and trigram search results mixing (to handle misspelled requests).	2019-01-18 10:35:45 +03:00
rinpatch	1b1af4798a	Use object instead of activity for metadata	2019-01-18 09:32:52 +03:00
Ivan Tashkinov	65bb9b2fba	[#491 ] Made full nicknames be preserved in user links text only in Bio.	2019-01-18 09:30:16 +03:00
rinpatch	64143d8040	Fix object id in OpenGraph test	2019-01-17 22:57:24 +03:00
Ivan Tashkinov	954dc4a4ad	[#502 ] Fixed `user_count` in `/api/v1/instance` to include only active local users.	2019-01-17 19:16:02 +03:00
Ivan Tashkinov	2bfae25a1f	[#491 ] Made user bio preserve full nicknames (nick@host).	2019-01-17 18:03:49 +03:00
rinpatch	3b18789684	Fix test	2019-01-17 11:08:50 +03:00
rinpatch	293f6a8b71	join us now and share the software~. Also tests	2019-01-16 17:15:13 +03:00
lain	943324b661	MastoAPI: Don't break on missing users.	2019-01-16 15:13:09 +01:00
lambda	608cc65d43	Merge branch 'feature/improve-microformats' into 'develop' improve microformats support See merge request pleroma/pleroma!672	2019-01-16 09:06:47 +00:00
lambda	da4b670451	Merge branch '518_instance_stats_fix' into 'develop' [#518] Fix: /api/v1/instance ("domain_count"), /api/v1/instance/peers Closes #518 See merge request pleroma/pleroma!673	2019-01-16 08:59:40 +00:00
Ivan Tashkinov	90433b988e	[#518 ] Fixed /api/v1/instance ("domain_count" value) and /api/v1/instance/peers responses.	2019-01-16 11:07:46 +03:00
rinpatch	8cea00e1dc	Remove OpenGraph test from Ostatus tests	2019-01-16 10:53:57 +03:00
William Pitcock	85a5be6220	tests: fixup	2019-01-16 04:09:01 +00:00
Ivan Tashkinov	5b8f9ff8c1	[#477 ] User search tests. Normalized search rank in User.search.	2019-01-15 13:05:25 +03:00
Ivan Tashkinov	fc965f982c	[#477 ] Added FTS index for `users`. Fixed failing test.	2019-01-15 12:04:54 +03:00
Haelwenn (lanodan) Monnier	9fcdca1bdc	Upload: Fix uploading with a : in the filename	2019-01-15 07:57:48 +01:00
Haelwenn (lanodan) Monnier	e3eb75bd23	Upload: Fix uploading with a ? in the filename	2019-01-15 07:40:39 +01:00
rinpatch	f20bfc9ea5	Merge branch 'media-url-escape' into 'develop' URI escape file upload URLs See merge request pleroma/pleroma!665	2019-01-14 18:52:23 +00:00
Shadowfacts	dcbe5bd58c	Add attachment escaping test	2019-01-14 13:29:38 -05:00
Ivan Tashkinov	dc45ec62c2	[#477 ] User search improvements: tsquery search with field weights, friends & followers boosting.	2019-01-14 20:04:45 +03:00
kaniini	de1da7b3d1	Merge branch 'feature/add-oembed-parser' into 'develop' Add OEmbed parser See merge request pleroma/pleroma!661	2019-01-14 07:28:04 +00:00
kaniini	fa0392e49c	Merge branch 'activitypub-likes' into 'develop' Activitypub c2s likes See merge request pleroma/pleroma!658	2019-01-14 07:27:05 +00:00
Sadposter	98d9ae0718	Add test for mastodon API /favourites endpoint	2019-01-13 15:17:47 +00:00
rinpatch	e4dc3f71ae	Resolve merge conflict	2019-01-13 13:38:28 +03:00
Maxim Filippov	b8a77c5d70	Add OEmbed parser	2019-01-13 02:06:50 +02:00
sxsdv1	868034375c	Add likes to activitypub object representation Top level of the likes OrderedCollection is inlined to get immediate access to totalItems. Because the count can be returned without scanning the database for like activities the extra query is saved when the client only wants to display the total.	2019-01-12 20:24:41 +01:00
sxsdv1	581edd5a91	Add route to get object like activities	2019-01-12 20:24:38 +01:00
sxsdv1	36711e1c83	Handle client submitted activitypub like activity	2019-01-12 20:24:35 +01:00
sxsdv1	1eb7318831	Prepare all types objects before serialising Activities returned from inbox can include other types of objects like Article	2019-01-12 20:24:32 +01:00
Egor Kislitsyn	728587fdaa	typo	2019-01-11 12:47:44 +07:00
Egor Kislitsyn	b594a54d0c	unpin when deleting a status	2019-01-11 12:31:31 +07:00
kaniini	e4afe1359b	Merge branch 'activitypub-dereference-activity-id' into 'develop' Support activity+json request for activity See merge request pleroma/pleroma!641	2019-01-10 18:42:36 +00:00
Maxim Filippov	1f851a0723	Add Twitter Card parser	2019-01-10 18:09:56 +00:00
kaniini	11d08c6226	Merge branch 'twapi-follower-pagination' into 'develop' Twapi follower pagination See merge request pleroma/pleroma!648	2019-01-10 18:03:32 +00:00
Haelwenn	ab4c5f5bf7	Merge branch 'bugfix/markdown-newline-codeblocks' into 'develop' common api: fix newlines in markdown code blocks See merge request pleroma/pleroma!651	2019-01-10 03:54:29 +00:00
William Pitcock	490c80bc96	test: common api: add tests for format_input/4	2019-01-10 03:46:34 +00:00
kaniini	7f5efddd6e	Merge branch 'feature/pinned-posts' into 'develop' Pinned Statuses Closes #440 See merge request pleroma/pleroma!636	2019-01-10 02:39:53 +00:00
kaniini	f85d108c41	Merge branch 'mass-follow' into 'develop' Mass follow See merge request pleroma/pleroma!642	2019-01-10 02:33:11 +00:00
kaniini	d203b0b4d3	Merge branch 'dm-optimizations' into 'develop' Add activity visibility index. See merge request pleroma/pleroma!646	2019-01-10 02:31:29 +00:00
lain	a99e156f2c	Add integer casts.	2019-01-09 18:17:23 +01:00
lain	7ac152ed38	TwitterAPI: Add follower/following pagination.	2019-01-09 18:14:32 +01:00
lambda	1881680e28	Merge branch 'scarlett/pleroma-summary-html-api' into 'develop' Scarlett/pleroma summary html api See merge request pleroma/pleroma!647	2019-01-09 16:26:38 +00:00
lain	8df348a3da	Add test for summary_html	2019-01-09 17:18:37 +01:00
lain	5027f82cde	Add activity visibility index.	2019-01-09 16:45:09 +01:00
Egor Kislitsyn	6cbe63726d	improve tests	2019-01-09 19:54:37 +07:00
Egor Kislitsyn	44a1e69484	Add Twitter API for the pinned statuses ``` # Only return statuses that have been pinned GET /api/statuses/user_timeline.json?pinned=true # Pin POST /api/statuses/pin/:id # Unpin POST /api/statuses/unpin/:id ```	2019-01-09 19:54:19 +07:00
Egor Kislitsyn	1b06e6fdf3	only non-reblogs, self-authored, public statuses can be pinned	2019-01-09 17:40:15 +07:00
lain	26938d65fd	Add User mass following function.	2019-01-09 11:35:23 +01:00
Egor Kislitsyn	48591aab98	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts # Conflicts: # docs/config.md	2019-01-09 16:56:31 +07:00
sxsdv1	20c0dd1e24	Support activity+json request for activity	2019-01-09 09:33:30 +01:00
kaniini	5c5c8508c2	Merge branch 'hotfix/media-proxy-uri' into 'develop' user: fix local vs remote determination in remote_or_auth_active?/1 See merge request pleroma/pleroma!640	2019-01-09 07:09:39 +00:00
William Pitcock	567651fb3f	test: user: add tests for visible_for?/2	2019-01-09 07:03:32 +00:00
William Pitcock	f2a4f89abe	tests: user: add tests for superuser?/1	2019-01-09 06:50:31 +00:00
William Pitcock	74f48beec3	user: remove entirely redundant remote_or_auth_active?/1. auth_active?/1 can check remote users and return true directly.	2019-01-09 06:36:50 +00:00
William Pitcock	4124c9aa4a	tests: user: add regression test for remote_or_auth_active?/1	2019-01-09 06:02:18 +00:00
Egor Kislitsyn	0c750bc432	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts	2019-01-08 16:32:07 +07:00
Egor Kislitsyn	7b6c5f0a9d	improve test readability	2019-01-08 16:01:35 +07:00
lain	0fae04c4e3	Add a setting for users to autofollow on sign up.	2019-01-08 09:57:53 +01:00
Egor Kislitsyn	db6f4496eb	fix test	2019-01-08 15:32:06 +07:00
Egor Kislitsyn	e679da4c34	add `pinned` property to `StatusView`	2019-01-08 15:27:02 +07:00
Egor Kislitsyn	63dbd87568	rename `post` to `status`	2019-01-08 15:25:50 +07:00
lain	a16b17cc61	Actually put some onformation in the error user, make it actually properly parse in conversations.	2019-01-07 20:59:30 +01:00
kaniini	74e1093732	Merge branch 'resilient-user-view' into 'develop' Make TwAPI UserView more resilient to issues. See merge request pleroma/pleroma!634	2019-01-07 17:09:52 +00:00
Egor Kislitsyn	f24087f96e	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts	2019-01-07 20:55:32 +07:00
Egor Kislitsyn	380e9fba21	add pinned posts	2019-01-07 20:45:33 +07:00
lain	7dcafb4894	MastoAPI: Add test.	2019-01-07 13:13:37 +01:00
lain	7382adf407	Make TwAPI UserView more resilient to issues. Will work for missing users and badly migrated users.	2019-01-07 12:41:31 +01:00
scarlett	52493467ac	Twitter API: Add a summary_html field. The intention here is to allow proper subject copying when it contains emoji, obviously this will require minor frontend changes, though.	2019-01-06 10:19:00 +00:00
Sadposter	042852ecf3	Add check to prevent multiple follow notifications from the same user	2019-01-05 22:54:25 +00:00
kaniini	8d047c7a72	Merge branch 'fix/user-search-null-name' into 'develop' fix user search results for users with unset display name Closes #499 See merge request pleroma/pleroma!625	2019-01-05 22:34:47 +00:00
kaniini	576368237c	Merge branch 'activitypub-tombstone-fix' into 'develop' Don't crash on AP request for tombstone See merge request pleroma/pleroma!630	2019-01-05 22:29:08 +00:00
scarlett	145d6fe6e9	Merge branch 'emoji-in-summary' into 'develop' Strip HTML in and allow emoji in summaries. See merge request pleroma/pleroma!631	2019-01-05 21:52:02 +00:00
scarlett	57df7d6e1d	Add tests for emoji and lack of HTML in summaries.	2019-01-05 21:46:42 +00:00
scarlett	096e121879	Remove redundant comma.	2019-01-05 18:25:36 +00:00
scarlett	6556be344d	Resolve some test failures.	2019-01-05 18:20:42 +00:00
sxsdv1	2d7da5f437	Don't crash on AP request for tombstone Because tombstone objects has no addressing the is_public?-predicate would cause an error that propagated as a 500 error in the api	2019-01-05 11:16:05 +01:00
cascode	a81307251c	Merge branch 'develop' of git.pleroma.social:cascode/pleroma into fix/user-search-null-name	2019-01-04 20:32:55 -08:00
kaniini	4258dd8633	Merge branch 'feature/rich-media' into 'develop' URL previews in posts Closes #402 See merge request pleroma/pleroma!617	2019-01-04 20:50:18 +00:00
kaniini	ffea81b84f	Merge branch 'activitypub-c2s-delete-activity' into 'develop' Activitypub c2s delete activity See merge request pleroma/pleroma!618	2019-01-04 20:32:10 +00:00
cascode	4c5ee4c62b	formatted	2019-01-04 10:18:43 -08:00
cascode	ab6ebbae67	added test for #499	2019-01-04 10:14:13 -08:00
rinpatch	b73a1a33de	Merge branch 'captcha' into 'develop' Make captcha (kocaptcha) stateless See merge request pleroma/pleroma!585	2019-01-03 17:04:27 +00:00
Maxim Filippov	48e81d3d40	Add RichMediaController and tests	2019-01-02 17:02:50 +03:00
sxsdv1	4e1cc2bab6	Implement delete activity	2019-01-01 23:20:43 +01:00
sxsdv1	551c3d9391	Split create activity specifics from update_outbox	2019-01-01 23:20:28 +01:00
Maxim Filippov	2aab4e03c3	Add OGP parser	2019-01-01 23:26:40 +03:00
kaniini	90e157ef80	Merge branch 'features/admin-api-user-views' into 'develop' User/Account views: Add rights.admin Closes #472 See merge request pleroma/pleroma!589	2018-12-31 15:49:34 +00:00
lambda	33e3a7ba7d	Merge branch 'fix/scrubber-cache' into 'develop' [#481] Store scrubbed posts in Cachex Closes #481 See merge request pleroma/pleroma!610	2018-12-31 09:56:26 +00:00
Rin Toshaka	9f5881cbb1	Fix a typo in user_test.ex	2018-12-31 08:34:14 +01:00
kaniini	8e7da98b18	Merge branch 'mr/retry-queue' into 'develop' Improves RetryQueue behavior See merge request pleroma/pleroma!609	2018-12-30 21:47:50 +00:00
rinpatch	05743e2000	Get default scrubbers from config instead of hardcoded	2018-12-31 00:12:14 +03:00
rinpatch	91d5a7e81c	Fix test failure	2018-12-31 00:03:03 +03:00
Michael Loftis	cb286fdeba	Improves RetryQueue behavior reduces to one single timer firing once a second switches to a parallel worker model	2018-12-30 15:16:26 +00:00
sxsdv1	569bad8210	Create activity when client posts to outbox	2018-12-30 12:01:39 +01:00
sxsdv1	26dc2dddab	Implement ActivityPub inbox view More or less verbatim copied from the outbox template with only changes to the activities fetched and url reported	2018-12-30 12:01:39 +01:00
sxsdv1	aa082ca7b6	Wire up stub routes for client calls of activitypub inbox/outbox Code style: remove wrapping function of outbox	2018-12-29 22:22:03 +01:00
kaniini	3dc5f04976	Merge branch 'carrot-bullying' into 'develop' Add some hard limits on inserted activities. See merge request pleroma/pleroma!595	2018-12-29 11:46:06 +00:00
kaniini	dd8f2196f6	Merge branch '483_blocks_import_export' into 'develop' [#483] Blocked users list import & export Closes #483 See merge request pleroma/pleroma!603	2018-12-29 11:34:51 +00:00
Ivan Tashkinov	242cc9a658	[#483 ] User.get_by_nickname/1: ensured case-insensitive matching for local FQN. Added tests.	2018-12-29 12:27:12 +03:00
Ivan Tashkinov	7bd49a3222	[#483 ] User.get_by_nickname/1: ensured case-insensitive matching for local FQN. Added tests.	2018-12-29 12:26:23 +03:00
Ivan Tashkinov	67b4297f4d	[#483 ] Refactored blocks and follows import, added tests.	2018-12-29 12:02:37 +03:00
Ivan Tashkinov	6e9a15b181	[#483 ] Blocked users export for TwitterAPI.	2018-12-28 21:08:07 +03:00
Haelwenn (lanodan) Monnier	b43d630f30	Web.TwitterAPI.UserView: Add rights.admin	2018-12-28 17:38:32 +01:00
Vyr Cossont	d8cc96cb1f	Fix Twitter timelines for private instances	2018-12-27 22:43:40 -08:00
kaniini	bee6acd51d	Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop' Create tombstone instead of object deletion See merge request pleroma/pleroma!593	2018-12-27 19:37:55 +00:00
kaniini	cff0292d4b	Merge branch 'reserve-user-names' into 'develop' Reserve a few user names See merge request pleroma/pleroma!594	2018-12-27 19:35:06 +00:00
Vyr Cossont	e4562105e7	Implement exclude_reblogs and include_rts	2018-12-26 21:38:00 -08:00
lain	551d80cc01	Expose restricted names in nodeinfo.	2018-12-26 12:46:16 +01:00
lain	5811e65e67	Add some hard limits on inserted activities.	2018-12-26 12:39:35 +01:00
Maxim Filippov	012b7ab5e6	Add test to check /object/:id does not leak the tombstone itself	2018-12-25 23:40:57 +03:00
lain	91724d160a	Reserve a few user names These are all names that are used for domain.com/:route routes or projected to be.	2018-12-25 20:10:45 +01:00
Maxim Filippov	340dd7a75e	Format	2018-12-25 03:47:20 +03:00
Maxim Filippov	ab2ee43634	Fix Activity test	2018-12-25 03:41:14 +03:00
Maxim Filippov	aeb89bece6	Remove unused test	2018-12-25 03:38:02 +03:00
Maxim Filippov	f75f707f6c	Revert Activity tombstones, add ObjectTombstone struct	2018-12-25 03:00:06 +03:00
Maxim Filippov	2bbec33c71	Fix failing tests	2018-12-25 00:29:13 +03:00
Maxim Filippov	18a4cbb244	Capitalize "tombstone"	2018-12-24 20:09:18 +03:00
Maxim Filippov	0f412cf6e6	Create tombstone instead of object deletion	2018-12-24 02:25:36 +03:00
William Pitcock	3c08d229db	tests: add legal boilerplate	2018-12-23 20:57:10 +00:00
William Pitcock	a2bceaf688	tests: twitter api: add test proving that peertube videos are correctly handled	2018-12-23 14:00:54 +00:00
William Pitcock	873938d223	tests: twitter api: activity view test: enable tesla mock	2018-12-23 14:00:54 +00:00
William Pitcock	9f48485f64	tests: mastodon api: add test verifying that peertube videos are correctly rendered	2018-12-23 13:44:01 +00:00
William Pitcock	71f6d9f418	transmogrifier: significantly rework handling of peertube videos, add test	2018-12-23 13:31:08 +00:00
Ekaterina Vaartis	336e37d98f	Make captcha (kocaptcha) stateless Also rename seconds_retained to seconds_valid since that's how it is now. Put it down from 180 to 20 seconds. The answer data is now stored in an encrypted text transfered to the client and back, so no ETS is needed	2018-12-21 09:55:47 +03:00
lambda	61a88a6757	Merge branch 'ci-test-fix' into 'develop' SetUserSessionIdPlugTest: try again to fix random ci failures See merge request pleroma/pleroma!579	2018-12-20 16:31:08 +00:00
kaniini	2e2030ada8	Merge branch '114_email_confirmation' into 'develop' [#114] Email confirmation See merge request pleroma/pleroma!546	2018-12-20 13:28:36 +00:00
Ivan Tashkinov	851db74f1c	[#114 ] Fixed test.	2018-12-20 15:23:16 +03:00
Ivan Tashkinov	7cab7de9ff	[#114 ] Allowed unconfirmed users to authenticate if :account_activation_required is disabled prior to confirmation. Ensured that no confirmation emails are sent if :account_activation_required is not true. Adjusted tests.	2018-12-20 14:48:48 +03:00
Ivan Tashkinov	f69cbf4755	[#114 ] Added :user_id component to email confirmation path to improve the security. Added tests for `confirm_email` action.	2018-12-20 13:41:30 +03:00
Maksim	f1b93b5be7	[#413 ] fix parse mentions	2018-12-20 09:35:01 +00:00
href	adbb265fc6	`daaa8cd6` take two	2018-12-19 20:14:33 +01:00
raeno	7fb3780431	Merge branch 'develop' into oembed_provider	2018-12-19 22:39:44 +04:00
Ivan Tashkinov	968d7490b6	[#114 ] User.Info: renamed `confirmation_update` to `confirmation_changeset`.	2018-12-19 16:31:03 +03:00
Ivan Tashkinov	59fc5d15df	[#114 ] User.Info: renamed `confirmation_update` to `confirmation_change`.	2018-12-19 16:27:16 +03:00
kaniini	f98ee9402f	Merge branch 'userless-admin' into 'develop' Add a way to use the admin api without a user. See merge request pleroma/pleroma!576	2018-12-19 00:12:39 +00:00
lain	f3eb414e28	Add a way to use the admin api without a user.	2018-12-18 21:08:52 +01:00
Rin Toshaka	196d9c0fd0	Fix tests	2018-12-18 20:30:04 +01:00
rinpatch	8a67677d77	Add test	2018-12-18 22:10:56 +03:00
Ivan Tashkinov	b096e30cff	[#114 ] Added email confirmation resend action. Added tests for registration, authentication, email confirmation, confirmation resending. Made admin methods create confirmed users.	2018-12-18 17:22:46 +03:00
Ivan Tashkinov	aed0f90287	[#114 ] Added `pleroma.confirmation_pending` to user views, adjusted view tests.	2018-12-18 17:22:45 +03:00
raeno	a300336459	Merge branch 'develop' into oembed_provider	2018-12-18 14:59:32 +01:00
href	daaa8cd66a	SetUserSessionIdPlugTest: try to fix random ci failures	2018-12-18 13:40:25 +01:00
href	b1860fe85a	Instance/Static runtime plug This allows to set-up an arbitrary directory which overrides most of the static files: index.html static/ emoji/ packs/ sounds/ images/ instance/ favicon.png. If the files are not present in the directory, the bundled ones in priv/static will be used.	2018-12-17 22:50:59 +01:00
lambda	7d9254fb4a	Merge branch 'fix-test' into 'develop' Fix uploads test. See merge request pleroma/pleroma!564	2018-12-17 20:24:58 +00:00
lain	52bda3b456	Fix uploads test.	2018-12-17 20:55:24 +01:00
Maksim Pechnikov	92a5133c42	fix text field	2018-12-17 22:53:16 +03:00
lambda	52ac7dce5c	Merge branch 'captcha' into 'develop' Captcha See merge request pleroma/pleroma!550	2018-12-17 19:45:14 +00:00
lambda	c6d5f189d9	Merge branch 'fix-tags' into 'develop' Fix tagging problems for existing instances. See merge request pleroma/pleroma!562	2018-12-17 19:38:24 +00:00
lambda	98c31deaa9	Merge branch 'test-mix-tasks' into 'develop' Add tests for Mix tasks See merge request pleroma/pleroma!555	2018-12-17 19:37:05 +00:00
lambda	078b8b6d22	Merge branch 'phoenix14' into 'develop' Upgrade to Phoenix 1.4 Closes #451 See merge request pleroma/pleroma!560	2018-12-17 19:30:05 +00:00
lain	e4763cd459	Fix tagging problems for existing instances.	2018-12-17 20:12:01 +01:00
Ekaterina Vaartis	de981ac5a2	Alias Kocaptcha in the test	2018-12-17 20:53:42 +03:00
href	b12a904911	Integration tests for mastodon websocket	2018-12-17 17:09:06 +01:00
lambda	567359790e	Merge branch 'testfix/webfinger-jrd' into 'develop' WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test See merge request pleroma/pleroma!554	2018-12-17 09:19:27 +00:00
Ekaterina Vaartis	ef6829382a	Clean captchas up periodically, not schedule it after theyre created	2018-12-16 23:53:44 +03:00
Ekaterina Vaartis	73576ab64e	Fix captcha tests	2018-12-16 23:01:44 +03:00
href	f672555ad3	Upgrade to Phoenix 1.4	2018-12-16 17:15:07 +01:00
link0ff	7c235b8874	Add more Mix task tests in relay_test.exs and uploads_test.exs. Rename test/tasks/user.exs to test/tasks/user_test.exs.	2018-12-16 18:08:31 +02:00
eal	28478a9c4f	Merge branch 'fix/masto-put-settings' into 'develop' Mastodon API: Fix PUT /api/web/settings See merge request pleroma/pleroma!557	2018-12-16 11:21:26 +00:00
eal	4c783e35c0	Mastodon API: Fix PUT /api/web/settings	2018-12-16 13:15:34 +02:00
vaartis	2e72d49e37	Rename captcha_test.ex to exs	2018-12-16 07:35:45 +00:00
link0ff	36f1af232a	Add tests for Mix tasks	2018-12-16 02:14:23 +02:00
Ekaterina Vaartis	c859cd1d61	Fix style	2018-12-15 23:39:23 +03:00
Ekaterina Vaartis	5f96c2d216	Add a test for kocaptcha	2018-12-15 23:38:19 +03:00
Ekaterina Vaartis	e8537208bd	Add a captcha mock for tests	2018-12-15 22:38:39 +03:00
Haelwenn (lanodan) Monnier	cddab5700b	WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test	2018-12-15 17:56:12 +01:00
Haelwenn (lanodan) Monnier	5af91020f8	Web.WebFinger.WebFingerControllerTest: test against XML and JRD webfinger endpoints	2018-12-15 16:17:44 +01:00
href	e74f384b68	Merge branch 'fix/issue_433' into 'develop' [#433] fix markdown formatting See merge request pleroma/pleroma!545	2018-12-14 20:30:35 +00:00
href	bfe27c1b55	Merge branch '114_email_invites' into 'develop' [#114] Email invites See merge request pleroma/pleroma!541	2018-12-14 20:22:24 +00:00
Maksim Pechnikov	ea72ac549b	fix case when tags is invalid	2018-12-14 23:16:12 +03:00
raeno	90b00701ff	Merge branch 'develop' into oembed_provider	2018-12-14 20:28:35 +01:00
raeno	9ff61ed793	Fix tests Notice test has been failing due to missing placeholder in index.html I've tried to use fixtures to substitute that file in test environment but it became too much hassle. Fixtures are not copied to _build directory so I'd need to change file fetching logic. IMO it doesn't worth it since pleroma-fe already has this placeholder merged and all future updated of index.html will include it.	2018-12-14 20:23:51 +01:00
Maksim Pechnikov	d3ec09bb38	fix tags	2018-12-14 22:09:04 +03:00
Maksim Pechnikov	baead4ea4b	fix markdown formatting	2018-12-14 16:03:58 +03:00
Ivan Tashkinov	07e93f9940	[#114 ] Improved tests.	2018-12-14 13:52:04 +03:00
Ivan Tashkinov	a89e3b4b60	[#114 ] Moved email_invite action to AdminAPIController, adjusted tests.	2018-12-14 12:28:23 +03:00
Ivan Tashkinov	3cbf16a5fe	[#114 ] Added UserInviteToken creation, adjusted invitation email link to include it.	2018-12-14 12:28:22 +03:00
Ivan Tashkinov	cc83d7ffe7	[#114 ] Naive implementation of email invitations.	2018-12-14 12:28:14 +03:00
href	30dc81667c	Merge branch '114_user_registration_emails' into 'develop' [#114] User registration emails Closes #114 See merge request pleroma/pleroma!531	2018-12-14 09:16:03 +00:00
lambda	262cc6d44b	Merge branch 'fix/double-rt-or-fav' into 'develop' Prevent accidental double RTs or favorites See merge request pleroma/pleroma!542	2018-12-14 08:26:08 +00:00
eal	61ad2ce422	TwitterAPI: Include favorited post in json	2018-12-14 08:24:18 +02:00
eal	1ca080c862	Prevent accidental double RTs or favorites	2018-12-14 07:56:49 +02:00
raeno	c5c3ad90d0	Fix tests. Remove oembed template	2018-12-14 03:00:50 +01:00
raeno	b5de7c4c4d	Remove oembed for now, will submit it in another MR. Fix warnings	2018-12-13 22:34:15 +01:00
raeno	8902942128	WIP. Implement oembed route and handle both json/xml for "Note" type activity	2018-12-13 22:17:53 +01:00
Ivan Tashkinov	18b9467d1a	[#114 ] Removed `email_invite` implementation (to be addressed separately).	2018-12-13 16:22:42 +03:00
Ivan Tashkinov	00744c6b03	[#114 ] Initial implementation of user email invitations.	2018-12-13 14:30:48 +03:00
href	7d9ddbe689	Allow underscores in usernames. Fixes #429.	2018-12-12 18:57:33 +01:00
Ivan Tashkinov	4e7d98922e	[#114 ] Added tests for "POST /api/account/password_reset".	2018-12-12 17:04:52 +03:00
Maksim Pechnikov	89b3729afa	fix warnings	2018-12-12 09:09:19 +03:00
lambda	0863ec2737	Merge branch 'fix_empty_bio_crash' into 'develop' Fixes #415. Do not crash during registration when hasn't filled bio field Closes #415 See merge request pleroma/pleroma!529	2018-12-10 19:08:35 +00:00
lambda	ff10b9927b	Merge branch 'support/bugfix_272' into 'develop' [#272] fix hashtags in api See merge request pleroma/pleroma!510	2018-12-10 19:05:16 +00:00
lain	c81c74d847	Treat warnings as errors outside of tests.	2018-12-10 19:13:53 +01:00
raeno	9ba4a1c5fe	Fixes #415 . Properly handle nil and empty string by User.parse_bio	2018-12-10 01:01:43 +04:00
Maksim Pechnikov	9442588ae9	fix hashtags in api response	2018-12-09 11:24:46 +03:00
href	bdc8112e40	Media proxy: fix url encoding	2018-12-07 21:57:59 +01:00
Ivan Tashkinov	6ed5044c4e	[#394 ] Refactoring (using Ecto.Multi; "untag" route change).	2018-12-07 11:04:39 +03:00
Ivan Tashkinov	7a2162bbcb	[#394 ] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.	2018-12-06 22:26:25 +03:00
Ivan Tashkinov	abbf347dc7	[#394 ] View tests fix.	2018-12-06 20:38:52 +03:00
Ivan Tashkinov	22830c8fc9	[#394 ] Formatting fix.	2018-12-06 20:13:07 +03:00
Ivan Tashkinov	7b19487389	[#394 ] Added `users.tags` and admin routes to tag and untag users. Added tests.	2018-12-06 20:06:50 +03:00
kaniini	ccf0b46dd6	Merge branch '210_twitter_api_uploads_alt_text' into 'develop' [#210] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix. See merge request pleroma/pleroma!496	2018-12-06 07:36:21 +00:00
Ivan Tashkinov	3e90f688f1	[#210 ] Mastodon: actor storing for media uploads, ownership check to update_media. Refactoring.	2018-12-06 10:26:17 +03:00
kaniini	48a0315646	Merge branch 'follower-hiding' into 'develop' Network hiding Closes #356 See merge request pleroma/pleroma!490	2018-12-05 21:41:53 +00:00
lain	76d6b1c6ab	Merge remote-tracking branch 'origin' into follower-hiding	2018-12-05 21:27:56 +01:00
lain	3ea4476445	MastodonAPI: Show users their own network.	2018-12-05 21:25:06 +01:00
Vald	3c8ffe7ed3	resolved activity view test	2018-12-06 01:54:04 +05:30
Vald	028904c333	lint	2018-12-06 01:46:53 +05:30
Vald	911a877576	resolved api and controller test failures	2018-12-06 01:46:30 +05:30
lain	fdac215091	TwitterAPI: Show users their own network.	2018-12-05 21:14:06 +01:00
Vald	743a09132b	linting	2018-12-06 01:28:52 +05:30
Vald	812b20d49f	resolved formatter_test failures	2018-12-06 01:27:08 +05:30
lain	839526a913	TwitterAPI: Add network hiding.	2018-12-05 19:22:40 +01:00
Maksim Pechnikov	c524c50509	fix/273	2018-12-05 17:32:06 +03:00
Ivan Tashkinov	ba345e4c29	[#210 ] Formatting fix.	2018-12-05 13:43:00 +03:00
Ivan Tashkinov	848151f7cb	[#210 ] [TwitterAPI] Made actor be stored for uploads. Added ownership check to `update_media` action. Added controller tests for `upload` and `update_media` actions. Refactoring.	2018-12-05 13:37:06 +03:00
Ivan Tashkinov	53797d19c5	[#210 ] Test update (replaced bang- with non-bang method).	2018-12-05 11:56:31 +03:00
William Pitcock	0f061bea0c	tests: add regression test for bug #408	2018-12-05 03:41:32 +00:00
Maksim Pechnikov	a9e3e387c9	add test	2018-12-04 20:37:13 +03:00
Ivan Tashkinov	44ab3dbe2c	[#210 ] Refactoring.	2018-12-04 19:45:09 +03:00
Ivan Tashkinov	826fc446d5	[#210 ] TwitterAPI: implemented /api/media/metadata/create to allow uploads description (alt text) setting.	2018-12-04 18:35:57 +03:00
Maksim Pechnikov	50e72f6c48	remove httpoison_mock	2018-12-04 18:09:22 +03:00
Maksim Pechnikov	dd8aee332c	formatting the code	2018-12-04 17:48:55 +03:00
Maksim Pechnikov	5c6d47614d	all tests passed	2018-12-04 17:44:15 +03:00
Maksim Pechnikov	a9e4a97586	update test	2018-12-04 14:04:06 +03:00
Maksim Pechnikov	7ec64ac33f	update test	2018-12-04 14:04:06 +03:00
Maksim Pechnikov	80bfdb4e7d	update test	2018-12-04 14:04:06 +03:00
Maksim Pechnikov	6cfdc11e32	update test	2018-12-04 14:04:06 +03:00
Maksim Pechnikov	c508d41c34	add http requests mock	2018-12-04 14:04:06 +03:00
Maksim Pechnikov	87109482f3	status_code -> status	2018-12-04 14:04:06 +03:00
Maksim Pechnikov	ec34de0c1f	WebSub fix test	2018-12-04 14:03:32 +03:00
William Pitcock	d6ab701a14	formatting	2018-12-04 05:01:21 +00:00
William Pitcock	419d4bd5e4	tests: add tests for Object.normalize()	2018-12-04 05:00:11 +00:00
William Pitcock	f0439617ef	tests: some minor cleanups	2018-12-04 04:52:09 +00:00
William Pitcock	f85949cc69	object: factor out fetching functions into Pleroma.Object.Fetcher module	2018-12-04 04:52:09 +00:00
William Pitcock	e8caecb5c7	object: move object containment out of transmogrifier into it's own module	2018-12-04 04:52:09 +00:00
William Pitcock	fe000f82f8	tests: activitypub: fix broken test due to invalid child object	2018-12-04 04:52:09 +00:00
William Pitcock	f7e15d3257	tests: fix a lot of the remaining test failures	2018-12-04 04:52:09 +00:00
William Pitcock	4ca4c83871	tests: fix most remaining failures	2018-12-04 04:52:09 +00:00
William Pitcock	e8570758f9	twitterapi: fix remaining test failures	2018-12-04 04:52:09 +00:00
William Pitcock	6f5f589f73	test: fix mastodon api test failure	2018-12-04 04:52:09 +00:00
lambda	88b05aeabb	Merge branch 'fix/parse-user-bio' into 'develop' Parse user's bio on register See merge request pleroma/pleroma!492	2018-12-03 16:31:00 +00:00
Maxim Filippov	4b70e5eae9	Parse bio for MastodonAPI	2018-12-03 18:59:50 +03:00
Maxim Filippov	8148943368	Format files	2018-12-02 22:08:53 +03:00
Maxim Filippov	ce98d5eb9b	Parse user's bio on register	2018-12-02 22:03:53 +03:00
lain	8c9a4e8b40	TwitterAPI: Implement hide_network.	2018-12-02 18:14:13 +01:00
lain	2a639de9b3	MastodonApi: Implement hide_network.	2018-12-02 17:48:00 +01:00
lain	6be0ab1e55	Hide network in ap.	2018-12-02 17:35:32 +01:00
lain	91065e1968	Fix background updating / handling.	2018-12-02 11:20:38 +01:00
lain	f18b86fd5f	More fixes for Info schema.	2018-12-01 12:46:08 +01:00
lain	93f2dc19d9	TwitterAPI: Fix banner and background update.	2018-12-01 12:01:22 +01:00
lain	347df6421d	Fix masto api user updating.	2018-12-01 10:40:01 +01:00
lain	c443c9bd72	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info	2018-12-01 09:55:46 +01:00
lain	1c67277c80	Fix admin api.	2018-12-01 09:03:16 +01:00
href	e9982c521b	Upload filter: anonymize filename It replaces the original filename with a randomly generated string.	2018-11-30 19:33:34 +01:00
kaniini	ca24ad2a2b	Merge branch 'feature/reverse-proxy' into 'develop' reverse proxy / uploads See merge request pleroma/pleroma!470	2018-11-30 18:15:44 +00:00
href	253da275bd	Pleroma.Config.delete/1	2018-11-30 18:27:27 +01:00
href	65e7307d68	Upload: bring back base_url	2018-11-30 18:02:50 +01:00
href	1d537bc74f	remove eal i like you eal don't take it personally<3	2018-11-30 18:02:49 +01:00
href	02d3dc6869	Uploads fun, part. 2	2018-11-30 18:02:37 +01:00
href	b19597f602	reverse proxy / uploads	2018-11-30 18:00:47 +01:00
lain	d0ec2812bd	Merge remote-tracking branch 'origin' into validate-user-info	2018-11-30 17:34:20 +01:00
lain	48b95a9b95	Assorted fixes.	2018-11-30 17:08:02 +01:00
lain	d407f662af	Fix TwitterApiController.	2018-11-30 17:07:37 +01:00
lain	a6812bc9df	Remove "most recent notification" endpoint.	2018-11-30 16:47:37 +01:00
lain	6ac5d48575	More fixes	2018-11-29 00:25:43 +01:00
KokaKiwi	87098d1676	Streamer: Don't send unwanted DMs to list streams	2018-11-27 20:50:19 +01:00
lain	e002858071	Fix ostatus test.	2018-11-27 18:37:46 +01:00
lain	3c61df6b9e	Webfinger fixes.	2018-11-27 18:31:44 +01:00
lain	5bd3b3a215	More and more fixes.	2018-11-27 18:21:05 +01:00
lain	badbe2656c	More fixes.	2018-11-27 18:12:03 +01:00
lain	f983c1d0c6	Fix CommonApi tests.	2018-11-27 17:31:14 +01:00
Haelwenn (lanodan) Monnier	cc8952b45f	Web.MastodonApi.MastodonSocketTest: Add test for unauthenticated websocket	2018-11-24 08:51:35 +01:00
kaniini	675653ceb7	Merge branch 'feature/admin-api' into 'develop' Add a admin API See merge request pleroma/pleroma!366	2018-11-22 00:28:04 +00:00
lain	0bea0308f1	Merge branch 'validate-user-info' of git.pleroma.social:pleroma/pleroma into validate-user-info	2018-11-20 20:16:16 +01:00
lain	0896cf4c0f	Fix most mastodon api bugs.	2018-11-20 20:12:39 +01:00
William Pitcock	5b3480d896	tests: fix up some more broken mastodon api testcases	2018-11-20 19:08:41 +00:00
Haelwenn	c7d08bc1cf	Merge branch 'feature/retry-queue' into 'develop' Federator: add retry queue. See merge request pleroma/pleroma!323	2018-11-20 19:04:52 +00:00
William Pitcock	c196754b4d	mastodon api: account view: fix tests	2018-11-20 18:54:48 +00:00
lain	2887f4ff1d	Fix formatter tests.	2018-11-20 19:07:01 +01:00
href	7f4c3a1e99	mediaproxy: fix empty url & add some tests	2018-11-20 17:50:03 +01:00
eal	689b46efc8	RetryQueue: tiny refractor, add tests	2018-11-19 18:08:41 +02:00
lain	fbb70d25fe	Several twitter api fixes.	2018-11-18 22:36:47 +01:00
lain	40d9d2098c	Fix user updating from AP.	2018-11-18 22:15:03 +01:00
lain	fc3bcf335e	Fix following locked users.	2018-11-18 18:53:50 +01:00
lain	d5af41b577	Fix note count update.	2018-11-18 18:52:21 +01:00
lain	6f90ceb2ed	Fix follower count test.	2018-11-18 18:49:17 +01:00
lain	8e3d8bde04	Fix user deactivation test.	2018-11-18 18:40:58 +01:00
lain	5c8f07f0a8	Fix note counting.	2018-11-18 18:17:56 +01:00
lain	47d883d3ab	Fix User deactivation.	2018-11-18 18:06:02 +01:00
William Pitcock	f6be980f4f	activitypub: object view: avoid leaking private details	2018-11-17 22:30:53 +00:00
William Pitcock	98795172a7	ostatus controller: respond with AS2 objects instead of activities to notice URIs	2018-11-17 22:10:15 +00:00
William Pitcock	e10f839e9b	tests: federator: fix formatting	2018-11-17 21:41:08 +00:00
William Pitcock	dfcfb184b1	activitypub: transmogrifier: make deletes secure	2018-11-17 21:22:57 +00:00
Haelwenn (lanodan) Monnier	52681f7fd0	Web.AdminAPI.AdminAPIControllerTest: New Test	2018-11-17 22:12:14 +01:00
Haelwenn (lanodan) Monnier	76bd80d462	test/plugs/user_is_admin_plug_test: New test	2018-11-17 22:12:13 +01:00
William Pitcock	b1a6e8d80d	test: add sanity tests for federator handling of AP docs	2018-11-17 21:01:19 +00:00
William Pitcock	55640c4804	tests: add a test to verify the general fake direction protection works in all cases	2018-11-17 20:31:20 +00:00
William Pitcock	dc1d8e13b4	tests: add a testcase for user collision	2018-11-17 20:20:45 +00:00
William Pitcock	1a940cb46e	tests: add tests for contain_origin_from_id()	2018-11-17 20:16:03 +00:00
William Pitcock	b483ae0a72	tests: add a second spoofing variant	2018-11-17 18:25:32 +00:00
William Pitcock	9c8adfb6ef	test: fix more test defects	2018-11-17 18:16:55 +00:00
William Pitcock	d9cb081f07	tests: add additional spoofing tests	2018-11-17 18:12:11 +00:00
William Pitcock	2ab8e28728	transmogrifier tests: fix defective spoofing test	2018-11-17 18:11:46 +00:00
William Pitcock	010fcb73d7	test: httpoison mock: add second spoofing activity test	2018-11-17 18:11:17 +00:00
lain	f87b315618	TwitterAPI: Fix dm_timeline displaying only half of the conversation.	2018-11-16 19:47:36 +01:00
lambda	2f639ea129	Merge branch 'feature/pleromafe-usersearch' into 'develop' Add Twitter / Pleroma API user search See merge request pleroma/pleroma!452	2018-11-16 18:13:47 +00:00
lain	e8d8c84f79	Add better test for user search functionlity.	2018-11-16 18:31:32 +01:00
AkiraFukushima	62944b47fb	Reset http security settings to fix plug test	2018-11-17 00:45:21 +09:00
lain	27aa136aac	Format.	2018-11-14 20:41:12 +01:00
lain	7b170cd616	Add Pleroma user search api for PleromaFE.	2018-11-14 20:33:23 +01:00
lain	ea9a776d7b	TwitterApi: Add direct message endpoint	2018-11-13 20:08:50 +01:00
lain	2cf40237ff	MastodonAPI: Add pagination to private messages.	2018-11-13 19:46:34 +01:00
scarlett	0ce5623134	Merge branch 'twitter-api-null-display-name' into 'develop' Twitter API: Fall back to user.nickname if user has no name Closes #375 See merge request pleroma/pleroma!444	2018-11-12 17:08:54 +00:00
scarlett	db78c72868	Twitter API: Add tests for nil names.	2018-11-12 17:02:01 +00:00
William Pitcock	ee5932a504	http security: allow referrer-policy to be configured	2018-11-12 15:14:46 +00:00
William Pitcock	fe67665e19	rename CSPPlug to HTTPSecurityPlug.	2018-11-12 15:08:02 +00:00
William Pitcock	54fdce9107	tests: add tests for CSPPlug	2018-11-11 07:26:31 +00:00
William Pitcock	69b8c0e299	tests: add test for internal data stripping	2018-11-10 12:24:25 +00:00
kaniini	c9c1f9dee2	Merge branch 'bugfix/ostatus-as2-reflection' into 'develop' ostatus: only federate activities concerning note objects See merge request pleroma/pleroma!437	2018-11-10 11:50:02 +00:00
kaniini	99a8ef967e	Merge branch 'tests/prismo-url-map' into 'develop' Test that prismo url-map transforms into a string See merge request pleroma/pleroma!414	2018-11-10 11:17:12 +00:00
William Pitcock	1d9fcbf2ba	add missing prismo testcase data	2018-11-10 11:11:01 +00:00
William Pitcock	c9df011215	tests: add tests for new OStatus.is_representable? function	2018-11-10 10:39:42 +00:00
William Pitcock	dfc26d0fdd	tests: add testing for new notification behavior	2018-11-09 09:37:12 +00:00
William Pitcock	719a8a1f82	tests: flip testing to/cc for mentions	2018-11-08 19:17:15 +00:00
lambda	59cf7cf235	Merge branch 'small-jsonld-refactor' into 'develop' Small jsonld refactor See merge request pleroma/pleroma!433	2018-11-08 16:23:58 +00:00
lain	34bd411781	Unify json ld header handling.	2018-11-08 16:39:38 +01:00
lain	3b02fd9fb7	Small refactor.	2018-11-08 16:05:28 +01:00
kaniini	4d627a5117	Merge branch 'feature/qvitter-notifications-dismiss' into 'develop' qvitter notifications: add new "read notifications" API See merge request pleroma/pleroma!431	2018-11-07 22:33:06 +00:00
kaniini	b451a92d78	Merge branch 'runtime-config' into 'develop' Runtime configuration See merge request pleroma/pleroma!430	2018-11-07 22:32:34 +00:00
William Pitcock	d675b8a16f	tests: add tests for twitterapi endpoint	2018-11-06 23:25:16 +00:00
William Pitcock	50bf174651	tests: add tests for Notification.set_read_up_to()	2018-11-06 23:02:55 +00:00
href	5bb88fd174	Runtime configuration Related to #85 Everything should now be configured at runtime, with the exception of the `Pleroma.HTML` scrubbers (the scrubbers used can be changed at runtime, but their configuration is compile-time) because it's building a module with a macro.	2018-11-06 19:41:15 +01:00
kaniini	0f3e78addb	Merge branch 'runtime-router' into 'develop' Runtime configured router See merge request pleroma/pleroma!426	2018-11-06 15:35:19 +00:00
href	7d328c658d	Small wrapper module around Application.get_env/put_env Same API as the old Pleroma.Config	2018-11-06 16:00:48 +01:00
href	36ca3c1b3e	format	2018-11-06 15:17:29 +01:00
href	2bc924ba45	Get rid of Pleroma.Config in favor of Application Discussed in https://git.pleroma.social/pleroma/pleroma/merge_requests/426#note_7232	2018-11-06 15:12:53 +01:00
href	013f7ba8c1	Add federating plug & public tests	2018-11-06 14:45:04 +01:00
lain	2fedd93931	Fix formatting.	2018-11-03 16:40:57 +01:00
lain	81af7fd02d	Test for null-content activities.	2018-11-03 16:28:29 +01:00
lain	7dfe611620	Test for case-insensitive mastodon hashtag timelines.	2018-11-03 11:41:40 +01:00
lain	45ebc8dd9a	Check for empty string in_reply_to ids.	2018-11-02 17:33:51 +01:00
Haelwenn (lanodan) Monnier	c5f26f3ce2	Test that prismo url-map transforms into a string	2018-11-01 11:30:50 +01:00
Lee Starnes	585b29337c	Ensure filters have a filter_id	2018-11-01 09:17:02 +00:00
lain	1e9ced5af4	Test Relay, switch to runtime configuration.	2018-11-01 09:01:43 +00:00
lain	9b77030d3c	Add basic configuration management module.	2018-11-01 09:01:03 +00:00
William Pitcock	2b3a40d038	object: split object_cache from user_cache	2018-11-01 08:41:46 +00:00
William Pitcock	2c092ed355	test: fixup test breakage caused by User.delete() harmonization	2018-11-01 08:23:49 +00:00
William Pitcock	21dafa7cd0	tests: add tests for User + cache interactions	2018-11-01 08:11:02 +00:00
William Pitcock	f55fc68f76	tests: add tests for object deletion	2018-11-01 07:37:07 +00:00
scarlett	b92e38d2d4	Add user reactivation task.	2018-10-29 23:13:15 +00:00
William Pitcock	2ac13061af	testsuite: formatting	2018-10-26 06:37:00 +00:00
William Pitcock	0d0c1dcf44	tests: add testsuite for broken thread filter	2018-10-26 06:35:06 +00:00
William Pitcock	b1d1f9bc27	tests: add test for user inbox	2018-10-25 05:24:17 +00:00
William Pitcock	6cfba7db8d	tests: twitterapi: add additional fields	2018-10-25 04:06:42 +00:00
William Pitcock	9563f3766d	tests: update for new in_reply_to_screen_name field	2018-10-25 03:03:44 +00:00
eal	5e9a0e2460	Fix some typos in the list test.	2018-10-20 13:03:45 +03:00
AkiraFukushima	a249cbf187	Add a test for List.get_lists_account_belongs	2018-10-19 21:24:15 +09:00
William Pitcock	958c5e02e8	tests: add a testcase for matching osada users in the formatter	2018-10-17 19:27:05 +00:00
Haelwenn (lanodan) Monnier	eacab0fb05	Delete Tokens and Authorizations on password change Closes: https://git.pleroma.social/pleroma/pleroma/issues/320	2018-10-14 02:14:54 +02:00
William Pitcock	ebc32045f0	test: add regression test for #316	2018-10-11 10:35:32 +00:00
William Pitcock	497814cbbb	test: update test for new html scrub policy	2018-10-05 21:11:22 +00:00
William Pitcock	b1be9415ef	Revert "Merge branch 'revert-a26d5e6b' into 'develop'" This reverts commit `d31bbb1cfe`, reversing changes made to `340ab3cb90`.	2018-10-05 20:49:34 +00:00
Haelwenn (lanodan) Monnier	a3cffd3566	formatter: Stop using phoenix HTML and format it ourselves * Pheonix has an extra scheme whitelist conflicting with ours * Pheonix doesn’t seems to do URL encoding, just HTML encoding Closes: https://git.pleroma.social/pleroma/pleroma/issues/307	2018-09-28 17:32:27 +02:00
Haelwenn	34b6d444d6	Merge branch 'feature/twitter_api/fields' into 'develop' [Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields" See merge request pleroma/pleroma!360	2018-09-28 09:25:27 +00:00
Haelwenn (lanodan) Monnier	a74daabfae	[Pleroma.Web.TwitterAPI.UserViewTest]: Add test for mastodon-fields	2018-09-28 11:17:33 +02:00
Haelwenn (lanodan) Monnier	82b57ebad1	[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"	2018-09-28 10:44:45 +02:00
William Pitcock	d830a243a3	transmogrifier: more robustly handle dereferencing pointer URIs	2018-09-27 20:00:48 +02:00
Haelwenn (lanodan) Monnier	eebe33e86a	transmogrifier: Add support for array-less hashtags, add broken announce, harden get_actor	2018-09-27 20:00:47 +02:00
Haelwenn (lanodan) Monnier	2c820e10b8	transmogrifier_test: incoming notices with tag not being an array (kroeg)	2018-09-27 20:00:47 +02:00
William Pitcock	85b59d07b6	test: add smoketests for the scrubbing policies	2018-09-22 03:45:37 +00:00
William Pitcock	56577d8b48	twitter api: add no_rich_text option to userview for account prefs	2018-09-22 03:24:40 +00:00
William Pitcock	bd03644ca8	test: add tests for new User.html_filter_policy()	2018-09-22 03:02:05 +00:00
William Pitcock	200ab27e7a	test: add test proving that users are refreshed when stale	2018-09-20 23:50:56 +00:00
Haelwenn (lanodan) Monnier	a8eaecadee	[Pleroma.Web.MastodonAPI.AccountView]: relationship.json: fake endorsed value (false)	2018-09-20 16:24:29 +02:00
Haelwenn (lanodan) Monnier	43d0b7bf7a	[Pleroma.Web.MastodonAPI.StatusView] add replies_count	2018-09-20 16:10:46 +02:00
shadowfacts	85b8590109	Update status_view_test.exs	2018-09-10 23:40:29 +00:00
William Pitcock	a4fe14de02	tests: break the cycle using pleroma.factory	2018-09-09 12:56:25 +00:00
William Pitcock	fc92bb28b4	tests: try breaking the cycle a different way	2018-09-09 12:43:58 +00:00
William Pitcock	33a5294fad	test: user enabled plug tests: fix circular reference	2018-09-09 12:23:48 +00:00
lambda	045953225e	Merge branch 'moonman/pleroma-sha512-crypt' into 'develop' auth overhaul and legacy GS auth See merge request pleroma/pleroma!331	2018-09-08 09:20:34 +00:00
Martin Kühl	619f67768a	Mastodon API: Add unsupported attributes to relationship responses These attributes are documented as required by the Mastodon API. Since we don’t support them (I think?), respond with default values.	2018-09-07 16:12:44 +02:00
lain	d22af29bb4	Fix warning.	2018-09-05 22:42:50 +02:00
lain	44b094908c	Update legacy passwords automatically.	2018-09-05 22:30:14 +02:00
Martin Kühl	ff38ffd9f8	Fix the tests	2018-09-05 22:20:59 +02:00
lain	e601165426	Add UserEnabledPlug.	2018-09-05 21:53:53 +02:00
lain	5ce1ebb179	Add SetUserSessionIdPlug.	2018-09-05 21:42:42 +02:00
Haelwenn	4a3dbd9d4e	Merge branch 'fix/sign-in-with-toot' into 'develop' Fix sign-in and sign-out with Toot! See merge request pleroma/pleroma!306	2018-09-05 18:20:26 +00:00
lain	12bc73dd28	Add EnsureUserKeyPlug, smaller fixes	2018-09-05 19:06:28 +02:00
lain	32465b9939	Simplify AuthenticationPlug	2018-09-05 18:53:38 +02:00
lain	9a96c93be7	Add SessionAuthenticationPlug.	2018-09-05 18:37:02 +02:00
lain	a3f54fca4d	Add LegacyAuthenticationPlug	2018-09-05 18:17:33 +02:00
lain	3cf17dc402	Add EnsureAuthenticatedPlug	2018-09-05 17:59:19 +02:00
lain	faf5347748	Add UserFetcherPlug.	2018-09-05 17:44:38 +02:00
lain	42bd985e66	Add BasicAuthDecoderPlug	2018-09-05 17:30:05 +02:00
Moon Man	1a8bc26e52	auth against sha512-crypt password hashes, upgrade to pbkdf2	2018-09-05 00:21:44 -04:00
kaniini	76c67a41c1	Merge branch 'develop' into 'feature/staff-discovery-api' # Conflicts: # lib/pleroma/web/nodeinfo/nodeinfo_controller.ex	2018-09-03 14:55:42 +00:00
William Pitcock	d3f6814feb	tests: add test for staffAccounts presence in nodeinfo	2018-09-03 14:48:36 +00:00
kaniini	1c9e539b47	Merge branch 'feature/mastodon_api_2.4.x' into 'develop' Add/Fix Mastodon endpoints for 2.4.3 compatibility See merge request pleroma/pleroma!266	2018-09-03 12:33:36 +00:00
kaniini	7ca2a2ddea	Merge branch 'nil-bio-emojis' into 'develop' add nil clause for Formatter.get_emoji/1 to return an empty result Closes #274 See merge request pleroma/pleroma!315	2018-09-03 05:54:11 +00:00
kaniini	b7923aa304	Merge branch 'hotfix_broken_likes' into 'develop' hotfix for broken like completely breaking the notifications API See merge request pleroma/pleroma!284	2018-09-02 12:37:00 +00:00
William Pitcock	834515fb51	formatter: don't add XSS emoji	2018-09-02 00:04:09 +00:00
William Pitcock	303af9ba4c	tests: add regression tests	2018-09-01 23:33:10 +00:00
Martin Kühl	b60d232719	AccountView: `sensitive` is supposed to be a boolean, not a string	2018-09-01 23:10:48 +02:00
Will Pearson	0c2a0e3551	Specify default scope in verify_credentials Certain Mastodon/Pleroma front ends call verify_credentials to get the default scope of a new toot. Currently, Pleroma hardcodes this value to "public". This patch changes it to the user's default_scope value.	2018-08-31 21:04:46 -07:00
Thurloat	a9c0f395cb	add nil clause for Formatter.get_emoji/1 to return an empty result	2018-08-31 14:29:23 -03:00
lambda	58539e1357	Revert "Merge branch 'feature/rich-text' into 'develop'" This reverts merge request !309	2018-08-31 09:51:20 +00:00
William Pitcock	e7871ed05e	tests: add tests for evil HTML filtering	2018-08-31 03:34:56 +00:00
William Pitcock	9cac7c957c	test: add testcase proving lists system does not leak non-public posts	2018-08-29 08:50:23 +00:00
Henry Jameson	0f1c629d65	better solution, added test.	2018-08-27 17:07:26 +03:00
Haelwenn (lanodan) Monnier	6e030129fb	[MastodonAPI] Add filters	2018-08-27 15:09:05 +02:00
Haelwenn (lanodan) Monnier	d008f2d69c	[Pleroma.Web.MastodonAPI.AccountView]: Add bot field	2018-08-27 15:09:04 +02:00
lambda	46c7c2380c	Merge branch 'feature/relay' into 'develop' message relay Closes #144 See merge request pleroma/pleroma!264	2018-08-27 08:29:25 +00:00
kaniini	63094cfd3e	Merge branch 'feature/emoji-in-local-users' into 'develop' Add emoji to local user profiles. Closes #202 See merge request pleroma/pleroma!271	2018-08-26 23:24:41 +00:00
William Pitcock	86dca39640	tests: fix formatting	2018-08-26 23:19:45 +00:00
William Pitcock	504a25f812	tests: add notification smoketests (ref #265 )	2018-08-26 22:42:02 +00:00
kaniini	0f5bff8c66	Merge branch 'develop' into 'feature/relay' # Conflicts: # lib/pleroma/web/activity_pub/utils.ex	2018-08-26 21:06:15 +00:00
William Pitcock	aab2bdddf4	twitter api: provide object descriptions as attachment description field	2018-08-25 00:12:58 +00:00
William Pitcock	a8bd120ea6	tests: formatting	2018-08-24 18:33:36 +00:00
William Pitcock	14d1187702	test: add testcase for formatter issue #163	2018-08-24 18:22:46 +00:00
William Pitcock	bc36d40bee	tests: add a testcase for verifying that objects without a valid ID are always rejected	2018-08-23 01:25:27 +00:00
kaniini	f6b06d2ac8	Merge branch 'feature/peertube_2' into 'develop' rebase/update of feature/peertube See merge request pleroma/pleroma!217	2018-08-21 16:58:44 +00:00
kaniini	a6d4cc8917	Merge branch 'sanitize-bio' into 'develop' mastodon api: sanitize the bio HTML See merge request pleroma/pleroma!282	2018-08-21 16:56:24 +00:00
Haelwenn (lanodan) Monnier	74c74decf5	Basic peertube support.	2018-08-21 18:24:09 +02:00
ensra	2b5db840ee	attempt to add html validation to mastodon api test case	2018-08-21 15:41:32 +01:00
ensra	e883587cc3	this should be looking at the follower's bio, not the user's bio. fixes test.	2018-08-21 15:25:21 +01:00
ensra	f533daffdb	sync bio sanitization code in tests	2018-08-21 15:24:06 +01:00
kaniini	183ccd1812	Merge branch 'dev-lanodan-url-regex' into 'develop' lib/pleroma/formatter.ex: Fix URL regex Closes #127 See merge request pleroma/pleroma!69	2018-08-16 15:41:16 +00:00
kaniini	5fbb14f5ec	Merge branch 'bugfix/federation-kroeg' into 'develop' fix federation with kroeg See merge request pleroma/pleroma!272	2018-08-16 15:20:15 +00:00
kaniini	38361e7b5e	Merge branch 'fix/put-repeats-at-activitypub-outbox' into 'develop' Fix: Output repeats at ActivityPub outbox Closes #191 See merge request pleroma/pleroma!175	2018-08-16 15:19:46 +00:00
kaniini	8dc715b30b	Merge branch 'fix/normalize-file-extension' into 'develop' Normalize file extension for uploaded files Closes #218 See merge request pleroma/pleroma!233	2018-08-16 15:17:17 +00:00
William Pitcock	8058443674	testsuite: add puckipedia test fixture	2018-08-16 15:10:57 +00:00
William Pitcock	b8560e5ed5	testsuite: formatting	2018-08-14 17:15:33 +00:00
William Pitcock	7fbcd4caaf	test: add kroeg fixtures	2018-08-14 17:09:17 +00:00
eal	92caa2632b	Use Image type for emoji icons.	2018-08-13 16:21:18 +03:00
eal	f9d13558c8	CommonAPI: add emoji to user source data on update	2018-08-13 15:27:20 +03:00
lambda	13440a80e1	Merge branch 'feature/invites' into 'develop' Invites Closes #108 See merge request pleroma/pleroma!208	2018-08-12 12:04:15 +00:00
eal	ed9738e031	Add tests for emoji in user profiles Also use the correct field in TwitterAPI...	2018-08-08 09:24:50 +03:00
eal	cee63ad3f7	TwitterAPI user view: add screen_name_html and description_html.	2018-08-08 08:38:25 +03:00
William Pitcock	3026177206	test: use private visibility for twitterapi update consistency test, to ensure that a second activity isn't relayed	2018-08-06 11:29:03 +00:00
William Pitcock	aea23468c6	test: nickname is no longer a required field	2018-08-06 08:46:06 +00:00
Haelwenn (lanodan) Monnier	32a55e9695	[Pleroma.FormatterTest] Add test for XMPP link	2018-07-30 22:01:48 +02:00
Haelwenn (lanodan) Monnier	1a2255ef7e	[Pleroma.FormatterTest]: .add_links: Add a space before the dot A dot is legal in the url, even at the end, so I moved it for the test	2018-07-30 22:01:48 +02:00
hakabahitoyo	9c1b6f11c5	improve test	2018-07-21 02:57:56 +09:00
hakabahitoyo	908cefd84a	debug	2018-07-21 02:19:20 +09:00
hakabahitoyo	9c2afb2e71	improve test	2018-07-21 01:44:35 +09:00
lambda	41b0ecef95	Merge branch 'tests/plume' into 'develop' Articles/Notes with a actor list outside object See merge request pleroma/pleroma!252	2018-07-19 07:35:34 +00:00
lambda	54963a6379	Merge branch 'bugfix/activitystreams-notice-urls' into 'develop' ostatus: return AS2 objects on /notice and /activities URLs like with /objects. Closes #206 See merge request pleroma/pleroma!251	2018-07-19 07:31:33 +00:00
William Pitcock	18cac1e36b	test: mastodon attachments: update for added description field	2018-07-17 03:40:48 +00:00
William Pitcock	489453c246	tests: verify media description api support is working	2018-07-17 03:40:47 +00:00
Haelwenn (lanodan) Monnier	24b5a75d09	Add test for Plume Articles	2018-07-12 23:08:28 +02:00
William Pitcock	f1a29fc43c	test: ostatus controller: add AS2 fetching tests	2018-07-12 20:32:56 +00:00
William Pitcock	4fb64c1d86	testsuite: twitter api: add summary where necessary	2018-07-12 16:12:25 +00:00
lambda	fe4387077a	Merge branch 'feature/default-scope' into 'develop' default scope setting See merge request pleroma/pleroma!239	2018-07-12 05:59:12 +00:00
lambda	4a922305af	Merge branch 'feature/article-support' into 'develop' article support (plume, etc) See merge request pleroma/pleroma!240	2018-07-12 05:58:39 +00:00
William Pitcock	8546551257	activitypub: switch to using x509 representation for public keys instead of pkcs#1	2018-07-12 03:30:22 +00:00
William Pitcock	66819ea784	twitter api: use ActivityView.render_content() where appropriate instead of duplicating the logic	2018-06-27 13:38:07 +00:00
William Pitcock	32211c4ada	tests: add default_scope where appropriate	2018-06-27 13:17:07 +00:00
lambda	fc012491a5	Merge branch 'fix/mutes.json-emptyarray' into 'develop' Return empty array from /api/qvitter/mutes.json See merge request pleroma/pleroma!234	2018-06-25 08:45:42 +00:00
Vivian Lim	6160a1b3c0	mix format	2018-06-24 15:24:41 -07:00
Vivian Lim	1299bccc7d	return unquoted empty array from /api/qvitter/mutes.json	2018-06-23 23:20:30 -07:00
Vivian Lim	6316003946	fixes- found that TwitterAPI.Controller adds .json suffix already	2018-06-23 23:05:54 -07:00
Haelwenn (lanodan) Monnier	359093d73b	Fake 2.4.0 API	2018-06-23 16:12:57 +02:00
Francis Dinh	082920044a	Normalize file extension for uploaded files	2018-06-21 14:04:12 -04:00
lambda	be800d7936	Merge branch 'bugfix/block-follow-relationships' into 'develop' fix follow relationship leaks when blocked See merge request pleroma/pleroma!230	2018-06-19 09:42:45 +00:00
William Pitcock	590e8d5555	tests: fix a completely bogus mastodon api test	2018-06-19 08:53:54 +00:00
William Pitcock	3707a7fa42	tests: transmogrifier: ensure incoming blocks have the same effect as local blocks	2018-06-19 00:59:28 +00:00
William Pitcock	e9ed7eb963	tests: prove that the block code is properly destroying follow relationships	2018-06-19 00:59:27 +00:00
William Pitcock	a2c6778ce6	tests: add regression test for contentMap-only posts	2018-06-18 22:14:51 +00:00
Haelwenn (lanodan) Monnier	72c2915ecd	Pleroma.Web.MastodonAPI.StatusView: Fix status.json so it renders threads	2018-06-15 22:14:17 +02:00
Francis Dinh	0a95b5594b	Add missing file extension if file does not have one	2018-06-14 12:16:34 -04:00
lambda	8c7fdcb31b	Merge branch 'feature/twitterapi-unrepeat' into 'develop' Add TwitterAPI unretweet endpoint and cleanup AP.unannounce See merge request pleroma/pleroma!218	2018-06-14 07:19:36 +00:00
Francis Dinh	fc15f30a3c	fixup test	2018-06-13 21:45:27 -04:00
Francis Dinh	1555c66650	Add unretweet TwAPI endpoint and cleanup AP.unannounce	2018-06-13 21:33:36 -04:00
Henry Jameson	9c1cf1befb	formatting	2018-06-12 15:01:40 +03:00
Henry Jameson	f42ffbe9a8	Initial invites support + tests.	2018-06-12 14:55:16 +03:00
lambda	3f42806b1b	Merge branch 'develop' into 'develop' Dedupe uploads See merge request pleroma/pleroma!115	2018-06-12 08:26:26 +00:00
lambda	564c73ab24	Merge branch 'feature/list-streaming' into 'develop' MastoAPI: Add streaming for lists. See merge request pleroma/pleroma!183	2018-06-12 07:19:45 +00:00
William Pitcock	c773f42ca4	tests: update twitterapi user view tests for new locked variable	2018-06-11 22:15:53 +00:00
William Pitcock	f8e0942745	twitter api: add approve/deny endpoints	2018-06-11 22:15:53 +00:00
William Pitcock	d116af3bee	tests: add tests for /api/pleroma/friend_requests	2018-06-11 22:15:53 +00:00
William Pitcock	993312cdb3	twitterapi: add profile setting for locked/unlocked accounts	2018-06-11 22:15:53 +00:00
William Pitcock	a0c5b42e29	tests: assert the state prior to mutating it as well as afterward	2018-06-11 22:15:53 +00:00
William Pitcock	c99b9b9d92	testsuite: add mastodon api tests	2018-06-11 22:15:53 +00:00
lambda	7f79b467b1	Merge branch 'feature/domain-blocks' into 'develop' Domain blocks See merge request pleroma/pleroma!190	2018-06-11 11:19:45 +00:00
William Pitcock	299ef74f2e	tests: add regression test for locking/unlocking account updates	2018-06-08 02:52:34 +00:00
Sir_Boops	3f0440ac3c	Dedupe uploads	2018-06-06 13:25:44 -06:00
lambda	0a0c6bf394	Merge branch 'bugfix/webfinger-xml-crash' into 'develop' webfinger robustness improvements See merge request pleroma/pleroma!195	2018-06-06 16:44:44 +00:00
William Pitcock	1620ec502c	testsuite: update fixture URIs that were http	2018-06-06 16:36:58 +00:00
D Anzorge	2cebaa7d3a	Add OAuth controller tests Tests for Pleroma.Web.OAuth.OAuthController	2018-06-06 03:18:11 +02:00
eal	4856962434	MastoAPI: add domain blocking.	2018-06-03 22:21:23 +03:00
lain	8073af6e10	Better error handling for OstatusController.	2018-06-03 21:04:44 +02:00
eal	87566b6e2f	user.ex: add domain blocks.	2018-06-03 22:01:37 +03:00
lain	06439f64d0	Better error handling for ActivityPubController	2018-06-03 19:58:59 +02:00
lain	4856ba596f	Better error handling for MastodonApiController.	2018-06-03 19:28:11 +02:00
lain	0f70e83e8c	Better error handling in TwitterApiController.	2018-06-03 19:11:22 +02:00
lambda	98b8f08783	Merge branch 'fix/twitterapi-incorrect-follows-you' into 'develop' TwitterAPI: fix "Follows you" being shown for the wrong user. Closes pleroma-fe#89 See merge request pleroma/pleroma!185	2018-06-01 08:51:04 +00:00
eal	935e544e19	TwitterAPI: fix "Follows you" being shown for the wrong user.	2018-05-31 15:27:42 +03:00
lain	349400c06a	Fix url guessing attacks.	2018-05-30 20:00:27 +02:00
eal	5d3fdbc082	MastoAPI: Add streaming for lists.	2018-05-30 16:48:59 +03:00
William Pitcock	f569b67cda	tests: update for html changes	2018-05-27 13:03:34 +00:00
lain	841ee8e3e4	Simplify DM query. Should also use indexes better.	2018-05-26 16:25:32 +02:00
lain	4b3ec53514	Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api	2018-05-26 16:00:59 +02:00
lain	745072b2cc	Merge branch 'kaniini/pleroma-feature/activitypub-accept-reject-conformance' into develop	2018-05-26 15:15:52 +02:00
lain	0a6c897c94	Formatting.	2018-05-26 15:11:50 +02:00
lain	bfce29866f	Make Mastodon follow hack more explicit.	2018-05-26 15:07:21 +02:00
lain	3839a11ef5	Don't treat remote accepts/rejects as local. Also, use specialized functions to get safe data.	2018-05-26 14:07:46 +02:00
William Pitcock	1db0dc3072	tests: add tests to verify the accept request is discarded if no follow activity could be found	2018-05-26 11:20:53 +00:00
William Pitcock	7cf3cf77cf	activitypub transmogrifier: cleanups and tests for incoming accepts/rejects	2018-05-25 12:53:12 +00:00
William Pitcock	1f3eb0f470	testsuite: fix module name for CommonAPI.Test (was duplicated with CommonAPI.UtilsTest)	2018-05-25 06:12:30 +00:00
William Pitcock	1d88abf2d4	user: do not allow refollowing somebody who has blocked a user	2018-05-25 03:18:35 +00:00
William Pitcock	8d2ee70da1	testsuite: fix module name for CommonAPI.Test (was duplicated with CommonAPI.UtilsTest)	2018-05-25 03:18:34 +00:00
lambda	f3a71f2986	Merge branch 'feature/lists' into 'develop' Mastodon List API See merge request pleroma/pleroma!138	2018-05-24 20:22:43 +00:00
lambda	c2dcd767cf	Merge branch 'feature/incoming-remote-unfollow' into 'develop' Add support for incoming remote unfollows and blocks/unblocks See merge request pleroma/pleroma!158	2018-05-24 19:52:24 +00:00
lambda	c41012053a	Merge branch 'feature/change-password' into 'develop' Feature/change password See merge request pleroma/pleroma!166	2018-05-24 17:16:37 +00:00
eal	3dbd9809d4	MastoAPI: add lists.	2018-05-24 15:34:39 +03:00
lain	1cd6194dee	More efficient queries.	2018-05-24 12:44:26 +02:00
lain	0b5bc62b33	Don't save double tags in AP objects we create This crashed Mastodon workers.	2018-05-23 17:25:24 +02:00
lambda	06c97f211f	Merge branch 'feature/deps-migration' into 'develop' Migrate to comeonin 4 and Cachex 3 See merge request pleroma/pleroma!162	2018-05-23 09:03:11 +00:00
Francis Dinh	72b93d13f8	Hook up block/unblock to TwitterAPI	2018-05-22 05:41:17 -04:00
Francis Dinh	b2c6ae7d82	Hook up unfollow and (un)block to MastoAPI + tests	2018-05-22 04:27:40 -04:00
csaurus	4fd9df100f	Merge branch 'develop' into feature/mstdn-direct-api	2018-05-21 20:19:37 -04:00
Syldexia	69aa7c213a	Fixed test	2018-05-21 23:06:03 +01:00
Syldexia	d0690622cd	Added endpoint for changing passwords	2018-05-21 23:06:03 +01:00
William Pitcock	75cfd9d34d	webfinger: fix finding the XRD uri for statusnet instances	2018-05-21 12:41:31 +00:00
Francis Dinh	d045b96f95	Add tests for incoming unfollow over OStatus	2018-05-21 05:11:13 -04:00
Francis Dinh	cc5373b846	Fix unblock handling	2018-05-21 05:00:58 -04:00
Francis Dinh	89c5de9096	Fix unfollows	2018-05-20 21:01:14 -04:00
Francis Dinh	56de0216ae	pass user to User.blocks?/2 instead of ap_id	2018-05-20 19:45:05 -04:00
Francis Dinh	1afd6d37bd	Merge remote-tracking branch 'upstream/develop' into feature/incoming-remote-unfollow Fixed some conflicts in transmogrifier.ex	2018-05-20 19:17:15 -04:00
Thog	e55c6f311b	Migrate to comeonin 4 and Cachex 3 Also fix some warning in the code and add a missing alias	2018-05-20 20:08:40 +02:00
lain	413de8e4bc	More fixes.	2018-05-20 19:26:09 +02:00
lain	ff007af0c2	Return visilility in twitter api, too.	2018-05-20 18:01:24 +02:00
lain	434601a5c3	Return private / direct posts on user timelines, too.	2018-05-20 16:15:18 +02:00
lambda	8b0c222b43	Merge branch 'feature/account-deletion' into 'develop' Feature/account deletion Closes #115 See merge request pleroma/pleroma!157	2018-05-20 10:57:19 +00:00
Francis Dinh	d46393f6ef	Fix test for blocks	2018-05-20 02:15:56 -04:00
Francis Dinh	1e43de0f86	Formatting and add tests for blocks/unblocks	2018-05-19 21:23:52 -04:00
Thog	6f39ecc41b	Support Undo like activities (Fix #139 )	2018-05-19 22:14:15 +02:00
Syldexia	d1366f8d46	Modified deleting an account to run as a task	2018-05-19 13:35:49 +01:00
lambda	7831b38705	Merge branch 'feature/webfinger-mime-ld-json' into 'develop' webfinger: handle application/ld+json links See merge request pleroma/pleroma!159	2018-05-19 09:31:08 +00:00
lain	df95118c81	Fix linking problem.	2018-05-19 11:27:14 +02:00
William Pitcock	725b05d04a	run mix format	2018-05-19 08:48:15 +00:00
William Pitcock	6e8de2faae	run mix format	2018-05-19 08:37:04 +00:00
William Pitcock	4033ed6714	tests: add test for hubzilla follow activity too	2018-05-19 03:28:32 -05:00
William Pitcock	19c96c8a19	tests: add tests for Transmogrifier.maybe_fix_user_object()	2018-05-19 03:28:30 -05:00
William Pitcock	f32e19f668	webfinger: add tests	2018-05-19 01:28:27 -05:00
Francis Dinh	8d11bae0d5	Revert "Undo formatting in user.ex" This reverts commit `e6dc15b96c`.	2018-05-17 23:55:00 -04:00
Francis Dinh	e6dc15b96c	Undo formatting in user.ex	2018-05-17 23:53:34 -04:00
Francis Dinh	d8c842a771	Add support for incoming remote unfollows	2018-05-17 22:15:57 -04:00
lain	1d4bbec6b3	Fix User search. Now uses a trigram based search. This is a lot faster and gives better results. Closes #185.	2018-05-16 17:55:20 +02:00
csaurus	d0ad13c12e	Add direct_note[_activity]_factory and a couple tests	2018-05-14 21:54:25 -04:00
csaurus	987a52cf6f	Post direct status test	2018-05-13 21:21:42 -04:00
Syldexia	98b36d359a	Fixed formatting and test	2018-05-13 15:43:42 +01:00
Syldexia	5bfb7b4ce6	Moved account deletion stuff to somewhere that hopefully makes more sense	2018-05-13 14:36:02 +01:00
Syldexia	a16117225f	Added endpoint for user account deletion	2018-05-13 14:35:48 +01:00
lain	89954a2ce7	Fix format.	2018-05-13 13:02:24 +02:00
lain	c7a85de35c	Revert "Remove 'unlisted' handling for now." This reverts commit `1027d1f696`.	2018-05-13 12:38:13 +02:00
lain	1027d1f696	Remove 'unlisted' handling for now. It's just too slow (over 1 second on small systems, haven't looked at the queries in detail yet). We'll need some other way to handle it.	2018-05-13 12:07:11 +02:00
lambda	aeff2d6474	Merge branch 'feature/unrepeats' into 'develop' Add unrepeats Closes #69 See merge request pleroma/pleroma!113	2018-05-13 09:32:29 +00:00
lain	ec531ca281	Add test.	2018-05-13 11:18:48 +02:00
Francis Dinh	694e376954	Update test fixture	2018-05-12 11:10:49 -04:00
Francis Dinh	16b793656d	Add tests for unrepeats	2018-05-11 15:30:47 -04:00
Pierrick Brun	89603eda9e	do not create notification for yourself	2018-05-11 11:31:17 +02:00
lambda	6c2903d9a1	Merge branch 'feld-warnings' into 'develop' Clean up warnings See merge request pleroma/pleroma!144	2018-05-06 18:42:31 +00:00
lain	9810153aeb	Streamer: Don't send out stream events for blocked users.	2018-05-05 13:40:47 +02:00
lain	c464355d1a	Idempotency: Use special cache, keep for 6 hours.	2018-05-05 11:15:57 +02:00
Mark Felder	ab4aa5720a	Fix a bunch of unused variable warnings	2018-05-04 20:59:01 +00:00
lain	90c4bed0af	Don't expire idempotency cache for five minutes.	2018-05-04 21:15:39 +02:00
lain	fcd3eca167	MastodonAPI: Support idempotency key.	2018-05-04 20:30:29 +02:00
Francis Dinh	8b4ee0ea51	Fix formatting	2018-05-04 03:19:48 -04:00
lain	bc215f5684	Fix format.	2018-04-29 11:28:26 +02:00
lambda	b7584edcea	Merge branch 'patch-bio' into 'develop' replace newlines in profiles with <br> See merge request pleroma/pleroma!136	2018-04-29 09:26:47 +00:00
lambda	a7a40bb8f1	Merge branch 'fix/blocked-user-boosts' into 'develop' ActivityPub.ex: do not return boosted statuses from blocked users. See merge request pleroma/pleroma!111	2018-04-28 13:49:12 +00:00
Wim Vanderbauwhede	6908f29e0a	Added a test (written by @andrewzah) for the MR	2018-04-28 12:01:43 +01:00
Francis Dinh	2d775bf1be	Merge branch 'feature/unrepeats' of git.pleroma.social:normandy/pleroma into feature/unrepeats	2018-04-25 01:58:50 -04:00
Francis Dinh	e981280fa7	Formatting fixes	2018-04-25 01:43:45 -04:00
Francis Dinh	9e0dd21ed6	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats	2018-04-25 00:46:28 -04:00
Dashie	9972678a68	Add User.decrease_note_count and call it from ActivityPub.delete	2018-04-24 11:34:18 +02:00
Francis Dinh	8c0806539c	Embed announce activity data instead of linking to it	2018-04-22 21:28:51 -04:00
lain	0574df273c	Small cleanup.	2018-04-22 10:01:10 +02:00
lain	114ca9e069	Merge branch 'develop' into fix/note-count-not-updating	2018-04-22 09:56:24 +02:00
lain	0c221943ef	Formatter: Use proper escaping for links.	2018-04-21 18:27:31 +02:00
eal	22bfeac256	Update note count in ActivityPub.create.	2018-04-21 12:58:04 +03:00
lain	9e6ae44729	Formatting fixes.	2018-04-21 09:43:53 +02:00
Francis Dinh	f0798440de	Use correct activity for undo	2018-04-20 23:22:16 -04:00
Francis Dinh	c5dc7e6e31	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats	2018-04-20 16:48:18 -04:00
lain	a61e8ac154	Formatting.	2018-04-20 13:10:57 +02:00
eal	fa37acfcc7	TwitterAPI: Add Qvitter notification endpoint.	2018-04-19 21:46:59 +03:00
Francis Dinh	7b4f55238e	Handle unrepeats via the TwitterAPI	2018-04-18 06:00:40 -04:00
Francis Dinh	687db1bc3a	Expose unannounce activity so that it can be tested	2018-04-18 03:39:42 -04:00
Francis Dinh	42279f54cf	Return target status in MastoAPI endpoint instead of reblog activity	2018-04-16 23:30:52 -04:00
Francis Dinh	5b0d0b9ab2	Add unreblogging tests	2018-04-14 22:34:06 -04:00
eal	48380aeccc	ActivityPub.ex: do not return boosted statuses from blocked users.	2018-04-14 14:26:20 +03:00
Gian Sass	2de2e29df2	Oops	2018-04-11 15:51:02 -04:00
Gian Sass	3a5c0465eb	Add unit test for pinned statuses	2018-04-11 15:48:32 -04:00
lain	70bcdf32bd	Only search in public data for now. This should be the data the user is allowed to see later, but this will stop accidental private message leaks.	2018-04-07 16:40:45 +02:00
lain	60f92e406c	Accept port number in urls.	2018-04-06 16:35:54 +02:00
lain	81600c94f4	Handle + in links.	2018-04-04 11:29:03 +02:00
lain	806550c921	Use user url in mention if we have it.	2018-04-03 18:32:46 +02:00
lain	b3b7ab5d9a	Load all users at once in timelines.	2018-04-02 16:35:41 +02:00
lain	360c51f1f5	Use context_ids directly if we have them.	2018-04-02 15:28:35 +02:00
lain	bc31bee7c4	Generates contexts and ids on insertion time.	2018-04-02 15:17:09 +02:00
lain	a4db3a732f	Pre-fetch conversation ids.	2018-04-02 14:46:56 +02:00
lain	0a14d155d6	Fail faster.	2018-04-02 13:13:14 +02:00
lain	1b57522bba	Fix some test stuff.	2018-04-02 13:13:04 +02:00
lain	2222e5599c	Don't fetch anything except ap_id for follower / following collections. Should speed up the queries because ecto doesn't have to parse the json.	2018-03-31 20:02:09 +02:00
lain	802736679c	Remove unused ActivityRepresenter module.	2018-03-30 16:50:30 +02:00
lain	e90f8f6c4b	TwApi ActivityView: Add delete activities.	2018-03-30 15:32:43 +02:00
lain	1f32ba052c	TwApi ActivityView: Add follows.	2018-03-30 15:17:13 +02:00
lain	4afbef39f4	Format the code.	2018-03-30 15:01:53 +02:00
lain	c1d529ee94	TwApi ActivityView: Add announces.	2018-03-30 14:46:36 +02:00
lain	1f1caab138	TwApi ActivityView: Add Like rendering.	2018-03-30 13:49:09 +02:00
lain	361016349f	Add ActivityViewTest.	2018-03-30 12:57:55 +02:00
lain	e30752bc79	Add basic activity view.	2018-03-27 22:24:19 +02:00
lain	37e5014d3e	Reduce OP fetching queries.	2018-03-27 18:18:24 +02:00
lain	ff7afe46b9	Don't try to fetch OP if none is there.	2018-03-27 17:43:08 +02:00
Francis Dinh	9556c8f6e7	Forgot to fix one of the links in a test	2018-03-27 02:08:46 -04:00
Francis Dinh	5ba2f4b6d8	Update tests to reflect hashtag link changes	2018-03-27 02:07:07 -04:00
William Pitcock	2aea3bc632	activitypub transmogrifier: rewrite incoming hashtags	2018-03-24 16:42:17 -05:00
lain	e3a81fe58f	Fetch the same data from json webfinger as from xml webfinger.	2018-03-24 14:45:54 +01:00
lain	eb7ce61ca5	Fix hashtags.	2018-03-24 11:03:10 +01:00
lain	5da2355e71	For outgoing objects, fake mastodon style ap id for ostatus.	2018-03-23 16:07:02 +01:00
lain	32ae918843	Clear caches on test.	2018-03-22 12:44:32 +01:00
William Pitcock	ff7afc0465	tests: webfinger: test quering a JSON response for activitypub actor URI	2018-03-22 00:36:13 -05:00
William Pitcock	8aa639a450	webfinger: support JSON output	2018-03-22 00:35:51 -05:00
lain	ec83175100	Use connection pools.	2018-03-19 17:42:09 +01:00
William Pitcock	0ee6e8af26	mastodon api tests: invalidate user cache prior to importing a test reply This is needed to ensure the user cache does not throw nil when creating the mentions list. Signed-off-by: lain <lain@soykaf.club>	2018-03-16 11:25:41 +01:00
William Pitcock	59a76ea464	activitypub transmogrifier: rewrite non-http URLs using the object's external URL Signed-off-by: lain <lain@soykaf.club>	2018-03-14 08:53:29 +01:00
lain	368e085144	Don't validate on missing public key.	2018-03-11 14:47:37 +01:00
lain	f29902a241	More signature debugging.	2018-03-11 14:37:23 +01:00
lain	611ca385de	Merge branch 'develop' into feature/activitypub	2018-03-08 12:37:06 +01:00
lain	a91adb146e	add test file.	2018-03-07 15:46:53 +01:00
lain	fcf1937a40	Correctly handle unlisted messages coming in through Ostatus.	2018-03-07 15:45:13 +01:00
lain	b82637f32d	Don't use special query for feed.	2018-03-06 16:04:29 +01:00
lain	d2ad99298e	Handle incoming deletes.	2018-03-03 18:38:40 +01:00
lain	e9de04b74b	Add support for outgoing update.	2018-02-25 21:08:32 +01:00
lain	f61fd00db5	Make likes and announces public.	2018-02-25 18:20:06 +01:00
lain	8a47974217	Fix specs.	2018-02-25 18:11:03 +01:00
lain	4ea2a41014	Fix more specs.	2018-02-25 17:48:31 +01:00
lain	d3b0167854	Fix salmon tests.	2018-02-25 17:06:12 +01:00
lain	4d13cc0dc6	Fix specs.	2018-02-25 16:52:33 +01:00
lain	8e7f63afde	Fix specs.	2018-02-25 16:40:37 +01:00
lain	e3629af4da	Handle remote update activities.	2018-02-25 16:14:25 +01:00
lain	b76de1ecd3	Some fixes to AP fetching.	2018-02-25 10:56:01 +01:00
lain	e5fcc51a06	Remove unneccesary subscriptions on update.	2018-02-24 17:36:02 +01:00
lain	fb02300234	Pleroma AP detection mechanism.	2018-02-24 13:06:53 +01:00
lain	01d5ef65fa	More fixes to user upgrading.	2018-02-24 10:42:47 +01:00
lain	aa79d64e0d	Correctly stitch mastodon -> ostatus replies.	2018-02-23 15:00:41 +01:00
lain	eb3f14da86	Missing test skeleton.	2018-02-23 08:49:57 +01:00
lain	37e406ae36	Get avatar and banner from AP users.	2018-02-22 08:14:15 +01:00
lain	4816b09fa7	Add user upgrade function.	2018-02-21 22:21:40 +01:00
Ekaterina Vaartis	ec07e087bc	Make user bio optional	2018-02-21 23:31:57 +03:00
lain	94db9ac4db	Merge branch 'develop' into feature/activitypub	2018-02-21 18:34:19 +01:00
lain	810cf8618f	ActivityPub: Fetch missing activities on reply.	2018-02-21 15:22:24 +01:00
lain	5bc810c452	Add moderator function.	2018-02-20 18:44:50 +01:00
lain	95f7e7e2d5	Add some more tests.	2018-02-20 18:42:41 +01:00
lain	297a2c7d3f	Ignore duplicate create activities.	2018-02-19 17:37:45 +01:00
lain	6b6ab592ab	AP: Fix incoming conversations.	2018-02-19 10:39:03 +01:00
lain	539340d914	Handle sensitive property.	2018-02-18 14:14:16 +01:00
lain	20e6190ead	Transmogrify outgoing nsfw.	2018-02-18 14:07:13 +01:00
lain	8ca66b5961	ActivityPub: Add conversation id.	2018-02-18 13:58:52 +01:00
lain	6ab0aba50a	Transmogrify outgoing hashtags.	2018-02-18 13:51:03 +01:00
lain	6046f10431	Actually fix incoming attachments.	2018-02-18 13:06:51 +01:00
lain	77c6c424a6	ActivityPub: Make fake Create activities for objects without one.	2018-02-18 11:24:54 +01:00
lain	fc9d361d17	Add mock.	2018-02-18 10:21:19 +01:00
lain	81ea359a7c	ActivityPub: Handle incoming announces.	2018-02-17 21:57:31 +01:00
lain	e3732ea3bc	Add test fixtures.	2018-02-17 21:56:52 +01:00
lain	5e36b750c1	ActivityPub: Fetch an object from an id.	2018-02-17 21:56:33 +01:00
lain	e1b12a7782	ActivityPub: Handle incoming likes.	2018-02-17 20:13:12 +01:00
lain	ab27c90c9f	ActivityPub: Handle attachments.	2018-02-17 18:38:58 +01:00
lain	fb7b926be3	Handle black name fields on incoming users.	2018-02-17 18:15:48 +01:00
lain	7b26443a76	ActivityPub: Send out Accept after Follow.	2018-02-17 16:08:55 +01:00
lain	e7b73359e3	ActivityPub: Partly handle incoming follows.	2018-02-17 14:55:44 +01:00
lain	5682e48a25	ActivityPub: tags -> tag.	2018-02-17 14:20:53 +01:00
lain	05ba6ca1b8	Do some transmogrifying for the output.	2018-02-17 14:11:20 +01:00
lain	5a371892a0	Fix specs.	2018-02-17 10:26:44 +01:00
lain	dea29d707c	Add post activity fixture.	2018-02-17 09:48:42 +01:00
lain	5454ec6a6c	ActivityPubController: Handle inbox data.	2018-02-15 20:00:43 +01:00
lain	ef0300889d	Transmogrifier: Handle basic notice creation.	2018-02-15 20:00:06 +01:00
lain	a15f572800	OstatusTest: Remove insert_or_update test (moved to User).	2018-02-15 19:59:40 +01:00
lain	ae26604378	ActivityPub: Refactor create function.	2018-02-15 19:59:35 +01:00
lain	0aa56a853b	UserTest: Move insert_or_update test.	2018-02-15 19:58:12 +01:00
lain	b331cb449a	Merge branch 'develop' into feature/activitypub	2018-02-12 10:24:15 +01:00
lain	1bc34de4df	Add missing support file.	2018-02-12 10:23:21 +01:00
lain	26ccb768d3	Make test output easier to read.	2018-02-12 10:14:11 +01:00
lain	33a5d0a238	Fix some test warnings.	2018-02-12 09:33:01 +01:00
lain	3c80d9b277	Fix spec.	2018-02-12 08:15:03 +01:00
lain	8cf97ee8e1	ActivityPub: Basic note federation with Mastodon.	2018-02-11 20:43:33 +01:00
lain	ce31f3a922	Twitter Representers: Handle Mastodon attachments.	2018-02-11 17:21:06 +01:00
Roger Braun	ae1ec858f4	Basic AP user building.	2018-02-11 17:20:43 +01:00
Roger Braun	c1d26751e6	Mocks: Add mastodon user json example.	2018-02-11 17:19:06 +01:00
Roger Braun	52200998c9	Merge branch 'develop' into feature/activitypub	2018-02-11 09:50:55 +01:00
lambda	61c16193de	Merge branch 'move-backend-images' into 'develop' Move avi.png & banner.png from /priv/static/static to /priv/static/images See merge request pleroma/pleroma!60	2018-02-03 13:05:20 +00:00
Hakaba Hitoyo	ea6d1b2b17	move avi.png & banner.png from /priv/static/static to /priv/static/images	2018-02-03 20:43:14 +09:00
eal	29be70c008	Add remote following of local profiles.	2018-02-02 00:14:05 +02:00
eal	ab83e0de6d	TwitterAPI: Add is_local to user view.	2018-02-01 21:41:19 +02:00
Roger Braun	ad0ab3a57b	Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop	2018-01-30 12:20:39 +01:00
Roger Braun	4501094606	Make specs less breaky.	2018-01-30 12:20:14 +01:00
Roger Braun	1bb3ba02f3	Fix specs.	2018-01-30 12:17:01 +01:00
eal	b3e7d7ae6d	Fetch external profile in the background.	2018-01-16 15:31:03 +02:00
eal	80f6ac412a	Merge branch 'default-pictures' into 'develop' Add a default profile picture and banner. See merge request pleroma/pleroma!48	2018-01-15 20:26:49 +00:00
eal	14b086eec2	Add a default profile picture and banner. This removes the placehold.it dependency.	2018-01-15 22:18:17 +02:00
eal	6e1cb86166	Fix instance test.	2018-01-14 08:28:35 +02:00
Lain Iwakura	2a744cdff8	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop	2017-12-19 16:15:45 +01:00
Lain Iwakura	f1f79c0dca	Fix timelines in subway tooter.	2017-12-19 16:15:07 +01:00
lambda	29c9812789	Merge branch 'fix/twitterapi-follow-lists' into 'develop' Fix follower/following lists. Closes #29 See merge request pleroma/pleroma!41	2017-12-18 22:44:15 +00:00
Lain Iwakura	47887ac848	MastoAPI: Fix always-sensitive bugs.	2017-12-18 16:56:03 +01:00
eal	1969773fb4	Fix follower/following lists. Add tests.	2017-12-18 16:37:26 +02:00
Lain Iwakura	4a13b84887	Add recipients field to activities. Also do some very basic checks for AP message insertion.	2017-12-12 18:07:14 +01:00
eal	9223038319	Fix some more tests.	2017-12-11 21:01:36 +02:00
Lain Iwakura	e2e6365035	ActivityPub: Add controller tests.	2017-12-11 18:22:48 +01:00
Lain Iwakura	da005d3332	ActivityPub: Add Objects View.	2017-12-11 18:19:46 +01:00
eal	79b3397c17	Fix tests.	2017-12-11 18:41:03 +02:00
Roger Braun	c3bcafc51b	HTTPSig: Add method to validate conn	2017-12-11 10:37:40 +01:00
Roger Braun	30e9b22f96	Merge branch 'develop' into feature/activitypub	2017-12-09 11:00:56 +01:00

... 14 15 16 17 18 ...

1965 commits