Skip to content
This repository has been archived by the owner on Sep 20, 2024. It is now read-only.

Check if a new message is from the bot using the bot's id instead of … #1397

Merged
merged 1 commit into from
Jun 27, 2018
Merged

Check if a new message is from the bot using the bot's id instead of … #1397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file modified bin/cli.js
100644 → 100755
View file
Open in desktop
Empty file.
8 changes: 5 additions & 3 deletions lib/CiscoSparkbot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ function Sparkbot(configuration) {

controller.api.messages.get(message.data).then(function(decrypted_message) {

message.userId = decrypted_message.personId;
message.user = decrypted_message.personEmail;
message.channel = decrypted_message.roomId;
message.text = decrypted_message.text;
Expand Down Expand Up @@ -240,21 +241,22 @@ function Sparkbot(configuration) {
if (message.resource != 'messages' || message.event != 'created') {

var event = message.resource + '.' + message.event;
message.userId = decrypted_message.personId;
message.user = message.data.personEmail;
message.channel = message.data.roomId;
message.id = message.data.id;
message.type = event;

switch (event) {
case 'memberships.deleted':
if (message.user === controller.identity.emails[0]) {
if (message.userId === controller.identity.id) {
message.type = 'bot_space_leave';
} else {
message.type = 'user_space_leave';
}
break;
case 'memberships.created':
if (message.user === controller.identity.emails[0]) {
if (message.userId === controller.identity.id) {
message.type = 'bot_space_join';
} else {
message.type = 'user_space_join';
Expand All @@ -270,7 +272,7 @@ function Sparkbot(configuration) {

// further categorize messages
if (message.type == 'message_received') {
if (message.user === controller.identity.emails[0]) {
if (message.user === controller.identity.id) {
message.type = 'self_message';
} else if (message.raw_message.data.roomType == 'direct') {
message.type = 'direct_message';
Expand Down