@meltwater/conversations-api-services 1.2.2 → 1.3.1

package/README.md

@@ -2,7 +2,7 @@
 
 Repository to contain all conversations api services shared across our services.
 
-## Maintainers
+## Maintainers.
 
 > Maintained by Phoenix (phoenix@meltwater.com).
 > Contact us via #eng-team-phoenix in Slack.

package/dist/cjs/data-access/http/twitter.native.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.addOAuthToToken = addOAuthToToken;
+exports.createTweet = createTweet;
 exports.followUser = followUser;
 exports.getAuthenticatedUser = getAuthenticatedUser;
 exports.getBrandUserRelationship = getBrandUserRelationship;
@@ -505,6 +506,23 @@ async function getBrandUserRelationship(token, profileId, brandProfileId, logger
     (0, _loggerHelpers.loggerDebug)(logger, `Error in getting user brand friendship info: ${profileId} and ${brandProfileId}`, error);
   }
 }
+async function createTweet(token, text, attachment, logger) {
+  let mediaId;
+  if (attachment) {
+    // Upload media for regular tweets (not DM, so use 'og' but will map to tweet_image/video/gif)
+    mediaId = await uploadMedia(attachment, token, 'og', logger);
+  }
+  const payload = {
+    text,
+    ...(attachment && {
+      media: {
+        media_ids: [mediaId]
+      }
+    })
+  };
+  let query = 'https://api.twitter.com/2/tweets';
+  return publishTweet(token, payload, query, false, logger);
+}
 async function reply(token, text, attachment, inReplyToId, removeInReplyToId, logger) {
   let mediaId;
   if (attachment) {
@@ -535,8 +553,16 @@ async function privateMessage(token, text, attachment, profileId, logger) {
   let query = `https://api.x.com/2/dm_conversations/with/${(0, _externalIdHelpers.removePrefix)(profileId)}/messages`;
   let mediaId;
   if (attachment) {
+    (0, _loggerHelpers.loggerDebug)(logger, 'Uploading media for DM', {
+      attachmentUrl: attachment.url,
+      attachmentMimeType: attachment.mimeType
+    });
     // discussionType only matters if DM or Not
     mediaId = await uploadMedia(attachment, token, 'dm', logger);
+    (0, _loggerHelpers.loggerInfo)(logger, 'Media uploaded for DM', {
+      mediaId,
+      mediaIdType: typeof mediaId
+    });
   }
   const payload = {
     text: text || ' ',
@@ -546,6 +572,11 @@ async function privateMessage(token, text, attachment, profileId, logger) {
       }]
     })
   };
+  (0, _loggerHelpers.loggerDebug)(logger, 'Sending DM with payload', {
+    query,
+    payload: JSON.stringify(payload),
+    hasAttachment: !!attachment
+  });
   return publishDirectMessage(token, payload, query, logger);
 }
 async function retweetWithComment(token, text, attachment, logger) {
@@ -717,7 +748,7 @@ async function publishDirectMessage(token, payload, query, logger) {
     const normalizedResponse = normalizeTwitterResponse(response, 'dm', logger);
     return normalizedResponse;
   } catch (err) {
-    (0, _loggerHelpers.loggerError)(logger, `Twitter DM exception details`, err);
+    (0, _loggerHelpers.loggerError)(logger, `Twitter DM send failed`, err);
     throw err;
   }
 }
@@ -883,7 +914,17 @@ async function uploadMedia(attachment, token, discussionType, logger) {
   try {
     filePath = generateFilePath(attachment.mimeType, attachment.__dirname);
     await downloadImage(attachment.url, filePath);
-    const mediaCategory = discussionType === 'dm' ? 'dm_image' : 'tweet_image';
+
+    // Determine media category based on mime type and discussion type
+    const mimeType = attachment.mimeType.toLowerCase();
+    let mediaCategory;
+    if (mimeType.startsWith('video/')) {
+      mediaCategory = discussionType === 'dm' ? 'dm_video' : 'tweet_video';
+    } else if (mimeType === 'image/gif') {
+      mediaCategory = discussionType === 'dm' ? 'dm_gif' : 'tweet_gif';
+    } else {
+      mediaCategory = discussionType === 'dm' ? 'dm_image' : 'tweet_image';
+    }
     const fileStats = _fs.default.statSync(filePath);
     const fileSize = fileStats.size;
     const fileData = _fs.default.readFileSync(filePath);
@@ -891,7 +932,7 @@ async function uploadMedia(attachment, token, discussionType, logger) {
     // For small files, use simple upload
     if (fileSize < 5000000) {
       // 5MB
-      const mediaIdString = await simpleMediaUpload(fileData, attachment.mimeType, token, logger);
+      const mediaIdString = await simpleMediaUpload(fileData, attachment.mimeType, mediaCategory, token, logger);
       removeMedia(filePath, logger);
       return mediaIdString;
     } else {
@@ -910,12 +951,14 @@ async function uploadMedia(attachment, token, discussionType, logger) {
 }
 
 // Simple upload for small media files
-async function simpleMediaUpload(fileData, mimeType, token, logger) {
+async function simpleMediaUpload(fileData, mimeType, mediaCategory, token, logger) {
   try {
     const base64Data = fileData.toString('base64');
     const mediaType = mimeType.split('/')[0]; // 'image', 'video', etc.
 
     const url = 'https://upload.twitter.com/1.1/media/upload.json';
+
+    // Original working code: empty OAuth signature, let superagent handle content-type
     const {
       Authorization
     } = token.oauth.toHeader(token.oauth.authorize({
@@ -926,10 +969,9 @@ async function simpleMediaUpload(fileData, mimeType, token, logger) {
       key: token.token,
       secret: token.tokenSecret
     }));
-    const result = await _superagent.default.post(url).set('Authorization', Authorization).send({
-      media_data: base64Data,
-      media_type: mimeType
-    });
+
+    // Use .field() for multipart/form-data (OAuth ignores multipart body)
+    const result = await _superagent.default.post(url).set('Authorization', Authorization).field('media_data', base64Data).field('media_type', mimeType);
     (0, _loggerHelpers.loggerDebug)(logger, 'Media uploaded successfully (simple)', {
       media_id: result.body.media_id_string
     });
@@ -1000,18 +1042,47 @@ async function chunkedMediaUpload(filePath, fileSize, mimeType, mediaCategory, t
 // Make a media upload request
 async function mediaUploadRequest(params, token, logger) {
   const url = 'https://upload.twitter.com/1.1/media/upload.json';
+
+  // Separate query params from body params
+  // Query params (everything except media_data) must be in OAuth signature
+  const queryParams = {};
+  const bodyParams = {};
+  for (const key in params) {
+    if (key === 'media_data') {
+      // media_data goes in POST body only
+      bodyParams[key] = params[key];
+    } else {
+      // All other params go in query string and OAuth signature
+      queryParams[key] = String(params[key]);
+    }
+  }
+
+  // Build full URL with query params
+  const queryString = Object.keys(queryParams).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(queryParams[key])}`).join('&');
+  const fullUrl = queryString ? `${url}?${queryString}` : url;
+
+  // OAuth signature: base URL + query params in data field
   const {
     Authorization
   } = token.oauth.toHeader(token.oauth.authorize({
-    url,
+    url: url,
+    // Base URL only
     method: 'post',
-    data: {}
+    data: queryParams // Query params go here for signature
   }, {
     key: token.token,
     secret: token.tokenSecret
   }));
   try {
-    const result = await _superagent.default.post(url).set('Authorization', Authorization).send(params);
+    // Don't set content-type, let superagent handle it
+    // For commands with media_data, it will use application/x-www-form-urlencoded
+    const request = _superagent.default.post(fullUrl).set('Authorization', Authorization);
+
+    // Only set type if we have body params
+    if (Object.keys(bodyParams).length > 0) {
+      request.type('form').send(bodyParams);
+    }
+    const result = await request;
     return result.body;
   } catch (e) {
     (0, _loggerHelpers.loggerError)(logger, `Media upload request failed for command: ${params.command}`, e);

package/dist/esm/data-access/http/twitter.native.js

@@ -481,6 +481,23 @@ export async function getBrandUserRelationship(token, profileId, brandProfileId,
     loggerDebug(logger, `Error in getting user brand friendship info: ${profileId} and ${brandProfileId}`, error);
   }
 }
+export async function createTweet(token, text, attachment, logger) {
+  let mediaId;
+  if (attachment) {
+    // Upload media for regular tweets (not DM, so use 'og' but will map to tweet_image/video/gif)
+    mediaId = await uploadMedia(attachment, token, 'og', logger);
+  }
+  const payload = {
+    text,
+    ...(attachment && {
+      media: {
+        media_ids: [mediaId]
+      }
+    })
+  };
+  let query = 'https://api.twitter.com/2/tweets';
+  return publishTweet(token, payload, query, false, logger);
+}
 export async function reply(token, text, attachment, inReplyToId, removeInReplyToId, logger) {
   let mediaId;
   if (attachment) {
@@ -511,8 +528,16 @@ export async function privateMessage(token, text, attachment, profileId, logger)
   let query = `https://api.x.com/2/dm_conversations/with/${removePrefix(profileId)}/messages`;
   let mediaId;
   if (attachment) {
+    loggerDebug(logger, 'Uploading media for DM', {
+      attachmentUrl: attachment.url,
+      attachmentMimeType: attachment.mimeType
+    });
     // discussionType only matters if DM or Not
     mediaId = await uploadMedia(attachment, token, 'dm', logger);
+    loggerInfo(logger, 'Media uploaded for DM', {
+      mediaId,
+      mediaIdType: typeof mediaId
+    });
   }
   const payload = {
     text: text || ' ',
@@ -522,6 +547,11 @@ export async function privateMessage(token, text, attachment, profileId, logger)
       }]
     })
   };
+  loggerDebug(logger, 'Sending DM with payload', {
+    query,
+    payload: JSON.stringify(payload),
+    hasAttachment: !!attachment
+  });
   return publishDirectMessage(token, payload, query, logger);
 }
 export async function retweetWithComment(token, text, attachment, logger) {
@@ -693,7 +723,7 @@ async function publishDirectMessage(token, payload, query, logger) {
     const normalizedResponse = normalizeTwitterResponse(response, 'dm', logger);
     return normalizedResponse;
   } catch (err) {
-    loggerError(logger, `Twitter DM exception details`, err);
+    loggerError(logger, `Twitter DM send failed`, err);
     throw err;
   }
 }
@@ -859,7 +889,17 @@ async function uploadMedia(attachment, token, discussionType, logger) {
   try {
     filePath = generateFilePath(attachment.mimeType, attachment.__dirname);
     await downloadImage(attachment.url, filePath);
-    const mediaCategory = discussionType === 'dm' ? 'dm_image' : 'tweet_image';
+
+    // Determine media category based on mime type and discussion type
+    const mimeType = attachment.mimeType.toLowerCase();
+    let mediaCategory;
+    if (mimeType.startsWith('video/')) {
+      mediaCategory = discussionType === 'dm' ? 'dm_video' : 'tweet_video';
+    } else if (mimeType === 'image/gif') {
+      mediaCategory = discussionType === 'dm' ? 'dm_gif' : 'tweet_gif';
+    } else {
+      mediaCategory = discussionType === 'dm' ? 'dm_image' : 'tweet_image';
+    }
     const fileStats = fs.statSync(filePath);
     const fileSize = fileStats.size;
     const fileData = fs.readFileSync(filePath);
@@ -867,7 +907,7 @@ async function uploadMedia(attachment, token, discussionType, logger) {
     // For small files, use simple upload
     if (fileSize < 5000000) {
       // 5MB
-      const mediaIdString = await simpleMediaUpload(fileData, attachment.mimeType, token, logger);
+      const mediaIdString = await simpleMediaUpload(fileData, attachment.mimeType, mediaCategory, token, logger);
       removeMedia(filePath, logger);
       return mediaIdString;
     } else {
@@ -886,12 +926,14 @@ async function uploadMedia(attachment, token, discussionType, logger) {
 }
 
 // Simple upload for small media files
-async function simpleMediaUpload(fileData, mimeType, token, logger) {
+async function simpleMediaUpload(fileData, mimeType, mediaCategory, token, logger) {
   try {
     const base64Data = fileData.toString('base64');
     const mediaType = mimeType.split('/')[0]; // 'image', 'video', etc.
 
     const url = 'https://upload.twitter.com/1.1/media/upload.json';
+
+    // Original working code: empty OAuth signature, let superagent handle content-type
     const {
       Authorization
     } = token.oauth.toHeader(token.oauth.authorize({
@@ -902,10 +944,9 @@ async function simpleMediaUpload(fileData, mimeType, token, logger) {
       key: token.token,
       secret: token.tokenSecret
     }));
-    const result = await superagent.post(url).set('Authorization', Authorization).send({
-      media_data: base64Data,
-      media_type: mimeType
-    });
+
+    // Use .field() for multipart/form-data (OAuth ignores multipart body)
+    const result = await superagent.post(url).set('Authorization', Authorization).field('media_data', base64Data).field('media_type', mimeType);
     loggerDebug(logger, 'Media uploaded successfully (simple)', {
       media_id: result.body.media_id_string
     });
@@ -976,18 +1017,47 @@ async function chunkedMediaUpload(filePath, fileSize, mimeType, mediaCategory, t
 // Make a media upload request
 async function mediaUploadRequest(params, token, logger) {
   const url = 'https://upload.twitter.com/1.1/media/upload.json';
+
+  // Separate query params from body params
+  // Query params (everything except media_data) must be in OAuth signature
+  const queryParams = {};
+  const bodyParams = {};
+  for (const key in params) {
+    if (key === 'media_data') {
+      // media_data goes in POST body only
+      bodyParams[key] = params[key];
+    } else {
+      // All other params go in query string and OAuth signature
+      queryParams[key] = String(params[key]);
+    }
+  }
+
+  // Build full URL with query params
+  const queryString = Object.keys(queryParams).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(queryParams[key])}`).join('&');
+  const fullUrl = queryString ? `${url}?${queryString}` : url;
+
+  // OAuth signature: base URL + query params in data field
   const {
     Authorization
   } = token.oauth.toHeader(token.oauth.authorize({
-    url,
+    url: url,
+    // Base URL only
     method: 'post',
-    data: {}
+    data: queryParams // Query params go here for signature
   }, {
     key: token.token,
     secret: token.tokenSecret
   }));
   try {
-    const result = await superagent.post(url).set('Authorization', Authorization).send(params);
+    // Don't set content-type, let superagent handle it
+    // For commands with media_data, it will use application/x-www-form-urlencoded
+    const request = superagent.post(fullUrl).set('Authorization', Authorization);
+
+    // Only set type if we have body params
+    if (Object.keys(bodyParams).length > 0) {
+      request.type('form').send(bodyParams);
+    }
+    const result = await request;
     return result.body;
   } catch (e) {
     loggerError(logger, `Media upload request failed for command: ${params.command}`, e);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@meltwater/conversations-api-services",
-    "version": "1.2.2",
+    "version": "1.3.1",
     "description": "Repository to contain all conversations api services shared across our services",
     "main": "dist/cjs/data-access/index.js",
     "module": "dist/esm/data-access/index.js",

package/src/data-access/http/twitter.native.js

@@ -609,6 +609,25 @@ export async function getBrandUserRelationship(
     }
 }
 
+export async function createTweet(token, text, attachment, logger) {
+    let mediaId;
+    if (attachment) {
+        // Upload media for regular tweets (not DM, so use 'og' but will map to tweet_image/video/gif)
+        mediaId = await uploadMedia(attachment, token, 'og', logger);
+    }
+    const payload = {
+        text,
+        ...(attachment && {
+            media: {
+                media_ids: [mediaId],
+            },
+        }),
+    };
+
+    let query = 'https://api.twitter.com/2/tweets';
+    return publishTweet(token, payload, query, false, logger);
+}
+
 export async function reply(
     token,
     text,
@@ -658,8 +677,16 @@ export async function privateMessage(
     )}/messages`;
     let mediaId;
     if (attachment) {
+        loggerDebug(logger, 'Uploading media for DM', {
+            attachmentUrl: attachment.url,
+            attachmentMimeType: attachment.mimeType,
+        });
         // discussionType only matters if DM or Not
         mediaId = await uploadMedia(attachment, token, 'dm', logger);
+        loggerInfo(logger, 'Media uploaded for DM', {
+            mediaId,
+            mediaIdType: typeof mediaId,
+        });
     }
     const payload = {
         text: text || ' ',
@@ -671,6 +698,11 @@ export async function privateMessage(
             ],
         }),
     };
+    loggerDebug(logger, 'Sending DM with payload', {
+        query,
+        payload: JSON.stringify(payload),
+        hasAttachment: !!attachment,
+    });
     return publishDirectMessage(token, payload, query, logger);
 }
 
@@ -904,7 +936,7 @@ async function publishDirectMessage(token, payload, query, logger) {
 
         return normalizedResponse;
     } catch (err) {
-        loggerError(logger, `Twitter DM exception details`, err);
+        loggerError(logger, `Twitter DM send failed`, err);
         throw err;
     }
 }
@@ -1097,8 +1129,20 @@ async function uploadMedia(attachment, token, discussionType, logger) {
         filePath = generateFilePath(attachment.mimeType, attachment.__dirname);
         await downloadImage(attachment.url, filePath);
 
-        const mediaCategory =
-            discussionType === 'dm' ? 'dm_image' : 'tweet_image';
+        // Determine media category based on mime type and discussion type
+        const mimeType = attachment.mimeType.toLowerCase();
+        let mediaCategory;
+
+        if (mimeType.startsWith('video/')) {
+            mediaCategory =
+                discussionType === 'dm' ? 'dm_video' : 'tweet_video';
+        } else if (mimeType === 'image/gif') {
+            mediaCategory = discussionType === 'dm' ? 'dm_gif' : 'tweet_gif';
+        } else {
+            mediaCategory =
+                discussionType === 'dm' ? 'dm_image' : 'tweet_image';
+        }
+
         const fileStats = fs.statSync(filePath);
         const fileSize = fileStats.size;
         const fileData = fs.readFileSync(filePath);
@@ -1109,6 +1153,7 @@ async function uploadMedia(attachment, token, discussionType, logger) {
             const mediaIdString = await simpleMediaUpload(
                 fileData,
                 attachment.mimeType,
+                mediaCategory,
                 token,
                 logger
             );
@@ -1137,12 +1182,14 @@ async function uploadMedia(attachment, token, discussionType, logger) {
 }
 
 // Simple upload for small media files
-async function simpleMediaUpload(fileData, mimeType, token, logger) {
+async function simpleMediaUpload(fileData, mimeType, mediaCategory, token, logger) {
     try {
         const base64Data = fileData.toString('base64');
         const mediaType = mimeType.split('/')[0]; // 'image', 'video', etc.
 
         const url = 'https://upload.twitter.com/1.1/media/upload.json';
+
+        // Original working code: empty OAuth signature, let superagent handle content-type
         const { Authorization } = token.oauth.toHeader(
             token.oauth.authorize(
                 {
@@ -1157,13 +1204,12 @@ async function simpleMediaUpload(fileData, mimeType, token, logger) {
             )
         );
 
+        // Use .field() for multipart/form-data (OAuth ignores multipart body)
         const result = await superagent
             .post(url)
             .set('Authorization', Authorization)
-            .send({
-                media_data: base64Data,
-                media_type: mimeType,
-            });
+            .field('media_data', base64Data)
+            .field('media_type', mimeType);
 
         loggerDebug(logger, 'Media uploaded successfully (simple)', {
             media_id: result.body.media_id_string,
@@ -1262,12 +1308,34 @@ async function chunkedMediaUpload(
 async function mediaUploadRequest(params, token, logger) {
     const url = 'https://upload.twitter.com/1.1/media/upload.json';
 
+    // Separate query params from body params
+    // Query params (everything except media_data) must be in OAuth signature
+    const queryParams = {};
+    const bodyParams = {};
+
+    for (const key in params) {
+        if (key === 'media_data') {
+            // media_data goes in POST body only
+            bodyParams[key] = params[key];
+        } else {
+            // All other params go in query string and OAuth signature
+            queryParams[key] = String(params[key]);
+        }
+    }
+
+    // Build full URL with query params
+    const queryString = Object.keys(queryParams)
+        .map(key => `${encodeURIComponent(key)}=${encodeURIComponent(queryParams[key])}`)
+        .join('&');
+    const fullUrl = queryString ? `${url}?${queryString}` : url;
+
+    // OAuth signature: base URL + query params in data field
     const { Authorization } = token.oauth.toHeader(
         token.oauth.authorize(
             {
-                url,
+                url: url, // Base URL only
                 method: 'post',
-                data: {},
+                data: queryParams, // Query params go here for signature
             },
             {
                 key: token.token,
@@ -1277,11 +1345,18 @@ async function mediaUploadRequest(params, token, logger) {
     );
 
     try {
-        const result = await superagent
-            .post(url)
-            .set('Authorization', Authorization)
-            .send(params);
+        // Don't set content-type, let superagent handle it
+        // For commands with media_data, it will use application/x-www-form-urlencoded
+        const request = superagent
+            .post(fullUrl)
+            .set('Authorization', Authorization);
+
+        // Only set type if we have body params
+        if (Object.keys(bodyParams).length > 0) {
+            request.type('form').send(bodyParams);
+        }
 
+        const result = await request;
         return result.body;
     } catch (e) {
         loggerError(