cqrenet/mxids
3
0
Fork 0
Code Pull Requests 10 Actions Releases Activity

Handle Homeservers not implementing the directory endpoint

Browse Source
This commit is contained in:
Maxime Dor
2017-10-06 14:12:43 +02:00
parent 0e48edf86e
commit b4f0645257
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/io/kamax/mxisd/directory/DirectoryManager.java
View File

@@ -31,6 +31,7 @@ import io.kamax.mxisd.exception.MatrixException;
import io.kamax.mxisd.util.GsonUtil; import io.kamax.mxisd.util.GsonUtil;
import io.kamax.mxisd.util.RestClientUtils; import io.kamax.mxisd.util.RestClientUtils;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpPost; import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.utils.URIBuilder; import org.apache.http.client.utils.URIBuilder;
@@ -88,8 +89,13 @@ public class DirectoryManager {
if (status != 200) { if (status != 200) {
MatrixErrorInfo info = gson.fromJson(body, MatrixErrorInfo.class); MatrixErrorInfo info = gson.fromJson(body, MatrixErrorInfo.class);
if (StringUtils.equals("M_UNRECOGNIZED", info.getErrcode())) { // FIXME no hardcoding, use Enum
log.warn("Homeserver does not support Directory feature, skipping");
} else {
log.error("Homeserver returned an error while performing directory search");
throw new MatrixException(status, info.getErrcode(), info.getError()); throw new MatrixException(status, info.getErrcode(), info.getError());
} }
}
UserDirectorySearchResult resultHs = gson.fromJson(body, UserDirectorySearchResult.class); UserDirectorySearchResult resultHs = gson.fromJson(body, UserDirectorySearchResult.class);
log.info("Found {} match(es) in HS for '{}'", resultHs.getResults().size(), query); log.info("Found {} match(es) in HS for '{}'", resultHs.getResults().size(), query);