LordMZTE/RUFF
1
1
Fork 0
Code Issues Pull requests Projects Releases 8 Wiki Activity

fix contains matching & bump version
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse source
This commit is contained in:
LordMZTE 2021-07-10 16:14:43 +02:00
parent 0e4664ceeb
commit 58569bae3f
3 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CHANGELOG.md
View file

@ -1,4 +1,3 @@
# 0.2.3 # 0.2.4
- added "matches" propery for memes - fix match = "contains" commands matching when keyword is at the start of message, and there are invalid characters after it.
- added tests for meme matching - add tests
- added "wtf" and "wtuff" commands

2
Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "ruff" name = "ruff"
version = "0.2.3" version = "0.2.4"
authors = ["LordMZTE <lord@mzte.de>"] authors = ["LordMZTE <lord@mzte.de>"]
edition = "2018" edition = "2018"

19
src/meme.rs
View file

@ -33,17 +33,17 @@ impl Meme {
Matcher::Contains => msg Matcher::Contains => msg
.match_indices(&self.keyword) .match_indices(&self.keyword)
.map(|(idx, subs)| { .map(|(idx, subs)| {
idx == 0 (idx == 0
|| msg || msg
.chars() .chars()
.nth(idx - 1) .nth(idx - 1)
.map(|c| ALLOWED_SPACES.contains(c)) .map(|c| ALLOWED_SPACES.contains(c))
.unwrap_or(true))
&& msg
.chars()
.nth(idx + subs.len())
.map(|c| ALLOWED_SPACES.contains(c))
.unwrap_or(true) .unwrap_or(true)
&& msg
.chars()
.nth(idx + subs.len())
.map(|c| ALLOWED_SPACES.contains(c))
.unwrap_or(true)
}) })
.any(|b| b), .any(|b| b),
} }
@ -85,6 +85,9 @@ mod tests {
assert!(!meme.matches("xxx")); assert!(!meme.matches("xxx"));
assert!(!meme.matches("testxxx")); assert!(!meme.matches("testxxx"));
assert!(!meme.matches("xxxtestxxx"));
assert!(!meme.matches("xxxtest xxx"));
assert!(!meme.matches("xxx testxxx"));
assert!(meme.matches("test")); assert!(meme.matches("test"));
assert!(meme.matches("test xxx")); assert!(meme.matches("test xxx"));
assert!(meme.matches("test; xxx")); assert!(meme.matches("test; xxx"));
@ -103,6 +106,10 @@ mod tests {
assert!(!meme.matches("xxx")); assert!(!meme.matches("xxx"));
assert!(!meme.matches("xxxtestxxx")); assert!(!meme.matches("xxxtestxxx"));
assert!(!meme.matches("xxxtest xxx"));
assert!(!meme.matches("xxx testxxx"));
assert!(!meme.matches("xxxtest"));
assert!(!meme.matches("testxxx"));
assert!(meme.matches("xxx test xxx")); assert!(meme.matches("xxx test xxx"));
assert!(meme.matches("xxx,test.xxx")); assert!(meme.matches("xxx,test.xxx"));
assert!(meme.matches("xxx,TEST.xxx")); assert!(meme.matches("xxx,TEST.xxx"));