File tree Expand file tree Collapse file tree 8 files changed +12
-12
lines changed
bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/module/chatantispam Expand file tree Collapse file tree 8 files changed +12
-12
lines changed Original file line number Diff line number Diff line change @@ -125,7 +125,7 @@ object CasListeners: Listener {
125125 break
126126 }
127127 }
128- if (messageMeta !is DeathMessage && scoreValue >= 0 ) {
128+ if (messageMeta.createdByOwn && scoreValue >= 0 ) {
129129 // A lucky player can get muted in check and in this! This is intentional.
130130 var remainScore = scoreValue
131131 if (mergeScoreValue) {
Original file line number Diff line number Diff line change 11package io.github.rothes.esu.bukkit.module.chatantispam.check
22
33import io.github.rothes.esu.bukkit.module.chatantispam.message.MessageRequest
4- import io.github.rothes.esu.bukkit.module.chatantispam.message.meta.DeathMessage
54import io.github.rothes.esu.core.configuration.data.MessageData.Companion.message
65import io.github.rothes.esu.core.util.extension.DurationExt.compareTo
76import kotlin.math.abs
@@ -11,7 +10,7 @@ object FixedRequest: Check("fixed-request") {
1110 override val defaultBlockedMessage = " <ec>We detected a suspicious bot chat activity." .message
1211
1312 override fun check (request : MessageRequest ): CheckResult {
14- if (request.messageMeta !is DeathMessage ) {
13+ if (! request.messageMeta.createdByOwn ) {
1514 return CheckResult ()
1615 }
1716
Original file line number Diff line number Diff line change 11package io.github.rothes.esu.bukkit.module.chatantispam.check
22
33import io.github.rothes.esu.bukkit.module.chatantispam.message.MessageRequest
4- import io.github.rothes.esu.bukkit.module.chatantispam.message.meta.DeathMessage
54import io.github.rothes.esu.core.configuration.data.MessageData.Companion.message
65import io.github.rothes.esu.core.util.extension.DurationExt.compareTo
76
@@ -15,7 +14,7 @@ object Frequency: Check("frequency") {
1514 with (request.spamCheck.frequency) {
1615 spamData.records.lastOrNull()?.let {
1716 if (minimalInterval >= time - it.time) {
18- val notify = request.messageMeta !is DeathMessage
17+ val notify = request.messageMeta.createdByOwn
1918 if (notify)
2019 notifyBlocked(request.user)
2120 return CheckResult (" freq iv" , 0.15 ,
@@ -26,7 +25,7 @@ object Frequency: Check("frequency") {
2625 if (it == - 1 ) spamData.records.size else it
2726 }
2827 if (maxMessages in 1 .. times) {
29- val notify = request.messageMeta !is DeathMessage
28+ val notify = request.messageMeta.createdByOwn
3029 if (notify)
3130 notifyBlocked(request.user)
3231 return CheckResult (" freq" , 0.2 ,
Original file line number Diff line number Diff line change 11package io.github.rothes.esu.bukkit.module.chatantispam.check
22
33import io.github.rothes.esu.bukkit.module.chatantispam.message.MessageRequest
4- import io.github.rothes.esu.bukkit.module.chatantispam.message.meta.DeathMessage
54import io.github.rothes.esu.core.configuration.data.MessageData.Companion.message
65import io.github.rothes.esu.core.util.ComponentUtils.duration
76import kotlin.time.Duration.Companion.milliseconds
@@ -11,7 +10,7 @@ object Muting: Check("muting") {
1110 override val defaultBlockedMessage = " <ec>You are getting muted temporarily. Please wait <edc><duration><ec>, and behave better.<br>You can still whisper some of your friends now." .message
1211
1312 override fun check (request : MessageRequest ): CheckResult {
14- if (request.messageMeta !is DeathMessage ) {
13+ if (! request.messageMeta.createdByOwn ) {
1514 return CheckResult ()
1615 }
1716 if (request.spamData.muteUntil > request.sendTime) {
Original file line number Diff line number Diff line change @@ -2,7 +2,6 @@ package io.github.rothes.esu.bukkit.module.chatantispam.check
22
33import info.debatty.java.stringsimilarity.RatcliffObershelp
44import io.github.rothes.esu.bukkit.module.chatantispam.message.MessageRequest
5- import io.github.rothes.esu.bukkit.module.chatantispam.message.meta.DeathMessage
65import io.github.rothes.esu.core.configuration.data.MessageData.Companion.message
76import io.github.rothes.esu.core.util.extension.charSize
87import it.unimi.dsi.fastutil.doubles.DoubleArrayList
@@ -36,7 +35,7 @@ object Similarity: Check("similarity") {
3635 hit.add(similarity)
3736 if (hit.size == allowCount) {
3837 val avg = hit.average()
39- val notify = request.messageMeta !is DeathMessage
38+ val notify = request.messageMeta.createdByOwn
4039 if (notify)
4140 notifyBlocked(request.user)
4241 return CheckResult (
Original file line number Diff line number Diff line change 11package io.github.rothes.esu.bukkit.module.chatantispam.check
22
33import io.github.rothes.esu.bukkit.module.chatantispam.message.MessageRequest
4- import io.github.rothes.esu.bukkit.module.chatantispam.message.meta.DeathMessage
54
65object SpacesFilter: Check(" spaces-filter" ) {
76
87 private val duplicateSpaceRegex = " [\\ s\\ u00A0\\ u1680\\ u180E\\ u2000-\\ u200B\\ u202F\\ u205F\\ u3000\\ uFEFF]+" .toRegex()
98
109 override fun check (request : MessageRequest ): CheckResult {
11- if (request.messageMeta !is DeathMessage ) {
10+ if (! request.messageMeta.createdByOwn ) {
1211 return CheckResult ()
1312 }
1413 val spacesCheck = request.spamCheck.spaces
Original file line number Diff line number Diff line change @@ -7,6 +7,9 @@ abstract class BaseMessageMeta(
77 val typeName: String
88 get() = javaClass.simpleName.removeSuffix(" Message" ).lowercase()
99
10+ override val createdByOwn: Boolean
11+ get() = true
12+
1013 override fun toString (): String {
1114 return typeName
1215 }
Original file line number Diff line number Diff line change @@ -4,6 +4,8 @@ interface MessageMeta {
44
55 val type: MessageType
66
7+ val createdByOwn: Boolean
8+
79 override fun toString (): String
810
911}
You can’t perform that action at this time.
0 commit comments