GeneralBots/botserver
2
1
Fork 0
Code Issues Pull requests 1 Projects Releases 323 Packages Wiki Activity Actions

fix(basic.gblib): SEND EMAIL body is now optional.

Browse source
This commit is contained in:
Rodrigo Rodriguez 2024-04-02 17:52:17 -03:00
parent f52f52d716
commit 9b59146034
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
packages/basic.gblib/services/DialogKeywords.ts
View file

@ -526,6 +526,11 @@ export class DialogKeywords {
* *
*/ */
public async sendEmail({ pid, to, subject, body }) { public async sendEmail({ pid, to, subject, body }) {
if (!body) {
body = "";
};
// tslint:disable-next-line:no-console // tslint:disable-next-line:no-console
GBLog.info(`[E-mail]: to:${to},subject: ${subject},body: ${body}.`); GBLog.info(`[E-mail]: to:${to},subject: ${subject},body: ${body}.`);
@ -1247,9 +1252,9 @@ export class DialogKeywords {
public async messageBot({ pid, text }) { public async messageBot({ pid, text }) {
const { min, user } = await DialogKeywords.getProcessInfo(pid); const { min, user } = await DialogKeywords.getProcessInfo(pid);
GBLogEx.info(min,`MESSAGE BOT: ${text}.`); GBLogEx.info(min, `MESSAGE BOT: ${text}.`);
const { conversation, client} = min['apiConversations'][pid]; const { conversation, client } = min['apiConversations'][pid];
await client.apis.Conversations.Conversations_PostActivity({ await client.apis.Conversations.Conversations_PostActivity({
conversationId: conversation.conversationId, conversationId: conversation.conversationId,
@ -1263,26 +1268,26 @@ export class DialogKeywords {
} }
} }
}); });
let messages = []; let messages = [];
GBLog.info(`MessageBot: Starting message polling ${conversation.conversationId}).`); GBLog.info(`MessageBot: Starting message polling ${conversation.conversationId}).`);
const worker = async () => { const worker = async () => {
try { try {
const response = await client.apis.Conversations.Conversations_GetActivities({ const response = await client.apis.Conversations.Conversations_GetActivities({
conversationId: conversation.conversationId, conversationId: conversation.conversationId,
watermark: conversation.watermark watermark: conversation.watermark
}); });
conversation.watermarkMap = response.obj.watermark; conversation.watermarkMap = response.obj.watermark;
let activities = response.obj.activites; let activities = response.obj.activites;
if (activities && activities.length) { if (activities && activities.length) {
activities = activities.filter(m => m.from.id === min.botId && m.type === 'message'); activities = activities.filter(m => m.from.id === min.botId && m.type === 'message');
if (activities.length) { if (activities.length) {
@ -1292,9 +1297,9 @@ export class DialogKeywords {
}); });
} }
} }
return messages.join('\n'); return messages.join('\n');
} catch (err) { } catch (err) {
GBLog.error( GBLog.error(
`Error calling printMessages API ${err.data === undefined ? err : err.data} ${err.errObj ? err.errObj.message : '' `Error calling printMessages API ${err.data === undefined ? err : err.data} ${err.errObj ? err.errObj.message : ''
@ -1325,7 +1330,7 @@ export class DialogKeywords {
const pid = GBVMService.createProcessInfo(user, min, 'api', null); const pid = GBVMService.createProcessInfo(user, min, 'api', null);
const conversation = min['apiConversations'][pid]; const conversation = min['apiConversations'][pid];
const client = await new SwaggerClient({ const client = await new SwaggerClient({
@ -1338,7 +1343,7 @@ export class DialogKeywords {
const response = await client.apis.Conversations.Conversations_StartConversation(); const response = await client.apis.Conversations.Conversations_StartConversation();
conversation.conversationId = response.obj.conversationId; conversation.conversationId = response.obj.conversationId;
return await GBVMService.callVM('start', min, null, pid); return await GBVMService.callVM('start', min, null, pid);
} }
@ -1377,10 +1382,10 @@ export class DialogKeywords {
); );
GBLog.verbose(`Translated text(playMarkdown): ${text}.`); GBLog.verbose(`Translated text(playMarkdown): ${text}.`);
if (step){ if (step) {
await min.conversationalService.sendText(min, step, text); await min.conversationalService.sendText(min, step, text);
} }
else{ else {
await min.conversationalService['sendOnConversation'](min, user, text); await min.conversationalService['sendOnConversation'](min, user, text);
} }
} }