Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

diary: dont crash in update path #2955

Merged
merged 3 commits into from
Oct 13, 2023
Merged

diary: dont crash in update path #2955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99c9292
diary: make sure we use right time, just in case
arthyn Oct 13, 2023
88c1d3b
notes: ensure safe access and refactor a little
arthyn Oct 13, 2023
9e14818
notification: make dot match
arthyn Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion desk/app/diary.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1087,7 +1087,12 @@
=. notes.diary (reduce:di-notes time p.dif)
=. cor (give-brief flag di-brief)
=/ cons=(list (list content:ha))
(hark:di-notes [flag bowl p.dif])
:: when using time, we need to use the new time if we're adding,
:: otherwise the time on the diff is correct
=- (hark:di-notes [flag bowl - q.p.dif])
?+ -.q.p.dif p.p.dif
%add time
==
=/ rope
?: =(%quips -.q.p.dif)
/note/(rsh 4 (scot %ui p.p.dif))
Expand Down
78 changes: 35 additions & 43 deletions desk/lib/notes.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,57 +109,49 @@
|= [=flag:d =bowl:gall =time =delta:notes:d]
^- (list (list content:ha))
?. ?=(%quips -.delta)
?. ?=(%add -.delta)
?. ?=(%add -.delta) ~
?. (want-hark [flag %msg bowl]) ~
=/ =essay:d p.+.delta
=/ from-me =(author.essay our.bowl)
?: from-me ~
=/ content
%+ turn
content.essay
|= =verse:d
?. ?=(%block -.verse)
p.+.verse
~
?: (want-hark [flag %msg bowl])
=/ =essay:d p.+.delta
=/ from-me =(author.essay our.bowl)
?: from-me ~
=/ content
%+ turn
content.essay
|= =verse:d
?. ?=(%block -.verse)
p.+.verse
~
=- ~[-]
:~ [%ship author.essay]
' published a note: '
[%emph title.essay]
' '
(flatten (zing content))
==
~
=/ [@ =note:d] (got time)
~! q.p.delta
?. ?=(%add -.q.p.delta)
~
=- ~[-]
:~ [%ship author.essay]
' published a note: '
[%emph title.essay]
' '
(flatten (zing content))
==
?. ?=(%add -.q.p.delta) ~
:: let's be extra safe here
=/ entry=(unit [@ =note:d]) (get time)
?~ entry ~
=* note note.u.entry
=/ =memo:d p.q.p.delta
=/ in-replies
%+ lien (tap:on:quips:d quips.note)
|= [=^time =quip:d]
=(author.quip our.bowl)
?: (want-hark [flag %msg bowl])
=- ~[-]
:~ [%ship author.memo]
' commented on '
[%emph title.note]
': '
[%ship author.memo]
': '
(flatten q.content.memo)
==
=/ contents
:~ :~ [%ship author.memo]
' commented on '
[%emph title.note]
': '
[%ship author.memo]
': '
(flatten q.content.memo)
== ==
?: (want-hark [flag %msg bowl]) contents
?: |(=(author.memo our.bowl) &(!in-replies !=(author.note our.bowl))) ~
?. (want-hark [flag %to-us bowl]) ~
=- ~[-]
:~ [%ship author.memo]
' commented on '
[%emph title.note]
': '
[%ship author.memo]
': '
(flatten q.content.memo)
==
contents
::
:: +trace: turn note into outline
::
:: XX: should trim actual note contents, probably
Expand Down
4 changes: 1 addition & 3 deletions ui/src/notifications/Notification.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,9 +342,7 @@ export default function Notification({
)}
<div className="absolute right-5 flex-none p-1">
<div className="flex items-center space-x-1">
{bin.unread ? (
<Bullet16Icon className="h-4 w-4 text-red sm:text-blue" />
) : null}
{bin.unread ? <Bullet16Icon className="h-4 w-4 text-blue" /> : null}
<span className="text-sm font-semibold">
{makePrettyTime(new Date(bin.time))}
</span>
Expand Down
Loading