Comparing version 1.0.1 to 1.0.2
{ | ||
"name": "icq-bot", | ||
"version": "1.0.1", | ||
"version": "1.0.2", | ||
"description": "ICQ-BOT", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
@@ -31,2 +31,3 @@ # icq-bot | ||
cd icq-bot-nodejs | ||
npm install | ||
npm install ntsc -g | ||
@@ -40,2 +41,2 @@ ntsc | ||
<li><a href="https://agent.mail.ru/botapi/">agent.mail.ru/botapi/</a></li> | ||
</ul> | ||
</ul> |
@@ -66,3 +66,3 @@ import { HttpClient, FormDataICQ, ICQHttpClient } from "./ICQHttpClient"; | ||
getUserAgent(): string { | ||
let libraryVersion = "0.0.1-alpha"; | ||
let libraryVersion = "1.0.1-beta"; | ||
return `${this.name}/${this.version} (uin=${this.uin ? this.uin : null}) bot-nodejs/${libraryVersion}` | ||
@@ -69,0 +69,0 @@ } |
@@ -11,3 +11,2 @@ import { URL } from 'url'; | ||
export class FormDataICQ { | ||
@@ -14,0 +13,0 @@ private data = []; |
@@ -7,3 +7,3 @@ import { PartsType, PartFile, PayLoadFileType } from "./Entities/Part"; | ||
export interface Filter { | ||
filter(event: ICQEvent): boolean; | ||
filter(event: ICQEvent): boolean; | ||
} | ||
@@ -13,3 +13,3 @@ | ||
export class MessageFilter implements Filter { | ||
filter(event: ICQEvent): boolean { | ||
filter(event: ICQEvent): boolean { | ||
return event.data["text"] && event["text"].length > 0; | ||
@@ -19,7 +19,6 @@ } | ||
export class CommandFilter extends MessageFilter { | ||
COMMAND_PREFIXES: String[] = ["/", "."]; | ||
filter(event: ICQEvent) { | ||
filter(event: ICQEvent) { | ||
return (super.filter(event) && this.COMMAND_PREFIXES.findIndex(r => r === (event.data as NewMessageEvent).text.trim()[0]) >= 0) | ||
@@ -26,0 +25,0 @@ } |
@@ -16,28 +16,11 @@ import { Filter } from "./Filter"; | ||
/** | ||
* Обработчик событий по фильтру | ||
* На вход поступают разные события | ||
*/ | ||
export interface Handler { | ||
// protected filter: Filter; | ||
check(event: ICQEvent, dispatcher: Dispatcher): boolean; | ||
handle(event: ICQEvent, dispatcher: Dispatcher): void; | ||
} | ||
/** | ||
* Обработчик событий по фильтру | ||
* На вход поступают разные события | ||
*/ | ||
export interface Handler { | ||
check(event: ICQEvent, dispatcher: Dispatcher): boolean; | ||
handle(event: ICQEvent, dispatcher: Dispatcher): void; | ||
} | ||
// export class HandlerBase implements Handler { | ||
// // protected filter: Filter; | ||
// constructor(protected filters, protected callback) { } | ||
// check(event: Event, dispatcher?: Dispatcher) { | ||
// return (!this.filters || this.filters(event)); | ||
// } | ||
// handle(event: Event, dispatcher: Dispatcher): void { | ||
// if (this.callback) { | ||
// this.callback(dispatcher.getBot(), event) | ||
// } | ||
// } | ||
// } | ||
export class HandlerBase implements Handler { | ||
@@ -58,3 +41,3 @@ constructor(protected filters: Filter, protected callback: (bot: ICQBot, event: ICQEvent) => void) { } | ||
constructor(callback = null) { | ||
super(null, callback); | ||
super(null, callback); | ||
} | ||
@@ -104,3 +87,3 @@ | ||
public check(event, dispatcher) { | ||
console.log(super.check(event,dispatcher)); | ||
console.log(super.check(event, dispatcher)); | ||
return (super.check(event, dispatcher) && event.type == EventType.NEW_MESSAGE) | ||
@@ -176,10 +159,10 @@ } | ||
let result = await bot.sendText(this.target, this.message.replace(/\{source\}/i, source).replace(/\{message\}/i, feedback_text)) | ||
if(!result.ok) console.log("Не удалось отправить запрос sendText"); | ||
if (!result.ok) console.log("Не удалось отправить запрос sendText"); | ||
if (this.reply != "") { | ||
let result = await bot.sendText(source, this.reply) | ||
if(!result.ok) console.log("Не удалось отправить запрос sendText"); | ||
let result = await bot.sendText(source, this.reply) | ||
if (!result.ok) console.log("Не удалось отправить запрос sendText"); | ||
} | ||
} else if (this.error_reply != "") { | ||
let result = await bot.sendText(source, this.error_reply) | ||
if(!result.ok) console.log("Не удалось отправить запрос sendText"); | ||
if (!result.ok) console.log("Не удалось отправить запрос sendText"); | ||
} | ||
@@ -204,18 +187,18 @@ } | ||
export class ICQEvent { | ||
type: EventType; | ||
data: NewMessageEvent | EditedMessageEvent | DeletedMessageEvent | PinnedMessageEvent | UnpinnedMessageEvent | NewChatMembersEvent | LeftChatMembersEvent | ||
text: String; | ||
messageAuthor: UserWidthName; | ||
fromChatId: string; | ||
constructor(event: Event) { | ||
this.type = event.type; | ||
this.data = event.payload; | ||
if (this.type == EventType.NEW_MESSAGE) { | ||
export class ICQEvent { | ||
type: EventType; | ||
data: NewMessageEvent | EditedMessageEvent | DeletedMessageEvent | PinnedMessageEvent | UnpinnedMessageEvent | NewChatMembersEvent | LeftChatMembersEvent | ||
text: String; | ||
messageAuthor: UserWidthName; | ||
fromChatId: string; | ||
constructor(event: Event) { | ||
this.type = event.type; | ||
this.data = event.payload; | ||
if (this.type == EventType.NEW_MESSAGE) { | ||
this.text = (this.data as NewMessageEvent).text | ||
this.fromChatId = (this.data as NewMessageEvent).chat.chatId | ||
this.messageAuthor = (this.data as NewMessageEvent).from | ||
} | ||
} | ||
} | ||
} | ||
@@ -233,3 +216,3 @@ // class Event(object): | ||
// self.message_author = data['from'] | ||
// def __repr__(self): | ||
@@ -236,0 +219,0 @@ // return "Event(type='{self.type}', data='{self.data}')".format(self=self) |
Mixed license
License(Experimental) Package contains multiple licenses.
Found 1 instance in 1 package
53144
36
1364
41
1