@plusscommunities/pluss-core-aws 2.0.25-beta.6 → 2.0.25-beta.7

package/helper/hqPublishing.js

@@ -145,14 +145,23 @@ const fanOutHqSource = async (hqSourceRow, tableName) => {
 		return [];
 	}
 	const copyId = `hqcopy-${hqSourceRow.Id}`;
-	// IMPORTANT: milliseconds (.valueOf), not seconds (.unix). Newsletter
-	// rows written by addNewsletterEntry.js use `moment.utc().valueOf()` for
-	// UnixTimestamp. UnixTimestampReverse-keyed feed queries (the standard
-	// Pluss list pattern) would otherwise rank HQ copies ~1000× ahead of
-	// locally-authored posts forever — MAX_SAFE_INTEGER minus a number 10^9
-	// is vastly larger than MAX_SAFE_INTEGER minus 10^12. Keep parity with
-	// the canonical addNewsletterEntry convention.
+	// Preserve the HQ-source row's own UnixTimestamp on each copy rather than
+	// stamping "now". For an immediate publish the source timestamp already IS
+	// ~now, so feed ranking is unchanged; for a SCHEDULED publish (future
+	// timestamp set via the compose "Schedule Post" tab) preserving it keeps the
+	// copies hidden until the scheduled moment — BOTH consumers key off it: the
+	// noFuture feed filter, and the deferred-notification scheduler
+	// (watchNewsletter / the INSERT-path checkSendNotifications both gate on
+	// `UnixTimestamp < now`). Stamping "now" here published scheduled HQ posts
+	// (feed + push) immediately, ignoring the schedule. Fall back to now only if
+	// the source somehow lacks a timestamp.
+	//
+	// IMPORTANT: milliseconds (.valueOf), not seconds (.unix) — parity with the
+	// addNewsletterEntry UnixTimestamp convention. UnixTimestampReverse-keyed
+	// feed queries would otherwise mis-rank an ms value against a seconds value
+	// (MAX_SAFE_INTEGER minus 10^9 vs minus 10^12).
 	const now = moment.utc().valueOf();
+	const publishTs = hqSourceRow.UnixTimestamp || now;
 
 	const writes = targets.map((targetSiteId) => {
 		// Spread + override pattern: keep all content fields, swap identity
@@ -164,8 +173,8 @@ const fanOutHqSource = async (hqSourceRow, tableName) => {
 		copy.Site = targetSiteId;
 		copy.RowId = `${targetSiteId}_${copyId}`;
 		copy.HqSourceId = hqSourceRow.Id;
-		copy.UnixTimestamp = now;
-		copy.UnixTimestampReverse = Number.MAX_SAFE_INTEGER - now;
+		copy.UnixTimestamp = publishTs;
+		copy.UnixTimestampReverse = Number.MAX_SAFE_INTEGER - publishTs;
 		// Each copy's own INSERT fires publishNotifications via the existing
 		// pipeline. Setting UnsentNotification: "X" matches the convention
 		// used by addNewsletterEntry when caller requested a notification.
@@ -173,6 +182,11 @@ const fanOutHqSource = async (hqSourceRow, tableName) => {
 		// HQ-only fields don't travel:
 		delete copy.PublishedToSites;
 		delete copy.Deleted;     // copies start undeleted; retract cascade is separate
+		// Tagged references HQ-site users; on a community copy those IDs are
+		// orphaned (cosmetic "tagged people" display + a createUserEntries write
+		// keyed on non-members in newsletterChanged's INSERT branch). Audience
+		// targeting (All/Category) already governs who sees the copy.
+		delete copy.Tagged;
 		return updateRef(tableName, copy).then(() => copy);
 	});
 	return Promise.all(writes);
@@ -312,8 +326,8 @@ const cascadeHqRetract = async (hqSourceRow, tableName, options = {}) => {
  * @param {string} templateId — the `Id` of the contentLibrary row.
  * @param {string} contentLibraryTable — entity-agnostic; caller passes the
  *   table name (without prefix).
- * @returns {Promise<boolean>} `true` if increment applied; `false` on graceful
- *   skip (table not shipped yet, or no template with that Id exists).
+ * @returns {Promise<boolean>} `true` if increment applied; `false` if table
+ *   doesn't exist (graceful skip).
  */
 const incrementTemplateUseCount = async (templateId, contentLibraryTable) => {
 	if (!templateId || !contentLibraryTable) {
@@ -322,16 +336,11 @@ const incrementTemplateUseCount = async (templateId, contentLibraryTable) => {
 	const params = {
 		TableName: `${process.env.tablePrefix}${contentLibraryTable}`,
 		Key: { Id: templateId },
-		UpdateExpression: "ADD UseCount :inc SET LastUsedTimestamp = :now",
-		// Guard against minting a phantom row: ADD on a missing key would CREATE
-		// it with UseCount=1. Only increment a template that actually exists; a
-		// stale/bogus TemplateId is skipped (ConditionalCheckFailed below).
-		ConditionExpression: "attribute_exists(Id)",
+		UpdateExpression:
+			"ADD UseCount :inc SET LastUsedTimestamp = :now",
 		ExpressionAttributeValues: {
 			":inc": 1,
-			// epoch ms — the contentLibrary timestamp convention (matches
-			// UpdatedAt). Was .unix() (seconds); reconciled to .valueOf().
-			":now": moment().utc().valueOf(),
+			":now": moment.utc().unix(),
 		},
 	};
 	try {
@@ -349,12 +358,6 @@ const incrementTemplateUseCount = async (templateId, contentLibraryTable) => {
 			);
 			return false;
 		}
-		if (error?.code === "ConditionalCheckFailedException") {
-			// TemplateId references no existing template — skip rather than
-			// create a phantom row. Not an error; continue the stream handler.
-			log("incrementTemplateUseCount", "NoSuchTemplate", { templateId });
-			return false;
-		}
 		// Anything else is genuinely unexpected — surface it.
 		log("incrementTemplateUseCount", "Error", error);
 		throw error;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@plusscommunities/pluss-core-aws",
-	"version": "2.0.25-beta.6",
+	"version": "2.0.25-beta.7",
 	"description": "Core extension package for Pluss Communities platform",
 	"scripts": {
 		"betapatch": "npm version prepatch --preid=beta",