Threads semantics

packages/commonwealth/client/scripts/identifiers.ts

@@ -10,7 +10,7 @@ import app from './state';
 // custom domain prefixes as well.
 export const getProposalUrlPath = (
   type: ProposalType,
-  id: string,
+  id: number | string,
   omitActiveId = true,
   chainId?: string,
 ): string => {

packages/commonwealth/client/scripts/models/Thread.ts

@@ -137,7 +137,7 @@ export class Thread implements IUniqueId {
   public readonly slug = ProposalType.Thread;
   public readonly url: string;
   public readonly versionHistory: VersionHistory[];
-  public readonly chain: string;
+  public readonly communityId: string;
   public readonly lastEdited: Moment;
 
   public markedAsSpamAt: Moment;
@@ -164,7 +164,7 @@ export class Thread implements IUniqueId {
     kind,
     stage,
     version_history,
-    chain,
+    community_id,
     read_only,
     body,
     plaintext,
@@ -194,7 +194,7 @@ export class Thread implements IUniqueId {
     id: number;
     kind: ThreadKind;
     stage: ThreadStage;
-    chain: string;
+    community_id: string;
     url?: string;
     pinned?: boolean;
     links?: Link[];
@@ -235,7 +235,7 @@ export class Thread implements IUniqueId {
     this.authorChain = Address.community_id;
     this.pinned = pinned;
     this.url = url;
-    this.chain = chain;
+    this.communityId = community_id;
     this.readOnly = read_only;
     this.collaborators = collaborators || [];
     this.lastCommentedOn = last_commented_on ? moment(last_commented_on) : null;

packages/commonwealth/client/scripts/state/api/threads/addThreadLinks.ts

@@ -11,17 +11,16 @@ interface AddThreadLinksProps {
 }
 
 const addThreadLinks = async ({
-  chainId,
   threadId,
   links,
-}: AddThreadLinksProps) => {
+}: AddThreadLinksProps): Promise<Thread> => {
   const response = await axios.post(
     `${app.serverUrl()}/linking/addThreadLinks`,
     {
       thread_id: threadId,
       links,
       jwt: app.user.jwt,
-    }
+    },
   );
 
   return new Thread(response.data.result);

packages/commonwealth/client/scripts/state/api/threads/createThread.ts

@@ -32,7 +32,7 @@ const createThread = async ({
   url,
   readOnly,
   authorProfile,
-}: CreateThreadProps) => {
+}: CreateThreadProps): Promise<Thread> => {
   const {
     action = null,
     session = null,

packages/commonwealth/client/scripts/state/api/threads/deleteThreadLinks.ts

@@ -11,10 +11,9 @@ interface DeleteThreadLinksProps {
 }
 
 const deleteThreadLinks = async ({
-  chainId,
   threadId,
   links,
-}: DeleteThreadLinksProps) => {
+}: DeleteThreadLinksProps): Promise<Thread> => {
   const response = await axios.delete(
     `${app.serverUrl()}/linking/deleteLinks`,
     {
@@ -23,7 +22,7 @@ const deleteThreadLinks = async ({
         links,
         jwt: app.user.jwt,
       },
-    }
+    },
   );
 
   return new Thread(response.data.result);

packages/commonwealth/client/scripts/state/api/threads/editThread.ts

@@ -61,7 +61,7 @@ const editThread = async ({
   topicId,
   // for editing thread collaborators
   collaborators,
-}: EditThreadProps) => {
+}: EditThreadProps): Promise<Thread> => {
   const {
     action = null,
     session = null,

packages/commonwealth/client/scripts/state/api/threads/fetchThreads.ts

@@ -118,7 +118,17 @@ const getFetchThreadsQueryKey = (props) => {
 };
 
 const fetchBulkThreads = (props) => {
-  return async ({ pageParam = 1 }) => {
+  return async ({
+    pageParam = 1,
+  }): Promise<{
+    data: {
+      numVotingThreads: number;
+      limit: number;
+      page: number;
+      threads: Thread[];
+    };
+    pageParam: number | undefined;
+  }> => {
     const res = await axios.get(
       `${app.serverUrl()}${ApiEndpoints.FETCH_THREADS}`,
       {
@@ -156,7 +166,7 @@ const fetchBulkThreads = (props) => {
 };
 
 const fetchActiveThreads = (props) => {
-  return async () => {
+  return async (): Promise<Thread[]> => {
     const response = await axios.get(
       `${app.serverUrl()}${ApiEndpoints.FETCH_THREADS}`,
       {

packages/commonwealth/client/scripts/state/api/threads/getThreadsById.ts

@@ -12,7 +12,10 @@ interface GetThreadsByIdProps {
   apiCallEnabled?: boolean;
 }
 
-const getThreadsById = async ({ chainId, ids }: GetThreadsByIdProps) => {
+const getThreadsById = async ({
+  chainId,
+  ids,
+}: GetThreadsByIdProps): Promise<Thread[]> => {
   const response = await axios.get(
     `${app.serverUrl()}${ApiEndpoints.FETCH_THREADS}`,
     {

packages/commonwealth/client/scripts/state/api/threads/getThreadsByLink.ts

@@ -12,7 +12,9 @@ interface GetThreadsByLinkProps {
   enabled: boolean;
 }
 
-const getThreadsByLink = async ({ link }: GetThreadsByLinkProps) => {
+const getThreadsByLink = async ({
+  link,
+}: GetThreadsByLinkProps): Promise<{ id: number; title: string }[]> => {
   const response = await axios.post(`${app.serverUrl()}/linking/getLinks`, {
     link,
     jwt: app.user.jwt,

packages/commonwealth/client/scripts/state/api/threads/searchThreads.ts

@@ -37,7 +37,9 @@ const searchThreads = async ({
   orderBy,
   orderDirection,
   threadTitleOnly,
-}: SearchThreadsProps & { pageParam: number }) => {
+}: SearchThreadsProps & {
+  pageParam: number;
+}): Promise<SearchThreadsResponse> => {
   const {
     data: { result },
   } = await axios.get<{ result: SearchThreadsResponse }>(

packages/commonwealth/client/scripts/views/components/Profile/ProfileActivityRow.tsx

@@ -3,7 +3,7 @@ import React from 'react';
 import 'components/Profile/ProfileActivityRow.scss';
 import moment from 'moment';
 
-import type Thread from 'models/Thread';
+import Thread from 'models/Thread';
 import withRouter, {
   navigateToCommunity,
   useCommonNavigate,
@@ -22,12 +22,18 @@ type ProfileActivityRowProps = {
 
 const ProfileActivityRow = ({ activity }: ProfileActivityRowProps) => {
   const navigate = useCommonNavigate();
-  const { chain: communityId, createdAt, author, title, id, body } = activity;
+  const { createdAt, author, title, id, body } = activity;
+  let communityId: string;
+  if (activity instanceof Thread) {
+    communityId = activity.communityId;
+  } else {
+    communityId = activity.chain;
+  }
   const isThread = !!(activity as Thread).kind;
   const comment = activity as CommentWithAssociatedThread;
   const { iconUrl } = app.config.chains.getById(communityId);
   const domain = document.location.origin;
-  let decodedTitle;
+  let decodedTitle: string;
 
   try {
     if (isThread) {

packages/commonwealth/client/scripts/views/components/UpvotePopover/UpvotePopover.scss

@@ -39,4 +39,4 @@
     align-items: center;
     color: $neutral-400;
   }
-}
+}

packages/commonwealth/client/scripts/views/components/thread_selector/thread_selector.tsx

@@ -49,13 +49,13 @@
         new Thread({
           id: t.id,
           title: t.title,
-          chain: t.community_id,
+          community_id: t.community_id,
           Address: new AddressInfo({
             id: t.address_id,
             address: t.address,
             chainId: t.address_chain,
           }),
-        } as any),
+        } as ConstructorParameters<typeof Thread>[0]),
     );
   }, [threadsData]);
 
@@ -94,7 +94,7 @@
     [linkedThreadsToSet, onSelect],
   );
 
   const EmptyComponent = () => (
     <div className="empty-component">{getEmptyContentMessage()}</div>
   );
 

packages/commonwealth/client/scripts/views/pages/Community/Groups/common/GroupForm/GroupForm.scss

@@ -54,7 +54,7 @@
     align-items: baseline;
     gap: 8px;
 
-    @include extraSmall{
+    @include extraSmall {
       justify-content: flex-end;
     }
   }

packages/commonwealth/client/scripts/views/pages/notification_settings/index.tsx

@@ -466,11 +466,11 @@ const NotificationSettingsPage = () => {
                     </div>
                     {subs.map((sub) => {
                       const getUser = () => {
-                        if (sub.Thread?.chain) {
+                        if (sub.Thread?.communityId) {
                           return (
                             <User
                               userAddress={sub.Thread.author}
-                              userCommunityId={sub.Thread.chain}
+                              userCommunityId={sub.Thread.communityId}
                             />
                           );
                         } else if (sub.Comment?.chain) {

packages/commonwealth/client/scripts/views/pages/search/index.tsx

@@ -317,7 +317,7 @@ const SearchPage = () => {
                 )}
               <div className="search-results-list">
                 {renderSearchResults(
-                  results as any,
+                  results,
                   queryParams.q,
                   activeTab,
                   commonNavigate,

packages/commonwealth/client/scripts/views/pages/view_proposal/proposal_components.tsx

@@ -47,7 +47,7 @@
   proposal: CompoundProposal;
 } & BaseCancelButtonProps;
 
 export const CompoundCancelButton = (props: CompoundCancelButtonProps) => {
   const { proposal, votingModalOpen, onModalClose, toggleVotingModal } = props;
 
   return (
@@ -68,10 +68,11 @@
   proposal: SubheaderProposalType;
 } & BaseCancelButtonProps;
 
 export const ProposalSubheader = (props: ProposalSubheaderProps) => {
   const { onModalClose, proposal, toggleVotingModal, votingModalOpen } = props;
   const forceRerender = useForceRerender();
-  const [linkedThreads, setLinkedThreads] = useState(null);
+  const [linkedThreads, setLinkedThreads] =
+    useState<{ id: number; title: string }[]>(null);
 
   useEffect(() => {
     app.proposalEmitter.on('redraw', forceRerender);

packages/commonwealth/client/scripts/views/pages/view_proposal/proposal_header_links.tsx

@@ -9,19 +9,19 @@ import { getProposalUrlPath } from 'identifiers';
 import { CWIcon } from '../../components/component_kit/cw_icons/cw_icon';
 
 type ProposalHeaderLinkProps = {
-  threads: any[];
+  threads: { id: number; title: string }[];
   community: string;
 };
 
 // "Go to discussion"
 const threadLinkButton = (
-  threadId: string,
+  threadId: number,
   title: string,
   community: string,
 ) => {
   const path = getProposalUrlPath(
     ProposalType.Thread,
-    `${threadId}`,
+    threadId,
     false,
     community,
   );
@@ -44,7 +44,7 @@ export const ThreadLink = ({ threads, community }: ProposalHeaderLinkProps) => {
 };
 
 type SnapshotThreadLinkProps = {
-  thread: { id: string; title: string };
+  thread: { id: number; title: string };
 };
 
 export const SnapshotThreadLink = ({ thread }: SnapshotThreadLinkProps) => {

packages/commonwealth/client/scripts/views/pages/view_snapshot_proposal/snapshot_information_card.tsx

@@ -33,7 +33,7 @@
 
 type SnapshotInfoLinkRowProps = SnapshotInfoRowProps & { url: string };
 
 const SnapshotInfoLinkRow = (props: SnapshotInfoLinkRowProps) => {
   const { label, url, value } = props;
 
   return (
@@ -53,10 +53,10 @@
 
 type SnapshotInformationCardProps = {
   proposal: SnapshotProposal;
-  threads: Array<{ id: string; title: string }> | null;
+  threads: Array<{ id: number; title: string }> | null;
 };
 
 export const SnapshotInformationCard = ({
   proposal,
   threads,
 }: SnapshotInformationCardProps) => {

packages/commonwealth/client/scripts/views/pages/view_thread/ViewThreadPage.tsx

@@ -283,7 +283,7 @@ const ViewThreadPage = ({ identifier }: ViewThreadPageProps) => {
   if (
     (!isLoading && !thread) ||
     fetchThreadError ||
-    thread.chain !== app.activeChainId()
+    thread.communityId !== app.activeChainId()
   ) {
     return <PageNotFound />;
   }
@@ -400,7 +400,7 @@ const ViewThreadPage = ({ identifier }: ViewThreadPageProps) => {
           showLinkedThreadOptions ||
           polls?.length > 0 ||
           isAuthor ||
-          hasWebLinks
+          !!hasWebLinks
         }
         isSpamThread={!!thread.markedAsSpamAt}
         title={

packages/commonwealth/client/scripts/views/pages/view_thread/linked_proposals_card.tsx

@@ -63,7 +63,7 @@ export const LinkedProposalsCard = ({
       const proposal = initialSnapshotLinks[0];
       if (proposal.identifier.includes('/')) {
         setSnapshotUrl(
-          `${app.isCustomDomain() ? '' : `/${thread.chain}`}/snapshot/${
+          `${app.isCustomDomain() ? '' : `/${thread.communityId}`}/snapshot/${
             proposal.identifier
           }`,
         );
@@ -76,9 +76,9 @@ export const LinkedProposalsCard = ({
             if (matchingSnapshot) {
               setSnapshotTitle(matchingSnapshot.title);
               setSnapshotUrl(
-                `${app.isCustomDomain() ? '' : `/${thread.chain}`}/snapshot/${
-                  _space.id
-                }/${matchingSnapshot.id}`,
+                `${
+                  app.isCustomDomain() ? '' : `/${thread.communityId}`
+                }/snapshot/${_space.id}/${matchingSnapshot.id}`,
               );
               break;
             }
@@ -87,7 +87,7 @@ export const LinkedProposalsCard = ({
       }
       setSnapshotProposalsLoaded(true);
     }
-  }, [initialSnapshotLinks, thread.chain]);
+  }, [initialSnapshotLinks, thread.communityId]);
 
   const showSnapshot =
     initialSnapshotLinks.length > 0 && snapshotProposalsLoaded;
@@ -112,7 +112,7 @@ export const LinkedProposalsCard = ({
                           <ReactRouterLink
                             key={l.identifier}
                             to={getThreadLink({
-                              threadChain: thread.chain,
+                              threadChain: thread.communityId,
                               identifier: l.identifier,
                             })}
                           >