10683471234

Committed 03 Sep 2024 01:01PM UTC coverage: 31.898% (-0.03%) from 31.93%

Build # 10683471234

Build Type

Pull #9699

github

Committed by

web-flow

Commit Message

Merge 71ff9ee24 into d49379aa0

Pull Request Pull Request #9699: [Draft] Fix issues with in-context comment links

Run Details

5071 of 41227 branches covered (12.3%)

Branch coverage included in aggregate %.

2 of 19 new or added lines in 4 files covered. (10.53%)

1 existing line in 1 file now uncovered.

29371 of 66749 relevant lines covered (44.0%)

185.64 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

22.14

/packages/lesswrong/lib/collections/comments/helpers.ts

import { isAF, taggingNameSetting } from '../../instanceSettings';
import { getSiteUrl } from '../../vulcan-lib/utils';
import { mongoFindOne } from '../../mongoQueries';
import { postGetPageUrl } from '../posts/helpers';
import { userCanDo } from '../../vulcan-users/permissions';
import { userGetDisplayName } from "../users/helpers";
import { tagGetCommentLink } from '../tags/helpers';
import { TagCommentType } from './types';
import { commentPermalinkStyleSetting, hideUnreviewedAuthorCommentsSettings } from '../../publicSettings';
import { forumSelect } from '../../forumTypeUtils';

// Get a comment author's name
export async function commentGetAuthorName(comment: DbComment): Promise<string> {
  var user = await mongoFindOne("Users", comment.userId);
  return user ? userGetDisplayName(user) : comment.author ?? "[unknown author]";
};

// Get URL of a comment page.
export async function commentGetPageUrlFromDB(comment: DbComment, context: ResolverContext, isAbsolute: boolean): Promise<string> {
  if (comment.postId) {
    const post = await context.loaders.Posts.load(comment.postId);
    if (!post) throw Error(`Unable to find post for comment: ${comment._id}`)
    return `${postGetPageUrl(post, isAbsolute)}?commentId=${comment._id}`;
  } else if (comment.tagId) {
    const tag = await context.loaders.Tags.load(comment.tagId);
    if (!tag) throw Error(`Unable to find ${taggingNameSetting.get()} for comment: ${comment._id}`)

    return tagGetCommentLink({tagSlug: tag.slug, commentId: comment._id, tagCommentType: comment.tagCommentType, isAbsolute});
  } else {
    throw Error(`Unable to find document for comment: ${comment._id}`)
  }
};

export function commentGetPageUrl(comment: CommentsListWithParentMetadata, isAbsolute = false): string {
  if (comment.post) {
    // TODO 1
    return `${postGetPageUrl(comment.post, isAbsolute)}?commentId=${comment._id}`;
  } else if (comment.tag) {
    return tagGetCommentLink({tagSlug: comment.tag.slug, commentId: comment._id, tagCommentType: comment.tagCommentType, isAbsolute});
  } else {
    throw new Error(`Unable to find document for comment: ${comment._id}`);
  }
}

// TODO there are several functions which do this, some of them should be combined
export function commentGetPageUrlFromIds({postId, postSlug, tagSlug, tagCommentType, commentId, permalink, isAbsolute=false}: {
  postId?: string | null,
  postSlug?: string,
  tagSlug?: string,
  tagCommentType?: TagCommentType,
  commentId: string,
  permalink?: boolean,
  isAbsolute?: boolean,
}): string {
  const prefix = isAbsolute ? getSiteUrl().slice(0,-1) : '';

  permalink = permalink ?? commentPermalinkStyleSetting.get() === 'top';
  if (commentPermalinkStyleSetting.get() === 'in-context') {
    permalink = true;
  }

  if (postId) {
    if (permalink) {
      return `${prefix}/posts/${postId}/${postSlug?postSlug:""}?commentId=${commentId}`;
    } else {
      return `${prefix}/posts/${postId}/${postSlug?postSlug:""}#${commentId}`;
    }
  } else if (tagSlug) {
    return tagGetCommentLink({tagSlug, commentId, tagCommentType: tagCommentType ?? "DISCUSSION", isAbsolute});
  } else {
    //throw new Error("commentGetPageUrlFromIds needs a post or tag");
    return "/"
  }
}

// URL for RSS feed of all direct replies
export const commentGetRSSUrl = function(comment: HasIdType, isAbsolute = false): string {
  const prefix = isAbsolute ? getSiteUrl().slice(0,-1) : '';
  return `${prefix}/feed.xml?type=comments&view=commentReplies&parentCommentId=${comment._id}`;
};

export const commentDefaultToAlignment = (currentUser: UsersCurrent|null, post: PostsMinimumInfo|undefined, comment?: CommentsList): boolean => {
  if (isAF) { return true }
  if (comment) {
    return !!(userCanDo(currentUser, "comments.alignment.new") && post?.af && comment.af)
  } else {
    return !!(userCanDo(currentUser, "comments.alignment.new") && post?.af)
  }
}

export const commentGetDefaultView = (post: PostsDetails|PostsList|DbPost|null, currentUser: UsersCurrent|null): CommentsViewName => {
  const fallback = forumSelect({
    AlignmentForum: "afPostCommentsTop",
    EAForum: "postCommentsMagic",
    default: "postCommentsTop",
  });
  const postSortOrder = (post && 'commentSortOrder' in post) ? post.commentSortOrder : null;
  return (postSortOrder as CommentsViewName)
    || (currentUser?.commentSorting as CommentsViewName)
    || fallback;
}

export const commentGetKarma = (comment: CommentsList|DbComment): number => {
  const baseScore = isAF ? comment.afBaseScore : comment.baseScore
  return baseScore || 0
}

export const commentAllowTitle = (comment: {tagCommentType: TagCommentType, parentCommentId?: string | null}): boolean => comment?.tagCommentType === 'SUBFORUM' && !comment?.parentCommentId

/**
 * If the site is currently hiding comments by unreviewed authors, check if we need to hide this comment.
 */
export const commentIsHidden = (comment: CommentsList|DbComment) => {
  const hideSince = hideUnreviewedAuthorCommentsSettings.get()
  const postedAfterGrandfatherDate = hideSince && new Date(hideSince) < new Date(comment.postedAt) 
  // hide unreviewed comments which were posted after we implmemented a "all comments need to be reviewed" date
  return postedAfterGrandfatherDate && comment.authorIsUnreviewed
}

1	import { isAF, taggingNameSetting } from '../../instanceSettings';	153✔
2	import { getSiteUrl } from '../../vulcan-lib/utils';	25✔
3	import { mongoFindOne } from '../../mongoQueries';	25✔
4	import { postGetPageUrl } from '../posts/helpers';	25✔
5	import { userCanDo } from '../../vulcan-users/permissions';	25✔
6	import { userGetDisplayName } from "../users/helpers";	25✔
7	import { tagGetCommentLink } from '../tags/helpers';	25✔
8	import { TagCommentType } from './types';
9	import { commentPermalinkStyleSetting, hideUnreviewedAuthorCommentsSettings } from '../../publicSettings';	25✔
10	import { forumSelect } from '../../forumTypeUtils';	25✔
11
12	// Get a comment author's name
13	export async function commentGetAuthorName(comment: DbComment): Promise<string> {
14	var user = await mongoFindOne("Users", comment.userId);	39✔
15	return user ? userGetDisplayName(user) : comment.author ?? "[unknown author]";	39!
16	};
17
18	// Get URL of a comment page.
19	export async function commentGetPageUrlFromDB(comment: DbComment, context: ResolverContext, isAbsolute: boolean): Promise<string> {
20	if (comment.postId) {	13!
21	const post = await context.loaders.Posts.load(comment.postId);	13✔
22	if (!post) throw Error(`Unable to find post for comment: ${comment._id}`)	13!
23	return `${postGetPageUrl(post, isAbsolute)}?commentId=${comment._id}`;	13✔
24	} else if (comment.tagId) {	×
25	const tag = await context.loaders.Tags.load(comment.tagId);	×
26	if (!tag) throw Error(`Unable to find ${taggingNameSetting.get()} for comment: ${comment._id}`)	×
27
28	return tagGetCommentLink({tagSlug: tag.slug, commentId: comment._id, tagCommentType: comment.tagCommentType, isAbsolute});	×
29	} else {
30	throw Error(`Unable to find document for comment: ${comment._id}`)	×
31	}
32	};
33
34	export function commentGetPageUrl(comment: CommentsListWithParentMetadata, isAbsolute = false): string {	×
35	if (comment.post) {	×
36	// TODO 1
37	return `${postGetPageUrl(comment.post, isAbsolute)}?commentId=${comment._id}`;	×
38	} else if (comment.tag) {	×
39	return tagGetCommentLink({tagSlug: comment.tag.slug, commentId: comment._id, tagCommentType: comment.tagCommentType, isAbsolute});	×
40	} else {
41	throw new Error(`Unable to find document for comment: ${comment._id}`);	×
42	}
43	}
44
45	// TODO there are several functions which do this, some of them should be combined
46	export function commentGetPageUrlFromIds({postId, postSlug, tagSlug, tagCommentType, commentId, permalink, isAbsolute=false}: {	×
47	postId?: string \| null,
48	postSlug?: string,
49	tagSlug?: string,
50	tagCommentType?: TagCommentType,
51	commentId: string,
52	permalink?: boolean,
53	isAbsolute?: boolean,
54	}): string {
55	const prefix = isAbsolute ? getSiteUrl().slice(0,-1) : '';	×
56
57	permalink = permalink ?? commentPermalinkStyleSetting.get() === 'top';	×
NEW 58	if (commentPermalinkStyleSetting.get() === 'in-context') {	×
NEW 59	permalink = true;	×
60	}
61
62	if (postId) {	×
63	if (permalink) {	×
64	return `${prefix}/posts/${postId}/${postSlug?postSlug:""}?commentId=${commentId}`;	×
65	} else {
66	return `${prefix}/posts/${postId}/${postSlug?postSlug:""}#${commentId}`;	×
67	}
68	} else if (tagSlug) {	×
69	return tagGetCommentLink({tagSlug, commentId, tagCommentType: tagCommentType ?? "DISCUSSION", isAbsolute});	×
70	} else {
71	//throw new Error("commentGetPageUrlFromIds needs a post or tag");
72	return "/"	×
73	}
74	}
75
76	// URL for RSS feed of all direct replies
77	export const commentGetRSSUrl = function(comment: HasIdType, isAbsolute = false): string {	25!
78	const prefix = isAbsolute ? getSiteUrl().slice(0,-1) : '';	×
79	return `${prefix}/feed.xml?type=comments&view=commentReplies&parentCommentId=${comment._id}`;	×
80	};
81
82	export const commentDefaultToAlignment = (currentUser: UsersCurrent\|null, post: PostsMinimumInfo\|undefined, comment?: CommentsList): boolean => {	25✔
83	if (isAF) { return true }	×
84	if (comment) {	×
85	return !!(userCanDo(currentUser, "comments.alignment.new") && post?.af && comment.af)	×
86	} else {
87	return !!(userCanDo(currentUser, "comments.alignment.new") && post?.af)	×
88	}
89	}
90
91	export const commentGetDefaultView = (post: PostsDetails\|PostsList\|DbPost\|null, currentUser: UsersCurrent\|null): CommentsViewName => {	25✔
92	const fallback = forumSelect({	×
93	AlignmentForum: "afPostCommentsTop",
94	EAForum: "postCommentsMagic",
95	default: "postCommentsTop",
96	});
97	const postSortOrder = (post && 'commentSortOrder' in post) ? post.commentSortOrder : null;	×
98	return (postSortOrder as CommentsViewName)	×
99	\|\| (currentUser?.commentSorting as CommentsViewName)	×
100	\|\| fallback;
101	}
102
103	export const commentGetKarma = (comment: CommentsList\|DbComment): number => {	25✔
104	const baseScore = isAF ? comment.afBaseScore : comment.baseScore	×
105	return baseScore \|\| 0	×
106	}
107
108	export const commentAllowTitle = (comment: {tagCommentType: TagCommentType, parentCommentId?: string \| null}): boolean => comment?.tagCommentType === 'SUBFORUM' && !comment?.parentCommentId	25!
109
110	/**
111	* If the site is currently hiding comments by unreviewed authors, check if we need to hide this comment.
112	*/
113	export const commentIsHidden = (comment: CommentsList\|DbComment) => {	25✔
114	const hideSince = hideUnreviewedAuthorCommentsSettings.get()	26✔
115	const postedAfterGrandfatherDate = hideSince && new Date(hideSince) < new Date(comment.postedAt)	26!
116	// hide unreviewed comments which were posted after we implmemented a "all comments need to be reviewed" date
117	return postedAfterGrandfatherDate && comment.authorIsUnreviewed	26!
118	}

ForumMagnum / ForumMagnum / 10683471234

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous