Godfather-Bots/autoresponder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/release-1.1.1'

Browse Source
This commit is contained in:
Mark Struchkov 2019-01-21 10:08:51 +03:00
commit 72ba0b8799
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>org.sadtech.autoresponder</groupId> <groupId>org.sadtech.autoresponder</groupId>
<artifactId>core</artifactId> <artifactId>core</artifactId>
<version>1.1.0-RELEASE</version> <version>1.1.1-RELEASE</version>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>

14
src/main/java/org/sadtech/autoresponder/Autoresponder.java
View File

@ -1,5 +1,6 @@
package org.sadtech.autoresponder; package org.sadtech.autoresponder;
import lombok.extern.log4j.Log4j;
import org.sadtech.autoresponder.entity.Person; import org.sadtech.autoresponder.entity.Person;
import org.sadtech.autoresponder.entity.Unit; import org.sadtech.autoresponder.entity.Unit;
import org.sadtech.autoresponder.entity.compare.UnitPriorityComparator; import org.sadtech.autoresponder.entity.compare.UnitPriorityComparator;
@ -7,9 +8,11 @@ import org.sadtech.autoresponder.service.PersonService;
import org.sadtech.autoresponder.service.UnitService; import org.sadtech.autoresponder.service.UnitService;
import org.sadtech.autoresponder.submodule.parser.Parser; import org.sadtech.autoresponder.submodule.parser.Parser;
import java.util.Collections; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set;
@Log4j
public class Autoresponder { public class Autoresponder {
private UnitService unitService; private UnitService unitService;
@ -48,10 +51,17 @@ public class Autoresponder {
Parser parser = new Parser(); Parser parser = new Parser();
parser.setText(message); parser.setText(message);
parser.parse(); parser.parse();
return nextUnits.stream().filter(nextUnit -> !Collections.disjoint(nextUnit.getKeyWords(), parser.getWords())).max(new UnitPriorityComparator()).get(); return nextUnits.stream().filter(nextUnit -> textPercentageMatch(nextUnit, parser.getWords()) >= nextUnit.getMatchThreshold()).max(new UnitPriorityComparator()).get();
} else { } else {
return null; return null;
} }
} }
private Double textPercentageMatch(Unit unit, Set<String> words) {
Set<String> temp = new HashSet<>(unit.getKeyWords());
temp.retainAll(words);
log.info((temp.size() / unit.getKeyWords().size()) * 100);
return (double) (temp.size() / unit.getKeyWords().size()) * 100;
}
} }