wickrio-bot-api - npm Package Compare versions

Comparing version 5.62.3 to 5.62.4

package.json

 {
 	"name": "wickrio-bot-api",
-	"version": "5.62.3",
+	"version": "5.62.4",
 	"description": "The official Wickr IO Bot API Framework",
@@ -5,0 +5,0 @@ "main": "src/WickrIOBot.js",

src/WickrIOBot.js

@@ -397,3 +397,3 @@ const WickrIOAPI = require("wickrio_addon")
 				vgroupid: vGroupID,
-				call : message.call,
+				call: message.call,
 				msgTS: msg_ts,
@@ -496,81 +496,161 @@ time,
 
-	async getMessageData(rawMessage) {
-		// TODO fix the parseMessage function so it can include control messages
-		// TODO add a parseMessage that can get the important parts and leave out recipients
-		// Parses an incoming message and returns an object with command, argument, vGroupID and Sender fields
-
-		// get message
+	getMessage({ rawMessage }) {
+		console.log({ rawMessage })
+		// const tokens = JSON.parse(process.env.tokens)
+		const jsonmsg = JSON.parse(rawMessage)
 		const {
-			ttl,
-			bor,
+			message_id: messageID,
+			message,
+			edit,
 			control,
-			msgTS,
+			file,
+			msg_ts: msgTS,
+			time,
 			receiver,
-			sender,
-			file,
-			filename,
-			message,
-			command,
-			argument,
-			vgroupid,
-			userEmail,
-			convotype,
-			isAdmin,
-			msgtype,
-			latitude,
-			longitude,
-			isVoiceMemo,
-			voiceMemoDuration
-		} = this.parseMessage(rawMessage)
-		let wickrUser
-		// get command
+			sender: userEmail,
+			ttl,
+			location,
+			vgroupid: vGroupID,
+			msgtype: msgType,
+			call,
+			users,
+			keyverify
+		} = jsonmsg
+		let { bor } = jsonmsg
+		if (!bor) bor = 0
 
-		// TODO what's the difference between full message and message
-		// const messageReceived = parsedMessage.message
+		// const msgtype = message.msgtype
+		// const vGroupID = message.vgroupid
+		let convoType = ""
 
-		// enable this and move it out of bot repos
-		// let user = this.getUser(userEmail) // Look up user by their wickr email
+		// Get the admin, if this is an admin user
+		const localWickrAdmins = this.myAdmins
+		const admin = localWickrAdmins.getAdmin(userEmail)
 
-		// if (user === undefined) {
-		// 	// Check if a user exists in the database
-		// 	wickrUser = new WickrUser(userEmail, {
-		// 		message,
-		// 		vgroupid,
-		// 		personalVGroupID: "",
-		// 		command: "",
-		// 		argument: "",
-		// 		currentState: 0
-		// 	})
-		// 	user = this.addUser(wickrUser) // Add a new user to the database
-		// }
-
-		// create a directory for users to upload files for the bot to recall or use, if it doesn't already exist
-		if (!fs.existsSync(`${process.cwd()}/files/${userEmail}`)) {
-			fs.mkdirSync(`${process.cwd()}/files/${userEmail}`)
+		// If ONLY admins can receive and handle messages and this is
+		// not an admin, then drop the message
+		if (this.adminOnly === true && admin === undefined) {
+			console.log("Dropping message from non-admin user!")
+			return
 		}
 
-		return {
-			ttl,
-			bor,
-			control,
+		// Set the isAdmin flag
+		const isAdmin = admin !== undefined
+
+		// Determine the convo type (1to1, group, or room)
+		if (vGroupID.charAt(0) === "S") convoType = "room"
+		else if (vGroupID.charAt(0) === "G") convoType = "groupconvo"
+		else convoType = "personal"
+		let parsedMessage = {
+			messageID,
+			message,
 			msgTS,
+			time,
 			receiver,
-			sender,
-			file,
-			filename,
-			message,
-			command,
-			argument,
-			vGroupID: vgroupid,
-			convoType: convotype,
-			msgType: msgtype,
+			users,
+			vGroupID,
 			userEmail,
+			convoType,
 			isAdmin,
-			latitude,
-			longitude,
-			isVoiceMemo,
-			voiceMemoDuration
+			ttl,
+			bor
 		}
+		if (file) {
+			if (file.isvoicememo) {
+				parsedMessage = {
+					...parsedMessage,
+					file: file.localfilename,
+					filename: file.filename,
+					isVoiceMemo: true,
+					voiceMemoDuration: file.voicememoduration,
+					msgType: "file"
+				}
+				return parsedMessage
+			} else {
+				parsedMessage = {
+					...parsedMessage,
+					file: file.localfilename,
+					filename: file.filename,
+					isVoiceMemo: false,
+					msgType: "file"
+				}
+			}
+			return parsedMessage
+		} else if (location) {
+			parsedMessage = {
+				...parsedMessage,
+				latitude: location.latitude,
+				longitude: location.longitude,
+				msgType: "location"
+			}
+			return parsedMessage
+		} else if (call) {
+			parsedMessage = {
+				...parsedMessage,
+				status: call.status,
+				call,
+				msgType: "call"
+			}
+			return parsedMessage
+		} else if (keyverify) {
+			parsedMessage = {
+				...parsedMessage,
+				control,
+				msgType: "keyverify"
+			}
+			return parsedMessage
+		} else if (control) {
+			if (control.isrecall) {
+				parsedMessage = {
+					...parsedMessage,
+					msgType: "delete"
+				}
+			} else {
+				parsedMessage = {
+					...parsedMessage,
+					control,
+					msgType: "edit"
+				}
+			}
+			return parsedMessage
+		} else if (edit) {
+			parsedMessage = {
+				...parsedMessage,
+				msgType: "edit"
+			}
+			return parsedMessage
+		} else if (message === undefined) {
+			return
+		}
+
+		let command = ""
+		let argument = ""
+		// This doesn't capture @ mentions
+		const parsedData = message.match(/(\/[a-zA-Z]+)([\s\S]*)$/)
+		if (parsedData !== null) {
+			command = parsedData[1]
+			if (parsedData[2] !== "") {
+				argument = parsedData[2]
+				argument = argument.trim()
+			}
+		}
+
+		// If this is an admin then process any admin commands
+		if (admin !== undefined) {
+			localWickrAdmins.processAdminCommand(
+				userEmail,
+				vGroupID,
+				command,
+				argument
+			)
+		}
+
+		parsedMessage = {
+			...parsedMessage,
+			command,
+			argument
+		}
+
+		return parsedMessage
 	}
-
 	/*
@@ -577,0 +657,0 @@ * User functions

No alert changes

Improved metrics

Total package byte prevSize

71118

increased by24.81%

Number of package files

11

increased by57.14%

Lines of code

1520

increased by11.93%

No dependency changes