From 9bdb707d272022960ad96fd3c32fdb0fcdda4e03 Mon Sep 17 00:00:00 2001
From: Jonathan Staab <shtaab@gmail.com>
Date: Mon, 6 Feb 2023 10:41:48 -0600
Subject: [PATCH] Fix alerts

---
 .husky/pre-commit           |   5 +++--
 README.md                   |  13 +++++++++----
 package-lock.json           | Bin 288725 -> 343546 bytes
 package.json                |   7 +++++--
 src/App.svelte              |  14 ++++++++++----
 src/agent/pool.ts           |  16 +++++++---------
 src/app/alerts.js           |  29 +++++++++++++++++++----------
 src/app/index.ts            |  30 +++++++++++++++++++-----------
 src/app/loaders.ts          |  15 ++-------------
 src/partials/Compose.svelte |   2 +-
 src/partials/Like.svelte    |  11 ++++++-----
 src/partials/Spinner.svelte |   4 +++-
 src/routes/Alerts.svelte    |  31 +++++++++----------------------
 13 files changed, 93 insertions(+), 84 deletions(-)

diff --git a/.husky/pre-commit b/.husky/pre-commit
index 524f353b..b5588ea2 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,5 +1,6 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-npm run lint
-npm run check
+npm run qa:lint
+npm run qa:check
+
diff --git a/README.md b/README.md
index 669dd01e..3a87a446 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,6 @@ If you like Coracle and want to support its development, you can donate sats via
   - Put user detail in a modal?
   - ReplaceState for settings modals?
 - [ ] Mentions are sorta weird, usually mention self
-- [ ] Alerts are not showing likes, just generally screwy. Maybe because I threadify before adding to the db?
 - [ ] Change network tab to list relays the user is connected to
 - [ ] Sync mentions box and in-reply mentions
 - [ ] Add petnames for channels
@@ -63,11 +62,17 @@ If you like Coracle and want to support its development, you can donate sats via
 
 # Changelog
 
+## 0.2.10
+
+- [x] Fixed likes not showing up in alerts
+- [x] Raised threshold for pool to 2 so we don't have such a small amount of results
+- [x] Wait for profile info on login, navigate to network by default
+
 ## 0.2.9
 
-- [x] Fix a bug in pool.subscribe which was causing requests to wait for all connections
-- [x] Add typescript with pre-commit hook
-- [x] Fix layout for chat, person pages
+- [x] Fixed a bug in pool.subscribe which was causing requests to wait for all connections
+- [x] Added typescript with pre-commit hook
+- [x] Fixed layout for chat, person pages
 - [x] Parse relays for kind 3
 
 ## 0.2.8
diff --git a/package-lock.json b/package-lock.json
index c6ffb56a067450fdbfc275f2172e5b90c701a29e..3e9fd0683e91b2243792e345541b3ada295b20a0 100644
GIT binary patch
delta 25751
zcmeHvd9))}dFQE;dU3aVZ};ZzcDr|@eov}WX)`gPeP2pam6kBUrK*xtrIJduXbr}g
zgqb8mf^C6s65@bEfHBN~F$sc925>N$L&n5*2q6r?*b_o>PDqT&Bqx|9bE~BHp43a?
z7{AbSPWq46s#_)LyWjox@B8UXPwsp1dj}usqK7-(_KMo;tT2*v`u0<&e~MVeR$Zqr
z0rB<7`AOEY?PC-4b6=kL8%Mz({F=pmfLB#nUEzoJ75mytu;)R`MasiPVwtwWM+#vb
zuLiWBD#&WG({Wbuu4t=szE(T#CgswAu-ii^o4|$xb=E<7ltfU_6t$=&i{gN&XCfoK
zTk>U<f*$e`6XpDc1A?}~s46oOw5Ca+V-=q~bkDhu<^MN}Y+qq&nyxY|Kt5%;8GQ5;
z2yudk&(9WhgUXGo6>Jp;5A8?J7kgY<%Vo!2_pmayV_X!=_M(AgHk=ZJO`k6wFU3;h
zk!#$c0&dYejN+rT-&3m>X|J0uD9MPeVvjkzeKMD~`NUDV+Y7pzb%R#$o-Uf)55H35
z^%Y%)lnI@N&NL>>`w#7b%euVMRfV>o3w<8!{fgxfxXq88IaBX-SY41it6f#rWqs7;
zS369bH+PH8&tq>AISnqAtUC`i;Ad;2c1@O6I9_8_p=-PsAOp*x8yb>aV<f#PfQ%nG
z4BkCPPJpZ*IW{@)*;n1rWHk8o@Ea!Nmk)s>Z?zl*Klco}XQ$4q9Y$KwBv}W!UC7~M
zbB3?fdi6T5nq)Xv9jh1=3x{kueha?pIelrzsrkRt@PImegE2O>GUino+;byxXgge0
z`364(FFc7HIs~t@CZqD)>@4RW4VZU8qK$hdr-00$D@QQLWgkA^nU>1e&4(v<e0JM@
zp`&$qR$t=}4g~`H>}l}C!^lqX_9xM;uU=&|O=xt?2MmEG7C+IXs=L7Jy2LcJ`G*nU
z>CYhtc9_qs=)9(ze7$={-@<z!y=}h3&EMr%buWIyRiD;$MqMNMvgeHxUt^5KLy4IQ
zItF<@qa3_p7qV?nuTztU3j$;?4?N7E$0pC6ae@^A>2IBh9{AzUSk6pxs&(@02k;A5
zisMWzE|XF4+~?7YRKuA~*K}!6agzK%Qv5<X6(>B&(LgL!<?u*Ps@`thEfj;^UP5uz
z;{KQmull+j(%Yp|?m<%x>axq3sD^q}TodY1J|(L~Q#GD^3#9f{CF?Gb@<XY-m$4oK
z-)|y!fZx3pJ+^yUIl$AOM2>;ayv;(~x_pD5k-nry&wUKJNRh#;BsHoDouOo3Tc`xs
zRIpj3m{>+kM4Y*bhS35S^7scrSj1YDVUj0{te*1oV}Ca0swVR>M+1*HavgVa5Fp}3
zuaNKd!F#@kTm&b5$N});lgO^!P*6EW=U3#K2*nR-(c$e-bWK$R<TsF4gG&N3_}It3
z`YQI|)f9TRt51C#A;2@LW&6s4I2q~=w{{If01X#5$qmoay^N=A4~*#~*$Gk+yHN6q
z6`pZ>`ZgQh^R!)5Bb=$l@;VoySt(29Y>{+M3TC)=%h9xtwCG62b*7(AghNWg-%4<K
z2J5H&lY7pb2OoLRvLCE|$#R=%WL^W=zGg(%)XcZKq?l{8YAa0!D!#FUH6_9U5=ERQ
zH}+ro7(l*;o&YN<ikob>u=oKBJXl;dE%!ZlTFz2KwiTetqhees`aHUV4{?9GW@}(>
zXU&y}jI>J2F(i~>CNiki$yPg4m4$q)=GJoKxX(_~PG^bl_3280iVGnkGtR_E3X`AQ
ziysDW{xf9f<kToN{pxFw1D5?)8d-q-DSCYJ+7A=<t6N}5`_*p%j6^Qdc(~2Quu4Bp
z3e~Qp2Q!UUPoO%ZUTZu|+w<;BC{cD|N!}TVVi~Afjsl)*mR&w7Dfs%;ZZ1U9oYJvj
zahCB9I^$x|)enk;jk9~Ei|zu)lE@+O*CcY_{`Z|SEyDC~{K)6FY%zVp<i6&S`&X>s
z;yDDLocc}cesfhb=w5dlpSjy|8?8mSxGOaZ2$^C`%yS+#nkz9~Ay!If%gIqMkSW{Q
zQo@<3kJTzkGu~+2?q%hAQ1TG|EUhTMlB<<zH+seRIAO;$yfKRV1~V~x^_MJX!LvQ&
z-O~?8kq>OM)`W%t9(ldx*d+JM?jweWGFCdeLDj|;xbGx-8>JWe!K5BgeNrpp2oD_$
zDdc<^TeeFRV*yv~8J>61t$e7)D1E0ZpQ@zCwE<a=6spyjqm{SiIk(e+QwbQ6*lUSk
zSk60XdFkxIw+o1MN@bDVmMt?+i9DVLKg=Q9cI)z-B6A&(e*llvql9fj&X%>+8WA5W
zg<UpE4n)Rbx2r7$1X^_J$)GA_NJq9YXgdO8w`gx9iGq}>gwms0sOgG3i@{>Dlglv<
zIUV&RLKU^ym^^)#&D5P4HEbSv)%M*mmVhpzA?PbYr!G&F*BnK>VBeiq=eg$cErZJC
zl@)x|`#={xOSOmbkiX_jX>E5%&L%v=n9XG?6C*4|*@>9oa-@7gmloFsNoQhAr3yrC
z(83~pkqb2Xl{`@!7YV&bkwOr2MZ$R96|1HC74X<;^yKtyRpivJot=$H!idL?flu$Y
z5+~qkZUh*RyrpY!a;x<st^2)HzQVGZaa#5fnk!9K8!>MtU@sRLcTCI5j&!PCE+&)V
zPK>5GzA<J<Ia2i`x&%?<`j8BKz!Y5^YZG1ZU|1V81rJ4<y0PSTj^3yV9KXUgnNEk7
zz(1u>(`N57ebDqn4di>s7Bkia_v}GW-v59V+<vnKKLhQ)xjK(pj6E!`tT-q4w9nK2
zLOs>$v@6~+gO~LHF=*Gun6uQw9e9o5{g{_c1cH2U<QSBxST*8^=SFn6tR%xMXVdX|
zrjSaduzt|p@<_vKSQaz2c%eMohH0MHRQ!l(qd`nTZQwnhhJx^{g5I`cjV3_@*#AV2
zfDgak>OQ)$*jykRhSGp(L3ckMJKP1Y?vTfFsGN@4dNm$*kNIFRQ)ZL#T%wu~yv=|b
zAp|a%YHLI=>Lc}}M+rz+O%`0)&^Xc+wE?ufxppjAOLs-4GM->}pWF(+7-}*gZ$OS2
zHfOH|#c!Ie!SkPyGShTZ0;qAo7gT#`rY(-zUQECfRVS71xQJXbs*z(Y!OQMpKjVxg
z5=79ik(q#7$oKRvUX(qaY(1Fi$wRHH#hYU$CugzoC>U-=vPRsobHj>g!2b!$@ePhm
z-zy+TExT&6Eb&Zd=GA9%`_zB166XwR7jLamy|e~y{V6EFjZlS2#uDw0NHC@0NOV_X
zqcYv)NM@kZsTk#AYc_tY=c4Sm?q<baksI`RS2Z54H_A$k;9VYn2Mb~TWZfIAI$IT$
z%qx`zzib}-+ZgLHBVzjC^mio$v+URiMP@{Q?`A7;3nY4DeNOSh0(j~s^djx6kW68y
z`GvxO?H8QRbfD!N6oYi9l(fZ~5iecM<6?fuH`AD#Wa%syQ*s@G&c)jKBq0@4r?=xv
zs6tPTcT#N5=NM|0OnoM&Z%~oPr+*_O4{W`0F(rTo>t^uvHi|#+pv8LY;+>f&EaeX?
zIC$=-k@FO%B>Ie+Vg_X`Qp<$+M9DMukG*j{;bS@6Tj|w%y~w!fh<dx3n3za+Dh_X`
z@6jq{yccm%T{1fmct4*F55pCIsZ{TIs#R+8)LoYh>pGskrH|Z!+}P>0YrML6__=Rd
z2!qTs3wP$6TzpuEL5TzSt(LQN3!@zI{5X}CJyod^uaEOR+?j2<(?UGLXpL^oSN6Dh
zr5>sJl|hUks5p@<2Ks?Yyozy!l&?C5v1-6qXvU!Z$P---`cHL%pPwEeRRlcwI1E4b
z{+`=Nh|T<D#ya!m<gte@QmuZT8-}!DRcwx_vcpsDq(<DhfE6iwF(DPHSgb-+QYo*8
zcY0*XPxwOhR!V7%Y_u4WS$QzReQdJN7KEOy74Lg+uUIV7lZPI?2p)ORvJWf^;f;&w
zoM|o%4{jL7#T!c&^C~w0Q$sHnH6?>np&n*;jNH9`c~sDY+3~397lQ>U#_|z4olKOx
zC105Gv3-HHlblv{wBVI979Kg{R5((N3o*NMVDrc96j{r~GTh{z|9Ej0)K<R%<M(wl
zX&5G$pMl&jp{8NF_Xz|ytmG_bo3V8Edi{JUJ&aT3vCtQJw_MMaJQD6?#ZWfQIDCzo
zXDIoVs9TJ>c+uU<(N4T5m2%EZGAF>)Kg!24JzrgJvTPp4enK@}&t^N>3Z<J#k)bYI
z%nSlNb^$S?Gs99IGzc>Dia9~XYj9$#^|oTr9?S)lWU15V*r5{l=ZB+gljvg<70w1@
z-A0IUlq!vGG89Q`V^+<v^?JkAYYqyHTrd^FOQm63aSNKDjlCXyTy$W1FA9_(deJBd
zoCJ0XhGvIGNFCk2GS9mw$m2JIy)_g+45^y0&B$6$%;6!@3ae|qRJ9!^9kza<kgm&g
ze-z<yTeJ}FciL5)9~XOFtPs$6pG_YGgS@~<?r>OeW>`EKVe4+2GR7l;Tt_TxE$^_I
zEHJqR=eK-})A3Iu&m!P+r_p26|8y7fGuHiGM%DP08n44>W5ujZ8S$<ml(?wLos}!^
z8!_fJZp{MDwyKP($$HrpZl*lVzQWS(QWP6i#E!`KDxq<x*<}5GN>#i$+3U&#$Uq`z
ztA?ne$E8$BpEuru@u0%B!oyatm8CpI4Iijxzyx0VGsxEI&bJ_6-nxU~R!l1D!sN04
zdlYoDi2D{v-dL54%y4-D+=@buCx_l<nrVq;hf^1##gsqJC2Ug4(bSWjvKX#r+|8C<
zm&bK`Dch?=xoRMxR&8o9k+0FgUPBWDPBES8_&kI=qml8tixvavSw`{bKJ?%re6gl6
zV;>|G+;@ZJFtBa6-T;32L&(9cLKnKpHaI1r$M1jNE#Ph6K+f)2rq&LA;)}?|`yX(F
zU;QF-BVf;<7wDifqS2Wc*5eA{GU07R%h<5q9~4V<tx^(Ql+A1JB{5eZI*v!xq)c@i
z&9b*ysty=?Hqv2Q0YRWM?LePz7ZZ6`n;m(C96Jl04GN~u{v7hv?bf!ej=)D=gyjZ@
z7qNohx?sUiw0UC{syNTIA!8RWR~!JjXt_{yQiHT}B)Zx<RS4H}1V&Zcy4_I-%5;Td
zDNJpZ`?dh-iZ{F+E=6cLIgtraiEy5&bGe#J6k~~KFWngFjbuLw`RXla0^pv{BbSg<
z08x<Jrk}hI86Vgxu>1<NL@(5=$H5P7w&Djmvy~AfYwe}!uqmw5BwQTN*Icrcsd)IZ
z7Z0>@Sx=!b%)1JON<zpL)gl+6=*qw^d4tKc-<9#@#A2lt6Y`><(d>{Vu~?Z)HHWw|
z945x840xywBX|6L$gl0(!M2zNZ$u7^nOeBOzRy|+aPp(b&I=p246<ak%}BzShw8L(
z17;Ym$qSLQwA~d<XPiYxo+uYZBE&`+ekj{ixmw@~k&@lv&t{AHtSS!2!6-IROXaW@
zt>u$^UzFl0s5xOmt4ayg6%G-Vl4GQ_TS*&l#z99fOKQxb1a6e}0LDW5-r>=02nHVd
zBzp8U_^CI(@s!i}Ll}QxHG890*@x7d@sLsXUfY8N`QFiH^;ReFe+OnRZ+<_r2kd<m
z*?xHKA%i(^{~Z5@w#@aU$s?~j1s-|AvK#za0~U$?`j~aE#kK00Jmfq}YfO&`)$O?|
zM>o_|F;jshnQocEguIYs8NMbYNi2}yx};Q!;Zm^A4@s`<a%r7hWR&!f<8F^rYQeZe
zDM#vAMvHNyOeji%Q@;TP`T2wB!O7DH&w$;JB0Hu}Jc7K*x?`h;Z+a2%{KFRaiH$|c
zIJk{6{|c;#n$@JN?8O_2ke_CmG$%MaJvkX+`mJ~@kf#+AQ~I#7;!DL^b~Zxf+yT7p
zWpWOp8LfL{Sn8|#0=?*<jL97-)$I0Uxn3B_WN2ow-+mF@0)GBG=uW`n=ss{q+_GZ}
zz6!q>q~ez2=iIQexpXXxT4)}vW7Ro%&zBEQesEw1_|xYsd(L$Q4yx?zjNr}XS`^e}
zZl&95fcxHz9`-bONm@~Qvc6V9cN?Ya4H=lZ_l4?Pm*HS7*EC_1uiwA#?geHU#MFe&
zBL83l%kjfiQCs{>qlMC4d)U0V=3{1+%=k>>F>T|qIe~Xwn%w-}i{KdsIeX&*A@<3*
zX$Plnvs%F)HDLYb-o_T-{(bZ&#5qB3K2Os{M>XzlRr6f2>8*?s17{&!tF-MsTSlpC
z{$aRV$~tm&pQd>2ypJdihuLl}IrK&HSVS5H^(-CAWJ#O1qf1I;DCAk2>QYS2n|wsr
zZ^2f5fMj7!&oHjbWIg=rw^`uPg8N=T{l<$4dBa&ctqZogPwFNz>>xtuCE9Dxs>Pxn
z!5UR~#~V?kk)M-$DkHIxQiLo;a9gGkj1`(<D_FC|BY~9StM#gbFa|4rBt>-jLhq`g
z^}(IU(Mia+fAY8Q-VYVfc`Y(O^a0G+#pIqRoZyD<q9@HQnI%QC?x%Fl){k(0JwmcU
zZ!kEj=vci{8WvyyJc+Y~kb4{ocr#A6tAzvpety{XjkD2)J8Cb)Vu^~s==Iu}u|3`k
zMg1u)L)W54*gSbe*aE)(U35DjzXY38pZN`B_s$J9v`-=r<CBM<!Y3bm`1s@-;u*?=
z*9&~7nI7P=YPv|r_@LjH47R)Bcx_w~NKMSx0x>pFEBN{<*4A}fKOyG0mKG0WsCLp{
z@)jdhD3?gO3KZoen_*ujTn?Gx#`1~rAGag!$(?6ilRx<QG5G4EXV24okxr?Bg6^q{
zwa}<B_BveMbVt+U8cr7jnO45-P=-~`miG8v<q$Wd^QEjSJ&Xp*)uvb>SS3|SK?RK}
z`MS3q$hF6VLbqfd*!Fc-2760~Cciq}HL1UU|73T02Rtqp`1&@>Y4GRYK=)0)Hr)Xa
z1)n^7#)%TE6Xe3Opn*4SL%c>Q!Elw}mm-!+;OU!SB+;+sWi{Z6P-LkuF_@e3=Iu&@
ziNr??u0+R!keX=+tG!B6t#Jh^9d*aCYA{OX`Fbl)H+$JuJW6+XPk?l~LWQ~v&0a!@
zn32TfFF${AiE|*7MJ^d}%=@#*!Ab3b3zU{j)G-^&lL3_|q+5Nm69{EOdYveiyL6L|
z!frv&q5CjzO>#OSomv=g6a7r8Y@<uOo$HEH%@*r5qLp#U(<93<pEs5ZSIki1N=*ZY
z{ugp-t*Zm%KeucFZ~6<%9`JuYk6xha;aD^oEVQXYDAy-?vgq|oA)6@YB*od~Ga*|n
zUl|P}V<MRw5Mv+iF4${cHQtM8c%+hOI0FN1n5et`KD(2Tb19}0wE03CgdAG5MAwfK
zTt1!W52Mb>BX4zsKfA@c9o%^YJqFa@fV>IQ&J<>Y@)4C)9Lu&leOXL8-R)+>Rvg8X
zp{7%a1d;){sk(-IIo`|!*r8W0agA0n942jna3oUUQu&^eu5+%Gm&jnWi#F3Y$5C`Y
z_=hIq1`Z9qZJC<4A4M_n)Kl;tB<Cc+N#p`O=*oqNe>l?IHJrf*u_{*Xh6;_4C*y<V
z;s)-^HGMtW-eYpU@X($tORZwH$a65O&lM_Ux6vObQ_)0=$0^F;AIs68n2GmEvtWEB
z0k%shZmQU0c5A_SVTNd=NQ(om9M=hlHys!JO0Z1GR8nhDcv$gA#~PmNw%P<kR%&9~
zRt=ZJY>6n;BblN~^wODXn{n_XqVAF!DYX@FFl7gsmS;(WumU>}=Opy-S{|^>kVo6-
zZ7@Xp=mm>w4=m8KMnTg2e+4tb?(=kPnBXcU1xpv>WG&(B3>>VYX)(E&p>Ve+DXF1e
zw2GA~(lAueDLqLwvrMAh#4y}mthQsrAytP>$y~XRZF}_4h|wI`LYxE-eGj<+{-lFq
z`^|4#bJFI88A<)(Cy;Gm>lZCQoIG;$;^db1odd?o)>)U?tgS(^$rljf?5yzzOYmm@
z8PdPJVD#y5U^o@J!Bc&%<za2SFivNvP%GapVS~h=QO^olK2{qB^7dw`oWz)-d)%fA
zS%;{RtOm`mI~^T(ePYngiqU$C&16+QUD2ZoEQ>ZK_u+@u8&xKi;K(0a{&w<<XO68m
z@UU5X1#TgLY&9E|tCLTC^#npp_WhpgmKnkG{`mR^=GQ9(P&ni~jkSl#x`TIlYyFW}
z2<pj7h0yZ6Ptfx%XD-oIdWo#a$6I5s*A-;PY@CSq6NykNSMcDnJm?jgwr*fZMe^Bh
z*;b@%w&t)|oq6xIHsb}eqdFTxDEpCJu&@6=rhoWJBzfajBaIhf4f|Iuvt$@X;Ik#U
z0}0-^Fq2@4$;M^PTkDC@jL&KJW`}k$muh<Q1G<w7kF-&Tj)ZM>vN~$G#bh`Yjt$0*
zB-G|ejB1n<DR*lm2_jtx1c^XD<IA?S0O8GpJHLfobj?Ry%y<-oA?H#Md5yxstj0W7
zfOFF$zmGU~AsqPjZ^D-6qZcg1fq5Kj>|_?v&XUgaFygM2d_*%93oF5fr_-#Bh*3W1
ziQ+b~0t<KfMvuj7;=n`o8bman==CtYU&nhfrrLLr-Z7`!O38#<Nn(*~+|9I^5+%DL
zeluw}x)3}Yf#>`ZhOm=;@5Kz;Wd+@n$eC&UiwJYU0wd`OdGZK!bO+V~Ye??e%L((q
zMH+@@b~c#x=>yp&1sX!Jl2JnLD5odA8j<NTB~^0URrtWbQKSl9IU#x2c2Uk&>-mZ#
zC5!Pw#of^{$|I64XH9J<m5MuHhMT*WYX_5uK6z*&_jkN%F%2_M1cxVbS%pGxuE0?W
zaEpYVSTjK&_g!R*6{ZGu(D(wfVmR-+|I%{Eblye0N@-j*5^MOKJy?X#)pIqG^Ta}-
z?l9LOVIrS#6x0xmy9zzJ97`zrpx7xXQAYq1t7@a2uzMsC3%BWbU{unv#xU9{^-aHE
zR!0^s;Q|@|=Cu&xyRFj?zKEnOdlr%&W9r4IkinRXFrs4T)#qZ&lZRtGR}9QRV@DXa
z?i?jH8sTi#sY!8nsoxL>b*aS?nMgiZtonPdU?)=#a4sdAt~5(r$L;AP0)d{Buoqh)
zn~moqZO$9?sXnn@PT(F}ry%581!|%Bu|AY={K{E^tBo8?zx@N`-hJC=HS!hx0UE{u
zrXRk07rN#6#$*rNna0%lwdagkAG1-P2vF2`lx>6uWwL^0dO5w%igtw!gleI7xL@kk
zn^LD-jki6nP&n4LG4(X2Vm&d@O=z^eQAiWI%cplkqnv<goV&{8A}|BHvQa<l;_Zh;
zRg<Q<nK3IGNkp5zaSuA&xqU5{1ur~=-V8f^$m>wz_}ZdwR0g$;D|jSc!^u-*43>AJ
z4Kf~0N_hb%MiJJ{xTTES7w0-dx04tUK4#>$iGJ58()2JGRk0EIt~-_++EaFH%!Wg`
zupoL_IK!jl-8E7R!-!{bN@C|iBXy~CeQe=|QFvImGz-|Y;wtAxx)KS;ld)Em6Vh?D
zf;rm#RKDLKn*?sRMdg4LDLHF+s+<bruvpctM!2?*81Rk&Bh$|OATf$64cDOH;k(0P
z-%;(a&q3T`j6fU&&39P#7^7l)mPf_RB=+D&Ghq66$IxHcvZKolS6Eq9c@{i2upD{d
zSD-z7aMkKOzH!570BH-CD^7506S_(^TVbivpc(ANf@Oj5<(p9MM~QIKDda?~DvW)h
zE-lbby;jW*$|1r>j^i0;x|>ZUGQ%dW3=~{SB&tj@O%HrZMj*su&@li{zYe`{!1y|-
zcq$Kv+2#f835guuW709NS*-{hc;*?)t>9iex_j5`9V~B71e)dVr`~S`Kl~Pg-)g>z
zAI|R?rSHpDfa6=1i?m%Ys+DZelgq`i4&`qQokWxBD&^iN5w(Siu|%;Gr&3Wug-N17
z410FH-e@ZrkFoLmAU_^d8#0kejS7NI71&g(+8Pjo%RhN~<;0Bajr{=Zo0b!6E%r5H
zmNsij_f?p{&)V%2TT^1ajz*R`iA>m?Y|@3amgZxwm_6kScVWw9tQ1LSFEz*nQ&o&4
zyqH{K<hl~`bh2*R0UI~vLB*YGk{pT0d9F0HSCa&I>UHQv=Mp1lV@*b}acKbRn#Zu)
zc=y8jJbeZ^hQQMDZ3uDhvNx@t!^Yzp6s?CM)(f<%+Gx5^*7MCQk&V^Ll;Dqeh9ze}
z_Jv^M(;ak)F`Hr^VlELEJHm)<Bx^&;;ftw`k|GsSltu`Iq{pIVrO12e7%NpuBl9Sx
zZ#;#5XX}AZW5FHFYG9N5b{{syU-%k=1Nl6<b#Y2<_KYDq=D6k+?}n6{@uS-#>w&V|
z(l}A;l*@Tau|fGRauS`d;!K^u@rr{fj*249$Yd+3I@?1D53nx2EqJ&r>C8rHnk2PW
zI~6VsBISYHZg(^5DsGOc&Em&HSB|OSaAp!P3i@9TUqR$-X7m2XkAv0wEVJF&7xpk8
z>Ac$Z=C@X`$y2X6PbWqN#YVJMSWXLTp+GoPNoQ+zDeWnfsh%`wxbpTkraE%va70mQ
zhZ5^cF0aNF1qq&JGFz8|S`rU?#bMnBb9P73;mMZ<R|}7?wLJ{_ha*?r9vm_S_x+CL
z#KsPtm+jCTL%r4>&71RG%56nVhnR{F@76l5Shnn``{FE{^4lm(_xqxKogxyd%n7ha
zT?u%^+;|-8=EvQJl=6!@MZ0SOm&-FA1f>M*{3#v3Q0b5hZV<ZlfBq1ST~5Ud=sOU!
zCQtk?908v>ih96PtJW=hV8>~`2ebQR#H3W8>HE|9a<&nmGZA-Z6b`pj&QKtU`QR*P
zh?V1ml1&?swqPwP^kC%HbL+N5OY&ps*npQyI>R+|B3_^=t(+Q#6eq!P?7$osFgr^B
zcoF^J>aL|RU9j(q=y7wj<-(OCypX;t7iYsRNwGTWMipD!9`nTFu9%dSqp?<rqTm|o
zC_;<WQ&Y8(N~`@29297bQ_Xn7Bf1lC9*WEg4i3wUqpD-TF);H<YIxT%bY_+s^)_QT
z=rEiMUg&&Jf4zjh6WO&iL=2w088)9_bJuyx(z;=Km&c94b0zC-v>WTffzpt#>B4AP
z<wpreAkV{*s<bm5N~V*YrrSpQQVy@vi3wfBO?tDDa<w8TId{jd*J49B+ZFfq@=bQc
zy8~*iC5&5v(1K<gGX_f&J8;JN7&!h`%U)n)i3ex(0yqW@hvC*H=|S!rurIRS;Gg0Z
z^u-;=uHEMWPq!?YJN~&w5ZwGfcN?0yQ(LX)=}<S>#wo!*%y{fEG8xpn)uEg(1)5bK
z98Xa6Q6uUt2OAmETa`kcVUKK=nxe}MAqDje5$rkbiFU22g=9~i^(PcU^EGi#c;@?e
z8ZKlOlIUhr<KWf&Ao%(-mQ&z861sbOi9-uJcVEVswZp|PU5#(X8DDMPJZY*nsB(RW
zKbh)wrAP%&R`X?du|I+n$g(J^9%;~OxZ9FLmE$8{h3^$qPom)T;EI$fVP1-?j2o4t
zZ!APvUM(rrY&+cX(HSE-GRFO9lV8RF_1?>etiY{5gz4Fxn)SxT@f#DDU<_NEj%V^(
z-wZV{8@=xOk-NaB+vt|*n`HF2fBVM;RssHZqGzswRyi_VIcLdVPjD5J+JDEZ{5xLd
z)Tz_g3MDoRuL6GWuh7HSDOP2s7fVyabFj)24_R)yPH`%?eg!=PPWWKr`%-W!2f&@r
zTXs$FI&ayX-W;F`wJAUqU~Y4*f;<DNxUb9ru$KT-0n$P1saF`ALT?H-g`AEw%UjS_
z9FGFqJ)3|>0rxxzC2?t3-Nd8p0MEY#irkAmOWyjg1EWxz0!EpM5(J}Q)7aRO*!r)*
zp;R^nheF<Q$LZ-kZ?@cxz69h+Wpj`x1_|(-KD_mnfSXh{1#U7hXngz6TRwin^@cV9
z_q+)`4VE0oWpI-p+Tr})@6*;j;CC9x^I-KW=%EEwF~|F%k2$<`1~$2#ASkoFEvfYe
z2IchRCqK69<)BZbO+lYDpoEyCRCmorz6^Nsj~$6(MionmErg;R08o&3P2c|xiywUj
zP$<-<pimZ^?gjwB5Yy>5AF#X@z3xybGf~aH%YskO{fgxo>yHdWscZ@i#c$ZL?>uO^
z;d(}(Eb#Jszizqt#|1%|h2$I7XWdfnTEd$AXdo17Ge9WK1?_?Og&k(#ecd2XW_&eN
z<zEFsp*918(wq?kF(@|hRtAm?|Dp^bjISLbUz_<!_`@0x0>kWFAFz}Khq!*O)8`(t
zd=c5c=6eA1LHLUuTfYXKyki#}rvKZ!kWWni?l&!EbQ7Q|l}&-Fn8B9s1C|?JK1hYy
z6p+d+&3Jhr74Yq&mSfhgP#=NEZnxfi{{y>$^ab?NIyPlL*!?c_=q3SFz*A=|r>C#`
zZ<b%!_A<dK<;?)6m<Rpef6Fr3dp&?s4oqF2v;5@^uMjAO+7wWVY1sb_K`D>D6aKJ+
zA-M(s<OcBg?bag(`sDU?;0fsdA#C4o67s~9+PzO&p0`|ISd*C<{{I$iGCNR%{4JV3
zl6c_%0_-Om7!NpbihbYWT1R<U;H=y1gf|E10iI_quR6@i68v#5R_^rq_0lgarh%1z
zKo5hTY@$22z+X;~TBhAJF(0S?9`#JNzk9cNp|DT@HwXA(k_UeFJLp~mPqY`jZzpmR
zf<E?6ZvE7uZKr<<!af$M1RwcF7(49xdvxy>i1>hz5QCK_=wp73ybC=~Zwl<AF{AV=
z-$i%B?}9_48@vN>aTnP8B7}oHal3Udc#jUTW4C|ba>>AdKxB<URC!Y%Akex`$lgt$
z6o+U5!*Xmf@mDhmgAkDUrOB1e!GV}uSptIGG<oNAKLmp8J#PGp*lCS#Lzy#2;NYP8
z`kc+=BhwRSAtq#fVf{D9%*N$>WDbYmq;(Mm5D;|O+~piAvcqJu2^fJ#0&!<EPHzru
zWX|d43VI`WeHNJ=^?HaghmFi4jPj;nN9Jce`IYI7!2TDO83A+9$ea^P$dUcv?mx5~
zEpG~ZWKPSr`RSTw<0?+8yg5#5b`+E8^Z?j>WUh1&9kLtTfk5cc5=3Mk@@)!EWNs0t
zTdey{@msK_050wY|MlpaMSw%9^H_8ZF*28w&4G=~8FcPbw}4aMx9l{bBFq=ygw0Q^
z!U*FBcI)9SrY@TLQrryO2>ABj!@%2sjchS~UvPmnTTJ~nB?fX0j^3NbYM;5fKDJ<(
zS2OC_B;W}2iI>2aJLpZo^$+OT=|BCE<ruQXgnqm{P)KESKp{pY$@<5ZCVE|=Jr*+L
z^+~TKxW~y^OQ`iHmfVi(0`u|04=iV2KIUUy%>CrEmJ>T)65xZ{6u`&yvwv;5_xMYI
za8R29;V{#pR|vu}i;kb%X4zsj2I-cw^*M-RZn-xF$uYCsyNybL8E9N)qJF$3gzR?f
z<LIWqIf|PB=UAwNuERMFUJcG+Hs+_hc3L0W`LYol)TSUf7PeqELLkmy)&tvnIf4UV
zF6+_hhYnf4eZ$McZ`{2p_zk1OyjGl?1>Fn3g$E`4r{_OFaJmnkynyUj`_;C83D7}p
z3ZP?skl<eebliFd^7>t;tRJ!d2rv$6Q(zqC9uCf77E8#6Yr;5o&!7GgARKpZ4us<h
z;knvCsv$+-)!(!nxDIh0j`NnY&Kc2bAQ;oEza(786_}fshv}d;1=BJ0p0hr>d2kMD
zQ{Wuy3cdj6IC$kS7w#~v=^=CO_cAC0-??6~99Ii|uf4g$SKHhxhvc9(1<A4C4%g%R
zYi|*BA!=j#Et@s@(!d;*O#yS5P4}}aR{HdHjN@4DcF%wu=D;lIXRSZ@k>DHDrocBA
zH2LMiHx8POaq!;1LXS@WbI$tI_J0HT2DK^h4U-u+nqK^+!8fMWiuL}j*FAE>l*(5K
cy0Hfa%(Gv&G#xNDIkoH9^qX(6KELh%0W8-I%>V!Z

delta 648
zcmW;I*-KOb6bE3=x#!-Q@s8r;Ad#)uGAfn$Fzr3~P$8Mc_#j4PI1jCpMo>hOA-GY|
zFyW!h2r5M~(<b{p*p60UR6>$gjICsm=u0kB4@KXf@Wp?72VQzQ%2@5gG&_2OpTCLT
zd$)t4)!%%jIJJd5208=OV<K-mU2&)#r!=k1X1^x8M6@JM$!HH!E928{%5-AkA)1%i
zP(=dwNtz&>tD#gwZ!MNFTs}>?j7MQ=urPU^))HnmQ8D4pH7aFvwo;6A;598p>vgIU
z?ChjL3p=`L$cc(xI+}v1A!@X>rCi1$zbbr@505hR;5SOZoF9~9=(vk5*usT`Cl+TJ
z$aZs{8w+M}P9l1IymJZK3wg7FwZ&ZTLHhwdY@_rz*O_{@mIbS8c+^7WIX+9+q<nQ5
zVoy0tsOsbC1o#FyVB^78zTJi9i^gWc&t}7&kIxfE8KXaLY?H2CvcW>LLqd#1TbeAj
zhG~WlhsE2lk^EYDh&u5&MH-!WKSzS3y4Oh3J>BGul!g4dwVF(nq{~ObzpnL+RhbeK
zU6d_T*q<Y5q(dvrB%S9sXX3?5X(6<&k^cW>^HIM}ju=>yE0ZSP=1Hvs!GP>dMo&;i
zT#=4_Cfdp+X6XGoaUfbNDTG(`5@0+(BLxXKaY52-oNkti*?R00C+Xcn{-vP;BUKAB
z%(+<pOzH^1K54X3Jt(6tOni}>66tk%bYl%q>ZM^x)uLL?#P2aFGEo?peA4$W)1_HO
i;?;+Byb9xgWORXs=9|-)m2QqW(X`YITk!bJ?~cFce)*vQ

diff --git a/package.json b/package.json
index 4f5b0f30..5f3bd4b6 100644
--- a/package.json
+++ b/package.json
@@ -7,8 +7,10 @@
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview",
-    "lint": "eslint src/*/** --quiet",
-    "check": "svelte-check --tsconfig ./tsconfig.json --threshold error"
+    "qa:lint": "eslint src/*/** --quiet",
+    "qa:check": "svelte-check --tsconfig ./tsconfig.json --threshold error",
+    "qa:all": "run-p qa:lint qa:check",
+    "watch": "find src -type f | entr -r npm run qa:all"
   },
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "^1.1.0",
@@ -36,6 +38,7 @@
     "hurdak": "github:ConsignCloud/hurdak",
     "husky": "^8.0.3",
     "nostr-tools": "^1.2.1",
+    "npm-run-all": "^4.1.5",
     "ramda": "^0.28.0",
     "svelte-check": "^3.0.3",
     "svelte-link-preview": "^0.3.3",
diff --git a/src/App.svelte b/src/App.svelte
index e0355f01..bdcae9a8 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -12,9 +12,10 @@
   import {displayPerson, isLike} from 'src/util/nostr'
   import {timedelta, now} from 'src/util/misc'
   import {keys, user, pool, getRelays} from 'src/agent'
-  import {modal, toast, settings, logUsage, alerts, messages} from "src/app"
+  import {modal, toast, settings, logUsage, alerts, messages, loadAppData} from "src/app"
   import {routes} from "src/app/ui"
   import Anchor from 'src/partials/Anchor.svelte'
+  import Content from 'src/partials/Content.svelte'
   import Spinner from 'src/partials/Spinner.svelte'
   import Modal from 'src/partials/Modal.svelte'
   import SignUp from "src/views/SignUp.svelte"
@@ -74,9 +75,7 @@
 
   onMount(() => {
     if ($user) {
-      alerts.load(getRelays(), $user.pubkey)
-      alerts.listen(getRelays(), $user.pubkey)
-      messages.listen(getRelays(), $user.pubkey)
+      loadAppData($user.pubkey)
     }
 
     const interval = setInterval(() => {
@@ -301,6 +300,13 @@
         <PubKeyLogin />
       {:else if $modal.type === 'person/settings'}
         <PersonSettings />
+      {:else if $modal.type === 'message'}
+        <Content size="lg">
+          <div class="text-center">{$modal.message}</div>
+          {#if $modal.spinner}
+          <Spinner delay={0} />
+          {/if}
+        </Content>
       {/if}
     </Modal>
     {/if}
diff --git a/src/agent/pool.ts b/src/agent/pool.ts
index dfa45b1f..89e1c3e9 100644
--- a/src/agent/pool.ts
+++ b/src/agent/pool.ts
@@ -192,17 +192,15 @@ const request = (relays, filters, {threshold = 2} = {}): Promise<Record<string,
     const eose = []
 
     const attemptToComplete = () => {
-      const done = (
-        eose.length === relays.length
-        || eose.filter(url => relaysWithEvents.has(url)).length >= threshold
-        || (
-          Date.now() - now >= 1000
-          && eose.length > relays.length - Math.round(relays.length / 10)
-        )
-        || Date.now() - now >= 5000
+      const allEose = eose.length === relays.length
+      const atThreshold = eose.filter(url => relaysWithEvents.has(url)).length >= threshold
+      const hardTimeout = Date.now() - now >= 5000
+      const softTimeout = (
+        Date.now() - now >= 1000
+        && eose.length > relays.length - Math.round(relays.length / 10)
       )
 
-      if (done) {
+      if (allEose || atThreshold || hardTimeout || softTimeout) {
         agg.unsub()
         resolve(events)
       }
diff --git a/src/app/alerts.js b/src/app/alerts.js
index fe98c6fd..9c1d32d7 100644
--- a/src/app/alerts.js
+++ b/src/app/alerts.js
@@ -1,9 +1,10 @@
 import {get} from 'svelte/store'
-import {synced, batch, now} from 'src/util/misc'
-import {isAlert} from 'src/util/nostr'
-import {load as _load, listen as _listen, getMuffle, db} from 'src/agent'
+import {groupBy, pluck, partition, propEq} from 'ramda'
+import {synced, timedelta, batch, now} from 'src/util/misc'
+import {isAlert, findReplyId} from 'src/util/nostr'
+import {load as _load, listen as _listen, db} from 'src/agent'
 import loaders from 'src/app/loaders'
-import {threadify} from 'src/app'
+import {annotate} from 'src/app'
 
 let listener
 
@@ -14,21 +15,29 @@ const onChunk = async (relays, pubkey, events) => {
   events = events.filter(e => isAlert(e, pubkey))
 
   if (events.length > 0) {
-    const context = await loaders.loadContext(relays, events, {threshold: 2})
-    const notes = threadify(events, context, {muffle: getMuffle()})
+    const context = await loaders.loadContext(relays, events)
+    const [likes, notes] = partition(propEq('kind', 7), events)
+    const annotatedNotes = notes.map(n => annotate(n, context))
+    const likesByParent = groupBy(findReplyId, likes)
+    const likedNotes = context
+      .filter(e => likesByParent[e.id])
+      .map(e => annotate({...e, likedBy: pluck('pubkey', likesByParent[e.id])}, context))
 
-    await db.table('alerts').bulkPut(notes)
+    await db.table('alerts').bulkPut(annotatedNotes.concat(likedNotes))
 
     mostRecentAlert.update($t => events.reduce((t, e) => Math.max(t, e.created_at), $t))
   }
 }
 
 const load = async (relays, pubkey) => {
-  const since = get(mostRecentAlert)
+  // Include an offset so we don't miss alerts on one relay but not another
+  const since = get(mostRecentAlert) - timedelta(30, 'days')
+
+  // Crank the threshold up since we can afford for this to be slow
   const events = await _load(
     relays,
-    {kinds: [1, 7], '#p': [pubkey], since, limit: 100},
-    {threshold: 2}
+    {kinds: [1, 7], '#p': [pubkey], since, limit: 1000},
+    {threshold: 10}
   )
 
   onChunk(relays, pubkey, events)
diff --git a/src/app/index.ts b/src/app/index.ts
index b07798de..55707c18 100644
--- a/src/app/index.ts
+++ b/src/app/index.ts
@@ -14,6 +14,15 @@ import loaders from 'src/app/loaders'
 
 export {toast, modal, settings, alerts, messages, logUsage}
 
+export const loadAppData = pubkey => {
+  return Promise.all([
+    loaders.loadNetwork(getRelays(), pubkey),
+    alerts.load(getRelays(), pubkey),
+    alerts.listen(getRelays(), pubkey),
+    messages.listen(getRelays(), pubkey),
+  ])
+}
+
 export const login = async ({privkey, pubkey}: {privkey?: string, pubkey?: string}, usingExtension = false) => {
   if (privkey) {
     keys.setPrivateKey(privkey)
@@ -21,16 +30,18 @@ export const login = async ({privkey, pubkey}: {privkey?: string, pubkey?: strin
     keys.setPublicKey(pubkey)
   }
 
+  modal.set({type: 'message', message: "Loading your profile data...", spinner: true})
+
   // Load network and start listening, but don't wait for it
-  loaders.loadNetwork(getRelays(), pubkey),
-  alerts.load(getRelays(), pubkey),
-  alerts.listen(getRelays(), pubkey),
-  messages.listen(getRelays(), pubkey)
+  loadAppData(pubkey)
+
+  // Load our user so we can populate network and show profile info
+  await loaders.loadPeople(getRelays(), [pubkey])
 
   // Not ideal, but the network tab depends on the user's social network being
   // loaded, so put them on global when they first log in so we're not slowing
   // down users' first run experience too much
-  navigate('/notes/global')
+  navigate('/notes/network')
 }
 
 export const addRelay = async relay => {
@@ -46,12 +57,8 @@ export const addRelay = async relay => {
     // Publish to the new set of relays
     await cmd.setRelays(relays, relays)
 
-    await Promise.all([
-      loaders.loadNetwork(relays, person.pubkey),
-      alerts.load(relays, person.pubkey),
-      alerts.listen(relays, person.pubkey),
-      messages.listen(getRelays(), person.pubkey)
-    ])
+    // Reload alerts, messages, etc
+    await loadAppData(person.pubkey)
   }
 }
 
@@ -126,6 +133,7 @@ export const annotate = (note, context) => {
 
 export const threadify = (events, context, {muffle = [], showReplies = true} = {}) => {
   const contextById = createMap('id', events.concat(context))
+
   // Show parents when possible. For reactions, if there's no parent,
   // throw it away. Sort by created date descending
   const notes = sortBy(
diff --git a/src/app/loaders.ts b/src/app/loaders.ts
index 7a98dcbb..bbcc811b 100644
--- a/src/app/loaders.ts
+++ b/src/app/loaders.ts
@@ -2,8 +2,7 @@ import {uniqBy, prop, uniq, flatten, pluck, identity} from 'ramda'
 import {ensurePlural, createMap, chunk} from 'hurdak/lib/hurdak'
 import {findReply, personKinds, Tags} from 'src/util/nostr'
 import {now, timedelta} from 'src/util/misc'
-import {load, getPerson} from 'src/agent'
-import defaults from 'src/agent/defaults'
+import {load, getPerson, getFollows} from 'src/agent'
 
 const getStalePubkeys = pubkeys => {
   // If we're not reloading, only get pubkeys we don't already know about
@@ -28,17 +27,7 @@ const loadPeople = (relays, pubkeys, {kinds = personKinds, force = false, ...opt
 }
 
 const loadNetwork = async (relays, pubkey) => {
-  // Get this user's profile to start with. This may update what relays
-  // are available, so don't assign relays to a variable here.
-  const events = pubkey ? await loadPeople(relays, [pubkey], {force: true}) : []
-  let petnames = Tags.from(events.filter(e => e.kind === 3)).type("p").all()
-
-  // Default to some cool guys we know
-  if (petnames.length === 0) {
-    petnames = defaults.petnames
-  }
-
-  const tags = Tags.wrap(petnames)
+  const tags = Tags.wrap(getFollows(pubkey))
 
   // Use nip-2 recommended relays to load our user's second-order follows
   await loadPeople(tags.relays(), tags.values().all())
diff --git a/src/partials/Compose.svelte b/src/partials/Compose.svelte
index 3c0a28be..a7a78f0b 100644
--- a/src/partials/Compose.svelte
+++ b/src/partials/Compose.svelte
@@ -178,7 +178,7 @@
 </div>
 
 {#if suggestions.length > 0}
-<div class="rounded border border-solid border-medium mt-2" in:fly={{y: 20}}>
+<div class="rounded border border-solid border-medium mt-2 flex flex-col" in:fly={{y: 20}}>
   {#each suggestions as person, i (person.pubkey)}
   <button
     class="py-2 px-4 cursor-pointer"
diff --git a/src/partials/Like.svelte b/src/partials/Like.svelte
index 7b65b374..323a97a6 100644
--- a/src/partials/Like.svelte
+++ b/src/partials/Like.svelte
@@ -1,10 +1,11 @@
 <script>
   import {fly} from 'svelte/transition'
-  import {uniqBy, prop} from 'ramda'
+  import {uniq} from 'ramda'
   import {ellipsize, quantify} from 'hurdak/lib/hurdak'
   import Badge from "src/partials/Badge.svelte"
   import {formatTimestamp} from 'src/util/misc'
   import {killEvent} from 'src/util/html'
+  import {getPerson} from 'src/agent'
   import {modal} from 'src/app'
 
   export let note
@@ -26,11 +27,11 @@
 
 <button
   class="py-2 px-3 flex flex-col gap-2 text-white cursor-pointer transition-all
-         border border-solid border-black hover:border-medium hover:bg-dark"
+         border border-solid border-black hover:border-medium hover:bg-dark text-left"
   on:click={() => modal.set({type: 'note/detail', note})}>
   <div class="flex gap-2 items-center justify-between relative">
     <button class="cursor-pointer" on:click={openPopover}>
-      {quantify(note.people.length, 'person', 'people')} liked your note.
+      {quantify(note.likedBy.length, 'person', 'people')} liked your note.
     </button>
     {#if isOpen}
     <button in:fly={{y: 20}} class="fixed inset-0 z-10" on:click={closePopover} />
@@ -39,8 +40,8 @@
       in:fly={{y: 20}}
       class="absolute top-0 mt-8 py-2 px-4 rounded border border-solid border-medium
              bg-dark grid grid-cols-3 gap-y-2 gap-x-4 z-20">
-      {#each uniqBy(prop('pubkey'), note.people) as person (person.pubkey)}
-        <Badge {person} />
+      {#each uniq(note.likedBy) as pubkey}
+      <Badge person={getPerson(pubkey)} />
       {/each}
     </button>
     {/if}
diff --git a/src/partials/Spinner.svelte b/src/partials/Spinner.svelte
index 8c2017b9..c3386213 100644
--- a/src/partials/Spinner.svelte
+++ b/src/partials/Spinner.svelte
@@ -1,9 +1,11 @@
 <script>
   import {fade} from 'svelte/transition'
   import {Circle2} from 'svelte-loading-spinners'
+
+  export let delay = 1000
 </script>
 
-<div class="py-20 flex flex-col gap-4 items-center justify-center" in:fade={{delay: 1000}}>
+<div class="py-20 flex flex-col gap-4 items-center justify-center" in:fade={{delay}}>
   <slot />
   <Circle2 colorOuter="#CCC5B9" colorInner="#403D39" colorCenter="#EB5E28" />
 </div>
diff --git a/src/routes/Alerts.svelte b/src/routes/Alerts.svelte
index bc0b6fe4..618daa1a 100644
--- a/src/routes/Alerts.svelte
+++ b/src/routes/Alerts.svelte
@@ -3,14 +3,14 @@
   import {onMount} from 'svelte'
   import {fly} from 'svelte/transition'
   import {now, createScroller} from 'src/util/misc'
-  import {user, db} from 'src/agent'
+  import {db} from 'src/agent'
   import {alerts} from 'src/app'
   import Note from 'src/partials/Note.svelte'
   import Content from 'src/partials/Content.svelte'
   import Like from 'src/partials/Like.svelte'
 
   let limit = 0
-  let annotatedNotes = []
+  let notes = []
 
   onMount(async () => {
     alerts.lastCheckedAlerts.set(now())
@@ -19,37 +19,24 @@
       limit += 10
 
       const events = await db.table('alerts').toArray()
-      const notes = events.filter(e => e.kind === 1)
-      const likes = events.filter(e => e.kind === 7)
 
-      // Combine likes of a single note. Remove grandchild likes
-      const likesById = {}
-      for (const like of likes.filter(e => e.parent?.pubkey === $user.pubkey)) {
-        if (!likesById[like.parent.id]) {
-          likesById[like.parent.id] = {...like.parent, people: []}
-        }
-
-        likesById[like.parent.id].people.push(like.person)
-      }
-
-      annotatedNotes = sortBy(
-        e => -e.created_at,
-        notes
-          .filter(e => e && e.pubkey !== $user.pubkey)
-          .concat(Object.values(likesById))
-      ).slice(0, limit)
+      notes = sortBy(e => -e.created_at, events).slice(0, limit)
     })
   })
 </script>
 
 <Content>
-  {#each annotatedNotes as e (e.id)}
+  {#each notes as e (e.id)}
   <div in:fly={{y: 20}}>
-    {#if e.people}
+    {#if e.likedBy}
     <Like note={e} />
     {:else}
     <Note note={e} />
     {/if}
   </div>
+  {:else}
+  <Content size="lg" class="text-center">
+    No alerts found - check back later!
+  </Content>
   {/each}
 </Content>