From 05c3964c8ec5c910a96d8594dbe8e3d36294a8ab Mon Sep 17 00:00:00 2001 From: Hunter Miller Date: Fri, 19 Jul 2024 08:53:52 -0500 Subject: [PATCH 1/6] prose-mirror: make sure links have underline --- apps/tlon-web/src/styles/components.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/tlon-web/src/styles/components.css b/apps/tlon-web/src/styles/components.css index 59e11a27f9..8108218a94 100644 --- a/apps/tlon-web/src/styles/components.css +++ b/apps/tlon-web/src/styles/components.css @@ -60,6 +60,10 @@ @apply my-0; } +.Prosemirror a { + @apply underline; +} + /* hack to prevent auto-zoom on em-emoji-picker */ @media screen and (max-width: 767px) { em-emoji-picker { From 1bb4c013581d0f4973462421cbb7118f1e5b1a1a Mon Sep 17 00:00:00 2001 From: Hunter Miller Date: Fri, 19 Jul 2024 09:07:17 -0500 Subject: [PATCH 2/6] prose-mirror: make sure links are underlined --- apps/tlon-web/src/styles/components.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/tlon-web/src/styles/components.css b/apps/tlon-web/src/styles/components.css index 8108218a94..d95530ed4a 100644 --- a/apps/tlon-web/src/styles/components.css +++ b/apps/tlon-web/src/styles/components.css @@ -60,7 +60,7 @@ @apply my-0; } -.Prosemirror a { +.ProseMirror a { @apply underline; } From ccd1e22912ecfbe31b617db8577c58043ab340fa Mon Sep 17 00:00:00 2001 From: Hunter Miller Date: Fri, 19 Jul 2024 10:45:55 -0500 Subject: [PATCH 3/6] activity: we should always act as if we might have bad state --- desk/app/activity.hoon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desk/app/activity.hoon b/desk/app/activity.hoon index d1a13b44c2..041e1b2ca4 100644 --- a/desk/app/activity.hoon +++ b/desk/app/activity.hoon @@ -462,7 +462,7 @@ %+ roll happenings |= [bn=activity-bundle:a acc=activity:a] - (~(put by acc) source.bn (~(got by activity) source.bn)) + (~(put by acc) source.bn (~(gut by activity) source.bn *activity-summary:a)) :: if start is now, need to increment to make sure we include latest :: event if that event somehow has now as its time =/ real-start ?:(=(start now.bowl) +(start) start) From 22eef275f44d1e1ae54246f440c4f564b21b6ee1 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 19 Jul 2024 16:14:07 +0000 Subject: [PATCH 4/6] update glob: [skip actions] --- desk/desk.docket-0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desk/desk.docket-0 b/desk/desk.docket-0 index 97bf99c2a4..439fbe4df7 100644 --- a/desk/desk.docket-0 +++ b/desk/desk.docket-0 @@ -2,7 +2,7 @@ info+'Start, host, and cultivate communities. Own your communications, organize your resources, and share documents. Tlon is a decentralized platform that offers a full, communal suite of tools for messaging, writing and sharing media with others.' color+0xde.dede image+'https://bootstrap.urbit.org/tlon.svg?v=1' - glob-http+['https://bootstrap.urbit.org/glob-0v2.ff303.9sd1e.hslh2.d9mcj.22a3t.glob' 0v2.ff303.9sd1e.hslh2.d9mcj.22a3t] + glob-http+['https://bootstrap.urbit.org/glob-0v4.m00s8.3g6um.jshk2.n12k4.v49a5.glob' 0v4.m00s8.3g6um.jshk2.n12k4.v49a5] base+'groups' version+[6 1 0] website+'https://tlon.io' From 81c220aabab7e4de6a01a6ab6185d0a780ecc372 Mon Sep 17 00:00:00 2001 From: Hunter Miller Date: Fri, 19 Jul 2024 12:58:04 -0500 Subject: [PATCH 5/6] activity: removing auto-marking since we actually weren't marking --- apps/tlon-web/src/state/activity.ts | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/apps/tlon-web/src/state/activity.ts b/apps/tlon-web/src/state/activity.ts index 3cbf49ea88..d9c560d75f 100644 --- a/apps/tlon-web/src/state/activity.ts +++ b/apps/tlon-web/src/state/activity.ts @@ -153,18 +153,19 @@ function updateActivity({ main: Activity; threads: Record; }) { - const { current, atBottom } = useChatStore.getState(); - const source = getKey(current); - const inFocus = useLocalState.getState().inFocus; - const filteredMain = - inFocus && atBottom && source in main - ? optimisticActivityUpdate(main, source) - : main; - console.log({ inFocus, source, atBottom, filteredMain }); + // TODO: actually mark read here + // const { current, atBottom } = useChatStore.getState(); + // const source = getKey(current); + // const inFocus = useLocalState.getState().inFocus; + // const filteredMain = + // inFocus && atBottom && source in main + // ? optimisticActivityUpdate(main, source) + // : main; + // console.log({ inFocus, source, atBottom, filteredMain }); queryClient.setQueryData(unreadsKey(), (d: Activity | undefined) => { return { ...d, - ...filteredMain, + ...main, }; }); From a3fae3f7eeb574e10e2023fb98d3732ce569e81b Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 19 Jul 2024 18:09:59 +0000 Subject: [PATCH 6/6] update glob: [skip actions] --- desk/desk.docket-0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desk/desk.docket-0 b/desk/desk.docket-0 index 439fbe4df7..beb842aaf9 100644 --- a/desk/desk.docket-0 +++ b/desk/desk.docket-0 @@ -2,7 +2,7 @@ info+'Start, host, and cultivate communities. Own your communications, organize your resources, and share documents. Tlon is a decentralized platform that offers a full, communal suite of tools for messaging, writing and sharing media with others.' color+0xde.dede image+'https://bootstrap.urbit.org/tlon.svg?v=1' - glob-http+['https://bootstrap.urbit.org/glob-0v4.m00s8.3g6um.jshk2.n12k4.v49a5.glob' 0v4.m00s8.3g6um.jshk2.n12k4.v49a5] + glob-http+['https://bootstrap.urbit.org/glob-0v6.7brns.i8okn.pvots.en2mf.jvera.glob' 0v6.7brns.i8okn.pvots.en2mf.jvera] base+'groups' version+[6 1 0] website+'https://tlon.io'