1535 commits

Author	SHA1	Message	Date
squidboi	82225dfc8d	even more formatting	2018-06-07 22:10:11 -07:00
lambda	c86823f724	Merge branch 'bugfix/locked-account-regression' into 'develop' ... security fix: locked account regression See merge request pleroma/pleroma!200	2018-06-08 05:10:08 +00:00
squidboi	990cde7439	more formatting	2018-06-07 22:03:24 -07:00
squidboi	5b9e1f228a	formatting	2018-06-07 21:55:58 -07:00
squidboi	f69d38e455	add mrf for dropping follower-only and direct posts	2018-06-07 21:00:57 -07:00
William Pitcock	1e9dd6fbc2	user: fix maybe_direct_follow() after user_info() refactoring broke it slightly	2018-06-08 02:52:36 +00:00
William Pitcock	47c7e259c4	activitypub transmogrifier: fix locked account state from being clobbered	2018-06-08 02:52:29 +00:00
William Pitcock	a003bdc30a	activitypub transmogrifier: learn locked state in Update messages	2018-06-08 02:52:24 +00:00
lambda	839cb7b424	Merge branch 'develop' into 'mastopost' ... # Conflicts: # .gitignore	2018-06-07 16:29:33 +00:00
lambda	595ca3bb3a	Merge branch 'feature/quarantine' into 'develop' ... add the ability to 'quarantine' an activitypub peer, causing them to be treated as an OStatus peer. See merge request pleroma/pleroma!199	2018-06-07 14:44:08 +00:00
William Pitcock	09604182d0	add the ability to 'quarantine' an activitypub peer, causing them to be treated as an OStatus peer.	2018-06-07 14:38:09 +00:00
Rachel H	1525a0404b	Fix follow errors	2018-06-07 00:39:24 -07:00
Sir_Boops	3f0440ac3c	Dedupe uploads	2018-06-06 13:25:44 -06:00
Rachel H	b4292295d7	Allow posting images without text in mastofe	2018-06-06 11:29:49 -07:00
eal	29c9c8d93b	Extract host from ap_id, add index	2018-06-06 21:13:40 +03: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	1abf0f3b3e	webfinger: use https as default fallback instead of http ... realistically, all instances need to be on https anyway to properly federate with all software	2018-06-06 16:27:14 +00:00
William Pitcock	aaa81d3540	XML: handle erlang errors too	2018-06-06 16:27:13 +00:00
lambda	b5d8213e70	Merge branch 'fix/oauth-http-basic' into 'develop' ... Make OAuth token endpoint work with HTTP Basic auth See merge request pleroma/pleroma!191	2018-06-06 08:27:08 +00:00
D Anzorge	3607dc4558	Make token exchange return errors with 400 as status code	2018-06-06 03:14:50 +02:00
eal	f9719b064c	Merge branch 'fix/emoji-picker' into 'develop' ... set visible_in_picker to true in custom_emojis Closes #177 and mastofe#16 See merge request pleroma/pleroma!188	2018-06-05 21:18:25 +00:00
D Anzorge	73904e8f78	Make OAuth token endpoint work with HTTP Basic auth ... client_id/client_secret can now be supplied in an Authorization header	2018-06-04 00:59:00 +02:00
eal	9075b6d25b	ActivityPub.ex: filter domain blocked activities.	2018-06-03 23:33:33 +03: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
Haelwenn (lanodan) Monnier	b143694b98	lib/pleroma/web/mastodon_api/mastodon_api_controller.ex: set visible_in_picker to true in custom_emojis ... Fixes: https://github.com/ilianaw/emojos.in/issues/4 Closes: https://git.pleroma.social/pleroma/pleroma/issues/177 Closes: https://git.pleroma.social/pleroma/mastofe/issues/16	2018-06-03 18:41:18 +02:00
eal	dca1d6d162	Merge branch 'fix/user-timeline-reading-user' into 'develop' ... MastoAPI user timelines: render statuses for the logged in user. See merge request pleroma/pleroma!187	2018-06-01 09:35:29 +00:00
eal	8c609ee3f9	MastoAPI user timelines: render statuses for the logged in user.	2018-06-01 12:30:11 +03: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
eal	7cb2e2971e	MastoAPI: fix dm_timeline getting non-create activities.	2018-05-30 15:02:22 +03:00
eal	35cb8969c4	MastoAPI: Fix link headers with restrictive params.	2018-05-29 13:31:36 +03:00
lain	461f201caa	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop	2018-05-28 12:39:49 +02:00
lain	3ece4a3ebc	Only return certain activities in TwitterAPI mentions.	2018-05-28 12:38:48 +02:00
William Pitcock	d7eb2e1b65	run mix format	2018-05-27 13:06:38 +00:00
William Pitcock	a8df7fc690	formatter: use class='mention' on links to user profiles ... helps mastodon frontend and apps have better context: https://mastodon.social/users/Gargron/statuses/100101267352899379	2018-05-27 12:56:24 +00:00
lain	a9e36e5a64	Fix user topic streaming.	2018-05-26 21:06:46 +02: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	6138b29783	There are no symbols in JSON.	2018-05-26 15:20:21 +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
lain	dd9bb37893	Rename id helper method.	2018-05-26 13:57:11 +02:00
William Pitcock	7e873756e7	activitypub transmogrifier: use fetch_latest_follow to verify a follow object exists	2018-05-26 11:20:52 +00:00
William Pitcock	1c926c7b60	activitypub: allow mastodon S2S block extension support to be disabled	2018-05-26 08:30:41 +00:00
Hakaba Hitoyo	e90b734f1c	debug	2018-05-26 14:10:12 +09:00
Hakaba Hitoyo	9c7da2ef48	output repeats at ActivityPub outbox	2018-05-26 14:02:57 +09:00
William Pitcock	7cf3cf77cf	activitypub transmogrifier: cleanups and tests for incoming accepts/rejects	2018-05-25 12:53:12 +00:00
William Pitcock	f35e6bf75b	activitypub transmogrifier: clean up accept/reject handling a bit	2018-05-25 09:40:11 +00:00
William Pitcock	e80d91c64a	introduce User.maybe_direct_follow() and use it where we used to call User.follow()	2018-05-25 09:40:10 +00:00
William Pitcock	c89b90222c	twitter api: also remove explicit User.follow here	2018-05-25 09:40:06 +00:00
William Pitcock	62c95e8d4d	run mix format	2018-05-25 09:39:46 +00:00
lambda	5d6d86bf00	Merge branch 'feature/blocks-deny-refollow' into 'develop' ... activitypub conformance: deny refollow for blocks See merge request pleroma/pleroma!170	2018-05-25 07:15:01 +00:00
William Pitcock	502ba33d01	activitypub: fix up accept/reject semantics for following ... fixes #175	2018-05-25 06:14:18 +00:00
William Pitcock	c0ca9f82b9	mastodon api: properly track if an account is locked or not	2018-05-25 06:14:09 +00:00
William Pitcock	47dc52a758	activitypub utils: optimize block and follow activity lookup ... multi-field @> comparison is very expensive, so only use @> for the field where it matters this makes the query take only a few usec to execute verses many msec on a busy instance	2018-05-25 05:23:49 +00:00
William Pitcock	1d88abf2d4	user: do not allow refollowing somebody who has blocked a user	2018-05-25 03:18:35 +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
Francis Dinh	1197ec10a8	Rewrite block fetch query	2018-05-24 13:26:59 -04: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
eal	a8369db4f2	MastoAPI: add lists.	2018-05-24 13:18:39 +03: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	55f9aefd08	Hook unfollow into TwitterAPI	2018-05-22 04:49:30 -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	d0690622cd	Added endpoint for changing passwords	2018-05-21 23:06:03 +01:00
lambda	b4064dfe30	Merge branch 'feature/clarify-http-sig-error' into 'develop' ... clarify HTTP signature error in logs See merge request pleroma/pleroma!165	2018-05-21 21:20:41 +00:00
William Pitcock	9a2d097ed8	activitypub controller: note that the HTTP Host header must be forwarded for http signature validation to work	2018-05-21 19:22:30 +00:00
Francis Dinh	46427cb90f	Pass correct number of arguments to unfollow	2018-05-21 11:57:15 -04:00
William Pitcock	75cfd9d34d	webfinger: fix finding the XRD uri for statusnet instances	2018-05-21 12:41:31 +00:00
lain	d269c69a0b	Actually fix missing alias.	2018-05-21 12:32:29 +02:00
lain	bf64208b52	Add missing alias.	2018-05-21 12:09:03 +02: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	f2d6c3a512	Handle unfollows from OStatus	2018-05-21 04:36:20 -04:00
Francis Dinh	2573332214	Add undo block handler	2018-05-21 04:35:43 -04:00
Francis Dinh	c8a16f334d	Format	2018-05-20 21:02:06 -04:00
Francis Dinh	89c5de9096	Fix unfollows	2018-05-20 21:01:14 -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	dca26f3655	Fix specs.	2018-05-20 19:22:26 +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	a9141d88aa	Pass user instead of their ap_id to User.block	2018-05-19 22:02:13 -04:00
Francis Dinh	3b706ea493	Remove handler for incoming undos with object references	2018-05-19 21:34:30 -04:00
Francis Dinh	1e43de0f86	Formatting and add tests for blocks/unblocks	2018-05-19 21:23:52 -04:00
Francis Dinh	da9744eb84	Use correct variable names in unfollow	2018-05-19 20:57:37 -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
lambda	ad563669c8	Merge branch 'feature/remote-user-deactivation' into 'develop' ... remote user deactivation See merge request pleroma/pleroma!154	2018-05-19 09:30:09 +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	2051530868	activitypub transmogrifier: handle hubzilla AP actor quirks	2018-05-19 03:28:29 -05:00
William Pitcock	4d2c6707c2	activitypub: normalize the actor to ensure we have its URI	2018-05-19 03:28:28 -05:00
William Pitcock	1a250d65af	webfinger: only do ld+json on modern json webfinger	2018-05-19 01:28:19 -05:00
William Pitcock	d1f6ecf607	webfinger: interpret application/ld+json links as an alternate to application/activity+json	2018-05-19 01:28:12 -05:00
William Pitcock	cce5a9cb1c	webfinger: expose the application/ld+json link alongside the older application/activity+json link	2018-05-19 01:28:03 -05:00
William Pitcock	13d4b6d2b5	remote user deactivation: fix test failures	2018-05-19 01:26:13 -05:00
Francis Dinh	0ec1abb3b6	Add federated blocks	2018-05-18 18:09:56 -04:00
Francis Dinh	6604bea9d0	actually rvert those changes	2018-05-17 23:56:47 -04: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	4dfb40a546	Handle cases where a to/cc field is absent on a status	2018-05-14 21:54:25 -04:00
William Pitcock	a6a6915aaf	add mix task for deactivating a user by nickname	2018-05-13 19:05:03 -05:00
William Pitcock	9390492138	ActivityPub create: discard activities from deactivated users	2018-05-13 19:05:02 -05:00
csaurus	2ce48c1a42	Formatting	2018-05-13 15:36:41 -04:00
csaurus	9aabff4883	Fix tests.	2018-05-13 15:33:59 -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	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
lain	a5c9dd0a2a	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop	2018-05-13 11:59:35 +02:00
lain	3c3933e40b	Unlisted fetching: Reverse logic ... Generates a faster query.	2018-05-13 11:58:03 +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
lain	29376fcc13	Format.	2018-05-13 10:56:44 +02:00
lain	76722ea9c8	Merge branch 'develop' into kaniini/pleroma-bugfix/unlisted-statuses	2018-05-13 10:56:11 +02:00
lambda	4ad5e72012	Merge branch 'feature/chain-policies' into 'develop' ... chain policies See merge request pleroma/pleroma!150	2018-05-13 08:24:18 +00:00
Francis Dinh	54ccbd8479	Use original status id instead of announce id	2018-05-13 03:42:31 -04:00
csaurus	c8d418acdd	api/v1/timelines/direct implementation	2018-05-12 21:50:59 -04:00
csaurus	392bd9ef56	Stream function to handle direct messages.	2018-05-12 17:40:59 -04:00
csaurus	c60a5405db	Detect and try to stream incoming "direct" messages	2018-05-12 17:40:59 -04:00
Francis Dinh	4d88747561	Revert "Log error when handling unrepeats" ... This reverts commit c17c55e989.	2018-05-11 15:34:46 -04:00
Francis Dinh	c17c55e989	Log error when handling unrepeats	2018-05-11 15:29:19 -04:00
Francis Dinh	271fb5ccb1	Probably better way of handling non-follow undos in ostatus	2018-05-11 11:59:53 -04:00
Francis Dinh	4151cbe6b2	Revert "Do not send non-follow undos over ostatus for now" ... This reverts commit 07fdc07238.	2018-05-11 11:53:28 -04:00
Francis Dinh	0b527b5528	Revert "Use [] instead of nil" ... This reverts commit 42268b0981.	2018-05-11 11:53:06 -04:00
Pierrick Brun	89603eda9e	do not create notification for yourself	2018-05-11 11:31:17 +02:00
Francis Dinh	42268b0981	Use [] instead of nil	2018-05-11 01:48:56 -04:00
Francis Dinh	07fdc07238	Do not send non-follow undos over ostatus for now	2018-05-11 01:45:10 -04:00
href	c220a6db43	format & made get_policies/1 private	2018-05-10 18:51:58 +02:00
href	e9e6f37bda	Chain policies ... - The `:pleroma, :instance, :rewrite_policy` can now be either a policy or a list of policies - Made a behaviour for MRF policies	2018-05-10 18:41:06 +02:00
Francis Dinh	900c735467	Match proper number of values from unannounce	2018-05-09 00:04:14 -04:00
Francis Dinh	54f6628590	Change argument order and call correct # of args	2018-05-08 23:59:36 -04:00
Francis Dinh	e55f69a676	Handle Undo activites containing an Announce	2018-05-08 23:50:19 -04:00
Francis Dinh	4d5ec883b7	Federate correct activity	2018-05-08 21:52:21 -04:00
lain	ffe028cd73	More warning fixes.	2018-05-07 18:11:37 +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
eal	bfad57c7c9	Get rid of unsafe variables.	2018-05-06 09:58:59 +03:00
lain	9810153aeb	Streamer: Don't send out stream events for blocked users.	2018-05-05 13:40:47 +02:00
lain	96add86b50	Unify wss uri generation.	2018-05-05 13:40:31 +02:00
lain	c464355d1a	Idempotency: Use special cache, keep for 6 hours.	2018-05-05 11:15:57 +02:00
Mark Felder	7a884d70d8	Group def renders here as well	2018-05-04 22:31:46 +00:00
Mark Felder	31ea9cbcd8	Group def renders together to fix warning	2018-05-04 22:28:13 +00:00
Mark Felder	14c0c6d16b	Fix formatting	2018-05-04 22:03:14 +00:00
Mark Felder	2a402fb395	Group response declarations together	2018-05-04 21:59:21 +00:00
Mark Felder	a24eed0f57	That last change was stupid. Multiline comments in Elixir don't really exist. ... Instead we'll just pad with # intstead of playing stupid games with the compiler.	2018-05-04 21:53:52 +00:00
Mark Felder	79d41aa12e	Dirty hack to remove the warning ... warning: code block contains unused literal "internal -> Mastodon\n" (remove the literal or assign it to _ to avoid warnings) lib/pleroma/web/activity_pub/transmogrifier.ex	2018-05-04 21:48:30 +00:00
Mark Felder	aaacebd906	Fix unused variables, imports, and aliases	2018-05-04 21:42:20 +00:00
Mark Felder	42f1a098aa	Fix build. Too eager with the fixing of unused variables. ... == Compilation error in file lib/pleroma/web/activity_pub/views/user_view.ex == ** (CompileError) lib/pleroma/web/activity_pub/views/user_view.ex:54: undefined function _total/0 (stdlib) lists.erl:1338: :lists.foreach/2 (stdlib) erl_eval.erl:670: :erl_eval.do_apply/6	2018-05-04 21:26:33 +00:00
Mark Felder	636f0fa402	Clean up unused aliases and imports	2018-05-04 21:25:31 +00:00
Mark Felder	943820ae29	More unused variables	2018-05-04 21:16:02 +00:00
Mark Felder	ab4aa5720a	Fix a bunch of unused variable warnings	2018-05-04 20:59:01 +00:00
lambda	11a1241d41	Merge branch 'feature/nodeinfo' into 'develop' ... Implements the nodeinfo endpoints See merge request pleroma/pleroma!140	2018-05-04 19:17:19 +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
Dashie	c3f9e24c70	Use a variable for stats to avoid double call	2018-05-03 15:31:39 +02:00
Dashie	724f096ac7	Add metadata.nodeName	2018-05-03 10:52:20 +02:00
Dashie	804497542d	Return the right content-type for the schema call	2018-05-03 10:50:02 +02:00
Dashie	e448734952	Explicit error message	2018-05-02 22:45:20 +02:00
Dashie	fd0bf3aa71	Simplify version and fix typo	2018-05-02 22:44:13 +02:00
Dashie	b8789cc8b6	Add localPosts count, also set to 0 if null	2018-05-02 22:36:19 +02:00
Dashie	abeb009acc	Change path of nodeinfo to use .json format	2018-05-02 22:16:19 +02:00
Dashie	65168393d8	Format files	2018-05-02 21:43:12 +02:00
Dashie	67dadd954e	Add first try at nodeinfo	2018-05-02 21:31:42 +02: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
William Pitcock	a3d1d4894f	ActivityPub core: fix handling of unlisted statuses by leveraging a similar strategy as for blocks	2018-04-28 22:32:46 -05:00
lain	4d55d7c95e	Insert object after being rewritten.	2018-04-28 16:10:24 +02: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	634c0c52a1	Merge remote-tracking branch 'upstream/develop' into patch-bio	2018-04-28 11:59:01 +01:00
lambda	39c80a3667	Merge branch 'bugfix/mrf-simple-media-stripping' into 'develop' ... ActivityPub MRF SimplePolicy: fix media stripping See merge request pleroma/pleroma!133	2018-04-27 05:49:12 +00:00
William Pitcock	90bbd94614	ActivityPub MRF SimplePolicy: fix media stripping	2018-04-25 16:28:53 -05:00
eal	845bd56c9c	Merge branch 'patch-1' into 'develop' ... Fix typo in MastoFE login page. See merge request pleroma/pleroma!132	2018-04-25 14:35:44 +00:00
lain	a7eb148d61	Optionally deactivate public timelines.	2018-04-25 16:11:07 +02:00
lain	279b1d19f0	Align local bio limits to remote limit.	2018-04-25 15:41:59 +02: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	9e0dd21ed6	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats	2018-04-25 00:46:28 -04:00
Francis Dinh	0df1a4efc8	Fix comment grammar	2018-04-25 00:46:06 -04:00
Normandy	715c90e54f	Fix typo in MastoFE login page. ... see https://git.pleroma.social/pleroma/mastofe/issues/13	2018-04-24 21:58:45 +00:00
lain	c78e7d8b11	Fix formatting.	2018-04-24 21:25:31 +02:00
lambda	7a52c4549c	Merge branch 'feature/message-rewrite-facility' into 'develop' ... message rewrite facility See merge request pleroma/pleroma!112	2018-04-24 17:21:28 +00:00
Wim Vanderbauwhede	7517155544	Changed to support \r\n and \n	2018-04-24 13:28:55 +01:00
Wim Vanderbauwhede	52ee91efce	Patch to replace newlines with <br> tags in bio	2018-04-24 13:20:17 +01:00
Dashie	afe892ddac	Correct syntax with mix format	2018-04-24 14:12:23 +02:00
Dashie	9972678a68	Add User.decrease_note_count and call it from ActivityPub.delete	2018-04-24 11:34:18 +02:00
lambda	62a2287bba	Merge branch 'favicon_tag' into 'develop' ... Fix endpoint for favicon See merge request pleroma/pleroma!84	2018-04-24 05:54:28 +00:00
Francis Dinh	8c0806539c	Embed announce activity data instead of linking to it	2018-04-22 21:28:51 -04:00
Francis Dinh	b1742eca42	Revert "Rename make_unannounce_data helper to make_undo_data" ... This reverts commit c649ca8958.	2018-04-22 19:42:28 -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
Francis Dinh	c649ca8958	Rename make_unannounce_data helper to make_undo_data ... This makes it a bit more easier to adapt for unlikes as well in the future.	2018-04-22 01:55:41 -04: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
lain	ff5e957476	Make search use id index too. ... Seems to be faster in general, query planner chooses well.	2018-04-21 09:22:31 +02:00
Francis Dinh	f0798440de	Use correct activity for undo	2018-04-20 23:22:16 -04:00
Francis Dinh	4b9f2ab526	Fix federation of unreblog activity	2018-04-20 23:09:19 -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
lain	193be32f45	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop	2018-04-19 21:44:29 +02:00
lain	0b4ff1bfe2	fix again	2018-04-19 21:44:11 +02:00
eal	fa37acfcc7	TwitterAPI: Add Qvitter notification endpoint.	2018-04-19 21:46:59 +03:00
nenolod@dereferenced.org	f08f9d4498	ActivityPub MRF: fix nsfw tagging of objects with attachments by looking at the right object (the child in this case)	2018-04-19 07:45:09 -05:00
lain	7b96a756fb	fix again	2018-04-19 13:04:29 +02:00
lain	77fc40d5d7	Fix generate config	2018-04-19 12:52:24 +02:00
eal	e30a056476	Revert "Ask for proxy URL if proxy enabled." ... The most common case is running it on the same server.	2018-04-19 13:29:14 +03:00
Francis Dinh	32a26eb910	Fix TwitterAPI.delete call	2018-04-18 20:43:03 -04:00
William Pitcock	ee6f15529d	CommonAPI post: kill \r with fire	2018-04-18 15:46:39 -05:00
eal	b586ead6b8	rm_user: also ensure that cache is running.	2018-04-18 17:52:25 +03:00
lambda	8b5ea91f68	Merge branch 'fix/rm-user-task' into 'develop' ... Fix rm_user task. See merge request pleroma/pleroma!119	2018-04-18 14:41:03 +00:00
eal	4e3fc530db	Fix rm_user task.	2018-04-18 17:39:27 +03:00
eal	947431e9aa	MastoAPI and OAuth: allow login with either email or username.	2018-04-18 13:13:57 +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	0251690e96	Add federation for unrepeats	2018-04-17 20:35:07 -04:00
Francis Dinh	c9e7b984d5	Add make_unannounce_data helper function	2018-04-17 04:13:08 -04:00
Francis Dinh	85bd191291	Remove unretweet function for now	2018-04-17 04:12:16 -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	d16877251a	doc fixes	2018-04-16 10:59:32 -04:00
Francis Dinh	b949577472	Add unrepeat functionality	2018-04-14 20:19:48 -04:00
William Pitcock	d24ddd9fb9	ActivityPub MRF: implement the SimplePolicy policy	2018-04-14 06:32:45 -05:00
William Pitcock	4a178b3d65	ActivityPub: implement MRF core hook and baseline noop policy object	2018-04-14 06:32:44 -05:00
eal	48380aeccc	ActivityPub.ex: do not return boosted statuses from blocked users.	2018-04-14 14:26:20 +03:00
Phenethylamine	13a64b82e3	Switch to User.delete for rm_user task	2018-04-12 14:30:53 -04:00
Phenethylamine	4478b9115c	Add rm_user mix task	2018-04-12 02:43:48 -04:00
Gian Sass	907df9b8ed	Fix issue #124	2018-04-11 14:55:49 -04:00
lain	b910483c16	Fix register_user task.	2018-04-10 21:05:53 +02:00
lain	1dd2c8163f	Order masto searches by date.	2018-04-10 18:38:52 +02:00
lambda	d7c2909ce2	Merge branch 'bugfix/user-search-with-at-sign' into 'develop' ... user: strip leading @ from user query when searching for users if present Closes #117 See merge request pleroma/pleroma!99	2018-04-09 08:42:01 +00:00
William Pitcock	2edde06042	user: strip leading @ from user query when searching for users if present ... closes #117	2018-04-09 02:42:37 -05:00
lambda	9998b4519d	Merge branch 'feature/mastodon-api-for-tootstream' into 'develop' ... mastodon api emulation improvements for tootstream Closes #101 See merge request pleroma/pleroma!100	2018-04-08 06:02:11 +00:00
lambda	9a2d3705c6	Merge branch 'fix/persisted-mastofe-settings' into 'develop' ... MastoAPI: Persist frontend timelines and settings. Closes #113 See merge request pleroma/pleroma!98	2018-04-08 06:01:06 +00:00
William Pitcock	1857f403be	mastodon api: report version as the Mastodon API version supported with the real version in parenthesis	2018-04-07 17:29:28 -05:00
William Pitcock	52a1a40d7d	mastodon api: implement /api/v1/lists stub	2018-04-07 17:29:27 -05:00
lain	8f9bcc4ab0	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop	2018-04-07 16:41:47 +02: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
eal	7c47534970	MastoAPI: Persist frontend timelines and settings.	2018-04-07 17:26:56 +03:00
lambda	d41bfd1d47	Merge branch 'bugfix/html-webfinger-host-meta' into 'develop' ... webfinger: handle situations where the well-known endpoint returns HTML See merge request pleroma/pleroma!94	2018-04-07 12:19:49 +00:00
eal	e7ddda44c0	Follow import: allow URI in addition to screen_name.	2018-04-07 15:00:23 +03:00
William Pitcock	bf9d3d4aba	XML: use try/catch with XPath functions	2018-04-06 22:56:09 -05:00
lain	60f92e406c	Accept port number in urls.	2018-04-06 16:35:54 +02:00
lain	303289d7da	MastodonAPI search: return only create activities.	2018-04-05 13:59:53 +02:00
RX14	033771d9f1	Fix failure to serve media from custom upload path	2018-04-05 11:46:33 +01:00
lain	d70d1c427a	TwitterAPI: Don't put follows into the public tls.	2018-04-04 15:23:27 +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	96007753ad	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop	2018-04-02 15:29:05 +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
lambda	807d243c64	Merge branch 'fix-107' into 'develop' ... masto api: run emojis through mediaproxy Closes #107 See merge request pleroma/pleroma!92	2018-04-02 11:24:12 +00:00
lain	cd543d58a1	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop	2018-04-02 13:15:38 +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
Morgan Bazalgette	5e4bb4ad92	masto api: run emojis through mediaproxy ... fixes #107	2018-04-02 12:04:11 +02:00
lambda	978df55a86	Merge branch 'feature/mastodon-search-tags' into 'develop' ... mastodon search api: implement a reasonable hashtags stub See merge request pleroma/pleroma!89	2018-04-01 08:37:45 +00:00
KANEKO Yoshitaka	b3d67750f0	Fix conflict	2018-04-01 16:58:35 +09:00
William Pitcock	2dcc6037d0	mastodon search api: implement a reasonable hashtags stub	2018-04-01 02:12:10 -05:00
William Pitcock	4bf86d4cf5	config: make the upload limit configurable	2018-03-31 19:53:23 -05:00
lambda	5fa8237bc1	Merge branch 'new-mastofe' into 'develop' ... Bring Mastodon frontend up-to-date See merge request pleroma/pleroma!87	2018-03-31 19:33:17 +00:00
lain	86525e3a34	Use correct linefeed.	2018-03-31 21:14:33 +02:00
lain	1b03981783	Small fix.	2018-03-31 21:11:46 +02:00
lain	94bbe1addc	Fix typo.	2018-03-31 21:10:56 +02:00
lain	8cbda7c0ee	Modify newlines.	2018-03-31 21:09:58 +02:00
lain	fe1dcf0027	Remove inspect.	2018-03-31 21:02:54 +02:00
lain	9f45e33ae8	Proper info.	2018-03-31 21:00:23 +02:00
lain	ae6e3cb981	No tabs.	2018-03-31 20:48: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	57b24b2cba	Gopher: Add like / repeat count.	2018-03-31 20:01:55 +02:00
Morgan Bazalgette	7f2174d811	Remove pl-dark-masto-fe, add preloading for common scripts	2018-03-31 19:14:47 +02:00
lain	4e5aa3b3a0	Add gopher server.	2018-03-31 18:12:20 +02:00
lain	802736679c	Remove unused ActivityRepresenter module.	2018-03-30 16:50:30 +02:00
lain	7ab94ae22d	TwitterApiController: Use ActivityView.	2018-03-30 16:30:16 +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	480932c8e5	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop	2018-03-30 14:48:08 +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	675839e13c	Fix TwApi reply visibility.	2018-03-30 12:19:57 +02:00
Morgan Bazalgette	457e040473	Add char_limit to initial-state of mastofe	2018-03-30 00:59:49 +02:00
lain	df8fc72491	Don't go through all available emoji. ... object carry their emoji information.	2018-03-28 09:56:32 +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
lain	d2099c849d	More Jason changes.	2018-03-27 16:45:38 +02:00
lain	527e803758	Add missing types.	2018-03-27 16:10:41 +02:00
lain	fbc187ac15	Switch to Jason for json handling. ... It's twice as fast and will be the standard in the coming ecto.	2018-03-27 16:09:08 +02:00
Francis Dinh	61692c7efa	Include the '#' symbol into the link itself	2018-03-27 02:00:04 -04:00
lain	bd4926288e	Speed up follower query.	2018-03-26 10:31:22 +02:00
lain	46f63ea8af	Fix atom feed pagination.	2018-03-26 09:51:43 +02:00
lain	2c1c221301	Fix follower collection id.	2018-03-25 19:34:33 +02:00
lain	09de76ad5a	Return "audio" info in mastodon api.	2018-03-25 17:08:54 +02:00
lambda	809bffbb21	Merge branch 'feature/oauth-token-password' into 'develop' ... oauth: implement grant_type=password for single-page apps See merge request pleroma/pleroma!81	2018-03-25 13:40:06 +00:00
KANEKO Yoshitaka	aa19fdef00	Fix favicon and add to index.html	2018-03-25 19:58:12 +09:00
William Pitcock	2aea3bc632	activitypub transmogrifier: rewrite incoming hashtags	2018-03-24 16:42:17 -05:00
lain	847cb15626	Fix tests.	2018-03-24 15:09:09 +01:00
lain	c7be7a9454	Unify user fetching.	2018-03-24 15:02:43 +01: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
William Pitcock	dd21137f38	oauth: implement grant_type=password for single-page apps	2018-03-23 15:53:58 -05:00
lain	fbe9aa3506	Strip html from emoji stuff.	2018-03-23 19:52:08 +01:00
lain	5da2355e71	For outgoing objects, fake mastodon style ap id for ostatus.	2018-03-23 16:07:02 +01:00
lain	b72a25f5b1	Merge branch 'develop' into kaniini/pleroma-feature/activitypub-endpoints	2018-03-22 12:48:56 +01:00
lain	f9ab38a443	Fix test.	2018-03-22 12:37:24 +01:00
William Pitcock	4d3af2af71	webfinger: implement json response parsing	2018-03-22 00:36:12 -05:00
William Pitcock	1decd2ecb2	webfinger: attempt to fall back if LRDD template cannot be found	2018-03-22 00:36:01 -05:00
William Pitcock	8aa639a450	webfinger: support JSON output	2018-03-22 00:35:51 -05:00
William Pitcock	3fcdfb75d0	activitypub: add outbox endpoint	2018-03-22 00:26:54 -05:00
William Pitcock	381ba256bf	activitypub: add restrict_limit	2018-03-22 00:26:47 -05:00
William Pitcock	1a94704230	activitypub: implement following/followers endpoints	2018-03-22 00:26:39 -05:00
lain	c50c7745bc	Fetch relayed messages from source while we don't have linked data sigs.	2018-03-21 07:12:14 +01:00
lambda	9b97b023c5	Merge branch 'feld-Logger' into 'develop' ... Logging cleanup See merge request pleroma/pleroma!76	2018-03-20 05:57:47 +00:00
Mark Felder	16d102c153	Clarify that this error is about a problem decoding the expected JSON ... payload	2018-03-19 18:18:52 +00:00
Mark Felder	96cfc67e05	LRDD, you are special and we love you too	2018-03-19 18:05:53 +00:00
Mark Felder	2702df489f	cap again	2018-03-19 18:00:02 +00:00
Mark Felder	2549a73d6d	start with a capital	2018-03-19 17:58:45 +00:00
Mark Felder	185c030258	AP again	2018-03-19 17:57:58 +00:00
Mark Felder	9a858621d6	AP and WebFinger need love here	2018-03-19 17:56:49 +00:00
Mark Felder	8d561f952f	Make XML feel special too	2018-03-19 17:51:31 +00:00
Mark Felder	032ed2b945	This log message was do do 💩	2018-03-19 17:47:51 +00:00
Mark Felder	4190abbf27	Another WebSub CamelCase	2018-03-19 17:46:53 +00:00
Mark Felder	7430ff9173	Capitalize Atom	2018-03-19 17:44:25 +00:00
Mark Felder	7f77433c0e	CamelCase WebSub in log messages	2018-03-19 17:41:04 +00:00
Mark Felder	25279dba77	Capitalize start of log message	2018-03-19 17:39:12 +00:00
Mark Felder	0cf6f7a54d	capitalize Salmon protocol name	2018-03-19 17:38:54 +00:00
Mark Felder	04395cb9bd	Grammar consistency ... Most log messages are sentence fragments so make them consistent by removing periods. Log messages that are expressing urgency with ! or pending more work with "..." are OK.	2018-03-19 17:31:58 +00:00
Mark Felder	402e775a80	ap -> AP for consistency	2018-03-19 17:28:06 +00:00
lain	ec83175100	Use connection pools.	2018-03-19 17:42:09 +01:00