@meltwater/conversations-api-services 1.1.22 → 1.1.23

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

@@ -361,6 +361,19 @@ async function postApi(apiUrl, accessToken, payload, logger) {
     }
     response = await request;
   } catch (err) {
+    // Handle specific case where content is already marked as spam
+    if (err?.response?.body?.error?.error_subcode === 1446036 && err?.response?.body?.error?.error_user_title === "Duplicate Mark Spam Request") {
+      (0, _loggerHelpers.loggerInfo)(logger, `Content already marked as spam - treating as successful hide operation`, {
+        responseBody: JSON.stringify(err.response.body)
+      });
+      return {
+        status: 200,
+        body: {
+          success: true,
+          message: "Content already hidden (marked as spam)"
+        }
+      };
+    }
     (0, _loggerHelpers.loggerDebug)(logger, `Failed to call facebook api`, err);
     throw err;
   }

package/dist/cjs/data-access/http/facebookApi.client.js

@@ -190,6 +190,19 @@ class FacebookApiClient {
         access_token: accessToken
       }).send(payload);
     } catch (err) {
+      // Handle specific case where content is already marked as spam
+      if (err?.response?.body?.error?.error_subcode === 1446036 && err?.response?.body?.error?.error_user_title === "Duplicate Mark Spam Request") {
+        loggerChild.info(`Content already marked as spam - treating as successful hide operation for documentId ${documentId}`, {
+          responseBody: JSON.stringify(err.response.body)
+        });
+        return {
+          status: 200,
+          body: {
+            success: true,
+            message: "Content already hidden (marked as spam)"
+          }
+        };
+      }
       let errorText = '';
       if (err && err.response && err.response.body && err.response.body.error) {
         errorText = `Failed to call facebook api for documentId ${documentId}: ${err.response.body.error.message}`;

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

@@ -29,6 +29,112 @@ var _axios = _interopRequireDefault(require("axios"));
 var _fs = _interopRequireDefault(require("fs"));
 var _socialTwit = _interopRequireDefault(require("@meltwater/social-twit"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const TWITTER_API_CONFIG = {
+  v1_1: {
+    base_url: 'https://api.twitter.com/1.1'
+  },
+  v2: {
+    base_url: 'https://api.x.com/2',
+    default_user_fields: 'id,name,username,profile_image_url,public_metrics,description,created_at,verified,protected'
+  }
+};
+
+// Helper function to create v2 API URLs with consistent field selection
+function createTwitterV2Url(endpoint) {
+  let additionalParams = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  const baseUrl = `${TWITTER_API_CONFIG.v2.base_url}/${endpoint}`;
+  const defaultFields = {
+    'user.fields': TWITTER_API_CONFIG.v2.default_user_fields
+  };
+  const allParams = {
+    ...defaultFields,
+    ...additionalParams
+  };
+  const queryString = Object.entries(allParams).map(_ref => {
+    let [key, value] = _ref;
+    return `${encodeURIComponent(key)}=${encodeURIComponent(value)}`;
+  }).join('&');
+  return queryString ? `${baseUrl}?${queryString}` : baseUrl;
+}
+
+// Helper function to make v2 API requests with fallback to v1.1
+async function makeTwitterV2Request(v2Endpoint, v1FallbackQuery, token, logger) {
+  let requestOptions = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
+  // Try v2 API first - it supports OAuth 1.0a for user lookup endpoints and has better rate limits!
+  try {
+    const v2Url = createTwitterV2Url(v2Endpoint, requestOptions.v2Params);
+    const result = await getRequest({
+      token,
+      uri: v2Url,
+      attachUrlPrefix: false,
+      convertPayloadToUri: false,
+      logger
+    });
+    return {
+      success: true,
+      data: result.data?.data,
+      source: 'v2'
+    };
+  } catch (e) {
+    (0, _loggerHelpers.loggerWarn)(logger, `Twitter API v2 request failed for ${v2Endpoint}, falling back to v1.1`, e);
+
+    // Fallback to v1.1 if v2 fails
+    if (v1FallbackQuery && requestOptions.enableFallback !== false) {
+      try {
+        (0, _loggerHelpers.loggerInfo)(logger, `Falling back to v1.1 API for ${v2Endpoint}`);
+        const fallbackResult = await (requestOptions.fallbackMethod === 'post' ? postRequest : getRequest)({
+          token,
+          uri: v1FallbackQuery,
+          logger
+        });
+        return {
+          success: true,
+          data: fallbackResult.data,
+          source: 'v1.1'
+        };
+      } catch (fallbackError) {
+        (0, _loggerHelpers.loggerError)(logger, `Both v2 and v1.1 APIs failed for ${v2Endpoint}`, fallbackError);
+      }
+    }
+    return {
+      success: false,
+      error: e,
+      source: 'failed'
+    };
+  }
+}
+function normalizeUserData(user) {
+  let apiVersion = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'v1.1';
+  if (!user) return user;
+  const normalized = {
+    ...user
+  };
+  if (apiVersion === 'v2') {
+    normalized.screen_name = user.username;
+    normalized.id_str = user.id;
+    normalized.profile_image_url_https = user.profile_image_url;
+  } else {
+    normalized.username = user.screen_name;
+    normalized.id = user.id_str;
+    normalized.profile_image_url = user.profile_image_url_https;
+  }
+  return normalized;
+}
+
+/**
+ * Normalizes an array of user data or a single user object
+ * @param {Object|Array} users - User object or array of user objects from Twitter API
+ * @param {string} apiVersion - API version used ('v1.1' or 'v2')
+ * @returns {Object|Array} Normalized user data with both screen_name and username
+ */
+function normalizeUsersData(users) {
+  let apiVersion = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'v1.1';
+  if (!users) return users;
+  if (Array.isArray(users)) {
+    return users.map(user => normalizeUserData(user, apiVersion));
+  }
+  return normalizeUserData(users, apiVersion);
+}
 function addOAuthToToken(token, TWITTER_CONSUMER_KEY, TWITTER_CONSUMER_SECRET) {
   if (!token.oauth) {
     token.oauth = (0, _oauth.default)({
@@ -50,31 +156,49 @@ async function getUserInfoFromHandles(token, handles, logger) {
   try {
     const handlesJoin = handles.join(',');
     if (!handlesJoin.length) {
-      loggerWarn(logger, `No handles provided to twitterNative getUserInfoFromHandles`);
+      (0, _loggerHelpers.loggerWarn)(logger, `No handles provided to twitterNative getUserInfoFromHandles`);
       return [];
     }
-    let query = `users/lookup.json?screen_name=${handlesJoin}`;
-    let result = await postRequest({
-      token,
-      uri: query,
-      logger
+
+    // Use Twitter API v2 for much better rate limits (900 req/15min vs v1.1 limits)
+    // v2 API supports up to 100 usernames per request vs v1.1's limit
+    const result = await makeTwitterV2Request('users/by',
+    // v2 endpoint
+    `users/lookup.json?screen_name=${handlesJoin}`,
+    // v1.1 fallback
+    token, logger, {
+      v2Params: {
+        usernames: handlesJoin
+      },
+      fallbackMethod: 'post'
     });
-    return result.data;
+    const normalizedData = normalizeUsersData(result.data, result.source);
+    return normalizedData || [];
   } catch (e) {
-    (0, _loggerHelpers.loggerError)(logger, `Error getting UserInfo`, e);
+    (0, _loggerHelpers.loggerError)(logger, `Unexpected error in getUserInfoFromHandles`, e);
+    return [];
   }
 }
 async function getUserInfoFromHandle(token, handleId, logger) {
   try {
-    let query = `users/show.json?user_id=${(0, _externalIdHelpers.removePrefix)(handleId)}`;
-    let result = await getRequest({
-      token,
-      uri: query,
-      logger
-    });
-    return result.data;
+    if (!handleId) {
+      (0, _loggerHelpers.loggerWarn)(logger, `Invalid handleId provided to getUserInfoFromHandle: ${JSON.stringify(handleId)}`);
+      throw new Error(`Invalid handleId: ${handleId}`);
+    }
+    // Use Twitter API v2 for much better rate limits (900 req/15min vs v1.1 limits)
+    const result = await makeTwitterV2Request(`users/${(0, _externalIdHelpers.removePrefix)(handleId)}`,
+    // v2 endpoint
+    `users/show.json?user_id=${(0, _externalIdHelpers.removePrefix)(handleId)}`,
+    // v1.1 fallback
+    token, logger);
+    if (result.success) {
+      // Normalize the user data to ensure both screen_name and username are present
+      return normalizeUserData(result.data, result.source);
+    } else {
+      throw result.error || new Error('Failed to get user info from both APIs');
+    }
   } catch (e) {
-    (0, _loggerHelpers.loggerError)(logger, `Error getting UserInfo`, e);
+    (0, _loggerHelpers.loggerError)(logger, `Error in getUserInfoFromHandle with handleId: ${JSON.stringify(handleId)}`, e);
   }
 }
 async function getDirectMessageImage(token, imageUrl, logger) {
@@ -403,7 +527,7 @@ async function publishTweet(token, payload, query, isDirectMessage, logger) {
     throw err;
   }
 }
-async function postRequest(_ref) {
+async function postRequest(_ref2) {
   let {
     token,
     uri,
@@ -411,7 +535,7 @@ async function postRequest(_ref) {
     attachUrlPrefix = true,
     convertPayloadToUri = true,
     logger
-  } = _ref;
+  } = _ref2;
   return doRequest({
     requestMethod: 'post',
     token,
@@ -422,7 +546,7 @@ async function postRequest(_ref) {
     logger
   });
 }
-async function getRequest(_ref2) {
+async function getRequest(_ref3) {
   let {
     token,
     uri,
@@ -430,7 +554,7 @@ async function getRequest(_ref2) {
     attachUrlPrefix = true,
     convertPayloadToUri = true,
     logger
-  } = _ref2;
+  } = _ref3;
   return doRequest({
     requestMethod: 'get',
     payload,
@@ -441,7 +565,7 @@ async function getRequest(_ref2) {
     logger
   });
 }
-async function deleteRequest(_ref3) {
+async function deleteRequest(_ref4) {
   let {
     token,
     uri,
@@ -449,7 +573,7 @@ async function deleteRequest(_ref3) {
     attachUrlPrefix = false,
     convertPayloadToUri = false,
     logger
-  } = _ref3;
+  } = _ref4;
   return doRequest({
     requestMethod: 'delete',
     token,
@@ -465,7 +589,7 @@ function fixedEncodeURIComponent(str) {
     return '%' + c.charCodeAt(0).toString(16);
   });
 }
-async function doRequest(_ref4) {
+async function doRequest(_ref5) {
   let {
     requestMethod,
     token,
@@ -474,7 +598,7 @@ async function doRequest(_ref4) {
     attachUrlPrefix = true,
     convertPayloadToUri = true,
     logger
-  } = _ref4;
+  } = _ref5;
   if (payload && convertPayloadToUri) {
     uri = uri + (uri.endsWith('?') ? '' : '?') + Object.keys(payload).map(key => {
       return fixedEncodeURIComponent(key) + '=' + fixedEncodeURIComponent(payload[key]);
@@ -513,7 +637,7 @@ async function doRequest(_ref4) {
       });
     } catch (e) {
       if (e.response.status == 503) {
-        loggerWarn(logger, `Twitter API 503 error - Service Unavailable`, {
+        (0, _loggerHelpers.loggerWarn)(logger, `Twitter API 503 error - Service Unavailable`, {
           url,
           convertPayloadToUri,
           payload: JSON.stringify(payload)

package/dist/cjs/lib/externalId.helpers.js

@@ -6,7 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.removePrefix = removePrefix;
 exports.twitterPrefixCheck = twitterPrefixCheck;
 function removePrefix(document) {
-  return document && document.replace(/id\:[a-zA-Z]+\.(com|net):/g, '');
+  if (!document || typeof document !== 'string') {
+    return document; // Return as-is if not a valid string
+  }
+  return document.replace(/id\:[a-zA-Z]+\.(com|net):/g, '');
 }
 function twitterPrefixCheck(socialOriginType, value) {
   let result = value;

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

@@ -342,6 +342,19 @@ async function postApi(apiUrl, accessToken, payload, logger) {
     }
     response = await request;
   } catch (err) {
+    // Handle specific case where content is already marked as spam
+    if (err?.response?.body?.error?.error_subcode === 1446036 && err?.response?.body?.error?.error_user_title === "Duplicate Mark Spam Request") {
+      loggerInfo(logger, `Content already marked as spam - treating as successful hide operation`, {
+        responseBody: JSON.stringify(err.response.body)
+      });
+      return {
+        status: 200,
+        body: {
+          success: true,
+          message: "Content already hidden (marked as spam)"
+        }
+      };
+    }
     loggerDebug(logger, `Failed to call facebook api`, err);
     throw err;
   }

package/dist/esm/data-access/http/facebookApi.client.js

@@ -181,6 +181,19 @@ export class FacebookApiClient {
         access_token: accessToken
       }).send(payload);
     } catch (err) {
+      // Handle specific case where content is already marked as spam
+      if (err?.response?.body?.error?.error_subcode === 1446036 && err?.response?.body?.error?.error_user_title === "Duplicate Mark Spam Request") {
+        loggerChild.info(`Content already marked as spam - treating as successful hide operation for documentId ${documentId}`, {
+          responseBody: JSON.stringify(err.response.body)
+        });
+        return {
+          status: 200,
+          body: {
+            success: true,
+            message: "Content already hidden (marked as spam)"
+          }
+        };
+      }
       let errorText = '';
       if (err && err.response && err.response.body && err.response.body.error) {
         errorText = `Failed to call facebook api for documentId ${documentId}: ${err.response.body.error.message}`;

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

@@ -1,11 +1,117 @@
 import superagent from 'superagent';
 import { removePrefix } from '../../lib/externalId.helpers.js';
-import { loggerDebug, loggerError, loggerInfo } from '../../lib/logger.helpers.js';
+import { loggerDebug, loggerError, loggerInfo, loggerWarn } from '../../lib/logger.helpers.js';
 import OAuth from 'oauth-1.0a';
 import crypto from 'crypto';
 import axios from 'axios';
 import fs from 'fs';
 import Twit from '@meltwater/social-twit';
+const TWITTER_API_CONFIG = {
+  v1_1: {
+    base_url: 'https://api.twitter.com/1.1'
+  },
+  v2: {
+    base_url: 'https://api.x.com/2',
+    default_user_fields: 'id,name,username,profile_image_url,public_metrics,description,created_at,verified,protected'
+  }
+};
+
+// Helper function to create v2 API URLs with consistent field selection
+function createTwitterV2Url(endpoint) {
+  let additionalParams = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  const baseUrl = `${TWITTER_API_CONFIG.v2.base_url}/${endpoint}`;
+  const defaultFields = {
+    'user.fields': TWITTER_API_CONFIG.v2.default_user_fields
+  };
+  const allParams = {
+    ...defaultFields,
+    ...additionalParams
+  };
+  const queryString = Object.entries(allParams).map(_ref => {
+    let [key, value] = _ref;
+    return `${encodeURIComponent(key)}=${encodeURIComponent(value)}`;
+  }).join('&');
+  return queryString ? `${baseUrl}?${queryString}` : baseUrl;
+}
+
+// Helper function to make v2 API requests with fallback to v1.1
+async function makeTwitterV2Request(v2Endpoint, v1FallbackQuery, token, logger) {
+  let requestOptions = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
+  // Try v2 API first - it supports OAuth 1.0a for user lookup endpoints and has better rate limits!
+  try {
+    const v2Url = createTwitterV2Url(v2Endpoint, requestOptions.v2Params);
+    const result = await getRequest({
+      token,
+      uri: v2Url,
+      attachUrlPrefix: false,
+      convertPayloadToUri: false,
+      logger
+    });
+    return {
+      success: true,
+      data: result.data?.data,
+      source: 'v2'
+    };
+  } catch (e) {
+    loggerWarn(logger, `Twitter API v2 request failed for ${v2Endpoint}, falling back to v1.1`, e);
+
+    // Fallback to v1.1 if v2 fails
+    if (v1FallbackQuery && requestOptions.enableFallback !== false) {
+      try {
+        loggerInfo(logger, `Falling back to v1.1 API for ${v2Endpoint}`);
+        const fallbackResult = await (requestOptions.fallbackMethod === 'post' ? postRequest : getRequest)({
+          token,
+          uri: v1FallbackQuery,
+          logger
+        });
+        return {
+          success: true,
+          data: fallbackResult.data,
+          source: 'v1.1'
+        };
+      } catch (fallbackError) {
+        loggerError(logger, `Both v2 and v1.1 APIs failed for ${v2Endpoint}`, fallbackError);
+      }
+    }
+    return {
+      success: false,
+      error: e,
+      source: 'failed'
+    };
+  }
+}
+function normalizeUserData(user) {
+  let apiVersion = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'v1.1';
+  if (!user) return user;
+  const normalized = {
+    ...user
+  };
+  if (apiVersion === 'v2') {
+    normalized.screen_name = user.username;
+    normalized.id_str = user.id;
+    normalized.profile_image_url_https = user.profile_image_url;
+  } else {
+    normalized.username = user.screen_name;
+    normalized.id = user.id_str;
+    normalized.profile_image_url = user.profile_image_url_https;
+  }
+  return normalized;
+}
+
+/**
+ * Normalizes an array of user data or a single user object
+ * @param {Object|Array} users - User object or array of user objects from Twitter API
+ * @param {string} apiVersion - API version used ('v1.1' or 'v2')
+ * @returns {Object|Array} Normalized user data with both screen_name and username
+ */
+function normalizeUsersData(users) {
+  let apiVersion = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'v1.1';
+  if (!users) return users;
+  if (Array.isArray(users)) {
+    return users.map(user => normalizeUserData(user, apiVersion));
+  }
+  return normalizeUserData(users, apiVersion);
+}
 export function addOAuthToToken(token, TWITTER_CONSUMER_KEY, TWITTER_CONSUMER_SECRET) {
   if (!token.oauth) {
     token.oauth = OAuth({
@@ -30,28 +136,46 @@ export async function getUserInfoFromHandles(token, handles, logger) {
       loggerWarn(logger, `No handles provided to twitterNative getUserInfoFromHandles`);
       return [];
     }
-    let query = `users/lookup.json?screen_name=${handlesJoin}`;
-    let result = await postRequest({
-      token,
-      uri: query,
-      logger
+
+    // Use Twitter API v2 for much better rate limits (900 req/15min vs v1.1 limits)
+    // v2 API supports up to 100 usernames per request vs v1.1's limit
+    const result = await makeTwitterV2Request('users/by',
+    // v2 endpoint
+    `users/lookup.json?screen_name=${handlesJoin}`,
+    // v1.1 fallback
+    token, logger, {
+      v2Params: {
+        usernames: handlesJoin
+      },
+      fallbackMethod: 'post'
     });
-    return result.data;
+    const normalizedData = normalizeUsersData(result.data, result.source);
+    return normalizedData || [];
   } catch (e) {
-    loggerError(logger, `Error getting UserInfo`, e);
+    loggerError(logger, `Unexpected error in getUserInfoFromHandles`, e);
+    return [];
   }
 }
 export async function getUserInfoFromHandle(token, handleId, logger) {
   try {
-    let query = `users/show.json?user_id=${removePrefix(handleId)}`;
-    let result = await getRequest({
-      token,
-      uri: query,
-      logger
-    });
-    return result.data;
+    if (!handleId) {
+      loggerWarn(logger, `Invalid handleId provided to getUserInfoFromHandle: ${JSON.stringify(handleId)}`);
+      throw new Error(`Invalid handleId: ${handleId}`);
+    }
+    // Use Twitter API v2 for much better rate limits (900 req/15min vs v1.1 limits)
+    const result = await makeTwitterV2Request(`users/${removePrefix(handleId)}`,
+    // v2 endpoint
+    `users/show.json?user_id=${removePrefix(handleId)}`,
+    // v1.1 fallback
+    token, logger);
+    if (result.success) {
+      // Normalize the user data to ensure both screen_name and username are present
+      return normalizeUserData(result.data, result.source);
+    } else {
+      throw result.error || new Error('Failed to get user info from both APIs');
+    }
   } catch (e) {
-    loggerError(logger, `Error getting UserInfo`, e);
+    loggerError(logger, `Error in getUserInfoFromHandle with handleId: ${JSON.stringify(handleId)}`, e);
   }
 }
 export async function getDirectMessageImage(token, imageUrl, logger) {
@@ -380,7 +504,7 @@ async function publishTweet(token, payload, query, isDirectMessage, logger) {
     throw err;
   }
 }
-async function postRequest(_ref) {
+async function postRequest(_ref2) {
   let {
     token,
     uri,
@@ -388,7 +512,7 @@ async function postRequest(_ref) {
     attachUrlPrefix = true,
     convertPayloadToUri = true,
     logger
-  } = _ref;
+  } = _ref2;
   return doRequest({
     requestMethod: 'post',
     token,
@@ -399,7 +523,7 @@ async function postRequest(_ref) {
     logger
   });
 }
-async function getRequest(_ref2) {
+async function getRequest(_ref3) {
   let {
     token,
     uri,
@@ -407,7 +531,7 @@ async function getRequest(_ref2) {
     attachUrlPrefix = true,
     convertPayloadToUri = true,
     logger
-  } = _ref2;
+  } = _ref3;
   return doRequest({
     requestMethod: 'get',
     payload,
@@ -418,7 +542,7 @@ async function getRequest(_ref2) {
     logger
   });
 }
-async function deleteRequest(_ref3) {
+async function deleteRequest(_ref4) {
   let {
     token,
     uri,
@@ -426,7 +550,7 @@ async function deleteRequest(_ref3) {
     attachUrlPrefix = false,
     convertPayloadToUri = false,
     logger
-  } = _ref3;
+  } = _ref4;
   return doRequest({
     requestMethod: 'delete',
     token,
@@ -442,7 +566,7 @@ function fixedEncodeURIComponent(str) {
     return '%' + c.charCodeAt(0).toString(16);
   });
 }
-async function doRequest(_ref4) {
+async function doRequest(_ref5) {
   let {
     requestMethod,
     token,
@@ -451,7 +575,7 @@ async function doRequest(_ref4) {
     attachUrlPrefix = true,
     convertPayloadToUri = true,
     logger
-  } = _ref4;
+  } = _ref5;
   if (payload && convertPayloadToUri) {
     uri = uri + (uri.endsWith('?') ? '' : '?') + Object.keys(payload).map(key => {
       return fixedEncodeURIComponent(key) + '=' + fixedEncodeURIComponent(payload[key]);

package/dist/esm/lib/externalId.helpers.js

@@ -1,5 +1,8 @@
 export function removePrefix(document) {
-  return document && document.replace(/id\:[a-zA-Z]+\.(com|net):/g, '');
+  if (!document || typeof document !== 'string') {
+    return document; // Return as-is if not a valid string
+  }
+  return document.replace(/id\:[a-zA-Z]+\.(com|net):/g, '');
 }
 export function twitterPrefixCheck(socialOriginType, value) {
   let result = value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meltwater/conversations-api-services",
-  "version": "1.1.22",
+  "version": "1.1.23",
   "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/facebook.native.js

@@ -545,6 +545,20 @@ async function postApi(
 
         response = await request;
     } catch (err) {
+        // Handle specific case where content is already marked as spam
+        if (
+            err?.response?.body?.error?.error_subcode === 1446036 &&
+            err?.response?.body?.error?.error_user_title === "Duplicate Mark Spam Request"
+        ) {
+            loggerInfo(logger, `Content already marked as spam - treating as successful hide operation`, {
+                responseBody: JSON.stringify(err.response.body),
+            });
+            return {
+                status: 200,
+                body: { success: true, message: "Content already hidden (marked as spam)" }
+            };
+        }
+        
         loggerDebug(logger, `Failed to call facebook api`, err);
         throw err;
     }

package/src/data-access/http/facebookApi.client.js

@@ -232,6 +232,20 @@ export class FacebookApiClient {
                 .query({ access_token: accessToken })
                 .send(payload);
         } catch (err) {
+            // Handle specific case where content is already marked as spam
+            if (
+                err?.response?.body?.error?.error_subcode === 1446036 &&
+                err?.response?.body?.error?.error_user_title === "Duplicate Mark Spam Request"
+            ) {
+                loggerChild.info(`Content already marked as spam - treating as successful hide operation for documentId ${documentId}`, {
+                    responseBody: JSON.stringify(err.response.body),
+                });
+                return {
+                    status: 200,
+                    body: { success: true, message: "Content already hidden (marked as spam)" }
+                };
+            }
+
             let errorText = '';
             if (
                 err &&

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

@@ -1,12 +1,105 @@
 import superagent from 'superagent';
 import { removePrefix } from '../../lib/externalId.helpers.js';
-import { loggerDebug, loggerError, loggerInfo } from '../../lib/logger.helpers.js';
+import { loggerDebug, loggerError, loggerInfo, loggerWarn } from '../../lib/logger.helpers.js';
 import OAuth from 'oauth-1.0a';
 import crypto from 'crypto';
 import axios from 'axios';
 import fs from 'fs';
 import Twit from '@meltwater/social-twit';
 
+const TWITTER_API_CONFIG = {
+    v1_1: {
+        base_url: 'https://api.twitter.com/1.1',
+    },
+    v2: {
+        base_url: 'https://api.x.com/2',
+        default_user_fields: 'id,name,username,profile_image_url,public_metrics,description,created_at,verified,protected'
+    }
+};
+
+// Helper function to create v2 API URLs with consistent field selection
+function createTwitterV2Url(endpoint, additionalParams = {}) {
+    const baseUrl = `${TWITTER_API_CONFIG.v2.base_url}/${endpoint}`;
+    const defaultFields = { 'user.fields': TWITTER_API_CONFIG.v2.default_user_fields };
+    const allParams = { ...defaultFields, ...additionalParams };
+    
+    const queryString = Object.entries(allParams)
+        .map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`)
+        .join('&');
+    
+    return queryString ? `${baseUrl}?${queryString}` : baseUrl;
+}
+
+// Helper function to make v2 API requests with fallback to v1.1
+async function makeTwitterV2Request(v2Endpoint, v1FallbackQuery, token, logger, requestOptions = {}) {
+    // Try v2 API first - it supports OAuth 1.0a for user lookup endpoints and has better rate limits!
+    try {
+        const v2Url = createTwitterV2Url(v2Endpoint, requestOptions.v2Params);
+        
+        const result = await getRequest({
+            token,
+            uri: v2Url,
+            attachUrlPrefix: false,
+            convertPayloadToUri: false,
+            logger
+        });
+        return { success: true, data: result.data?.data, source: 'v2' };
+    } catch (e) {
+        loggerWarn(logger, `Twitter API v2 request failed for ${v2Endpoint}, falling back to v1.1`, e);
+        
+        // Fallback to v1.1 if v2 fails
+        if (v1FallbackQuery && requestOptions.enableFallback !== false) {
+            try {
+                loggerInfo(logger, `Falling back to v1.1 API for ${v2Endpoint}`);
+                const fallbackResult = await (requestOptions.fallbackMethod === 'post' ? postRequest : getRequest)({
+                    token,
+                    uri: v1FallbackQuery,
+                    logger
+                });
+                return { success: true, data: fallbackResult.data, source: 'v1.1' };
+            } catch (fallbackError) {
+                loggerError(logger, `Both v2 and v1.1 APIs failed for ${v2Endpoint}`, fallbackError);
+            }
+        }
+        
+        return { success: false, error: e, source: 'failed' };
+    }
+}
+
+function normalizeUserData(user, apiVersion = 'v1.1') {
+    if (!user) return user;
+    
+    const normalized = { ...user };
+    
+    if (apiVersion === 'v2') {
+        normalized.screen_name = user.username;
+        normalized.id_str = user.id; 
+        normalized.profile_image_url_https = user.profile_image_url; 
+    } else {
+        normalized.username = user.screen_name;
+        normalized.id = user.id_str;
+        normalized.profile_image_url = user.profile_image_url_https;
+    }
+    
+    return normalized;
+}
+
+/**
+ * Normalizes an array of user data or a single user object
+ * @param {Object|Array} users - User object or array of user objects from Twitter API
+ * @param {string} apiVersion - API version used ('v1.1' or 'v2')
+ * @returns {Object|Array} Normalized user data with both screen_name and username
+ */
+function normalizeUsersData(users, apiVersion = 'v1.1') {
+    if (!users) return users;
+    
+    if (Array.isArray(users)) {
+        return users.map(user => normalizeUserData(user, apiVersion));
+    }
+    
+    return normalizeUserData(users, apiVersion);
+}
+
 
 
 export function addOAuthToToken(token, TWITTER_CONSUMER_KEY, TWITTER_CONSUMER_SECRET) {
@@ -37,21 +130,50 @@ export async function getUserInfoFromHandles(token, handles, logger) {
             loggerWarn(logger,`No handles provided to twitterNative getUserInfoFromHandles`);
             return [];
         }
-        let query = `users/lookup.json?screen_name=${handlesJoin}`;
-        let result = await postRequest({ token, uri: query, logger });
-        return result.data;
+        
+        // Use Twitter API v2 for much better rate limits (900 req/15min vs v1.1 limits)
+        // v2 API supports up to 100 usernames per request vs v1.1's limit
+        const result = await makeTwitterV2Request(
+            'users/by', // v2 endpoint
+            `users/lookup.json?screen_name=${handlesJoin}`, // v1.1 fallback
+            token,
+            logger,
+            {
+                v2Params: { usernames: handlesJoin },
+                fallbackMethod: 'post'
+            }
+        );
+        
+        const normalizedData = normalizeUsersData(result.data, result.source);
+        return normalizedData || [];
     } catch (e) {
-        loggerError(logger,`Error getting UserInfo`, e);
+        loggerError(logger, `Unexpected error in getUserInfoFromHandles`, e);
+        return [];
     }
 }
 
 export async function getUserInfoFromHandle(token, handleId, logger) {
     try {
-        let query = `users/show.json?user_id=${removePrefix(handleId)}`;
-        let result = await getRequest({ token, uri: query, logger });
-        return result.data;
+        if (!handleId) {
+            loggerWarn(logger, `Invalid handleId provided to getUserInfoFromHandle: ${JSON.stringify(handleId)}`);
+            throw new Error(`Invalid handleId: ${handleId}`);
+        }
+        // Use Twitter API v2 for much better rate limits (900 req/15min vs v1.1 limits)
+        const result = await makeTwitterV2Request(
+            `users/${removePrefix(handleId)}`, // v2 endpoint
+            `users/show.json?user_id=${removePrefix(handleId)}`, // v1.1 fallback
+            token,
+            logger
+        );
+        
+        if (result.success) {
+            // Normalize the user data to ensure both screen_name and username are present
+            return normalizeUserData(result.data, result.source);
+        } else {
+            throw result.error || new Error('Failed to get user info from both APIs');
+        }
     } catch (e) {
-        loggerError(logger,`Error getting UserInfo`, e);
+        loggerError(logger, `Error in getUserInfoFromHandle with handleId: ${JSON.stringify(handleId)}`, e);
     }
 }
 

package/src/lib/externalId.helpers.js

@@ -1,5 +1,8 @@
 export function removePrefix(document) {
-    return document && document.replace(/id\:[a-zA-Z]+\.(com|net):/g, '');
+    if (!document || typeof document !== 'string') {
+        return document; // Return as-is if not a valid string
+    }
+    return document.replace(/id\:[a-zA-Z]+\.(com|net):/g, '');
 }
 
 export function twitterPrefixCheck(socialOriginType, value) {