IO-1656 Allow images only to be sent via messaging.
This commit is contained in:
@@ -45,14 +45,14 @@ function ChatSendMessageComponent({
|
|||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
|
|
||||||
const handleEnter = () => {
|
const handleEnter = () => {
|
||||||
if (message === "" || !message) return;
|
|
||||||
logImEXEvent("messaging_send_message");
|
|
||||||
const selectedImages = selectedMedia.filter((i) => i.isSelected);
|
const selectedImages = selectedMedia.filter((i) => i.isSelected);
|
||||||
|
if ((message === "" || !message) && selectedImages.length === 0) return;
|
||||||
|
logImEXEvent("messaging_send_message");
|
||||||
|
|
||||||
if (selectedImages.length < 11) {
|
if (selectedImages.length < 11) {
|
||||||
sendMessage({
|
sendMessage({
|
||||||
to: conversation.phone_num,
|
to: conversation.phone_num,
|
||||||
body: message,
|
body: message || "",
|
||||||
messagingServiceSid: bodyshop.messagingservicesid,
|
messagingServiceSid: bodyshop.messagingservicesid,
|
||||||
conversationid: conversation.id,
|
conversationid: conversation.id,
|
||||||
selectedMedia: selectedImages,
|
selectedMedia: selectedImages,
|
||||||
@@ -93,7 +93,7 @@ function ChatSendMessageComponent({
|
|||||||
</span>
|
</span>
|
||||||
<SendOutlined
|
<SendOutlined
|
||||||
className="imex-flex-row__margin"
|
className="imex-flex-row__margin"
|
||||||
disabled={message === "" || !message}
|
// disabled={message === "" || !message}
|
||||||
onClick={handleEnter}
|
onClick={handleEnter}
|
||||||
/>
|
/>
|
||||||
<Spin
|
<Spin
|
||||||
|
|||||||
@@ -13,13 +13,20 @@ const logger = require("../utils/logger");
|
|||||||
const client = twilio(
|
const client = twilio(
|
||||||
process.env.TWILIO_AUTH_TOKEN,
|
process.env.TWILIO_AUTH_TOKEN,
|
||||||
process.env.TWILIO_AUTH_KEY
|
process.env.TWILIO_AUTH_KEY
|
||||||
);const { admin } = require("../firebase/firebase-handler");
|
);
|
||||||
|
const { admin } = require("../firebase/firebase-handler");
|
||||||
|
|
||||||
const gqlClient = require("../graphql-client/graphql-client").client;
|
const gqlClient = require("../graphql-client/graphql-client").client;
|
||||||
|
|
||||||
exports.send = (req, res) => {
|
exports.send = (req, res) => {
|
||||||
const { to, messagingServiceSid, body, conversationid, selectedMedia, imexshopid } =
|
const {
|
||||||
req.body;
|
to,
|
||||||
|
messagingServiceSid,
|
||||||
|
body,
|
||||||
|
conversationid,
|
||||||
|
selectedMedia,
|
||||||
|
imexshopid,
|
||||||
|
} = req.body;
|
||||||
|
|
||||||
logger.log("sms-outbound", "DEBUG", req.user.email, null, {
|
logger.log("sms-outbound", "DEBUG", req.user.email, null, {
|
||||||
messagingServiceSid: messagingServiceSid,
|
messagingServiceSid: messagingServiceSid,
|
||||||
@@ -34,7 +41,12 @@ exports.send = (req, res) => {
|
|||||||
req.body.selectedMedia.length > 0 ? selectedMedia.map((i) => i.src) : [],
|
req.body.selectedMedia.length > 0 ? selectedMedia.map((i) => i.src) : [],
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!!to && !!messagingServiceSid && !!body && !!conversationid) {
|
if (
|
||||||
|
!!to &&
|
||||||
|
!!messagingServiceSid &&
|
||||||
|
(!!body || !!selectedMedia.length > 0) &&
|
||||||
|
!!conversationid
|
||||||
|
) {
|
||||||
client.messages
|
client.messages
|
||||||
.create({
|
.create({
|
||||||
body: body,
|
body: body,
|
||||||
@@ -67,10 +79,9 @@ exports.send = (req, res) => {
|
|||||||
const data = {
|
const data = {
|
||||||
type: "messaging-outbound",
|
type: "messaging-outbound",
|
||||||
conversationid: newMessage.conversationid || "",
|
conversationid: newMessage.conversationid || "",
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
admin.messaging().send({
|
admin.messaging().send({
|
||||||
topic: `${imexshopid}-messaging`,
|
topic: `${imexshopid}-messaging`,
|
||||||
data,
|
data,
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user