3 commits

Author	SHA1	Message	Date
Neil Alexander	fe82e1f725	Separate muxes for public and internal APIs (#1056) ... * Separate muxes for public and internal APIs * Update client-api-proxy and federation-api-proxy so they don't add /api to the path * Tidy up * Consistent HTTP setup * Set up prefixes properly	2020-05-22 11:43:17 +01:00
Kegsay	24d8df664c	Fix #897 and shuffle directory around (#1054) ... * Fix #897 and shuffle directory around * Update find-lint * goimports Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com>	2020-05-21 14:40:13 +01:00
Neil Alexander	5c894efd0e	Roomserver perform join (#1001) ... * Add PerformJoin template * Try roomserver perform join * Send correct server name to FS API * Pass through content, try to handle multiple server names * Fix local server checks * Don't refer to non-existent error * Add directory lookups of aliases * Remove unneeded parameters * Don't repeat join events into the roomserver * Unmarshal the content, that would help * Check if the user is already in the room in the fedeationapi too * Return incompatible room version error * Use Membership, don't try more servers than needed * Review comments, make FS API take list of servernames, dedupe them, break out of loop properly on success * Tweaks	2020-05-04 13:53:47 +01:00