From feaaf194dadab7e94c76dc44f9de685876934437 Mon Sep 17 00:00:00 2001
From: Ryan Freeman <hello@ryanfreeman.dev>
Date: Sat, 26 Apr 2025 13:41:29 +0100
Subject: [PATCH] More comment improvements

---
 .env.example                        |   1 +
 .env.gpg                            | Bin 951 -> 961 bytes
 app/actions/comments.ts             |  13 +++----------
 app/context/CommentFormProvider.tsx |   2 +-
 lib/github.ts                       |   4 ++++
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.env.example b/.env.example
index ac3f5b9..3c0509e 100644
--- a/.env.example
+++ b/.env.example
@@ -3,6 +3,7 @@ SPOTIFY_CLIENT_SECRET=
 SPOTIFY_REFRESH_TOKEN=
 NEXT_PUBLIC_SITE_URL=
 GITHUB_ACCESS_TOKEN=
+GITHUB_USER_ID=
 GITHUB_USERNAME=
 GITHUB_CLIENT_ID=
 GITHUB_SECRET=
diff --git a/.env.gpg b/.env.gpg
index 10e53cb0dda06b65ed42a5c83bc366ced97545ae..3c65502f29bbd61c971fd277700b6874b9437879 100644
GIT binary patch
literal 961
zcmV;y13vtW4Fm@R0-JzcD6#;AukzCA0a^OlB}OM*k&#A<y^sE5=A&O8tW_+#cdDyP
zK41F&TP7YRL@+Vbf5SMi{}~O%;OtSP4BE|%FFn;QV!nAQ5_VP`)oQhwITqXJMaArk
z9bw;6lqieezR=cLG1*h{w4+d{>Cdc?IlZ(MD`2-rl=h#deer!Uc_M$m9rT$)B5-*Q
zt?9t%cUUq-7d~f4SNat`Krb*Wci-l7(de=1efzP;W8z#V8=ZhCgx7+>Ol9OYe~-0g
zJzconD1Sw2vCtK5j`0Yxgn9^CX{c)J)PzolKQ-M6?e#H&OMnUsK77bh>ySo8#Sf8^
zr1+$^`XO%DqA1TI_m4w;JrAZ~o+K(c&+t;t(heK^Tc}9BbGL@(8=~!|A!=1vzy0cS
z8#)+JO82=1YJF!jq>!RUw3RAWI;nPH5bMx7(t)sk?y_vlkLG9X;=a<@pCn#S9M*Ju
zCu9x8xI#L)ZrO)%xL$E$l)frT%P7nse<lmUw&9Pgj=Zz=4$8VHq~6+3Wlb3D6RcZJ
zjj*GbtC|FWn@2}bLKIj5(nbI{o>qsqi6}DQ=9q5(oFrEK3PSR4n(s%0Cw%yg?OdGw
z^i%|jX+)OKgS-Q-XxWViu!xL^zuwO9oP^zVP%68oIC^+7H670ayGbex;?$@H{Oqr2
z#$N)<83~{Z&OQsV$B`&%!0z>&aCMS2nDwwMnK}f<A}C>-p>Q|&@(=HIgWMd->9aFU
zS@~H%)@#7}z)hK-wK|+<T5*kpn4&P=3<iim;T65^V_&}1IQ}n<K+rTYyNG$W7Ss|N
zGO^&6(7?$c&R8s<X`(<GCEJN1PV9OeCcF^ZN&l3v49VSx(wAUoIIO!8mmdKVMgxr-
z2@y2m%U=xO5{C&*q3-3vU8&1oZMWkEelXq|23;WjoiUK1{iXz6g~7Je?;Ti;QC%X=
z6h~tw6XA8GEvK-F<Ju-87oXK<s1WIMz$9V+)0N@Z+aD=bM|MtoQ1psfa#o9wTkPAU
zaV9EErskjJ1J@CL-;@rmYP2I!>X6}o<#FkSC{9WamqDsx>@6bm*)9|J<BD52)5hk*
zG@PxrCJ525AG2Oq$1786rh9(S+G>9kJ_Dt4b6@bW%cyK&v`oH0gQ=NbYU59WTv3g7
zm7WHB1v_xHfnLLq%R1NPHoT{C^OR_}r;q+@<TTZj_kl>fFPZZ>E+eTDZbc_ta^gW<
j8?qpZnv&h#(1Uw<bG1#TNlH05;MXl@`Vl<z_wE!!CJ)~w

literal 951
zcmV;o14#Ug4Fm@R0=B&)IQD@VJO9$@0Vha%{bs1pXm;1SGNMM|$`b;b<!suB!pes=
z3lIzBs<>+Gwkd5JINV@9K`;}Hq}&46FD0{kXHkfvFDVS1<D0@$pBL2hrY?plm}k1g
zhCV(m!aQ6+)E^}N-cca(-5r7ts^~;UW$l++C)DG4H_!axJ)D0atQh8yo9X*jw4Rix
zwZR>ZW1ACz^5-)F6%YnVy{L<1eCRnTC4bm~Tt?Lj_BK3E+K(As@#+X#wi#?_o{Mrz
z9Ip|v*|d&XUa;Ah&f3O}oTdQu_u0~S*OXxUSbJ7F^!1!Lo98QlP)>W(pTjV$!dg?}
z6Rl+UPz9P&#S&0^s%sH+Rbqg3Hz$gh^Ru}c)iWex>FR7yd94w<7*jHL`gC?jx|$UB
zUQ+3yu9PqC&A)jT5wN)gnw%=}kr`>Bdj&y&WKPRP`!d_nV%d&Px6BC}Dd_1pPi<JB
zZj`wqeky?JOJXIayl@^KTp@Cgpbq6(Q5CTtE4$^L7;-3S!U>n~t?`m{u|#^659_lJ
zr=z4dnLp+(o4Ipbrmxn#4;3`SNyB)N0J{D~+<WO_wHM_vxbu^;av@AD`GC1h9I(Io
z3nOFs*7eDnS-)ka@`$r6!A5!!l@DUvcZmrbYR_zezg>hz19(Yl;Lw(>a?HM#iLNPJ
zh2VTJ2-8hCdW}k2pa2H>z~me<R*MI&l9*qoSB45(SK{)6R7<{tC7)a}L}UN&E%ie~
zyzJsB54#l1BSKAdSB9-no-F-0AK3Th2ZF>t_@QP2<b`y){SMDT@v$l&V;QT}kjfd(
zu@YOxgie{$-UL06r~Z_t^BH-Ptn+jzHW9|2J(&dIQj{-Wt-9jOv6whC)gq_BvlH^4
zW9Ql@?{;*axL#f#T6@Gh8AdmGtgjdY|07Dm<GudKQgzAj(behkED5<U^UV}zE0kRq
zABzw{;DhXAxqw+QUJ4s`uCyqPgXa9lzDS4nNJ!kgkx}Y7X`FJabhTMFeHanTWM9`0
z_?6Py5gJxfG<Wsi4g8a=zc|WybX9Pv7lD44rSZM_XD~XPsJdA~xGMYo5r%WG81N;R
z)8{494eFI-S(^QnT54x>m84gcl<gV{w!*}sNm354F1b@ZVQ`z=m=sE43W?<y{H7<z
zpU=hM=ivp5Sp=32cMw!U2|LMQ*V<Wjy<t!&O^}T#cclQ+K2Xn@9*pSl6Snm{G{eJT
Z>f;2gq2b8<hfUwM!YRJG!NM$;>;iaz+xY+h

diff --git a/app/actions/comments.ts b/app/actions/comments.ts
index 0c6bf9b..1f302f1 100644
--- a/app/actions/comments.ts
+++ b/app/actions/comments.ts
@@ -4,6 +4,7 @@ import {auth, signIn} from '@/auth'
 import {createClient} from '@/lib/supabase/server'
 import {z} from 'zod'
 import {sendNotification} from '@/lib/ntfy'
+import {extractUserId} from '@/lib/github'
 
 export async function loginWithGitHub() {
     await signIn('github')
@@ -22,15 +23,6 @@ const notificationBody = (comment: { id: number, content: string }, user: { name
                 headers: {
                     Authorization: `Bearer ${process.env.NTFY_TOKEN}`
                 }
-            },
-            {
-                action: 'http',
-                label: 'Delete comment',
-                url: `${process.env.NEXT_PUBLIC_SITE_URL}/api/comments/moderate/${comment.id}`,
-                method: 'DELETE',
-                headers: {
-                    Authorization: `Bearer ${process.env.NTFY_TOKEN}`
-                }
             }
         ]
     }
@@ -64,6 +56,7 @@ export async function addComment(prevState: { message: string }, formData: FormD
     try {
         const supabase = await createClient()
         const session = await auth()
+        const isMe = process.env.GITHUB_USER_ID === extractUserId(session?.user?.image ?? '')
 
         if (!session?.user) {
             return {message: authorisation_error}
@@ -78,7 +71,7 @@ export async function addComment(prevState: { message: string }, formData: FormD
 
         const {data: newComment, error} = await supabase
             .from('comments')
-            .insert({content: comment, article_id: article?.id, user_id: user?.id, parent_id: parent_id})
+            .insert({content: comment, article_id: article?.id, user_id: user?.id, parent_id: parent_id, published: isMe})
             .select('*')
             .single()
 
diff --git a/app/context/CommentFormProvider.tsx b/app/context/CommentFormProvider.tsx
index 7220f8e..d4a8916 100644
--- a/app/context/CommentFormProvider.tsx
+++ b/app/context/CommentFormProvider.tsx
@@ -19,7 +19,7 @@ export default function CommentFormProvider({children}: { children: ReactNode })
     const [replyTo, setReplyTo] = useState<Comment | null>(null)
     const [commentLength, setCommentLength] = useState<number>(0)
     const commentFormRef = useRef<HTMLTextAreaElement>(null)
-    const commentMaxLength = 300
+    const commentMaxLength = 500
 
     const focusCommentForm = () => {
         commentFormRef.current?.focus()
diff --git a/lib/github.ts b/lib/github.ts
index 5ab3dc8..8f5fdda 100644
--- a/lib/github.ts
+++ b/lib/github.ts
@@ -46,4 +46,8 @@ export async function getPinnedRepos() {
     }) as PinnedReposResponse
 
     return response.data.user.pinnedItems.nodes
+}
+
+export function extractUserId(avatarUrl: string) {
+    return new URL(avatarUrl).pathname.split('/')[2]
 }
\ No newline at end of file