Comparing version 2.1.3 to 2.1.4
@@ -133,3 +133,3 @@ "use strict"; | ||
return _super.prototype.filter.call(this, event) && event.data['parts'] && | ||
event.data['parts'].findIndex(function (r) { return r.type == Part_1.PartsType.MENTION && (!_this.userId || r.payload.userId == _this.userId); }) >= 0; | ||
event.data['parts'].findIndex(function (r) { return r && r.type == Part_1.PartsType.MENTION && (!_this.userId || r.payload.userId == _this.userId); }) >= 0; | ||
}; | ||
@@ -145,3 +145,3 @@ return MentionFilter; | ||
ForwardFilter.prototype.filter = function (event) { | ||
return event.data['parts'] && event.data.parts.findIndex(function (r) { return r.type == Part_1.PartsType.FORWARD; }) >= 0; | ||
return event.data['parts'] && event.data.parts.findIndex(function (r) { return r && r.type == Part_1.PartsType.FORWARD; }) >= 0; | ||
}; | ||
@@ -158,3 +158,3 @@ return ForwardFilter; | ||
return _super.prototype.filter.call(this, event) && event.data['parts'] && | ||
event.data.parts.findIndex(function (r) { return r.type == Part_1.PartsType.REPLY; }) >= 0; | ||
event.data.parts.findIndex(function (r) { return r && r.type == Part_1.PartsType.REPLY; }) >= 0; | ||
}; | ||
@@ -161,0 +161,0 @@ return ReplyFilter; |
@@ -46,3 +46,3 @@ { | ||
}, | ||
"version": "2.1.3" | ||
"version": "2.1.4" | ||
} |
@@ -91,3 +91,3 @@ import { PartsType, PartFile, PayLoadFileType } from "./Entities/Part"; | ||
return super.filter(event) && event.data['parts'] && | ||
event.data['parts'].findIndex(r => r.type == PartsType.MENTION && (!this.userId || r.payload.userId == this.userId)) >= 0 | ||
event.data['parts'].findIndex(r => r && r.type == PartsType.MENTION && (!this.userId || r.payload.userId == this.userId)) >= 0 | ||
} | ||
@@ -99,3 +99,3 @@ } | ||
filter(event: ICQEvent) { | ||
return event.data['parts'] && (event.data as NewMessageEvent).parts.findIndex(r => r.type == PartsType.FORWARD) >= 0 | ||
return event.data['parts'] && (event.data as NewMessageEvent).parts.findIndex(r => r && r.type == PartsType.FORWARD) >= 0 | ||
} | ||
@@ -107,3 +107,3 @@ } | ||
return super.filter(event) && event.data['parts'] && | ||
(event.data as NewMessageEvent).parts.findIndex(r => r.type == PartsType.REPLY) >= 0 | ||
(event.data as NewMessageEvent).parts.findIndex(r => r && r.type == PartsType.REPLY) >= 0 | ||
} | ||
@@ -152,3 +152,3 @@ } | ||
} | ||
throw "Not type filter" | ||
throw "Not type filter" | ||
} | ||
@@ -165,7 +165,7 @@ } | ||
static audio = new AudioFilter() | ||
static media = FilterComposite.or(FilterComposite.or( Filter.image, Filter.video), Filter.audio); | ||
static media = FilterComposite.or(FilterComposite.or(Filter.image, Filter.video), Filter.audio); | ||
static data = FilterComposite.and(Filter.file, FilterComposite.not(Filter.media)); | ||
static sticker = new StickerFilter() | ||
static url = new URLFilter() | ||
static text = FilterComposite.and(Filter.message, FilterComposite.not(FilterComposite.or(FilterComposite.or(FilterComposite.or(Filter.command, Filter.sticker ), Filter.file), Filter.url))); | ||
static text = FilterComposite.and(Filter.message, FilterComposite.not(FilterComposite.or(FilterComposite.or(FilterComposite.or(Filter.command, Filter.sticker), Filter.file), Filter.url))); | ||
static regexp = RegexpFilter | ||
@@ -172,0 +172,0 @@ static mention = MentionFilter |
@@ -209,7 +209,35 @@ | ||
}) | ||
it("eventMessage must by CommandFilter false",() =>{ | ||
assert(!filter.filter(new ICQEvent(event.eventMessage))); | ||
}) | ||
it("eventDeleteMessage must by CommandFilter false",() =>{ | ||
assert(!filter.filter(new ICQEvent(event.eventDeleteMessage))); | ||
}) | ||
it("eventEditMessage must by CommandFilter false",() =>{ | ||
assert(!filter.filter(new ICQEvent(event.eventEditMessage))); | ||
}) | ||
it("eventPinnedMessage must by CommandFilter false",() =>{ | ||
assert(!filter.filter(new ICQEvent(event.eventPinnedMessage))); | ||
}) | ||
it("eventUnpunnedMessage must by CommandFilter false",() =>{ | ||
assert(!filter.filter(new ICQEvent(event.eventUnpunnedMessage))); | ||
}) | ||
it("eventNewChatMembers must by CommandFilter false",() =>{ | ||
assert(!filter.filter(new ICQEvent(event.eventNewChatMembers))); | ||
}) | ||
it("eventLeftChatMembers must by CommandFilter false",() =>{ | ||
assert(!filter.filter(new ICQEvent(event.eventLeftChatMembers))); | ||
}) | ||
}) | ||
describe("Filters MentionFilter ", () => { | ||
let filter = new Filters.MentionFilter("1234567890"); | ||
it("timeCommandMessage must by CommandFilter false",() =>{ | ||
assert(!filter.filter(new ICQEvent(event.timeCommandMessage))); | ||
}) | ||
it("eventMessage must by CommandFilter false",() =>{ | ||
assert(!filter.filter(new ICQEvent(event.eventMessage))); | ||
}) | ||
it("eventDeleteMessage must by CommandFilter false",() =>{ | ||
@@ -226,3 +254,3 @@ assert(!filter.filter(new ICQEvent(event.eventDeleteMessage))); | ||
assert(!filter.filter(new ICQEvent(event.eventUnpunnedMessage))); | ||
}); | ||
}) | ||
it("eventNewChatMembers must by CommandFilter false",() =>{ | ||
@@ -229,0 +257,0 @@ assert(!filter.filter(new ICQEvent(event.eventNewChatMembers))); |
Sorry, the diff of this file is not supported yet
340786
6384