Added image handling for messaging BOD-187
This commit is contained in:
@@ -13,7 +13,8 @@ const admin = require("../firebase/firebase-handler").admin;
|
||||
|
||||
exports.receive = (req, res) => {
|
||||
//Perform request validation
|
||||
console.log("Twilio Receive Inbound");
|
||||
console.log("[SMS Receive] Inbound Twilio Message.", req.body.SmsMessageSid);
|
||||
console.log("req.body", req.body);
|
||||
if (
|
||||
!!!req.body ||
|
||||
!!!req.body.MessagingServiceSid ||
|
||||
@@ -29,7 +30,12 @@ exports.receive = (req, res) => {
|
||||
})
|
||||
.then((response) => {
|
||||
//TODO Add logic for handling MMS.
|
||||
let newMessage = { msid: req.body.SmsMessageSid, text: req.body.Body };
|
||||
let newMessage = {
|
||||
msid: req.body.SmsMessageSid,
|
||||
text: req.body.Body,
|
||||
image: !!req.body.MediaUrl0,
|
||||
image_path: req.body.MediaUrl0 || null,
|
||||
};
|
||||
if (response.bodyshops[0]) {
|
||||
//Found a bodyshop - should always happen.
|
||||
if (response.bodyshops[0].conversations.length === 0) {
|
||||
@@ -57,7 +63,7 @@ exports.receive = (req, res) => {
|
||||
client
|
||||
.request(queries.INSERT_MESSAGE, { msg: newMessage })
|
||||
.then((r2) => {
|
||||
console.log("R2", JSON.stringify(r2));
|
||||
res.status(200).send("");
|
||||
|
||||
const arrayOfAllUserFcmTokens = r2.insert_messages.returning[0].conversation.bodyshop.associations.map(
|
||||
(a) => a.user.fcmtokens
|
||||
@@ -77,7 +83,7 @@ exports.receive = (req, res) => {
|
||||
},
|
||||
tokens: uniqueTokens,
|
||||
};
|
||||
res.status(200).send("");
|
||||
|
||||
// Send a message to the device corresponding to the provided
|
||||
// registration token.
|
||||
admin
|
||||
@@ -86,8 +92,8 @@ exports.receive = (req, res) => {
|
||||
.then((response) => {
|
||||
// Response is a message ID string.
|
||||
console.log(
|
||||
"Successfully sent message:",
|
||||
JSON.stringify(response)
|
||||
"[SMS Receive] Successfully sent FCM Broadcast.:",
|
||||
//JSON.stringify(response)
|
||||
);
|
||||
})
|
||||
.catch((error) => {
|
||||
@@ -129,3 +135,27 @@ exports.receive = (req, res) => {
|
||||
// "From": "+16049992002",
|
||||
// "ApiVersion": "2010-04-01"
|
||||
// }
|
||||
// ] req.body {
|
||||
// [0] ToCountry: 'CA',
|
||||
// [0] MediaContentType0: 'image/jpeg',
|
||||
// [0] ToState: 'BC',
|
||||
// [0] SmsMessageSid: 'MM14fa2851ba26e0dc2b62073f8e7cdf27',
|
||||
// [0] NumMedia: '1',
|
||||
// [0] ToCity: 'Vancouver',
|
||||
// [0] FromZip: '',
|
||||
// [0] SmsSid: 'MM14fa2851ba26e0dc2b62073f8e7cdf27',
|
||||
// [0] FromState: 'BC',
|
||||
// [0] SmsStatus: 'received',
|
||||
// [0] FromCity: 'VANCOUVER',
|
||||
// [0] Body: '',
|
||||
// [0] FromCountry: 'CA',
|
||||
// [0] To: '+16043301606',
|
||||
// [0] MessagingServiceSid: 'MG6e259e2add04ffa0d0aa355038670ee1',
|
||||
// [0] ToZip: '',
|
||||
// [0] NumSegments: '1',
|
||||
// [0] MessageSid: 'MM14fa2851ba26e0dc2b62073f8e7cdf27',
|
||||
// [0] AccountSid: 'AC6c09d337d6b9c68ab6488c2052bd457c',
|
||||
// [0] From: '+16049992002',
|
||||
// [0] MediaUrl0: 'https://api.twilio.com/2010-04-01/Accounts/AC6c09d337d6b9c68ab6488c2052bd457c/Messages/MM14fa2851ba26e0dc2b62073f8e7cdf27/Media/MEf129dd37979852f395eb29ffb126e19e',
|
||||
// [0] ApiVersion: '2010-04-01'
|
||||
// [0] }
|
||||
|
||||
@@ -36,7 +36,7 @@ exports.send = (req, res) => {
|
||||
gqlClient
|
||||
.request(queries.INSERT_MESSAGE, { msg: newMessage })
|
||||
.then((r2) => {
|
||||
console.log("Responding GQL Message ID", JSON.stringify(r2));
|
||||
//console.log("Responding GQL Message ID", JSON.stringify(r2));
|
||||
res.sendStatus(200);
|
||||
})
|
||||
.catch((e2) => {
|
||||
|
||||
@@ -18,7 +18,7 @@ exports.status = (req, res) => {
|
||||
fields: { status: SmsStatus },
|
||||
})
|
||||
.then((response) => {
|
||||
console.log("Message Updated");
|
||||
console.log("Message Updated", JSON.stringify(response));
|
||||
})
|
||||
.catch((error) => {
|
||||
console.log("Error updating message status", error);
|
||||
|
||||
Reference in New Issue
Block a user