@pkcprotocol/pkc-js 0.0.118 → 0.0.120

package/dist/node/runtime/node/community/db-handler.js

@@ -1108,59 +1108,47 @@ export class DbHandler {
     _pendingApprovalClause(alias) {
         return `(${alias}.pendingApproval IS NULL OR ${alias}.pendingApproval != 1)`;
     }
-    _communityAddressClause(alias) {
+    // The community identity rule (issue #401), the SQL twin of createCommunityIdentityRowFilter: the rows that belong in
+    // this community's pages, counts and stats, by the community fields the comment's author signed. It is the rule client
+    // page verification applies, so the community never hides a row a client would accept. A community with a name admits
+    // rows whose communityName is NULL or is that name or its .eth/.bso alias. A community without a name admits rows whose
+    // communityPublicKey is NULL (pre-v37 domain rows) or is its key, which is its address. Always on, for every query.
+    _communityIdentityClause(alias) {
         const address = this._community.address;
-        const addresses = getEquivalentCommunityAddresses(address);
         if (isStringDomain(address)) {
-            // Domain-based: match communityName OR communityPublicKey (domain strings and IPNS keys never overlap)
-            const domainPlaceholders = addresses.map(() => "?").join(", ");
+            const names = getEquivalentCommunityAddresses(address);
             return {
-                clause: `(${alias}.communityName IN (${domainPlaceholders}) OR ${alias}.communityPublicKey IN (${domainPlaceholders}))`,
-                params: [...addresses, ...addresses]
+                clause: `(${alias}.communityName IS NULL OR ${alias}.communityName IN (${names.map(() => "?").join(", ")}))`,
+                params: names
             };
         }
-        else {
-            // IPNS key: match communityPublicKey directly
-            return { clause: `${alias}.communityPublicKey = ?`, params: [address] };
-        }
+        return { clause: `(${alias}.communityPublicKey IS NULL OR ${alias}.communityPublicKey = ?)`, params: [address] };
     }
-    _communityAddressClauseNamed(alias, paramPrefix) {
+    _communityIdentityClauseNamed(alias, paramPrefix) {
         const address = this._community.address;
-        const addresses = getEquivalentCommunityAddresses(address);
         if (isStringDomain(address)) {
-            // Domain-based: match communityName OR communityPublicKey (domain strings and IPNS keys never overlap)
             const params = {};
-            const namePlaceholders = [];
-            const keyPlaceholders = [];
-            addresses.forEach((addr, i) => {
-                const nameParam = `${paramPrefix}CommunityName${i}`;
-                const keyParam = `${paramPrefix}CommunityKey${i}`;
-                params[nameParam] = addr;
-                params[keyParam] = addr;
-                namePlaceholders.push(`:${nameParam}`);
-                keyPlaceholders.push(`:${keyParam}`);
+            const placeholders = getEquivalentCommunityAddresses(address).map((name, i) => {
+                const paramName = `${paramPrefix}CommunityName${i}`;
+                params[paramName] = name;
+                return `:${paramName}`;
             });
-            return {
-                clause: `(${alias}.communityName IN (${namePlaceholders.join(", ")}) OR ${alias}.communityPublicKey IN (${keyPlaceholders.join(", ")}))`,
-                params
-            };
-        }
-        else {
-            // IPNS key: match communityPublicKey directly
-            const paramName = `${paramPrefix}CommunityKey`;
-            return { clause: `${alias}.communityPublicKey = :${paramName}`, params: { [paramName]: address } };
+            return { clause: `(${alias}.communityName IS NULL OR ${alias}.communityName IN (${placeholders.join(", ")}))`, params };
         }
+        const paramName = `${paramPrefix}CommunityKey`;
+        return {
+            clause: `(${alias}.communityPublicKey IS NULL OR ${alias}.communityPublicKey = :${paramName})`,
+            params: { [paramName]: address }
+        };
     }
     _buildPageQueryParts(options) {
         const commentsTable = TABLES.COMMENTS;
         const commentUpdatesTable = TABLES.COMMENT_UPDATES;
         const whereClauses = [`${commentsTable}.parentCid = ?`];
         const params = [options.parentCid];
-        if (options.excludeCommentsWithDifferentCommunityAddress) {
-            const { clause, params: addrParams } = this._communityAddressClause(commentsTable);
-            whereClauses.push(clause);
-            params.push(...addrParams);
-        }
+        const { clause: identityClause, params: identityParams } = this._communityIdentityClause(commentsTable);
+        whereClauses.push(identityClause);
+        params.push(...identityParams);
         if (options.excludeCommentPendingApproval)
             whereClauses.push(this._pendingApprovalClause(commentsTable));
         if (options.excludeRemovedComments)
@@ -1428,14 +1416,12 @@ export class DbHandler {
         const commentsAlias = "comments";
         const commentUpdatesAlias = "c_updates";
         const deletedLookupAlias = "d";
-        if (options.excludeCommentsWithDifferentCommunityAddress) {
-            const { clause: baseClause, params: baseAddrParams } = this._communityAddressClause(commentsAlias);
-            baseFilterClauses.push(baseClause);
-            params.push(...baseAddrParams);
-            const { clause: recClause, params: recAddrParams } = this._communityAddressClause(commentsAlias);
-            recursiveFilterClauses.push(recClause);
-            params.push(...recAddrParams);
-        }
+        const { clause: baseIdentityClause, params: baseIdentityParams } = this._communityIdentityClause(commentsAlias);
+        baseFilterClauses.push(baseIdentityClause);
+        params.push(...baseIdentityParams);
+        const { clause: recursiveIdentityClause, params: recursiveIdentityParams } = this._communityIdentityClause(commentsAlias);
+        recursiveFilterClauses.push(recursiveIdentityClause);
+        params.push(...recursiveIdentityParams);
         if (options.excludeCommentPendingApproval) {
             const clause = this._pendingApprovalClause(commentsAlias);
             baseFilterClauses.push(clause);
@@ -1630,8 +1616,8 @@ export class DbHandler {
     _collectCommentsToBeUpdated() {
         const windowed = this._buildWindowedReplySortArms(timestamp());
         const notPending = (alias) => `(${alias}.pendingApproval IS NULL OR ${alias}.pendingApproval != 1)`;
-        const countedChildAddress = this._communityAddressClauseNamed("c", "countedChild");
-        // A child that counts towards its parent's childCount: has a CommentUpdate and this community's address, not
+        const countedChildAddress = this._communityIdentityClauseNamed("c", "countedChild");
+        // A child that counts towards its parent's childCount: has a CommentUpdate, passes the community identity rule, not
         // removed, not deleted by its author, not disapproved (the rule _queryReplyCountsByParentCids and
         // _queryLastChildCidsByParentCids apply, or the parent is re-flagged every cycle)
         const countedChild = `
@@ -1789,8 +1775,8 @@ export class DbHandler {
     queryCommunityStats() {
         // if you change this logic, make sure to run stats.community.test.js
         const now = timestamp(); // All timestamps are in seconds
-        const { clause: commentAddrClause, params: commentAddrParams } = this._communityAddressClauseNamed("comments", "statsComments");
-        const { clause: votesAddrClause, params: votesAddrParams } = this._communityAddressClauseNamed("comments_for_votes", "statsVotes");
+        const { clause: commentAddrClause, params: commentAddrParams } = this._communityIdentityClauseNamed("comments", "statsComments");
+        const { clause: votesAddrClause, params: votesAddrParams } = this._communityIdentityClauseNamed("comments_for_votes", "statsVotes");
         const removedCommentsClause = this._removedClause("cu_comments");
         const deletedCommentsClause = this._deletedFromUpdatesClause("cu_comments");
         const removedVotesClause = this._removedClause("cu_votes");
@@ -1940,7 +1926,7 @@ export class DbHandler {
     queryFirstCommentWithDepth(commentDepth) {
         if (!Number.isInteger(commentDepth) || commentDepth < 0)
             throw new Error("commentDepth must be a non-negative integer");
-        const { clause: addrClause, params: addrParams } = this._communityAddressClauseNamed("c", "firstComment");
+        const { clause: addrClause, params: addrParams } = this._communityIdentityClauseNamed("c", "firstComment");
         const exactDepthRow = this._db
             .prepare(`SELECT c.* FROM ${TABLES.COMMENTS} c
                  LEFT JOIN ${TABLES.COMMENT_UPDATES} cu ON cu.cid = c.cid
@@ -2022,7 +2008,7 @@ export class DbHandler {
             .sort((a, b) => a - b)
             .map((bucket) => `WHEN (${currentTimestampSeconds} - c.timestamp) <= ${bucket} THEN ${bucket}`)
             .join(" ");
-        const { clause: addrClause, params: addrParams } = this._communityAddressClause("c");
+        const { clause: addrClause, params: addrParams } = this._communityIdentityClause("c");
         const query = `
             WITH post_data AS (
                 SELECT c.cid, c.timestamp, cu.postUpdatesBucket AS current_bucket,
@@ -2344,7 +2330,7 @@ export class DbHandler {
     // when it is also present (neither removed, deleted nor disapproved); childCount is the level-1 part of the same count.
     _queryReplyCountsByParentCids(parentCids) {
         const result = new Map();
-        const { clause: addrClause, params: addrParams } = this._communityAddressClause("c");
+        const { clause: addrClause, params: addrParams } = this._communityIdentityClause("c");
         const present = this._replyWalkPresentExpression();
         const deletedLookup = `(SELECT cid, json_extract(edit, '$.deleted') AS deleted_flag FROM ${TABLES.COMMENT_UPDATES})`;
         for (const { placeholders, params } of this._cidChunks(parentCids, addrParams.length * 2)) {
@@ -2372,7 +2358,7 @@ export class DbHandler {
     // but the present replies under it do (#405).
     _queryLastReplyTimestampsByParentCids(parentCids) {
         const result = new Map();
-        const { clause: addrClause, params: addrParams } = this._communityAddressClause("c");
+        const { clause: addrClause, params: addrParams } = this._communityIdentityClause("c");
         const walked = `${addrClause} AND (c.pendingApproval IS NULL OR c.pendingApproval != 1)`;
         const present = this._replyWalkPresentExpression();
         const deletedLookup = `(SELECT cid, json_extract(edit, '$.deleted') AS deleted_flag FROM ${TABLES.COMMENT_UPDATES})`;
@@ -2400,7 +2386,7 @@ export class DbHandler {
     // not pending, disapproved, removed or deleted (MAX(rowid) with the bare cid column: SQLite returns the cid of that row).
     _queryLastChildCidsByParentCids(parentCids) {
         const result = new Map();
-        const { clause: addrClause, params: addrParams } = this._communityAddressClause("c");
+        const { clause: addrClause, params: addrParams } = this._communityIdentityClause("c");
         for (const { placeholders, params } of this._cidChunks(parentCids, addrParams.length)) {
             const rows = this._prepareCached(`SELECT c.parentCid AS parentCid, c.cid AS cid, MAX(c.rowid) AS lastRowid FROM ${TABLES.COMMENTS} c
                  INNER JOIN ${TABLES.COMMENT_UPDATES} cu ON cu.cid = c.cid
@@ -3164,11 +3150,9 @@ export class DbHandler {
         const mapper = this._pageEntryMapper(pageOptions.commentUpdateFieldsToExclude);
         const params = {};
         const postsWhereClauses = ["c.depth = 0"];
-        if (pageOptions.excludeCommentsWithDifferentCommunityAddress) {
-            const { clause, params: addrParams } = this._communityAddressClauseNamed("c", "asPosts");
-            postsWhereClauses.push(clause);
-            Object.assign(params, addrParams);
-        }
+        const { clause: identityClause, params: identityParams } = this._communityIdentityClauseNamed("c", "asPosts");
+        postsWhereClauses.push(identityClause);
+        Object.assign(params, identityParams);
         if (pageOptions.excludeRemovedComments)
             postsWhereClauses.push(this._removedClause("cu"));
         if (pageOptions.excludeDeletedComments)