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

Add on/off switch for 3PID in directory lookups

Browse Source
This commit is contained in:
Max Dor
2018-08-15 11:25:41 +02:00
parent 1ab8a27fda
commit feb37112b2
3 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,11 +129,15 @@ public class DirectoryManager {
result.setLimited(true);
}
resultProvider = provider.searchBy3pid(query);
log.info("Threepid: found {} match(es) for '{}'", resultProvider.getResults().size(), query);
result.getResults().addAll(resultProvider.getResults());
if (resultProvider.isLimited()) {
result.setLimited(true);
if (cfg.getExclude().getThreepid()) {
log.info("Skipping 3PID data, disabled in config");
} else {
resultProvider = provider.searchBy3pid(query);
log.info("Threepid: found {} match(es) for '{}'", resultProvider.getResults().size(), query);
result.getResults().addAll(resultProvider.getResults());
if (resultProvider.isLimited()) {
result.setLimited(true);
}
}
}