From a6dec2092a0684cdef008b05664fe8720f0d9547 Mon Sep 17 00:00:00 2001
From: Lorenzo Corallo <lorenzo.corallo@outlook.it>
Date: Sun, 12 Apr 2026 23:36:39 +0200
Subject: [PATCH 01/22] checkpoint: user-list user-details (no cards)

---
 src/app/(auth)/onboarding/no-role/page.tsx    |   2 +-
 .../dashboard/(active)/account/telegram.tsx   |   2 +-
 .../_components/set-assoc-number-dialog.tsx   |   2 +-
 .../(active)/azure/members/columns.tsx        |   2 +-
 .../dashboard/(active)/azure/members/page.tsx |   2 +-
 .../(active)/azure/members/table.tsx          |   4 +-
 .../(active)/telegram/grants/delete-grant.tsx |  22 +-
 .../(active)/telegram/grants/grant-list.tsx   |   4 +-
 .../(active)/telegram/grants/new-grant.tsx    |  38 +-
 .../(active)/telegram/groups/page.tsx         | 324 +++++++++---------
 .../telegram/user-details/add-role.tsx        |  14 +-
 .../telegram/user-details/card-audit-log.tsx  |  10 +-
 .../user-details/card-group-admin.tsx         |   2 +-
 .../telegram/user-details/card-message.tsx    |   2 +-
 .../telegram/user-details/card-user-grant.tsx |  11 +-
 .../telegram/user-details/card-user-info.tsx  |   2 +-
 .../user-details/delete-group-admin.tsx       |  24 +-
 .../telegram/user-details/new-group-admin.tsx |  20 +-
 .../(active)/telegram/user-details/page.tsx   |  93 ++---
 .../telegram/user-details/remove-role.tsx     |  14 +-
 .../(active)/telegram/user-list/page.tsx      |  12 +-
 src/app/dashboard/layout.tsx                  |   5 +-
 src/app/layout.tsx                            |  12 +-
 src/app/testtrpc/page.tsx                     |   2 +-
 src/components/create-assoc-member.tsx        |   2 +-
 src/components/user-select.tsx                |   4 +-
 src/lib/trpc/client.tsx                       |  56 ---
 src/lib/trpc/query-client.ts                  |  21 --
 src/lib/utils/telegram.ts                     |   2 +-
 src/server/actions/get-user.ts                |  15 +
 src/server/trpc/index.tsx                     |  16 +
 src/{lib => server}/trpc/server.tsx           |   2 +-
 src/{lib => server}/trpc/types.tsx            |   0
 33 files changed, 329 insertions(+), 414 deletions(-)
 delete mode 100644 src/lib/trpc/client.tsx
 delete mode 100644 src/lib/trpc/query-client.ts
 create mode 100644 src/server/actions/get-user.ts
 create mode 100644 src/server/trpc/index.tsx
 rename src/{lib => server}/trpc/server.tsx (96%)
 rename src/{lib => server}/trpc/types.tsx (100%)

diff --git a/src/app/(auth)/onboarding/no-role/page.tsx b/src/app/(auth)/onboarding/no-role/page.tsx
index c890e55..e04ac23 100644
--- a/src/app/(auth)/onboarding/no-role/page.tsx
+++ b/src/app/(auth)/onboarding/no-role/page.tsx
@@ -2,8 +2,8 @@ import Image from "next/image"
 import { redirect } from "next/navigation"
 import loginSvg2 from "@/assets/svg/login-2.svg"
 import { Card } from "@/components/ui/card"
-import { getQueryClient, trpc } from "@/lib/trpc/server"
 import { getServerSession } from "@/server/auth"
+import { getQueryClient, trpc } from "@/server/trpc/server"
 import { Logout } from "../link/logout"
 
 export default async function OnboardingNoRole() {
diff --git a/src/app/dashboard/(active)/account/telegram.tsx b/src/app/dashboard/(active)/account/telegram.tsx
index f5261e1..0f1e66d 100644
--- a/src/app/dashboard/(active)/account/telegram.tsx
+++ b/src/app/dashboard/(active)/account/telegram.tsx
@@ -1,7 +1,7 @@
 "use client"
 import { useQuery } from "@tanstack/react-query"
 import { useSession } from "@/lib/auth"
-import { useTRPC } from "@/lib/trpc/client"
+import { useTRPC } from "@/server/trpc"
 
 export function Telegram() {
   const { data: session, isPending } = useSession()
diff --git a/src/app/dashboard/(active)/azure/members/_components/set-assoc-number-dialog.tsx b/src/app/dashboard/(active)/azure/members/_components/set-assoc-number-dialog.tsx
index ace742d..e286b43 100644
--- a/src/app/dashboard/(active)/azure/members/_components/set-assoc-number-dialog.tsx
+++ b/src/app/dashboard/(active)/azure/members/_components/set-assoc-number-dialog.tsx
@@ -14,8 +14,8 @@ import {
 } from "@/components/ui/dialog"
 import { Input } from "@/components/ui/input"
 import { Label } from "@/components/ui/label"
-import { useTRPC } from "@/lib/trpc/client"
 import { wait } from "@/lib/utils"
+import { useTRPC } from "@/server/trpc"
 
 export function SetAssocNumberDialog({ userId }: { userId: string }) {
   const [value, setValue] = useState<string>("")
diff --git a/src/app/dashboard/(active)/azure/members/columns.tsx b/src/app/dashboard/(active)/azure/members/columns.tsx
index 7476cc2..fddd659 100644
--- a/src/app/dashboard/(active)/azure/members/columns.tsx
+++ b/src/app/dashboard/(active)/azure/members/columns.tsx
@@ -1,7 +1,7 @@
 "use client"
 import { createColumnHelper, type Row } from "@tanstack/react-table"
 import { Badge } from "@/components/ui/badge"
-import type { ApiOutput } from "@/lib/trpc/types"
+import type { ApiOutput } from "@/server/trpc/types"
 import { SetAssocNumberDialog } from "./_components/set-assoc-number-dialog"
 
 type ParsedUser = ApiOutput["azure"]["members"]["getAll"][0]
diff --git a/src/app/dashboard/(active)/azure/members/page.tsx b/src/app/dashboard/(active)/azure/members/page.tsx
index 84e7e68..3a72300 100644
--- a/src/app/dashboard/(active)/azure/members/page.tsx
+++ b/src/app/dashboard/(active)/azure/members/page.tsx
@@ -3,7 +3,7 @@ import Link from "next/link"
 import { Suspense } from "react"
 import { ErrorBoundary } from "react-error-boundary"
 import { Spinner } from "@/components/spinner"
-import { getQueryClient, trpc } from "@/lib/trpc/server"
+import { getQueryClient, trpc } from "@/server/trpc/server"
 import { AssocTable } from "./table"
 
 export default async function AssocMembers() {
diff --git a/src/app/dashboard/(active)/azure/members/table.tsx b/src/app/dashboard/(active)/azure/members/table.tsx
index c2d8b65..5258332 100644
--- a/src/app/dashboard/(active)/azure/members/table.tsx
+++ b/src/app/dashboard/(active)/azure/members/table.tsx
@@ -5,8 +5,8 @@ import { useState } from "react"
 import { CreateAssocUser } from "@/components/create-assoc-member"
 import { DataTable } from "@/components/data-table"
 import { Badge } from "@/components/ui/badge"
-import { useTRPC } from "@/lib/trpc/client"
-import type { ApiOutput } from "@/lib/trpc/types"
+import { useTRPC } from "@/server/trpc"
+import type { ApiOutput } from "@/server/trpc/types"
 import { columns } from "./columns"
 
 type ParsedUser = ApiOutput["azure"]["members"]["getAll"][0]
diff --git a/src/app/dashboard/(active)/telegram/grants/delete-grant.tsx b/src/app/dashboard/(active)/telegram/grants/delete-grant.tsx
index 286f0b2..22414d1 100644
--- a/src/app/dashboard/(active)/telegram/grants/delete-grant.tsx
+++ b/src/app/dashboard/(active)/telegram/grants/delete-grant.tsx
@@ -18,26 +18,26 @@ import {
 } from "@/components/ui/alert-dialog"
 import { Button } from "@/components/ui/button"
 import { useSession } from "@/lib/auth"
-import { useTRPC } from "@/lib/trpc/client"
+// import { useTRPC } from "@/server/trpc"
 
 export function DeleteGrant({ userId }: { userId: number }) {
   const sesh = useSession()
 
-  const qc = useQueryClient()
-  const trpc = useTRPC()
+  // const qc = useQueryClient()
+  // const trpc = useTRPC()
   const removerId = sesh.data?.user.telegramId
-  const { mutateAsync } = useMutation(trpc.tg.grants.interrupt.mutationOptions())
+  // const { mutateAsync } = useMutation(trpc.tg.grants.interrupt.mutationOptions())
 
   const [open, setOpen] = useState(false)
 
   async function interrupt() {
     if (!removerId) return toast.error("Invalid session, try to reload the page")
-    const { error } = await mutateAsync({ userId, interruptedById: removerId, sendTgLog: true })
+    // const { error } = await mutateAsync({ userId, interruptedById: removerId, sendTgLog: true })
 
-    if (error === "NOT_FOUND") toast.info("The grant was expired or already interrupted")
-    else if (error === "UNAUTHORIZED") toast.error("You don't have enought permission")
-    else if (error === "INTERNAL_SERVER_ERROR") toast.error("There was an internal server error")
-    else toast.success("Grant interrupted successfully")
+    // if (error === "NOT_FOUND") toast.info("The grant was expired or already interrupted")
+    // else if (error === "UNAUTHORIZED") toast.error("You don't have enought permission")
+    // else if (error === "INTERNAL_SERVER_ERROR") toast.error("There was an internal server error")
+    // else toast.success("Grant interrupted successfully")
 
     handleOpenChange(false)
   }
@@ -45,8 +45,8 @@ export function DeleteGrant({ userId }: { userId: number }) {
   function handleOpenChange(v: boolean) {
     setOpen(v)
     if (v === false) {
-      qc.invalidateQueries(trpc.tg.grants.getOngoing.queryOptions())
-      qc.invalidateQueries(trpc.tg.grants.checkUser.queryOptions({ userId }))
+      // qc.invalidateQueries(trpc.tg.grants.getOngoing.queryOptions())
+      // qc.invalidateQueries(trpc.tg.grants.checkUser.queryOptions({ userId }))
     }
   }
 
diff --git a/src/app/dashboard/(active)/telegram/grants/grant-list.tsx b/src/app/dashboard/(active)/telegram/grants/grant-list.tsx
index 0516719..ff32ce2 100644
--- a/src/app/dashboard/(active)/telegram/grants/grant-list.tsx
+++ b/src/app/dashboard/(active)/telegram/grants/grant-list.tsx
@@ -1,8 +1,8 @@
 "use client"
 import { useQuery } from "@tanstack/react-query"
 import { format } from "date-fns"
-import { useTRPC } from "@/lib/trpc/client"
-import type { ApiOutput } from "@/lib/trpc/types"
+import { useTRPC } from "@/server/trpc"
+import type { ApiOutput } from "@/server/trpc/types"
 import { DeleteGrant } from "./delete-grant"
 
 type Grants = NonNullable<ApiOutput["tg"]["grants"]["getOngoing"]["grants"]>
diff --git a/src/app/dashboard/(active)/telegram/grants/new-grant.tsx b/src/app/dashboard/(active)/telegram/grants/new-grant.tsx
index 34649e8..6e6f589 100644
--- a/src/app/dashboard/(active)/telegram/grants/new-grant.tsx
+++ b/src/app/dashboard/(active)/telegram/grants/new-grant.tsx
@@ -33,16 +33,16 @@ import {
 } from "@/components/ui/select"
 import { UserSelect } from "@/components/user-select"
 import { useSession } from "@/lib/auth"
-import { useTRPC } from "@/lib/trpc/client"
-import type { TgUser } from "@/lib/trpc/types"
+// import { useTRPC } from "@/server/trpc"
+import type { TgUser } from "@/server/trpc/types"
 
 export function NewGrant() {
   const sesh = useSession()
   const adderId = sesh.data?.user.telegramId
 
-  const trpc = useTRPC()
-  const qc = useQueryClient()
-  const mutation = useMutation(trpc.tg.grants.create.mutationOptions())
+  // const trpc = useTRPC()
+  // const qc = useQueryClient()
+  // const mutation = useMutation(trpc.tg.grants.create.mutationOptions())
 
   const [open, setOpen] = useState(false)
   const [user, setUser] = useState<TgUser | null>(null)
@@ -59,8 +59,8 @@ export function NewGrant() {
       setStartDate(undefined)
       setEndDate(undefined)
       setReason("")
-      qc.invalidateQueries(trpc.tg.grants.getOngoing.queryOptions())
-      if (user) qc.invalidateQueries(trpc.tg.grants.checkUser.queryOptions({ userId: user.id }))
+      // qc.invalidateQueries(trpc.tg.grants.getOngoing.queryOptions())
+      // if (user) qc.invalidateQueries(trpc.tg.grants.checkUser.queryOptions({ userId: user.id }))
     }
   }
 
@@ -81,19 +81,19 @@ export function NewGrant() {
 
   async function create() {
     if (!user || !startDate || !endDate || !adderId) return
-    const res = await mutation.mutateAsync({
-      userId: user.id,
-      adderId,
-      since: startDate,
-      until: endDate,
-      reason: reason || undefined,
-      sendTgLog: true,
-    })
+    // const res = await mutation.mutateAsync({
+    //   userId: user.id,
+    //   adderId,
+    //   since: startDate,
+    //   until: endDate,
+    //   reason: reason || undefined,
+    //   sendTgLog: true,
+    // })
 
-    if (res.error === "UNAUTHORIZED") toast.error("You don't have permission to create grants.")
-    else if (res.error === "ALREADY_EXISTING") toast.error("This user already has an ongoing grant.")
-    else if (res.error === "INTERNAL_SERVER_ERROR") toast.error("There was a server error.")
-    else toast.success("Grant created successfully!")
+    // if (res.error === "UNAUTHORIZED") toast.error("You don't have permission to create grants.")
+    // else if (res.error === "ALREADY_EXISTING") toast.error("This user already has an ongoing grant.")
+    // else if (res.error === "INTERNAL_SERVER_ERROR") toast.error("There was a server error.")
+    // else toast.success("Grant created successfully!")
     handleOpenChange(false)
   }
 
diff --git a/src/app/dashboard/(active)/telegram/groups/page.tsx b/src/app/dashboard/(active)/telegram/groups/page.tsx
index 914fd63..09c349d 100644
--- a/src/app/dashboard/(active)/telegram/groups/page.tsx
+++ b/src/app/dashboard/(active)/telegram/groups/page.tsx
@@ -1,162 +1,162 @@
-"use client"
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"
-import { ArrowLeft, Copy, Pen, RefreshCcw, Search, X } from "lucide-react"
-import Link from "next/link"
-import { useState } from "react"
-import { toast } from "sonner"
-import { Badge } from "@/components/ui/badge"
-import { Button } from "@/components/ui/button"
-import { Input } from "@/components/ui/input"
-import { Label } from "@/components/ui/label"
-import { useTRPC } from "@/lib/trpc/client"
-import type { ApiOutput } from "@/lib/trpc/types"
-
-type Groups = ApiOutput["tg"]["groups"]["search"]["groups"]
-
-export default function TgGroups() {
-  const [query, setQuery] = useState("")
-
-  const trpc = useTRPC()
-  const qc = useQueryClient()
-  const queryOpts = trpc.tg.groups.search.queryOptions({ query, limit: 20, showHidden: true })
-  const { data: allGroups, isLoading, refetch } = useQuery(trpc.tg.groups.getAll.queryOptions())
-
-  const [rows, setRows] = useState<Groups>(!isLoading ? (allGroups ?? []) : [])
-
-  async function search() {
-    const res = await qc.fetchQuery(queryOpts)
-    setRows(res.groups)
-    return res
-  }
-
-  async function invalidate() {
-    await qc.invalidateQueries(queryOpts)
-    refetch()
-    await search()
-  }
-
-  async function submit(e: React.FormEvent<HTMLFormElement>) {
-    e.preventDefault()
-
-    const res = await search()
-    if (res.count === 0) toast.warning("No groups found with this query")
-    else toast.info(`Found ${res.count} groups`)
-  }
-
-  function reset() {
-    setRows(allGroups ?? [])
-    setQuery("")
-  }
-
-  return (
-    <div className="container p-8">
-      <Link href="/dashboard/telegram" className="flex gap-1 items-center text-muted-foreground mb-2 hover:underline">
-        <ArrowLeft size={16} /> Back
-      </Link>
-      <form onSubmit={submit} className="pt-2 gap-y-4 flex flex-col justify-start items-start">
-        <div className="flex gap-2 flex-col items-start justify-start">
-          <Label htmlFor="email" className="text-base">
-            Search
-          </Label>
-          <div className="flex gap-2 items-center justify-start">
-            <Input
-              id="group-query"
-              type="text"
-              placeholder="Group name"
-              className="bg-card w-auto"
-              required
-              onChange={(e) => {
-                setQuery(e.target.value)
-              }}
-              value={query}
-            />
-            <Button type="submit" size="icon">
-              <Search />
-            </Button>
-            {rows.length > 0 && (
-              <Button variant="outline" onClick={reset}>
-                <X />
-                Reset
-              </Button>
-            )}
-            <Button variant="outline" onClick={invalidate}>
-              <RefreshCcw />
-              Refresh
-            </Button>
-          </div>
-          <span className="text-muted-foreground text-xs">Max results: 20</span>
-        </div>
-      </form>
-      <div className="flex flex-col w-full items-start justify-start py-4">
-        <div className="grid gap-4 items-center grid-cols-5 w-full border-b py-2">
-          <p>telegram ID</p>
-          <p>Title</p>
-          <p>Tag</p>
-          <p>Invite Link</p>
-          <p>Hide</p>
-        </div>
-        {rows.map((r) => (
-          <GroupRow row={r} key={r.telegramId} invalidate={invalidate} />
-        ))}
-      </div>
-    </div>
-  )
-}
-
-function GroupRow({ row: r, invalidate }: { row: Groups[number]; invalidate: () => void }) {
-  const trpc = useTRPC()
-  const { mutateAsync: hideMutate } = useMutation(trpc.tg.groups.setHide.mutationOptions())
-
-  async function toggleHide() {
-    const ok = await hideMutate({ telegramId: r.telegramId, hide: !r.hide }).catch(() => false)
-    if (!ok) toast.error("The field cannot be modified")
-
-    toast.success("Hide option toggled!")
-    invalidate()
-  }
-
-  return (
-    <div className="grid gap-4 items-center grid-cols-5 border-b py-2 w-full">
-      <p>{r.telegramId}</p>
-      <p>{r.title}</p>
-      <p className={r.tag ? "" : "text-muted-foreground italic"}>{r.tag ? `@${r.tag}` : `<unset>`}</p>
-      <div className="flex items-center justify-start gap-2">
-        {r.link && (
-          <a
-            href={r.link}
-            target="_blank"
-            rel="noopener noreferrer"
-            aria-label={`Link for group ${r.title}`}
-            className="hover:underline text-xs"
-          >
-            {r.link}
-          </a>
-        )}
-        <Button
-          type="button"
-          variant="outline"
-          size="icon-sm"
-          className={!r.link ? "hidden" : ""}
-          onClick={async () => {
-            try {
-              if (!r.link) return
-              await navigator.clipboard.writeText(r.link)
-              toast.success("Link copied to clipboard!")
-            } catch (err) {
-              toast.error("Cannot copy link to clipboard")
-              console.error(err)
-            }
-          }}
-        >
-          <Copy />
-        </Button>
-      </div>
-      <div className="flex items-center justify-start gap-2">
-        <p>{r.hide ? <Badge className="bg-yellow-800">HIDDEN</Badge> : <Badge variant="secondary">Visibile</Badge>}</p>
-        <Button type="button" variant="outline" size="icon-sm" className={!r.link ? "hidden" : ""} onClick={toggleHide}>
-          <Pen />
-        </Button>
-      </div>
-    </div>
-  )
-}
+// "use client"
+// import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"
+// import { ArrowLeft, Copy, Pen, RefreshCcw, Search, X } from "lucide-react"
+// import Link from "next/link"
+// import { useState } from "react"
+// import { toast } from "sonner"
+// import { Badge } from "@/components/ui/badge"
+// import { Button } from "@/components/ui/button"
+// import { Input } from "@/components/ui/input"
+// import { Label } from "@/components/ui/label"
+// import { useTRPC } from "@/server/trpc"
+// import type { ApiOutput } from "@/server/trpc/types"
+//
+// type Groups = ApiOutput["tg"]["groups"]["search"]["groups"]
+//
+// export default function TgGroups() {
+//   const [query, setQuery] = useState("")
+//
+//   const trpc = useTRPC()
+//   const qc = useQueryClient()
+//   const queryOpts = trpc.tg.groups.search.queryOptions({ query, limit: 20, showHidden: true })
+//   const { data: allGroups, isLoading, refetch } = useQuery(trpc.tg.groups.getAll.queryOptions())
+//
+//   const [rows, setRows] = useState<Groups>(!isLoading ? (allGroups ?? []) : [])
+//
+//   async function search() {
+//     const res = await qc.fetchQuery(queryOpts)
+//     setRows(res.groups)
+//     return res
+//   }
+//
+//   async function invalidate() {
+//     await qc.invalidateQueries(queryOpts)
+//     refetch()
+//     await search()
+//   }
+//
+//   async function submit(e: React.FormEvent<HTMLFormElement>) {
+//     e.preventDefault()
+//
+//     const res = await search()
+//     if (res.count === 0) toast.warning("No groups found with this query")
+//     else toast.info(`Found ${res.count} groups`)
+//   }
+//
+//   function reset() {
+//     setRows(allGroups ?? [])
+//     setQuery("")
+//   }
+//
+//   return (
+//     <div className="container p-8">
+//       <Link href="/dashboard/telegram" className="flex gap-1 items-center text-muted-foreground mb-2 hover:underline">
+//         <ArrowLeft size={16} /> Back
+//       </Link>
+//       <form onSubmit={submit} className="pt-2 gap-y-4 flex flex-col justify-start items-start">
+//         <div className="flex gap-2 flex-col items-start justify-start">
+//           <Label htmlFor="email" className="text-base">
+//             Search
+//           </Label>
+//           <div className="flex gap-2 items-center justify-start">
+//             <Input
+//               id="group-query"
+//               type="text"
+//               placeholder="Group name"
+//               className="bg-card w-auto"
+//               required
+//               onChange={(e) => {
+//                 setQuery(e.target.value)
+//               }}
+//               value={query}
+//             />
+//             <Button type="submit" size="icon">
+//               <Search />
+//             </Button>
+//             {rows.length > 0 && (
+//               <Button variant="outline" onClick={reset}>
+//                 <X />
+//                 Reset
+//               </Button>
+//             )}
+//             <Button variant="outline" onClick={invalidate}>
+//               <RefreshCcw />
+//               Refresh
+//             </Button>
+//           </div>
+//           <span className="text-muted-foreground text-xs">Max results: 20</span>
+//         </div>
+//       </form>
+//       <div className="flex flex-col w-full items-start justify-start py-4">
+//         <div className="grid gap-4 items-center grid-cols-5 w-full border-b py-2">
+//           <p>telegram ID</p>
+//           <p>Title</p>
+//           <p>Tag</p>
+//           <p>Invite Link</p>
+//           <p>Hide</p>
+//         </div>
+//         {rows.map((r) => (
+//           <GroupRow row={r} key={r.telegramId} invalidate={invalidate} />
+//         ))}
+//       </div>
+//     </div>
+//   )
+// }
+//
+// function GroupRow({ row: r, invalidate }: { row: Groups[number]; invalidate: () => void }) {
+//   const trpc = useTRPC()
+//   const { mutateAsync: hideMutate } = useMutation(trpc.tg.groups.setHide.mutationOptions())
+//
+//   async function toggleHide() {
+//     const ok = await hideMutate({ telegramId: r.telegramId, hide: !r.hide }).catch(() => false)
+//     if (!ok) toast.error("The field cannot be modified")
+//
+//     toast.success("Hide option toggled!")
+//     invalidate()
+//   }
+//
+//   return (
+//     <div className="grid gap-4 items-center grid-cols-5 border-b py-2 w-full">
+//       <p>{r.telegramId}</p>
+//       <p>{r.title}</p>
+//       <p className={r.tag ? "" : "text-muted-foreground italic"}>{r.tag ? `@${r.tag}` : `<unset>`}</p>
+//       <div className="flex items-center justify-start gap-2">
+//         {r.link && (
+//           <a
+//             href={r.link}
+//             target="_blank"
+//             rel="noopener noreferrer"
+//             aria-label={`Link for group ${r.title}`}
+//             className="hover:underline text-xs"
+//           >
+//             {r.link}
+//           </a>
+//         )}
+//         <Button
+//           type="button"
+//           variant="outline"
+//           size="icon-sm"
+//           className={!r.link ? "hidden" : ""}
+//           onClick={async () => {
+//             try {
+//               if (!r.link) return
+//               await navigator.clipboard.writeText(r.link)
+//               toast.success("Link copied to clipboard!")
+//             } catch (err) {
+//               toast.error("Cannot copy link to clipboard")
+//               console.error(err)
+//             }
+//           }}
+//         >
+//           <Copy />
+//         </Button>
+//       </div>
+//       <div className="flex items-center justify-start gap-2">
+//         <p>{r.hide ? <Badge className="bg-yellow-800">HIDDEN</Badge> : <Badge variant="secondary">Visibile</Badge>}</p>
+//         <Button type="button" variant="outline" size="icon-sm" className={!r.link ? "hidden" : ""} onClick={toggleHide}>
+//           <Pen />
+//         </Button>
+//       </div>
+//     </div>
+//   )
+// }
diff --git a/src/app/dashboard/(active)/telegram/user-details/add-role.tsx b/src/app/dashboard/(active)/telegram/user-details/add-role.tsx
index b9a3997..b21085f 100644
--- a/src/app/dashboard/(active)/telegram/user-details/add-role.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/add-role.tsx
@@ -19,8 +19,8 @@ import {
 } from "@/components/ui/dialog"
 import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
 import { useSession } from "@/lib/auth"
-import { useTRPC } from "@/lib/trpc/client"
-import type { ApiInput, ApiOutput } from "@/lib/trpc/types"
+// import { useTRPC } from "@/server/trpc"
+import type { ApiInput, ApiOutput } from "@/server/trpc/types"
 
 type User = ApiOutput["tg"]["users"]["getByUsername"]["user"]
 type Roles = NonNullable<ApiOutput["tg"]["permissions"]["getRoles"]["roles"]>
@@ -43,14 +43,14 @@ export function AddRole({ user, alreadyRoles }: { user: User; alreadyRoles: Role
     label: `${g.slice(0, 1).toUpperCase()}${g.slice(1)}`,
   }))
 
-  const trpc = useTRPC()
-  const qc = useQueryClient()
+  // const trpc = useTRPC()
+  // const qc = useQueryClient()
   const router = useRouter()
 
   const [open, setOpen] = useState(false)
   const [selectedRole, setSelectedRole] = useState<Roles[number] | null>(null)
 
-  const submitMutation = useMutation(trpc.tg.permissions.addRole.mutationOptions())
+  // const submitMutation = useMutation(trpc.tg.permissions.addRole.mutationOptions())
 
   async function submit() {
     if (!adderId) return toast.warning("Invalid session, try reloading the page")
@@ -58,7 +58,7 @@ export function AddRole({ user, alreadyRoles }: { user: User; alreadyRoles: Role
     if (!user) return toast.warning("Invalid user, try restarting the dialog")
 
     try {
-      await submitMutation.mutateAsync({ adderId, userId: user.id, role: selectedRole })
+      // await submitMutation.mutateAsync({ adderId, userId: user.id, role: selectedRole })
       toast.info(`Role added`)
       handleOpenChange(false)
       router.refresh()
@@ -73,7 +73,7 @@ export function AddRole({ user, alreadyRoles }: { user: User; alreadyRoles: Role
     setOpen(v)
     if (v === false) {
       // closing
-      qc.invalidateQueries(trpc.tg.permissions.getRoles.queryOptions({ userId: user?.id ?? 0 }))
+      // qc.invalidateQueries(trpc.tg.permissions.getRoles.queryOptions({ userId: user?.id ?? 0 }))
       setSelectedRole(null)
     }
   }
diff --git a/src/app/dashboard/(active)/telegram/user-details/card-audit-log.tsx b/src/app/dashboard/(active)/telegram/user-details/card-audit-log.tsx
index 70cb5a5..cde007f 100644
--- a/src/app/dashboard/(active)/telegram/user-details/card-audit-log.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/card-audit-log.tsx
@@ -1,14 +1,14 @@
 import { useQuery } from "@tanstack/react-query"
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"
-import { useTRPC } from "@/lib/trpc/client"
-import type { ApiOutput } from "@/lib/trpc/types"
 import { fmtUser } from "@/lib/utils/telegram"
+// import { useTRPC } from "@/server/trpc"
+import type { ApiOutput } from "@/server/trpc/types"
 
 type Log = NonNullable<ApiOutput["tg"]["auditLog"]["getById"]>[number]
 export function AuditLogCard({ log: m }: { log: Log }) {
-  const trpc = useTRPC()
+  // const trpc = useTRPC()
 
-  const { data: admin } = useQuery(trpc.tg.users.get.queryOptions({ userId: m.adminId }))
+  // const { data: admin } = useQuery(trpc.tg.users.get.queryOptions({ userId: m.adminId }))
 
   return (
     <Card>
@@ -21,7 +21,7 @@ export function AuditLogCard({ log: m }: { log: Log }) {
           {m.groupTitle && <span>{m.groupTitle}</span>} [{m.groupId}]
         </p>
         <span className="text-muted-foreground">Admin ID: </span>
-        <p>{admin?.user && fmtUser(admin.user)}</p>
+        {/*<p>{admin?.user && fmtUser(admin.user)}</p>*/}
 
         {m.createdAt && (
           <>
diff --git a/src/app/dashboard/(active)/telegram/user-details/card-group-admin.tsx b/src/app/dashboard/(active)/telegram/user-details/card-group-admin.tsx
index 693195a..fce04b0 100644
--- a/src/app/dashboard/(active)/telegram/user-details/card-group-admin.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/card-group-admin.tsx
@@ -1,7 +1,7 @@
 import { Code } from "@/components/code"
 import { Card, CardContent, CardFooter, CardHeader, CardTitle } from "@/components/ui/card"
-import type { ApiOutput } from "@/lib/trpc/types"
 import { stripChatId } from "@/lib/utils/telegram"
+import type { ApiOutput } from "@/server/trpc/types"
 import { DeleteGroupAdmin } from "./delete-group-admin"
 
 type User = ApiOutput["tg"]["users"]["getByUsername"]["user"]
diff --git a/src/app/dashboard/(active)/telegram/user-details/card-message.tsx b/src/app/dashboard/(active)/telegram/user-details/card-message.tsx
index b2828da..46603cc 100644
--- a/src/app/dashboard/(active)/telegram/user-details/card-message.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/card-message.tsx
@@ -1,8 +1,8 @@
 import { ExternalLinkIcon } from "lucide-react"
 import { Button } from "@/components/ui/button"
 import { Card, CardContent, CardFooter } from "@/components/ui/card"
-import type { ApiOutput } from "@/lib/trpc/types"
 import { stripChatId } from "@/lib/utils/telegram"
+import type { ApiOutput } from "@/server/trpc/types"
 
 type Message = NonNullable<ApiOutput["tg"]["messages"]["getLastByUser"]["messages"]>[number]
 export function MessageCard({ message: m }: { message: Message }) {
diff --git a/src/app/dashboard/(active)/telegram/user-details/card-user-grant.tsx b/src/app/dashboard/(active)/telegram/user-details/card-user-grant.tsx
index 5809b79..029cf89 100644
--- a/src/app/dashboard/(active)/telegram/user-details/card-user-grant.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/card-user-grant.tsx
@@ -3,15 +3,16 @@ import { useQuery } from "@tanstack/react-query"
 import { format } from "date-fns"
 import { Sparkle, Star } from "lucide-react"
 import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from "@/components/ui/card"
-import { useTRPC } from "@/lib/trpc/client"
-import type { TgUser } from "@/lib/trpc/types"
+// import { useTRPC } from "@/server/trpc"
+import type { TgUser } from "@/server/trpc/types"
 import { DeleteGrant } from "../grants/delete-grant"
 
 export function UserGrantCard({ user }: { user: TgUser }) {
-  const trpc = useTRPC()
-  const { data } = useQuery(trpc.tg.grants.checkUser.queryOptions({ userId: user.id }))
+  // const trpc = useTRPC()
+  // const { data } = useQuery(trpc.tg.grants.checkUser.queryOptions({ userId: user.id }))
 
-  if (!data) return null
+  // if (!data) return null
+  return null
   return (
     data.grant && (
       <Card className="w-fit min-w-120">
diff --git a/src/app/dashboard/(active)/telegram/user-details/card-user-info.tsx b/src/app/dashboard/(active)/telegram/user-details/card-user-info.tsx
index 70e7034..c9fc339 100644
--- a/src/app/dashboard/(active)/telegram/user-details/card-user-info.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/card-user-info.tsx
@@ -2,7 +2,7 @@ import { Star } from "lucide-react"
 import { Badge } from "@/components/ui/badge"
 import { Card, CardContent, CardFooter, CardHeader, CardTitle } from "@/components/ui/card"
 import { useSession } from "@/lib/auth"
-import type { ApiOutput } from "@/lib/trpc/types"
+import type { ApiOutput } from "@/server/trpc/types"
 import { AddRole } from "./add-role"
 import { RemoveRole } from "./remove-role"
 
diff --git a/src/app/dashboard/(active)/telegram/user-details/delete-group-admin.tsx b/src/app/dashboard/(active)/telegram/user-details/delete-group-admin.tsx
index 86bb9c7..b4a58ea 100644
--- a/src/app/dashboard/(active)/telegram/user-details/delete-group-admin.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/delete-group-admin.tsx
@@ -19,28 +19,28 @@ import {
 } from "@/components/ui/alert-dialog"
 import { Button } from "@/components/ui/button"
 import { useSession } from "@/lib/auth"
-import { useTRPC } from "@/lib/trpc/client"
+// import { useTRPC } from "@/server/trpc"
 
 export function DeleteGroupAdmin({ userId, chatId }: { userId: number; chatId: number }) {
   const router = useRouter()
   const sesh = useSession()
 
-  const qc = useQueryClient()
-  const trpc = useTRPC()
+  // const qc = useQueryClient()
+  // const trpc = useTRPC()
   const removerId = sesh.data?.user.telegramId
-  const { mutateAsync } = useMutation(trpc.tg.permissions.removeGroup.mutationOptions())
+  // const { mutateAsync } = useMutation(trpc.tg.permissions.removeGroup.mutationOptions())
 
   const [open, setOpen] = useState(false)
 
   async function deleteGroupAdmin() {
     if (!removerId) return toast.error("Invalid session, try to reload the page")
-    const { error } = await mutateAsync({ removerId, userId, groupId: chatId })
-    if (error) {
-      toast.error("There was an error")
-      console.error(error)
-    } else {
-      toast.success("Group Admin deleted!")
-    }
+    // const { error } = await mutateAsync({ removerId, userId, groupId: chatId })
+    // if (error) {
+    //   toast.error("There was an error")
+    //   console.error(error)
+    // } else {
+    //   toast.success("Group Admin deleted!")
+    // }
 
     handleOpenChange(false)
   }
@@ -48,7 +48,7 @@ export function DeleteGroupAdmin({ userId, chatId }: { userId: number; chatId: n
   function handleOpenChange(v: boolean) {
     setOpen(v)
     if (v === false) {
-      qc.invalidateQueries(trpc.tg.permissions.getRoles.queryOptions({ userId }))
+      // qc.invalidateQueries(trpc.tg.permissions.getRoles.queryOptions({ userId }))
       router.refresh()
     }
   }
diff --git a/src/app/dashboard/(active)/telegram/user-details/new-group-admin.tsx b/src/app/dashboard/(active)/telegram/user-details/new-group-admin.tsx
index 066658a..8d4aac5 100644
--- a/src/app/dashboard/(active)/telegram/user-details/new-group-admin.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/new-group-admin.tsx
@@ -19,8 +19,8 @@ import { Input } from "@/components/ui/input"
 import { Label } from "@/components/ui/label"
 import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger } from "@/components/ui/select"
 import { useSession } from "@/lib/auth"
-import { useTRPC } from "@/lib/trpc/client"
-import type { ApiOutput } from "@/lib/trpc/types"
+// import { useTRPC } from "@/server/trpc"
+import type { ApiOutput } from "@/server/trpc/types"
 
 type Groups = ApiOutput["tg"]["groups"]["search"]["groups"]
 type User = ApiOutput["tg"]["users"]["getByUsername"]["user"]
@@ -29,8 +29,8 @@ export function NewGroupAdmin({ user, alreadyIn }: { user: User; alreadyIn: numb
   const sesh = useSession()
   const adderId = sesh.data?.user.telegramId
 
-  const trpc = useTRPC()
-  const qc = useQueryClient()
+  // const trpc = useTRPC()
+  // const qc = useQueryClient()
   const router = useRouter()
 
   const [open, setOpen] = useState(false)
@@ -38,16 +38,16 @@ export function NewGroupAdmin({ user, alreadyIn }: { user: User; alreadyIn: numb
   const [groups, setGroups] = useState<Groups>([])
   const [selectedGroup, setSelectedGroup] = useState<Groups[number] | null>(null)
 
-  const queryOpts = trpc.tg.groups.search.queryOptions({ query: groupQuery, limit: 20, showHidden: true })
+  // const queryOpts = trpc.tg.groups.search.queryOptions({ query: groupQuery, limit: 20, showHidden: true })
 
   async function searchGroup(e: React.FormEvent<HTMLFormElement>) {
     e.preventDefault()
 
-    const res = await qc.fetchQuery(queryOpts)
-    setGroups(res.groups.filter((g) => !alreadyIn.includes(g.telegramId)))
+    // const res = await qc.fetchQuery(queryOpts)
+    // setGroups(res.groups.filter((g) => !alreadyIn.includes(g.telegramId)))
   }
 
-  const submitMutation = useMutation(trpc.tg.permissions.addGroup.mutationOptions())
+  // const submitMutation = useMutation(trpc.tg.permissions.addGroup.mutationOptions())
 
   async function submit() {
     if (!adderId) return toast.warning("Invalid session, try reloading the page")
@@ -55,7 +55,7 @@ export function NewGroupAdmin({ user, alreadyIn }: { user: User; alreadyIn: numb
     if (!user) return toast.warning("Invalid user, try restarting the dialog")
 
     try {
-      await submitMutation.mutateAsync({ adderId, groupId: selectedGroup?.telegramId, userId: user.id })
+      // await submitMutation.mutateAsync({ adderId, groupId: selectedGroup?.telegramId, userId: user.id })
       toast.info(`Group admin added`)
       handleOpenChange(false)
       router.refresh()
@@ -76,7 +76,7 @@ export function NewGroupAdmin({ user, alreadyIn }: { user: User; alreadyIn: numb
     setOpen(v)
     if (v === false) {
       // closing
-      qc.invalidateQueries(trpc.tg.permissions.getRoles.queryOptions({ userId: user?.id ?? 0 }))
+      // qc.invalidateQueries(trpc.tg.permissions.getRoles.queryOptions({ userId: user?.id ?? 0 }))
       reset()
     }
   }
diff --git a/src/app/dashboard/(active)/telegram/user-details/page.tsx b/src/app/dashboard/(active)/telegram/user-details/page.tsx
index a8b5343..9bcc45c 100644
--- a/src/app/dashboard/(active)/telegram/user-details/page.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/page.tsx
@@ -1,14 +1,12 @@
 "use client"
-import { useQuery, useQueryClient } from "@tanstack/react-query"
 import { ArrowLeft, RefreshCcw, Search, X } from "lucide-react"
 import Link from "next/link"
-import { useState } from "react"
-import { toast } from "sonner"
+import { startTransition, useActionState, useState } from "react"
+import { Spinner } from "@/components/spinner"
 import { Button } from "@/components/ui/button"
 import { Input } from "@/components/ui/input"
 import { Label } from "@/components/ui/label"
-import { useTRPC } from "@/lib/trpc/client"
-import type { ApiOutput } from "@/lib/trpc/types"
+import { getUser } from "@/server/actions/get-user"
 import { AuditLogCard } from "./card-audit-log"
 import { GroupAdminCard } from "./card-group-admin"
 import { MessageCard } from "./card-message"
@@ -16,45 +14,15 @@ import { UserGrantCard } from "./card-user-grant"
 import { UserInfoCard } from "./card-user-info"
 import { NewGroupAdmin } from "./new-group-admin"
 
-type User = ApiOutput["tg"]["users"]["getByUsername"]["user"]
+type Data = Awaited<ReturnType<typeof getUser>>
 
 export default function TgUsers() {
-  const [query, setQuery] = useState("")
-  const [user, setUser] = useState<User>(null)
-
-  const trpc = useTRPC()
-
-  const qc = useQueryClient()
-  const searchQuery = trpc.tg.users.getByUsername.queryOptions({ username: query })
-  const { data: userData, refetch: refetch1 } = useQuery(
-    trpc.tg.permissions.getRoles.queryOptions({ userId: user?.id ?? 0 })
-  )
-  const { data: messages, refetch: refetch2 } = useQuery(
-    trpc.tg.messages.getLastByUser.queryOptions({ userId: user?.id ?? 0 })
-  )
-  const { data: auditLog, refetch: refetch3 } = useQuery(
-    trpc.tg.auditLog.getById.queryOptions({ targetId: user?.id ?? 0 })
-  )
-
-  async function refetch() {
-    await Promise.all([refetch1(), refetch2(), refetch3])
-    toast.success("Reloaded correctly")
-  }
-
-  async function search(e: React.FormEvent<HTMLFormElement>) {
-    e.preventDefault()
-
-    const res = await qc.fetchQuery(searchQuery)
-    if (!res.user) {
-      setUser(null)
-      return toast.warning("No user found with this username")
-    }
-    setUser(res.user)
-  }
+  const [username, setUsername] = useState("")
+  const [data, action, pending] = useActionState<Data | null>(() => (username ? getUser(username) : null), null)
 
   function reset() {
-    setUser(null)
-    setQuery("")
+    setUsername("")
+    action()
   }
 
   return (
@@ -63,7 +31,7 @@ export default function TgUsers() {
         <ArrowLeft size={16} /> Back
       </Link>
 
-      <form onSubmit={search} className="pt-2 gap-y-4 flex flex-col justify-start items-start">
+      <form action={action} className="pt-2 gap-y-4 flex flex-col justify-start items-start">
         <div className="flex gap-2 flex-col items-start justify-start">
           <Label htmlFor="email" className="text-base">
             Search by username
@@ -73,24 +41,27 @@ export default function TgUsers() {
               id="group-query"
               type="text"
               placeholder="Username"
+              disabled={!!data}
               className="bg-card w-auto"
               required
               onChange={(e) => {
-                setQuery(e.target.value)
+                setUsername(e.target.value)
               }}
-              value={query}
+              value={username}
             />
-            <Button type="submit" size="icon">
-              <Search />
-            </Button>
-            {user && (
-              <Button variant="outline" onClick={reset}>
+
+            {data ? (
+              <Button variant="outline" onClick={() => startTransition(reset)}>
                 <X />
                 Reset
               </Button>
+            ) : (
+              <Button disabled={pending} type="submit" size="icon" className={pending ? "bg-muted" : ""}>
+                {pending ? <Spinner /> : <Search />}
+              </Button>
             )}
-            {user && (
-              <Button variant="secondary" onClick={refetch}>
+            {data && (
+              <Button disabled={pending} variant="secondary" type="submit">
                 <RefreshCcw />
                 Refresh
               </Button>
@@ -101,25 +72,25 @@ export default function TgUsers() {
 
       <br />
 
-      {user && (
+      {data && (
         <>
           <div className="grid grid-cols-3 items-start">
-            <UserInfoCard user={user} roles={userData?.roles ?? []} />
-            <UserGrantCard user={user} />
+            <UserInfoCard user={data.user} roles={data.roles ?? []} />
+            <UserGrantCard user={data.user} />
           </div>
 
           <div className="pt-6 flex gap-4 items-center">
             <p>Admin in groups:</p>
-            <NewGroupAdmin user={user} alreadyIn={userData?.groupAdmin.map((g) => g?.group.id ?? 0) ?? []} />
+            <NewGroupAdmin user={data.user} alreadyIn={data.groupAdmin.map((g) => g?.group.id ?? 0) ?? []} />
           </div>
           <div className="grid grid-cols-4 py-2 gap-4">
-            {userData?.groupAdmin
+            {data.groupAdmin
               .filter((m) => m !== null && m !== undefined)
               .map((m) => (
-                <GroupAdminCard groupAdminInfo={m} user={user} key={m.group.id} />
+                <GroupAdminCard groupAdminInfo={m} user={data.user} key={m.group.id} />
               ))}
 
-            {userData?.groupAdmin.length === 0 && (
+            {data.groupAdmin.length === 0 && (
               <p className="bg-card rounded-lg p-3 italic text-muted-foreground text-sm">
                 This user is not group admin in any group.
               </p>
@@ -128,11 +99,11 @@ export default function TgUsers() {
 
           <p className="pt-6">Last messages (max 12):</p>
           <div className="grid grid-cols-3 py-2 gap-4">
-            {messages?.messages?.map((m) => (
+            {data.messages?.map((m) => (
               <MessageCard message={m} key={`${m.chatId}-${m.messageId}`} />
             ))}
 
-            {messages?.messages?.length === 0 && (
+            {data.messages?.length === 0 && (
               <p className="bg-card rounded-lg p-3 italic text-muted-foreground text-sm">
                 No recent messages sent by this user
               </p>
@@ -141,10 +112,10 @@ export default function TgUsers() {
 
           <p className="pt-6">Audit log:</p>
           <div className="grid grid-cols-3 py-2 gap-4">
-            {auditLog?.map((m) => (
+            {data.audits.map((m) => (
               <AuditLogCard log={m} key={`${m.id}-${m.type}`} />
             ))}
-            {auditLog?.length === 0 && (
+            {data.audits.length === 0 && (
               <p className="bg-card rounded-lg p-3 italic text-muted-foreground text-sm">
                 No audit log found for this user
               </p>
diff --git a/src/app/dashboard/(active)/telegram/user-details/remove-role.tsx b/src/app/dashboard/(active)/telegram/user-details/remove-role.tsx
index 173551e..11eed4d 100644
--- a/src/app/dashboard/(active)/telegram/user-details/remove-role.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/remove-role.tsx
@@ -19,8 +19,8 @@ import {
 } from "@/components/ui/dialog"
 import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
 import { useSession } from "@/lib/auth"
-import { useTRPC } from "@/lib/trpc/client"
-import type { ApiOutput } from "@/lib/trpc/types"
+// import { useTRPC } from "@/server/trpc"
+import type { ApiOutput } from "@/server/trpc/types"
 
 type User = ApiOutput["tg"]["users"]["getByUsername"]["user"]
 type Roles = NonNullable<ApiOutput["tg"]["permissions"]["getRoles"]["roles"]>
@@ -43,14 +43,14 @@ export function RemoveRole({ user, alreadyRoles }: { user: User; alreadyRoles: R
     label: `${g.slice(0, 1).toUpperCase()}${g.slice(1)}`,
   }))
 
-  const trpc = useTRPC()
-  const qc = useQueryClient()
+  // const trpc = useTRPC()
+  // const qc = useQueryClient()
   const router = useRouter()
 
   const [open, setOpen] = useState(false)
   const [selectedRole, setSelectedRole] = useState<Roles[number] | null>(null)
 
-  const submitMutation = useMutation(trpc.tg.permissions.removeRole.mutationOptions())
+  // const submitMutation = useMutation(trpc.tg.permissions.removeRole.mutationOptions())
 
   async function submit() {
     if (!removerId) return toast.warning("Invalid session, try reloading the page")
@@ -58,7 +58,7 @@ export function RemoveRole({ user, alreadyRoles }: { user: User; alreadyRoles: R
     if (!user) return toast.warning("Invalid user, try restarting the dialog")
 
     try {
-      await submitMutation.mutateAsync({ removerId, userId: user.id, role: selectedRole })
+      // await submitMutation.mutateAsync({ removerId, userId: user.id, role: selectedRole })
       toast.info(`Role removed`)
       handleOpenChange(false)
       router.refresh()
@@ -73,7 +73,7 @@ export function RemoveRole({ user, alreadyRoles }: { user: User; alreadyRoles: R
     setOpen(v)
     if (v === false) {
       // closing
-      qc.invalidateQueries(trpc.tg.permissions.getRoles.queryOptions({ userId: user?.id ?? 0 }))
+      // qc.invalidateQueries(trpc.tg.permissions.getRoles.queryOptions({ userId: user?.id ?? 0 }))
       setSelectedRole(null)
     }
   }
diff --git a/src/app/dashboard/(active)/telegram/user-list/page.tsx b/src/app/dashboard/(active)/telegram/user-list/page.tsx
index a6f8bfc..a7cdba6 100644
--- a/src/app/dashboard/(active)/telegram/user-list/page.tsx
+++ b/src/app/dashboard/(active)/telegram/user-list/page.tsx
@@ -1,16 +1,12 @@
-"use client"
-import { useQuery } from "@tanstack/react-query"
 import { ArrowLeft } from "lucide-react"
 import Link from "next/link"
-import { useTRPC } from "@/lib/trpc/client"
-import type { ApiOutput } from "@/lib/trpc/types"
+import { trpc } from "@/server/trpc"
+import type { ApiOutput } from "@/server/trpc/types"
 
 type Users = NonNullable<ApiOutput["tg"]["users"]["getAll"]["users"]>
 
-export default function TgUsers() {
-  const trpc = useTRPC()
-  const { data } = useQuery(trpc.tg.users.getAll.queryOptions())
-
+export default async function TgUsers() {
+  const data = await trpc.tg.users.getAll.query()
   return (
     <div className="container p-8">
       <Link href="/dashboard/telegram" className="flex gap-1 items-center text-muted-foreground mb-2 hover:underline">
diff --git a/src/app/dashboard/layout.tsx b/src/app/dashboard/layout.tsx
index 1f92b69..d55b79f 100644
--- a/src/app/dashboard/layout.tsx
+++ b/src/app/dashboard/layout.tsx
@@ -1,7 +1,7 @@
 import { redirect } from "next/navigation"
 import { AdminHeader } from "@/components/admin-header"
-import { getQueryClient, trpc } from "@/lib/trpc/server"
 import { getServerSession } from "@/server/auth"
+import { trpc } from "@/server/trpc"
 
 export default async function AdminLayout({ children }: { children: React.ReactNode }) {
   const session = await getServerSession()
@@ -13,8 +13,7 @@ export default async function AdminLayout({ children }: { children: React.ReactN
   // if (session?.user.role === USER_ROLE.INACTIVE) ;
   // if (session?.user.role === USER_ROLE.DISABLED) redirect("/dashboard/disabled");
 
-  const qc = getQueryClient()
-  const { roles } = await qc.fetchQuery(trpc.tg.permissions.getRoles.queryOptions({ userId: tgId }))
+  const { roles } = await trpc.tg.permissions.getRoles.query({ userId: tgId })
   if (!roles || roles.length === 0) redirect("/onboarding/no-role")
   if (roles.includes("creator")) redirect("/onboarding/unauthorized")
 
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 3eda8bf..b503bb8 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -5,8 +5,6 @@ import { HEADER_HEIGHT } from "@/components/header"
 import { ThemeProvider } from "@/components/theme-provider"
 import { Toaster } from "@/components/ui/sonner"
 import { TooltipProvider } from "@/components/ui/tooltip"
-import { TRPCReactProvider } from "@/lib/trpc/client"
-import { HydrateClient } from "@/lib/trpc/server"
 import { cn } from "@/lib/utils/shadcn"
 
 const geist = Geist({ subsets: ["latin"], variable: "--font-sans" })
@@ -45,13 +43,9 @@ export default function RootLayout({ children }: Readonly<{ children: React.Reac
           disableTransitionOnChange
         >
           <TooltipProvider>
-            <TRPCReactProvider>
-              <HydrateClient>
-                <div className="flex h-screen overflow-y-auto w-full flex-col items-center justify-start px-4 sm:px-8">
-                  {children}
-                </div>
-              </HydrateClient>
-            </TRPCReactProvider>
+            <div className="flex h-screen overflow-y-auto w-full flex-col items-center justify-start px-4 sm:px-8">
+              {children}
+            </div>
             <Toaster richColors position="bottom-center" />
           </TooltipProvider>
         </ThemeProvider>
diff --git a/src/app/testtrpc/page.tsx b/src/app/testtrpc/page.tsx
index 1ca88c4..9794c7c 100644
--- a/src/app/testtrpc/page.tsx
+++ b/src/app/testtrpc/page.tsx
@@ -1,4 +1,4 @@
-import { getQueryClient, trpc } from "@/lib/trpc/server"
+import { getQueryClient, trpc } from "@/server/trpc/server"
 export const dynamic = "force-dynamic"
 
 export default async function TestTRPCPage() {
diff --git a/src/components/create-assoc-member.tsx b/src/components/create-assoc-member.tsx
index faba22b..dd3c907 100644
--- a/src/components/create-assoc-member.tsx
+++ b/src/components/create-assoc-member.tsx
@@ -12,7 +12,7 @@ import {
   SheetTitle,
   SheetTrigger,
 } from "@/components/ui/sheet"
-import { useTRPC } from "@/lib/trpc/client"
+import { useTRPC } from "@/server/trpc"
 import { Button } from "./ui/button"
 import { Input } from "./ui/input"
 import { Label } from "./ui/label"
diff --git a/src/components/user-select.tsx b/src/components/user-select.tsx
index 1b238f9..4dc121a 100644
--- a/src/components/user-select.tsx
+++ b/src/components/user-select.tsx
@@ -4,9 +4,9 @@ import { useQueryClient } from "@tanstack/react-query"
 import { Search, X } from "lucide-react"
 import { useState } from "react"
 import { toast } from "sonner"
-import { useTRPC } from "@/lib/trpc/client"
-import type { TgUser } from "@/lib/trpc/types"
 import { fmtUser } from "@/lib/utils/telegram"
+import { useTRPC } from "@/server/trpc"
+import type { TgUser } from "@/server/trpc/types"
 import { Button } from "./ui/button"
 import { Input } from "./ui/input"
 import { Label } from "./ui/label"
diff --git a/src/lib/trpc/client.tsx b/src/lib/trpc/client.tsx
deleted file mode 100644
index c4d0ba1..0000000
--- a/src/lib/trpc/client.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-"use client"
-
-import { type AppRouter, TRPC_PATH } from "@polinetwork/backend"
-import type { QueryClient } from "@tanstack/react-query"
-import { QueryClientProvider } from "@tanstack/react-query"
-import { createTRPCClient, httpBatchLink } from "@trpc/client"
-import { createTRPCContext } from "@trpc/tanstack-react-query"
-import { useState } from "react"
-import SuperJSON from "superjson"
-import { getBaseUrl } from "../utils"
-import { makeQueryClient } from "./query-client"
-export const { TRPCProvider, useTRPC } = createTRPCContext<AppRouter>()
-
-let browserQueryClient: QueryClient
-function getQueryClient() {
-  if (typeof window === "undefined") {
-    // Server: always make a new query client
-    return makeQueryClient()
-  }
-  // Browser: make a new query client if we don't already have one
-  // This is very important, so we don't re-make a new client if React
-  // suspends during the initial render. This may not be needed if we
-  // have a suspense boundary BELOW the creation of the query client
-  if (!browserQueryClient) browserQueryClient = makeQueryClient()
-  return browserQueryClient
-}
-
-const url = getBaseUrl() + TRPC_PATH
-export function TRPCReactProvider(
-  props: Readonly<{
-    children: React.ReactNode
-  }>
-) {
-  // NOTE: Avoid useState when initializing the query client if you don't
-  //       have a suspense boundary between this and the code that may
-  //       suspend because React will throw away the client on the initial
-  //       render if it suspends and there is no boundary
-  const queryClient = getQueryClient()
-  const [trpcClient] = useState(() =>
-    createTRPCClient<AppRouter>({
-      links: [
-        httpBatchLink({
-          url,
-          transformer: SuperJSON,
-        }),
-      ],
-    })
-  )
-  return (
-    <QueryClientProvider client={queryClient}>
-      <TRPCProvider trpcClient={trpcClient} queryClient={queryClient}>
-        {props.children}
-      </TRPCProvider>
-    </QueryClientProvider>
-  )
-}
diff --git a/src/lib/trpc/query-client.ts b/src/lib/trpc/query-client.ts
deleted file mode 100644
index 8f1e8e6..0000000
--- a/src/lib/trpc/query-client.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { defaultShouldDehydrateQuery, QueryClient } from "@tanstack/react-query"
-import SuperJSON from "superjson"
-
-export function makeQueryClient() {
-  return new QueryClient({
-    defaultOptions: {
-      queries: {
-        // With SSR, we usually want to set some default staleTime
-        // above 0 to avoid refetching immediately on the client
-        staleTime: 30 * 1000,
-      },
-      dehydrate: {
-        serializeData: SuperJSON.serialize,
-        shouldDehydrateQuery: (query) => defaultShouldDehydrateQuery(query) || query.state.status === "pending",
-      },
-      hydrate: {
-        deserializeData: SuperJSON.deserialize,
-      },
-    },
-  })
-}
diff --git a/src/lib/utils/telegram.ts b/src/lib/utils/telegram.ts
index c5b114c..a7741cc 100644
--- a/src/lib/utils/telegram.ts
+++ b/src/lib/utils/telegram.ts
@@ -1,4 +1,4 @@
-import type { TgUser } from "../trpc/types"
+import type { TgUser } from "../../server/trpc/types"
 
 export function stripChatId(chatId: number): number {
   if (chatId > 0) return chatId
diff --git a/src/server/actions/get-user.ts b/src/server/actions/get-user.ts
new file mode 100644
index 0000000..db8bb64
--- /dev/null
+++ b/src/server/actions/get-user.ts
@@ -0,0 +1,15 @@
+"use server"
+import { trpc } from "../trpc"
+
+export async function getUser(username: string) {
+  const { user } = await trpc.tg.users.getByUsername.query({ username })
+  if (!user) {
+    return null
+  }
+
+  const { roles, groupAdmin } = await trpc.tg.permissions.getRoles.query({ userId: user.id })
+  const { messages } = await trpc.tg.messages.getLastByUser.query({ userId: user.id, limit: 15 })
+  const audit = await trpc.tg.auditLog.getById.query({ targetId: user.id })
+
+  return { roles, groupAdmin, user, messages, audits: audit }
+}
diff --git a/src/server/trpc/index.tsx b/src/server/trpc/index.tsx
new file mode 100644
index 0000000..1d68f02
--- /dev/null
+++ b/src/server/trpc/index.tsx
@@ -0,0 +1,16 @@
+import "server-only"
+
+import { type AppRouter, TRPC_PATH } from "@polinetwork/backend"
+import { createTRPCClient, httpBatchLink } from "@trpc/client"
+import SuperJSON from "superjson"
+import { getBaseUrl } from "../../lib/utils"
+
+const url = getBaseUrl() + TRPC_PATH
+export const trpc = createTRPCClient<AppRouter>({
+  links: [
+    httpBatchLink({
+      url,
+      transformer: SuperJSON,
+    }),
+  ],
+})
diff --git a/src/lib/trpc/server.tsx b/src/server/trpc/server.tsx
similarity index 96%
rename from src/lib/trpc/server.tsx
rename to src/server/trpc/server.tsx
index 93d09af..2a1bba6 100644
--- a/src/lib/trpc/server.tsx
+++ b/src/server/trpc/server.tsx
@@ -6,7 +6,7 @@ import { createTRPCClient, httpLink } from "@trpc/client"
 import { createTRPCOptionsProxy, type TRPCQueryOptions } from "@trpc/tanstack-react-query"
 import { cache } from "react"
 import SuperJSON from "superjson"
-import { getBaseUrl } from "../utils"
+import { getBaseUrl } from "../../lib/utils"
 import { makeQueryClient } from "./query-client"
 
 const url = getBaseUrl() + TRPC_PATH
diff --git a/src/lib/trpc/types.tsx b/src/server/trpc/types.tsx
similarity index 100%
rename from src/lib/trpc/types.tsx
rename to src/server/trpc/types.tsx

From 0bf1c70c225d1ba906dbe68ee0e2c71dd30b2d3e Mon Sep 17 00:00:00 2001
From: Lorenzo Corallo <lorenzo.corallo@outlook.it>
Date: Mon, 13 Apr 2026 00:24:21 +0200
Subject: [PATCH 02/22] checkpoint

---
 .../telegram/user-details/card-audit-log.tsx       | 14 +++++---------
 .../(active)/telegram/user-details/page.tsx        | 12 +++++++-----
 src/server/actions/get-user.ts                     | 11 +++++++++--
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/app/dashboard/(active)/telegram/user-details/card-audit-log.tsx b/src/app/dashboard/(active)/telegram/user-details/card-audit-log.tsx
index cde007f..9896149 100644
--- a/src/app/dashboard/(active)/telegram/user-details/card-audit-log.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/card-audit-log.tsx
@@ -1,15 +1,11 @@
-import { useQuery } from "@tanstack/react-query"
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"
 import { fmtUser } from "@/lib/utils/telegram"
-// import { useTRPC } from "@/server/trpc"
-import type { ApiOutput } from "@/server/trpc/types"
+import type { searchUser } from "@/server/actions/get-user"
 
-type Log = NonNullable<ApiOutput["tg"]["auditLog"]["getById"]>[number]
-export function AuditLogCard({ log: m }: { log: Log }) {
-  // const trpc = useTRPC()
-
-  // const { data: admin } = useQuery(trpc.tg.users.get.queryOptions({ userId: m.adminId }))
+type Data = Awaited<ReturnType<typeof searchUser>>
+type Log = NonNullable<Data>["audits"][number]
 
+export function AuditLogCard({ log: m }: { log: Log }) {
   return (
     <Card>
       <CardHeader>
@@ -21,7 +17,7 @@ export function AuditLogCard({ log: m }: { log: Log }) {
           {m.groupTitle && <span>{m.groupTitle}</span>} [{m.groupId}]
         </p>
         <span className="text-muted-foreground">Admin ID: </span>
-        {/*<p>{admin?.user && fmtUser(admin.user)}</p>*/}
+        <p>{m.admin?.user && fmtUser(m.admin.user)}</p>
 
         {m.createdAt && (
           <>
diff --git a/src/app/dashboard/(active)/telegram/user-details/page.tsx b/src/app/dashboard/(active)/telegram/user-details/page.tsx
index 9bcc45c..5d55858 100644
--- a/src/app/dashboard/(active)/telegram/user-details/page.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/page.tsx
@@ -1,12 +1,12 @@
 "use client"
 import { ArrowLeft, RefreshCcw, Search, X } from "lucide-react"
 import Link from "next/link"
-import { startTransition, useActionState, useState } from "react"
+import { Suspense, startTransition, useActionState, useState } from "react"
 import { Spinner } from "@/components/spinner"
 import { Button } from "@/components/ui/button"
 import { Input } from "@/components/ui/input"
 import { Label } from "@/components/ui/label"
-import { getUser } from "@/server/actions/get-user"
+import { searchUser } from "@/server/actions/get-user"
 import { AuditLogCard } from "./card-audit-log"
 import { GroupAdminCard } from "./card-group-admin"
 import { MessageCard } from "./card-message"
@@ -14,11 +14,11 @@ import { UserGrantCard } from "./card-user-grant"
 import { UserInfoCard } from "./card-user-info"
 import { NewGroupAdmin } from "./new-group-admin"
 
-type Data = Awaited<ReturnType<typeof getUser>>
+type Data = Awaited<ReturnType<typeof searchUser>>
 
 export default function TgUsers() {
   const [username, setUsername] = useState("")
-  const [data, action, pending] = useActionState<Data | null>(() => (username ? getUser(username) : null), null)
+  const [data, action, pending] = useActionState<Data | null>(() => (username ? searchUser(username) : null), null)
 
   function reset() {
     setUsername("")
@@ -113,7 +113,9 @@ export default function TgUsers() {
           <p className="pt-6">Audit log:</p>
           <div className="grid grid-cols-3 py-2 gap-4">
             {data.audits.map((m) => (
-              <AuditLogCard log={m} key={`${m.id}-${m.type}`} />
+              <Suspense fallback={null} key={`${m.id}-${m.type}`}>
+                <AuditLogCard log={m} />
+              </Suspense>
             ))}
             {data.audits.length === 0 && (
               <p className="bg-card rounded-lg p-3 italic text-muted-foreground text-sm">
diff --git a/src/server/actions/get-user.ts b/src/server/actions/get-user.ts
index db8bb64..ea89fe8 100644
--- a/src/server/actions/get-user.ts
+++ b/src/server/actions/get-user.ts
@@ -1,7 +1,7 @@
 "use server"
 import { trpc } from "../trpc"
 
-export async function getUser(username: string) {
+export async function searchUser(username: string) {
   const { user } = await trpc.tg.users.getByUsername.query({ username })
   if (!user) {
     return null
@@ -11,5 +11,12 @@ export async function getUser(username: string) {
   const { messages } = await trpc.tg.messages.getLastByUser.query({ userId: user.id, limit: 15 })
   const audit = await trpc.tg.auditLog.getById.query({ targetId: user.id })
 
-  return { roles, groupAdmin, user, messages, audits: audit }
+  const audits = await Promise.all(
+    audit.map(async (audit) => ({
+      ...audit,
+      admin: await trpc.tg.users.get.query({ userId: audit.adminId }).catch(() => null),
+    }))
+  )
+
+  return { roles, groupAdmin, user, messages, audits }
 }

From d93aa85130d808a9789ffa3f0b49996d43564639 Mon Sep 17 00:00:00 2001
From: Lorenzo Corallo <lorenzo.corallo@outlook.it>
Date: Mon, 13 Apr 2026 00:35:16 +0200
Subject: [PATCH 03/22] checkpoint

---
 .../telegram/user-details/card-audit-log.tsx  |  2 +-
 .../telegram/user-details/new-group-admin.tsx | 29 ++++++-------------
 .../(active)/telegram/user-details/page.tsx   |  8 +++--
 src/server/actions/groups.ts                  |  7 +++++
 src/server/actions/{get-user.ts => users.ts}  |  4 +++
 5 files changed, 27 insertions(+), 23 deletions(-)
 create mode 100644 src/server/actions/groups.ts
 rename src/server/actions/{get-user.ts => users.ts} (81%)

diff --git a/src/app/dashboard/(active)/telegram/user-details/card-audit-log.tsx b/src/app/dashboard/(active)/telegram/user-details/card-audit-log.tsx
index 9896149..6b17205 100644
--- a/src/app/dashboard/(active)/telegram/user-details/card-audit-log.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/card-audit-log.tsx
@@ -1,6 +1,6 @@
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"
 import { fmtUser } from "@/lib/utils/telegram"
-import type { searchUser } from "@/server/actions/get-user"
+import type { searchUser } from "@/server/actions/users"
 
 type Data = Awaited<ReturnType<typeof searchUser>>
 type Log = NonNullable<Data>["audits"][number]
diff --git a/src/app/dashboard/(active)/telegram/user-details/new-group-admin.tsx b/src/app/dashboard/(active)/telegram/user-details/new-group-admin.tsx
index 8d4aac5..1dac5cd 100644
--- a/src/app/dashboard/(active)/telegram/user-details/new-group-admin.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/new-group-admin.tsx
@@ -1,7 +1,5 @@
 "use client"
-import { useMutation, useQueryClient } from "@tanstack/react-query"
 import { Plus, Search, X } from "lucide-react"
-import { useRouter } from "next/navigation"
 import { useState } from "react"
 import { toast } from "sonner"
 import { Button } from "@/components/ui/button"
@@ -19,32 +17,25 @@ import { Input } from "@/components/ui/input"
 import { Label } from "@/components/ui/label"
 import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger } from "@/components/ui/select"
 import { useSession } from "@/lib/auth"
-// import { useTRPC } from "@/server/trpc"
+import { searchGroup } from "@/server/actions/groups"
+import { addGroupAdmin } from "@/server/actions/users"
 import type { ApiOutput } from "@/server/trpc/types"
 
 type Groups = ApiOutput["tg"]["groups"]["search"]["groups"]
 type User = ApiOutput["tg"]["users"]["getByUsername"]["user"]
 
-export function NewGroupAdmin({ user, alreadyIn }: { user: User; alreadyIn: number[] }) {
+export function NewGroupAdmin({ user, alreadyIn, onConfirm }: { user: User; alreadyIn: number[]; onConfirm(): void }) {
   const sesh = useSession()
   const adderId = sesh.data?.user.telegramId
 
-  // const trpc = useTRPC()
-  // const qc = useQueryClient()
-  const router = useRouter()
-
   const [open, setOpen] = useState(false)
   const [groupQuery, setGroupQuery] = useState("")
   const [groups, setGroups] = useState<Groups>([])
   const [selectedGroup, setSelectedGroup] = useState<Groups[number] | null>(null)
 
-  // const queryOpts = trpc.tg.groups.search.queryOptions({ query: groupQuery, limit: 20, showHidden: true })
-
-  async function searchGroup(e: React.FormEvent<HTMLFormElement>) {
-    e.preventDefault()
-
-    // const res = await qc.fetchQuery(queryOpts)
-    // setGroups(res.groups.filter((g) => !alreadyIn.includes(g.telegramId)))
+  async function search() {
+    const { groups } = await searchGroup(groupQuery)
+    setGroups(groups.filter((g) => !alreadyIn.includes(g.telegramId)))
   }
 
   // const submitMutation = useMutation(trpc.tg.permissions.addGroup.mutationOptions())
@@ -55,10 +46,10 @@ export function NewGroupAdmin({ user, alreadyIn }: { user: User; alreadyIn: numb
     if (!user) return toast.warning("Invalid user, try restarting the dialog")
 
     try {
-      // await submitMutation.mutateAsync({ adderId, groupId: selectedGroup?.telegramId, userId: user.id })
+      await addGroupAdmin(user.id, selectedGroup.telegramId, adderId)
       toast.info(`Group admin added`)
       handleOpenChange(false)
-      router.refresh()
+      onConfirm()
     } catch (err) {
       console.error(err)
       handleOpenChange(false)
@@ -75,8 +66,6 @@ export function NewGroupAdmin({ user, alreadyIn }: { user: User; alreadyIn: numb
   function handleOpenChange(v: boolean) {
     setOpen(v)
     if (v === false) {
-      // closing
-      // qc.invalidateQueries(trpc.tg.permissions.getRoles.queryOptions({ userId: user?.id ?? 0 }))
       reset()
     }
   }
@@ -101,7 +90,7 @@ export function NewGroupAdmin({ user, alreadyIn }: { user: User; alreadyIn: numb
           </p>
         )}
 
-        <form onSubmit={searchGroup} className="pt-2 gap-y-4 flex flex-col justify-start items-start">
+        <form action={search} className="pt-2 gap-y-4 flex flex-col justify-start items-start">
           <div className="flex gap-2 flex-col items-start justify-start w-full">
             <Label htmlFor="group-query" className="text-base">
               Search Group
diff --git a/src/app/dashboard/(active)/telegram/user-details/page.tsx b/src/app/dashboard/(active)/telegram/user-details/page.tsx
index 5d55858..2319d7e 100644
--- a/src/app/dashboard/(active)/telegram/user-details/page.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/page.tsx
@@ -6,7 +6,7 @@ import { Spinner } from "@/components/spinner"
 import { Button } from "@/components/ui/button"
 import { Input } from "@/components/ui/input"
 import { Label } from "@/components/ui/label"
-import { searchUser } from "@/server/actions/get-user"
+import { searchUser } from "@/server/actions/users"
 import { AuditLogCard } from "./card-audit-log"
 import { GroupAdminCard } from "./card-group-admin"
 import { MessageCard } from "./card-message"
@@ -81,7 +81,11 @@ export default function TgUsers() {
 
           <div className="pt-6 flex gap-4 items-center">
             <p>Admin in groups:</p>
-            <NewGroupAdmin user={data.user} alreadyIn={data.groupAdmin.map((g) => g?.group.id ?? 0) ?? []} />
+            <NewGroupAdmin
+              user={data.user}
+              alreadyIn={data.groupAdmin.map((g) => g?.group.id ?? 0) ?? []}
+              onConfirm={() => startTransition(action)}
+            />
           </div>
           <div className="grid grid-cols-4 py-2 gap-4">
             {data.groupAdmin
diff --git a/src/server/actions/groups.ts b/src/server/actions/groups.ts
new file mode 100644
index 0000000..95a8f29
--- /dev/null
+++ b/src/server/actions/groups.ts
@@ -0,0 +1,7 @@
+"use server"
+
+import { trpc } from "../trpc"
+
+export async function searchGroup(query: string) {
+  return trpc.tg.groups.search.query({ query, limit: 20, showHidden: true })
+}
diff --git a/src/server/actions/get-user.ts b/src/server/actions/users.ts
similarity index 81%
rename from src/server/actions/get-user.ts
rename to src/server/actions/users.ts
index ea89fe8..f9e7637 100644
--- a/src/server/actions/get-user.ts
+++ b/src/server/actions/users.ts
@@ -20,3 +20,7 @@ export async function searchUser(username: string) {
 
   return { roles, groupAdmin, user, messages, audits }
 }
+
+export async function addGroupAdmin(userId: number, groupId: number, adderId: number) {
+  await trpc.tg.permissions.addGroup.mutate({ userId, adderId, groupId })
+}

From bbb5e5ff3b007d48e37864e2a05e6dea6a7ff529 Mon Sep 17 00:00:00 2001
From: Lorenzo Corallo <lorenzo.corallo@outlook.it>
Date: Mon, 13 Apr 2026 00:44:34 +0200
Subject: [PATCH 04/22] checkpoint: user-details components

---
 .../telegram/user-details/add-role.tsx        | 23 ++++--------
 .../user-details/card-group-admin.tsx         |  4 ++-
 .../telegram/user-details/card-user-info.tsx  | 14 ++++++--
 .../user-details/delete-group-admin.tsx       | 36 +++++++------------
 .../(active)/telegram/user-details/page.tsx   | 10 ++++--
 .../telegram/user-details/remove-role.tsx     | 15 +++-----
 src/server/actions/users.ts                   | 13 +++++++
 src/server/trpc/types.tsx                     |  1 +
 8 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/src/app/dashboard/(active)/telegram/user-details/add-role.tsx b/src/app/dashboard/(active)/telegram/user-details/add-role.tsx
index b21085f..789f04d 100644
--- a/src/app/dashboard/(active)/telegram/user-details/add-role.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/add-role.tsx
@@ -19,11 +19,8 @@ import {
 } from "@/components/ui/dialog"
 import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
 import { useSession } from "@/lib/auth"
-// import { useTRPC } from "@/server/trpc"
-import type { ApiInput, ApiOutput } from "@/server/trpc/types"
-
-type User = ApiOutput["tg"]["users"]["getByUsername"]["user"]
-type Roles = NonNullable<ApiOutput["tg"]["permissions"]["getRoles"]["roles"]>
+import { addUserRole } from "@/server/actions/users"
+import type { ApiOutput, TgUser, TgUserRole } from "@/server/trpc/types"
 
 const ARRAY_USER_ROLES = [
   USER_ROLE.ADMIN,
@@ -34,7 +31,7 @@ const ARRAY_USER_ROLES = [
   USER_ROLE.PRESIDENT,
 ] as const
 
-export function AddRole({ user, alreadyRoles }: { user: User; alreadyRoles: Roles }) {
+export function AddRole({ user, alreadyRoles, onAdd }: { user: TgUser; alreadyRoles: TgUserRole[]; onAdd(): void }) {
   const sesh = useSession()
   const adderId = sesh.data?.user.telegramId
 
@@ -43,14 +40,8 @@ export function AddRole({ user, alreadyRoles }: { user: User; alreadyRoles: Role
     label: `${g.slice(0, 1).toUpperCase()}${g.slice(1)}`,
   }))
 
-  // const trpc = useTRPC()
-  // const qc = useQueryClient()
-  const router = useRouter()
-
   const [open, setOpen] = useState(false)
-  const [selectedRole, setSelectedRole] = useState<Roles[number] | null>(null)
-
-  // const submitMutation = useMutation(trpc.tg.permissions.addRole.mutationOptions())
+  const [selectedRole, setSelectedRole] = useState<TgUserRole | null>(null)
 
   async function submit() {
     if (!adderId) return toast.warning("Invalid session, try reloading the page")
@@ -58,10 +49,10 @@ export function AddRole({ user, alreadyRoles }: { user: User; alreadyRoles: Role
     if (!user) return toast.warning("Invalid user, try restarting the dialog")
 
     try {
-      // await submitMutation.mutateAsync({ adderId, userId: user.id, role: selectedRole })
+      await addUserRole(user.id, selectedRole, adderId)
       toast.info(`Role added`)
       handleOpenChange(false)
-      router.refresh()
+      onAdd()
     } catch (err) {
       console.error(err)
       handleOpenChange(false)
@@ -72,8 +63,6 @@ export function AddRole({ user, alreadyRoles }: { user: User; alreadyRoles: Role
   function handleOpenChange(v: boolean) {
     setOpen(v)
     if (v === false) {
-      // closing
-      // qc.invalidateQueries(trpc.tg.permissions.getRoles.queryOptions({ userId: user?.id ?? 0 }))
       setSelectedRole(null)
     }
   }
diff --git a/src/app/dashboard/(active)/telegram/user-details/card-group-admin.tsx b/src/app/dashboard/(active)/telegram/user-details/card-group-admin.tsx
index fce04b0..e098242 100644
--- a/src/app/dashboard/(active)/telegram/user-details/card-group-admin.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/card-group-admin.tsx
@@ -10,9 +10,11 @@ type GroupAdminSingle = NonNullable<ApiOutput["tg"]["permissions"]["getRoles"]["
 export function GroupAdminCard({
   user,
   groupAdminInfo: m,
+  onDelete,
 }: {
   user: NonNullable<User>
   groupAdminInfo: GroupAdminSingle
+  onDelete(): void
 }) {
   return (
     <Card>
@@ -30,7 +32,7 @@ export function GroupAdminCard({
         </p>
       </CardContent>
       <CardFooter className="justify-end gap-2">
-        <DeleteGroupAdmin userId={user.id} chatId={m.group.id} />
+        <DeleteGroupAdmin userId={user.id} chatId={m.group.id} onDelete={onDelete} />
       </CardFooter>
     </Card>
   )
diff --git a/src/app/dashboard/(active)/telegram/user-details/card-user-info.tsx b/src/app/dashboard/(active)/telegram/user-details/card-user-info.tsx
index c9fc339..fabef3a 100644
--- a/src/app/dashboard/(active)/telegram/user-details/card-user-info.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/card-user-info.tsx
@@ -9,7 +9,15 @@ import { RemoveRole } from "./remove-role"
 type User = ApiOutput["tg"]["users"]["getByUsername"]["user"]
 type UserRoles = ApiOutput["tg"]["permissions"]["getRoles"]["roles"]
 
-export function UserInfoCard({ user, roles }: { user: NonNullable<User>; roles: UserRoles }) {
+export function UserInfoCard({
+  user,
+  roles,
+  onUpdate,
+}: {
+  user: NonNullable<User>
+  roles: UserRoles
+  onUpdate(): void
+}) {
   const sesh = useSession()
   const seshUserId = sesh.data?.user.telegramId
   const isSelf = seshUserId && seshUserId === user.id
@@ -41,8 +49,8 @@ export function UserInfoCard({ user, roles }: { user: NonNullable<User>; roles:
         </div>
       </CardContent>
       <CardFooter className="gap-2">
-        <AddRole alreadyRoles={roles ?? []} user={user} />
-        <RemoveRole alreadyRoles={roles ?? []} user={user} />
+        <AddRole alreadyRoles={roles ?? []} user={user} onAdd={onUpdate} />
+        <RemoveRole alreadyRoles={roles ?? []} user={user} onDelete={onUpdate} />
       </CardFooter>
     </Card>
   )
diff --git a/src/app/dashboard/(active)/telegram/user-details/delete-group-admin.tsx b/src/app/dashboard/(active)/telegram/user-details/delete-group-admin.tsx
index b4a58ea..1b85966 100644
--- a/src/app/dashboard/(active)/telegram/user-details/delete-group-admin.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/delete-group-admin.tsx
@@ -1,8 +1,6 @@
 "use client"
 
-import { useMutation, useQueryClient } from "@tanstack/react-query"
 import { Trash2, Trash2Icon } from "lucide-react"
-import { useRouter } from "next/navigation"
 import { useState } from "react"
 import { toast } from "sonner"
 import {
@@ -19,42 +17,32 @@ import {
 } from "@/components/ui/alert-dialog"
 import { Button } from "@/components/ui/button"
 import { useSession } from "@/lib/auth"
-// import { useTRPC } from "@/server/trpc"
+import { delGroupAdmin } from "@/server/actions/users"
 
-export function DeleteGroupAdmin({ userId, chatId }: { userId: number; chatId: number }) {
-  const router = useRouter()
+export function DeleteGroupAdmin({ userId, chatId, onDelete }: { userId: number; chatId: number; onDelete(): void }) {
   const sesh = useSession()
 
-  // const qc = useQueryClient()
-  // const trpc = useTRPC()
   const removerId = sesh.data?.user.telegramId
-  // const { mutateAsync } = useMutation(trpc.tg.permissions.removeGroup.mutationOptions())
 
   const [open, setOpen] = useState(false)
 
   async function deleteGroupAdmin() {
     if (!removerId) return toast.error("Invalid session, try to reload the page")
-    // const { error } = await mutateAsync({ removerId, userId, groupId: chatId })
-    // if (error) {
-    //   toast.error("There was an error")
-    //   console.error(error)
-    // } else {
-    //   toast.success("Group Admin deleted!")
-    // }
 
-    handleOpenChange(false)
-  }
-
-  function handleOpenChange(v: boolean) {
-    setOpen(v)
-    if (v === false) {
-      // qc.invalidateQueries(trpc.tg.permissions.getRoles.queryOptions({ userId }))
-      router.refresh()
+    try {
+      await delGroupAdmin(userId, chatId, removerId)
+      toast.success("Group Admin deleted!")
+      onDelete()
+    } catch (err) {
+      toast.error("There was an error")
+      console.error(err)
     }
+
+    setOpen(false)
   }
 
   return (
-    <AlertDialog open={open} onOpenChange={handleOpenChange}>
+    <AlertDialog open={open} onOpenChange={setOpen}>
       <AlertDialogTrigger
         render={
           <Button variant="destructive">
diff --git a/src/app/dashboard/(active)/telegram/user-details/page.tsx b/src/app/dashboard/(active)/telegram/user-details/page.tsx
index 2319d7e..a842e76 100644
--- a/src/app/dashboard/(active)/telegram/user-details/page.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/page.tsx
@@ -2,6 +2,7 @@
 import { ArrowLeft, RefreshCcw, Search, X } from "lucide-react"
 import Link from "next/link"
 import { Suspense, startTransition, useActionState, useState } from "react"
+import { start } from "repl"
 import { Spinner } from "@/components/spinner"
 import { Button } from "@/components/ui/button"
 import { Input } from "@/components/ui/input"
@@ -75,7 +76,7 @@ export default function TgUsers() {
       {data && (
         <>
           <div className="grid grid-cols-3 items-start">
-            <UserInfoCard user={data.user} roles={data.roles ?? []} />
+            <UserInfoCard user={data.user} roles={data.roles ?? []} onUpdate={() => startTransition(action)} />
             <UserGrantCard user={data.user} />
           </div>
 
@@ -91,7 +92,12 @@ export default function TgUsers() {
             {data.groupAdmin
               .filter((m) => m !== null && m !== undefined)
               .map((m) => (
-                <GroupAdminCard groupAdminInfo={m} user={data.user} key={m.group.id} />
+                <GroupAdminCard
+                  groupAdminInfo={m}
+                  user={data.user}
+                  key={m.group.id}
+                  onDelete={() => startTransition(action)}
+                />
               ))}
 
             {data.groupAdmin.length === 0 && (
diff --git a/src/app/dashboard/(active)/telegram/user-details/remove-role.tsx b/src/app/dashboard/(active)/telegram/user-details/remove-role.tsx
index 11eed4d..6d66409 100644
--- a/src/app/dashboard/(active)/telegram/user-details/remove-role.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/remove-role.tsx
@@ -19,6 +19,7 @@ import {
 } from "@/components/ui/dialog"
 import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
 import { useSession } from "@/lib/auth"
+import { delUserRole } from "@/server/actions/users"
 // import { useTRPC } from "@/server/trpc"
 import type { ApiOutput } from "@/server/trpc/types"
 
@@ -34,7 +35,7 @@ const ARRAY_USER_ROLES = [
   USER_ROLE.PRESIDENT,
 ] as const
 
-export function RemoveRole({ user, alreadyRoles }: { user: User; alreadyRoles: Roles }) {
+export function RemoveRole({ user, alreadyRoles, onDelete }: { user: User; alreadyRoles: Roles; onDelete(): void }) {
   const sesh = useSession()
   const removerId = sesh.data?.user.telegramId
 
@@ -43,25 +44,19 @@ export function RemoveRole({ user, alreadyRoles }: { user: User; alreadyRoles: R
     label: `${g.slice(0, 1).toUpperCase()}${g.slice(1)}`,
   }))
 
-  // const trpc = useTRPC()
-  // const qc = useQueryClient()
-  const router = useRouter()
-
   const [open, setOpen] = useState(false)
   const [selectedRole, setSelectedRole] = useState<Roles[number] | null>(null)
 
-  // const submitMutation = useMutation(trpc.tg.permissions.removeRole.mutationOptions())
-
   async function submit() {
     if (!removerId) return toast.warning("Invalid session, try reloading the page")
     if (!selectedRole) return toast.warning("No group selected, cannot proceed")
     if (!user) return toast.warning("Invalid user, try restarting the dialog")
 
     try {
-      // await submitMutation.mutateAsync({ removerId, userId: user.id, role: selectedRole })
+      await delUserRole(user.id, selectedRole, removerId)
       toast.info(`Role removed`)
       handleOpenChange(false)
-      router.refresh()
+      onDelete()
     } catch (err) {
       console.error(err)
       handleOpenChange(false)
@@ -72,8 +67,6 @@ export function RemoveRole({ user, alreadyRoles }: { user: User; alreadyRoles: R
   function handleOpenChange(v: boolean) {
     setOpen(v)
     if (v === false) {
-      // closing
-      // qc.invalidateQueries(trpc.tg.permissions.getRoles.queryOptions({ userId: user?.id ?? 0 }))
       setSelectedRole(null)
     }
   }
diff --git a/src/server/actions/users.ts b/src/server/actions/users.ts
index f9e7637..df8c18d 100644
--- a/src/server/actions/users.ts
+++ b/src/server/actions/users.ts
@@ -1,5 +1,6 @@
 "use server"
 import { trpc } from "../trpc"
+import type { TgUserRole } from "../trpc/types"
 
 export async function searchUser(username: string) {
   const { user } = await trpc.tg.users.getByUsername.query({ username })
@@ -24,3 +25,15 @@ export async function searchUser(username: string) {
 export async function addGroupAdmin(userId: number, groupId: number, adderId: number) {
   await trpc.tg.permissions.addGroup.mutate({ userId, adderId, groupId })
 }
+
+export async function delGroupAdmin(userId: number, groupId: number, removerId: number) {
+  await trpc.tg.permissions.removeGroup.mutate({ userId, removerId, groupId })
+}
+
+export async function addUserRole(userId: number, role: TgUserRole, adderId: number) {
+  await trpc.tg.permissions.addRole.mutate({ userId, role, adderId })
+}
+
+export async function delUserRole(userId: number, role: TgUserRole, removerId: number) {
+  await trpc.tg.permissions.removeRole.mutate({ userId, role, removerId })
+}
diff --git a/src/server/trpc/types.tsx b/src/server/trpc/types.tsx
index e6f82e0..ab0a9b1 100644
--- a/src/server/trpc/types.tsx
+++ b/src/server/trpc/types.tsx
@@ -7,3 +7,4 @@ export type ApiError = inferRouterError<AppRouter>
 
 export type TgUser = NonNullable<ApiOutput["tg"]["users"]["get"]["user"]>
 export type TgGroup = NonNullable<ApiOutput["tg"]["groups"]["search"]["groups"][number]>
+export type TgUserRole = NonNullable<ApiInput["tg"]["permissions"]["addRole"]["role"]>

From 09194834117fcd8bc95d2535260aeb579904f9fc Mon Sep 17 00:00:00 2001
From: Lorenzo Corallo <lorenzo.corallo@outlook.it>
Date: Mon, 13 Apr 2026 00:58:08 +0200
Subject: [PATCH 05/22] checkpoint: grants

---
 .../(active)/telegram/grants/delete-grant.tsx | 24 ++++++------
 .../(active)/telegram/grants/grant-list.tsx   | 11 ++----
 .../(active)/telegram/grants/new-grant.tsx    | 39 +++++++++----------
 .../(active)/telegram/grants/page.tsx         |  8 +++-
 src/components/user-select.tsx                | 11 +-----
 src/server/actions/grants.ts                  | 12 ++++++
 src/server/actions/users.ts                   | 14 +++++--
 7 files changed, 64 insertions(+), 55 deletions(-)
 create mode 100644 src/server/actions/grants.ts

diff --git a/src/app/dashboard/(active)/telegram/grants/delete-grant.tsx b/src/app/dashboard/(active)/telegram/grants/delete-grant.tsx
index 22414d1..332100d 100644
--- a/src/app/dashboard/(active)/telegram/grants/delete-grant.tsx
+++ b/src/app/dashboard/(active)/telegram/grants/delete-grant.tsx
@@ -1,7 +1,7 @@
 "use client"
 
-import { useMutation, useQueryClient } from "@tanstack/react-query"
-import { OctagonX, Square, Trash2, Trash2Icon } from "lucide-react"
+import { OctagonX } from "lucide-react"
+import { useRouter } from "next/navigation"
 import { useState } from "react"
 import { toast } from "sonner"
 import {
@@ -18,26 +18,26 @@ import {
 } from "@/components/ui/alert-dialog"
 import { Button } from "@/components/ui/button"
 import { useSession } from "@/lib/auth"
-// import { useTRPC } from "@/server/trpc"
+import { interruptGrant } from "@/server/actions/grants"
 
 export function DeleteGrant({ userId }: { userId: number }) {
   const sesh = useSession()
-
-  // const qc = useQueryClient()
-  // const trpc = useTRPC()
   const removerId = sesh.data?.user.telegramId
-  // const { mutateAsync } = useMutation(trpc.tg.grants.interrupt.mutationOptions())
 
+  const router = useRouter()
   const [open, setOpen] = useState(false)
 
   async function interrupt() {
     if (!removerId) return toast.error("Invalid session, try to reload the page")
-    // const { error } = await mutateAsync({ userId, interruptedById: removerId, sendTgLog: true })
+    const { error } = await interruptGrant({ userId, interruptedById: removerId, sendTgLog: true })
 
-    // if (error === "NOT_FOUND") toast.info("The grant was expired or already interrupted")
-    // else if (error === "UNAUTHORIZED") toast.error("You don't have enought permission")
-    // else if (error === "INTERNAL_SERVER_ERROR") toast.error("There was an internal server error")
-    // else toast.success("Grant interrupted successfully")
+    if (error === "NOT_FOUND") toast.info("The grant was expired or already interrupted")
+    else if (error === "UNAUTHORIZED") toast.error("You don't have enought permission")
+    else if (error === "INTERNAL_SERVER_ERROR") toast.error("There was an internal server error")
+    else {
+      toast.success("Grant interrupted successfully")
+      router.refresh()
+    }
 
     handleOpenChange(false)
   }
diff --git a/src/app/dashboard/(active)/telegram/grants/grant-list.tsx b/src/app/dashboard/(active)/telegram/grants/grant-list.tsx
index ff32ce2..2a4e931 100644
--- a/src/app/dashboard/(active)/telegram/grants/grant-list.tsx
+++ b/src/app/dashboard/(active)/telegram/grants/grant-list.tsx
@@ -1,16 +1,11 @@
 "use client"
-import { useQuery } from "@tanstack/react-query"
 import { format } from "date-fns"
-import { useTRPC } from "@/server/trpc"
 import type { ApiOutput } from "@/server/trpc/types"
 import { DeleteGrant } from "./delete-grant"
 
 type Grants = NonNullable<ApiOutput["tg"]["grants"]["getOngoing"]["grants"]>
 
-export function GrantList() {
-  const trpc = useTRPC()
-  const { data } = useQuery(trpc.tg.grants.getOngoing.queryOptions())
-
+export function GrantList({ grants }: { grants: Grants }) {
   return (
     <div className="flex flex-col w-full items-start justify-start py-4">
       <div className="grid gap-4 items-center grid-cols-5 w-full border-b py-2 font-bold">
@@ -20,10 +15,10 @@ export function GrantList() {
         <p>End Date</p>
         <p>Interrupt</p>
       </div>
-      {data?.grants?.map((r) => (
+      {grants.map((r) => (
         <GrantRow row={r} key={r.grant.id} />
       ))}
-      {data?.grants.length === 0 && <div className="w-full text-center py-2 italic">There are no ongoing grants</div>}
+      {grants.length === 0 && <div className="w-full text-center py-2 italic">There are no ongoing grants</div>}
     </div>
   )
 }
diff --git a/src/app/dashboard/(active)/telegram/grants/new-grant.tsx b/src/app/dashboard/(active)/telegram/grants/new-grant.tsx
index 6e6f589..051b8f2 100644
--- a/src/app/dashboard/(active)/telegram/grants/new-grant.tsx
+++ b/src/app/dashboard/(active)/telegram/grants/new-grant.tsx
@@ -1,8 +1,8 @@
 "use client"
 
-import { useMutation, useQueryClient } from "@tanstack/react-query"
 import { format } from "date-fns"
 import { ChevronDownIcon, Plus } from "lucide-react"
+import { useRouter } from "next/navigation"
 import { useCallback, useEffect, useState } from "react"
 import { toast } from "sonner"
 import { Button } from "@/components/ui/button"
@@ -33,17 +33,14 @@ import {
 } from "@/components/ui/select"
 import { UserSelect } from "@/components/user-select"
 import { useSession } from "@/lib/auth"
-// import { useTRPC } from "@/server/trpc"
+import { createGrant } from "@/server/actions/grants"
 import type { TgUser } from "@/server/trpc/types"
 
 export function NewGrant() {
   const sesh = useSession()
+  const router = useRouter()
   const adderId = sesh.data?.user.telegramId
 
-  // const trpc = useTRPC()
-  // const qc = useQueryClient()
-  // const mutation = useMutation(trpc.tg.grants.create.mutationOptions())
-
   const [open, setOpen] = useState(false)
   const [user, setUser] = useState<TgUser | null>(null)
   const [startDate, setStartDate] = useState<Date | undefined>()
@@ -59,8 +56,6 @@ export function NewGrant() {
       setStartDate(undefined)
       setEndDate(undefined)
       setReason("")
-      // qc.invalidateQueries(trpc.tg.grants.getOngoing.queryOptions())
-      // if (user) qc.invalidateQueries(trpc.tg.grants.checkUser.queryOptions({ userId: user.id }))
     }
   }
 
@@ -81,19 +76,23 @@ export function NewGrant() {
 
   async function create() {
     if (!user || !startDate || !endDate || !adderId) return
-    // const res = await mutation.mutateAsync({
-    //   userId: user.id,
-    //   adderId,
-    //   since: startDate,
-    //   until: endDate,
-    //   reason: reason || undefined,
-    //   sendTgLog: true,
-    // })
+    const res = await createGrant({
+      userId: user.id,
+      adderId,
+      since: startDate,
+      until: endDate,
+      reason: reason || undefined,
+      sendTgLog: true,
+    })
+
+    if (res.error === "UNAUTHORIZED") toast.error("You don't have permission to create grants.")
+    else if (res.error === "ALREADY_EXISTING") toast.error("This user already has an ongoing grant.")
+    else if (res.error === "INTERNAL_SERVER_ERROR") toast.error("There was a server error.")
+    else {
+      toast.success("Grant created successfully!")
+      router.refresh()
+    }
 
-    // if (res.error === "UNAUTHORIZED") toast.error("You don't have permission to create grants.")
-    // else if (res.error === "ALREADY_EXISTING") toast.error("This user already has an ongoing grant.")
-    // else if (res.error === "INTERNAL_SERVER_ERROR") toast.error("There was a server error.")
-    // else toast.success("Grant created successfully!")
     handleOpenChange(false)
   }
 
diff --git a/src/app/dashboard/(active)/telegram/grants/page.tsx b/src/app/dashboard/(active)/telegram/grants/page.tsx
index d76971b..e2a7359 100644
--- a/src/app/dashboard/(active)/telegram/grants/page.tsx
+++ b/src/app/dashboard/(active)/telegram/grants/page.tsx
@@ -1,9 +1,13 @@
+"use server"
 import { ArrowLeft } from "lucide-react"
 import Link from "next/link"
+import { trpc } from "@/server/trpc"
 import { GrantList } from "./grant-list"
 import { NewGrant } from "./new-grant"
 
-export default function GrantsPage() {
+export default async function GrantsPage() {
+  const { grants } = await trpc.tg.grants.getOngoing.query()
+
   return (
     <div className="container p-8">
       <Link href="/dashboard/telegram" className="flex gap-1 items-center text-muted-foreground mb-2 hover:underline">
@@ -13,7 +17,7 @@ export default function GrantsPage() {
         <p>Telegram Grants</p>
         <NewGrant />
       </div>
-      <GrantList />
+      <GrantList grants={grants} />
     </div>
   )
 }
diff --git a/src/components/user-select.tsx b/src/components/user-select.tsx
index 4dc121a..68b2a14 100644
--- a/src/components/user-select.tsx
+++ b/src/components/user-select.tsx
@@ -1,11 +1,10 @@
 "use client"
 
-import { useQueryClient } from "@tanstack/react-query"
 import { Search, X } from "lucide-react"
 import { useState } from "react"
 import { toast } from "sonner"
 import { fmtUser } from "@/lib/utils/telegram"
-import { useTRPC } from "@/server/trpc"
+import { getUserInfo, searchUserInfo } from "@/server/actions/users"
 import type { TgUser } from "@/server/trpc/types"
 import { Button } from "./ui/button"
 import { Input } from "./ui/input"
@@ -23,14 +22,8 @@ export function UserSelect({ onUser, onReset }: Props) {
   const [username, setUsername] = useState("")
   const [id, setId] = useState("")
 
-  const trpc = useTRPC()
-  const qc = useQueryClient()
-
-  const usernameSearch = trpc.tg.users.getByUsername.queryOptions({ username })
-  const idSearch = trpc.tg.users.get.queryOptions({ userId: id ? parseInt(id, 10) : 0 })
-
   async function search() {
-    const { user } = await qc.fetchQuery(searchType === "id" ? idSearch : usernameSearch)
+    const user = searchType === "username" ? await searchUserInfo(username) : await getUserInfo(parseInt(id, 10))
     if (!user) return toast.error(`User with this ${searchType === "id" ? "ID" : "username"} not found`)
     setUser(user)
     onUser(user)
diff --git a/src/server/actions/grants.ts b/src/server/actions/grants.ts
new file mode 100644
index 0000000..fb51e53
--- /dev/null
+++ b/src/server/actions/grants.ts
@@ -0,0 +1,12 @@
+"use server"
+
+import { trpc } from "../trpc"
+import type { ApiInput } from "../trpc/types"
+
+export async function createGrant(input: ApiInput["tg"]["grants"]["create"]) {
+  return await trpc.tg.grants.create.mutate(input)
+}
+
+export async function interruptGrant(input: ApiInput["tg"]["grants"]["interrupt"]) {
+  return await trpc.tg.grants.interrupt.mutate(input)
+}
diff --git a/src/server/actions/users.ts b/src/server/actions/users.ts
index df8c18d..18d3d7e 100644
--- a/src/server/actions/users.ts
+++ b/src/server/actions/users.ts
@@ -2,11 +2,17 @@
 import { trpc } from "../trpc"
 import type { TgUserRole } from "../trpc/types"
 
+export async function getUserInfo(userId: number) {
+  return (await trpc.tg.users.get.query({ userId })).user ?? null
+}
+
+export async function searchUserInfo(username: string) {
+  return (await trpc.tg.users.getByUsername.query({ username })).user ?? null
+}
+
 export async function searchUser(username: string) {
-  const { user } = await trpc.tg.users.getByUsername.query({ username })
-  if (!user) {
-    return null
-  }
+  const user = await searchUserInfo(username)
+  if (!user) return null
 
   const { roles, groupAdmin } = await trpc.tg.permissions.getRoles.query({ userId: user.id })
   const { messages } = await trpc.tg.messages.getLastByUser.query({ userId: user.id, limit: 15 })

From d4e9ee0ad170489ebda3997b72f2037d8b5fe5d0 Mon Sep 17 00:00:00 2001
From: Lorenzo Corallo <lorenzo.corallo@outlook.it>
Date: Mon, 13 Apr 2026 01:16:02 +0200
Subject: [PATCH 06/22] checkpoint: azure

---
 .../(active)/azure/members/columns.tsx        |  9 +++---
 .../azure/members}/create-assoc-member.tsx    | 32 +++++++++++--------
 .../dashboard/(active)/azure/members/page.tsx |  8 ++---
 .../set-assoc-number-dialog.tsx               | 29 ++++++++---------
 .../(active)/azure/members/table.tsx          | 19 ++++-------
 src/components/data-table.tsx                 |  2 +-
 src/server/actions/azure.ts                   | 16 ++++++++++
 src/server/trpc/types.tsx                     |  2 ++
 8 files changed, 65 insertions(+), 52 deletions(-)
 rename src/{components => app/dashboard/(active)/azure/members}/create-assoc-member.tsx (83%)
 rename src/app/dashboard/(active)/azure/members/{_components => }/set-assoc-number-dialog.tsx (72%)
 create mode 100644 src/server/actions/azure.ts

diff --git a/src/app/dashboard/(active)/azure/members/columns.tsx b/src/app/dashboard/(active)/azure/members/columns.tsx
index fddd659..0673bbf 100644
--- a/src/app/dashboard/(active)/azure/members/columns.tsx
+++ b/src/app/dashboard/(active)/azure/members/columns.tsx
@@ -1,11 +1,10 @@
 "use client"
 import { createColumnHelper, type Row } from "@tanstack/react-table"
 import { Badge } from "@/components/ui/badge"
-import type { ApiOutput } from "@/server/trpc/types"
-import { SetAssocNumberDialog } from "./_components/set-assoc-number-dialog"
+import type { AzureMember } from "@/server/trpc/types"
+import { SetAssocNumberDialog } from "./set-assoc-number-dialog"
 
-type ParsedUser = ApiOutput["azure"]["members"]["getAll"][0]
-const ch = createColumnHelper<ParsedUser>()
+const ch = createColumnHelper<AzureMember>()
 
 export const columns = [
   ch.accessor("employeeId", {
@@ -46,6 +45,6 @@ export const columns = [
   }),
 ]
 
-function RowActions({ row: _ }: { row: Row<ParsedUser> }) {
+function RowActions({ row: _ }: { row: Row<AzureMember> }) {
   return <div className="flex gap-2 justify-start items-center"></div>
 }
diff --git a/src/components/create-assoc-member.tsx b/src/app/dashboard/(active)/azure/members/create-assoc-member.tsx
similarity index 83%
rename from src/components/create-assoc-member.tsx
rename to src/app/dashboard/(active)/azure/members/create-assoc-member.tsx
index dd3c907..ffead70 100644
--- a/src/components/create-assoc-member.tsx
+++ b/src/app/dashboard/(active)/azure/members/create-assoc-member.tsx
@@ -1,8 +1,11 @@
 "use client"
 import { useMutation } from "@tanstack/react-query"
 import { useRouter } from "next/navigation"
-import { useState } from "react"
+import { useState, useTransition } from "react"
 import { toast } from "sonner"
+import { Button } from "@/components/ui/button"
+import { Input } from "@/components/ui/input"
+import { Label } from "@/components/ui/label"
 import {
   Sheet,
   SheetClose,
@@ -12,10 +15,7 @@ import {
   SheetTitle,
   SheetTrigger,
 } from "@/components/ui/sheet"
-import { useTRPC } from "@/server/trpc"
-import { Button } from "./ui/button"
-import { Input } from "./ui/input"
-import { Label } from "./ui/label"
+import { createAzureMember } from "@/server/actions/azure"
 
 export function CreateAssocUser() {
   const [open, setOpen] = useState<boolean>(false)
@@ -23,11 +23,8 @@ export function CreateAssocUser() {
   const [lastName, setLastName] = useState<string>("")
   const [assocNumber, setAssocNumber] = useState<string>("")
   const [sendTo, setSendTo] = useState<string>("")
-  const trpc = useTRPC()
   const router = useRouter()
 
-  const { mutateAsync, isPending } = useMutation(trpc.azure.members.create.mutationOptions())
-
   function handleOpenChange(v: boolean): void {
     setOpen(v)
     setFirstName("")
@@ -36,11 +33,18 @@ export function CreateAssocUser() {
     setSendTo("")
   }
 
-  async function handleSubmit(e: React.FormEvent<HTMLFormElement>) {
-    e.preventDefault()
+  const [pending, startTransition] = useTransition()
+
+  async function handleSubmit() {
     if (!assocNumber || Number.isNaN(parseInt(assocNumber, 10))) return
 
-    const res = await mutateAsync({ assocNumber: parseInt(assocNumber, 10), firstName, lastName, sendEmailTo: sendTo })
+    const res = await createAzureMember({
+      assocNumber: parseInt(assocNumber, 10),
+      firstName,
+      lastName,
+      sendEmailTo: sendTo,
+    })
+
     if (res.error !== null) {
       toast.error(res.error)
       return
@@ -59,7 +63,7 @@ export function CreateAssocUser() {
         <SheetHeader className="px-0">
           <SheetTitle>Create new member account</SheetTitle>
         </SheetHeader>
-        <form onSubmit={handleSubmit}>
+        <form action={() => startTransition(handleSubmit)}>
           <div className="grid gap-4 py-4">
             <div className="grid w-full items-center gap-1.5">
               <Label htmlFor="first-name">First Name</Label>
@@ -117,11 +121,11 @@ export function CreateAssocUser() {
           </div>
           <SheetFooter className="mt-4 flex flex-row justify-end items-center">
             <SheetClose>
-              <Button variant="ghost" disabled={isPending}>
+              <Button variant="ghost" disabled={pending}>
                 Cancel
               </Button>
             </SheetClose>
-            <Button disabled={isPending}>{isPending ? "Saving..." : "Create"}</Button>
+            <Button disabled={pending}>{pending ? "Saving..." : "Create"}</Button>
           </SheetFooter>
         </form>
       </SheetContent>
diff --git a/src/app/dashboard/(active)/azure/members/page.tsx b/src/app/dashboard/(active)/azure/members/page.tsx
index 3a72300..1b38126 100644
--- a/src/app/dashboard/(active)/azure/members/page.tsx
+++ b/src/app/dashboard/(active)/azure/members/page.tsx
@@ -3,12 +3,12 @@ import Link from "next/link"
 import { Suspense } from "react"
 import { ErrorBoundary } from "react-error-boundary"
 import { Spinner } from "@/components/spinner"
-import { getQueryClient, trpc } from "@/server/trpc/server"
+import { getAzureMembers } from "@/server/actions/azure"
 import { AssocTable } from "./table"
 
 export default async function AssocMembers() {
-  const qc = getQueryClient()
-  void qc.prefetchQuery(trpc.azure.members.getAll.queryOptions())
+  const members = await getAzureMembers()
+
   return (
     <div className="container p-8">
       <Link href="/dashboard/azure" className="flex gap-1 items-center text-muted-foreground mb-2 hover:underline">
@@ -16,7 +16,7 @@ export default async function AssocMembers() {
       </Link>
       <ErrorBoundary fallback={<div>Something went wrong</div>}>
         <Suspense fallback={<Spinner />}>
-          <AssocTable />
+          <AssocTable members={members} />
         </Suspense>
       </ErrorBoundary>
     </div>
diff --git a/src/app/dashboard/(active)/azure/members/_components/set-assoc-number-dialog.tsx b/src/app/dashboard/(active)/azure/members/set-assoc-number-dialog.tsx
similarity index 72%
rename from src/app/dashboard/(active)/azure/members/_components/set-assoc-number-dialog.tsx
rename to src/app/dashboard/(active)/azure/members/set-assoc-number-dialog.tsx
index e286b43..853b116 100644
--- a/src/app/dashboard/(active)/azure/members/_components/set-assoc-number-dialog.tsx
+++ b/src/app/dashboard/(active)/azure/members/set-assoc-number-dialog.tsx
@@ -1,5 +1,5 @@
-import { useMutation, useQueryClient } from "@tanstack/react-query"
-import { useState } from "react"
+import { useRouter } from "next/navigation"
+import { useState, useTransition } from "react"
 import { toast } from "sonner"
 import { Button } from "@/components/ui/button"
 import {
@@ -15,28 +15,25 @@ import {
 import { Input } from "@/components/ui/input"
 import { Label } from "@/components/ui/label"
 import { wait } from "@/lib/utils"
-import { useTRPC } from "@/server/trpc"
+import { setAzureMemberNumber } from "@/server/actions/azure"
 
 export function SetAssocNumberDialog({ userId }: { userId: string }) {
+  const router = useRouter()
   const [value, setValue] = useState<string>("")
   const [open, setOpen] = useState<boolean>(false)
-  const trpc = useTRPC()
-
-  const qc = useQueryClient()
-  const { mutateAsync, isPending } = useMutation(trpc.azure.members.setAssocNumber.mutationOptions())
 
   function handleOpenChange(v: boolean): void {
     setOpen(v)
     setValue("")
   }
 
-  async function handleSubmit(e: React.FormEvent<HTMLFormElement>) {
-    console.log("submit")
-    e.preventDefault()
-    if (isPending || !value || Number.isNaN(parseInt(value, 10))) return
+  const [pending, startTransition] = useTransition()
+
+  async function handleSubmit() {
+    if (pending || !value || Number.isNaN(parseInt(value, 10))) return
 
     const loading = toast.loading(`Updating...`)
-    const res = await mutateAsync({ userId, assocNumber: parseInt(value, 10) })
+    const res = await setAzureMemberNumber({ userId, assocNumber: parseInt(value, 10) })
     handleOpenChange(false)
     if (res.error !== null) {
       toast.error("There was an error")
@@ -45,8 +42,8 @@ export function SetAssocNumberDialog({ userId }: { userId: string }) {
     }
 
     await wait(2000)
-    await qc.refetchQueries({ queryKey: trpc.azure.members.getAll.queryKey() })
     toast.success(`Updated successfully!`, { id: loading })
+    router.refresh()
     console.log("Updated user assocNumber", userId, value)
   }
 
@@ -64,7 +61,7 @@ export function SetAssocNumberDialog({ userId }: { userId: string }) {
           <DialogTitle>Set Assoc Number</DialogTitle>
           <DialogDescription>This changes the `employeeId` field in the Azure User properties.</DialogDescription>
         </DialogHeader>
-        <form className="grid gap-y-4" onSubmit={handleSubmit}>
+        <form className="grid gap-y-4" action={() => startTransition(handleSubmit)}>
           <div>
             <Label htmlFor="assoc-num">Member Number</Label>
             <Input
@@ -82,11 +79,11 @@ export function SetAssocNumberDialog({ userId }: { userId: string }) {
           </div>
           <DialogFooter>
             <DialogClose>
-              <Button disabled={isPending} variant="outline">
+              <Button disabled={pending} variant="outline">
                 Cancel
               </Button>
             </DialogClose>
-            <Button type="submit" disabled={isPending}>
+            <Button type="submit" disabled={pending}>
               Save
             </Button>
           </DialogFooter>
diff --git a/src/app/dashboard/(active)/azure/members/table.tsx b/src/app/dashboard/(active)/azure/members/table.tsx
index 5258332..2282f5d 100644
--- a/src/app/dashboard/(active)/azure/members/table.tsx
+++ b/src/app/dashboard/(active)/azure/members/table.tsx
@@ -1,16 +1,13 @@
 "use client"
 
-import { useSuspenseQuery } from "@tanstack/react-query"
 import { useState } from "react"
-import { CreateAssocUser } from "@/components/create-assoc-member"
 import { DataTable } from "@/components/data-table"
 import { Badge } from "@/components/ui/badge"
-import { useTRPC } from "@/server/trpc"
-import type { ApiOutput } from "@/server/trpc/types"
+import type { AzureMember } from "@/server/trpc/types"
 import { columns } from "./columns"
+import { CreateAssocUser } from "./create-assoc-member"
 
-type ParsedUser = ApiOutput["azure"]["members"]["getAll"][0]
-function sortByAssocNumber(users: ParsedUser[]) {
+function sortByAssocNumber(users: AzureMember[]) {
   if (!users || users.length === 0) return users
   if (users.every((u) => !u.employeeId))
     return users.sort((a, b) => (a.displayName ?? "").localeCompare(b.displayName ?? ""))
@@ -30,18 +27,16 @@ function sortByAssocNumber(users: ParsedUser[]) {
   })
 }
 
-export function AssocTable() {
-  const trpc = useTRPC()
-  const { data } = useSuspenseQuery(trpc.azure.members.getAll.queryOptions())
+export function AssocTable({ members }: { members: AzureMember[] }) {
   const [sociFilter, setSociFilter] = useState(false)
-  const users = sociFilter ? data.filter((v) => v.isMember) : data
+  const users = sociFilter ? members.filter((v) => v.isMember) : members
 
   return (
     <div className="space-y-3">
       <div className="flex gap-2 items-center">
         <p>Utenti MS @polinetwork.org</p>
-        <Badge onClick={() => setSociFilter((v) => !v)}>{data.filter((d) => d.isMember).length} Soci</Badge>
-        <Badge variant="secondary">{data.filter((d) => !d.isMember).length} fuori</Badge>
+        <Badge onClick={() => setSociFilter((v) => !v)}>{members.filter((d) => d.isMember).length} Soci</Badge>
+        <Badge variant="secondary">{members.filter((d) => !d.isMember).length} fuori</Badge>
         <Badge>{users.filter((u) => u.assignedLicensesIds.includes("OFFICE_365")).length} licenze Office</Badge>
         <div className="grow" />
         <CreateAssocUser />
diff --git a/src/components/data-table.tsx b/src/components/data-table.tsx
index eba2000..acc07c7 100644
--- a/src/components/data-table.tsx
+++ b/src/components/data-table.tsx
@@ -41,7 +41,7 @@ export function DataTable<TData extends RowData, TValue = unknown>({ columns, da
           ))}
         </TableHeader>
         <TableBody>
-          {table.getRowModel().rows?.length ? (
+          {table.getRowModel().rows.length ? (
             table.getRowModel().rows.map((row) => (
               <TableRow key={row.id} data-state={row.getIsSelected() && "selected"}>
                 {row.getVisibleCells().map((cell) => (
diff --git a/src/server/actions/azure.ts b/src/server/actions/azure.ts
new file mode 100644
index 0000000..5e28550
--- /dev/null
+++ b/src/server/actions/azure.ts
@@ -0,0 +1,16 @@
+"use server"
+
+import { trpc } from "../trpc"
+import type { ApiInput } from "../trpc/types"
+
+export async function getAzureMembers() {
+  return await trpc.azure.members.getAll.query()
+}
+
+export async function createAzureMember(input: ApiInput["azure"]["members"]["create"]) {
+  return await trpc.azure.members.create.mutate(input)
+}
+
+export async function setAzureMemberNumber(input: ApiInput["azure"]["members"]["setAssocNumber"]) {
+  return await trpc.azure.members.setAssocNumber.mutate(input)
+}
diff --git a/src/server/trpc/types.tsx b/src/server/trpc/types.tsx
index ab0a9b1..2322671 100644
--- a/src/server/trpc/types.tsx
+++ b/src/server/trpc/types.tsx
@@ -8,3 +8,5 @@ export type ApiError = inferRouterError<AppRouter>
 export type TgUser = NonNullable<ApiOutput["tg"]["users"]["get"]["user"]>
 export type TgGroup = NonNullable<ApiOutput["tg"]["groups"]["search"]["groups"][number]>
 export type TgUserRole = NonNullable<ApiInput["tg"]["permissions"]["addRole"]["role"]>
+
+export type AzureMember = ApiOutput["azure"]["members"]["getAll"][number]

From a39bd0e248836d01c7e287a9b2297abf33d151c8 Mon Sep 17 00:00:00 2001
From: Lorenzo Corallo <lorenzo.corallo@outlook.it>
Date: Mon, 13 Apr 2026 01:16:55 +0200
Subject: [PATCH 07/22] fix: button as render

---
 .../azure/members/set-assoc-number-dialog.tsx        | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/app/dashboard/(active)/azure/members/set-assoc-number-dialog.tsx b/src/app/dashboard/(active)/azure/members/set-assoc-number-dialog.tsx
index 853b116..d660a10 100644
--- a/src/app/dashboard/(active)/azure/members/set-assoc-number-dialog.tsx
+++ b/src/app/dashboard/(active)/azure/members/set-assoc-number-dialog.tsx
@@ -78,11 +78,13 @@ export function SetAssocNumberDialog({ userId }: { userId: string }) {
             />
           </div>
           <DialogFooter>
-            <DialogClose>
-              <Button disabled={pending} variant="outline">
-                Cancel
-              </Button>
-            </DialogClose>
+            <DialogClose
+              render={
+                <Button disabled={pending} variant="outline">
+                  Cancel
+                </Button>
+              }
+            ></DialogClose>
             <Button type="submit" disabled={pending}>
               Save
             </Button>

From 72a85b33bd3a9337ca748f24b35f10f239458ca6 Mon Sep 17 00:00:00 2001
From: Lorenzo Corallo <lorenzo.corallo@outlook.it>
Date: Mon, 13 Apr 2026 01:22:39 +0200
Subject: [PATCH 08/22] checkpoint: account

---
 .../dashboard/(active)/account/telegram.tsx   | 27 ++++++-------------
 .../azure/members/create-assoc-member.tsx     |  1 -
 src/server/actions/users.ts                   |  4 +++
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/app/dashboard/(active)/account/telegram.tsx b/src/app/dashboard/(active)/account/telegram.tsx
index 0f1e66d..a836afa 100644
--- a/src/app/dashboard/(active)/account/telegram.tsx
+++ b/src/app/dashboard/(active)/account/telegram.tsx
@@ -1,27 +1,16 @@
-"use client"
-import { useQuery } from "@tanstack/react-query"
-import { useSession } from "@/lib/auth"
-import { useTRPC } from "@/server/trpc"
+import { getUserRoles } from "@/server/actions/users"
+import { getServerSession } from "@/server/auth"
 
-export function Telegram() {
-  const { data: session, isPending } = useSession()
-  if (isPending || !session) return null
+export async function Telegram() {
+  const { data } = await getServerSession()
+  if (!data || !data.user.telegramId) return null
 
-  const { user } = session
-  if (!user.telegramUsername || !user.telegramId) return null
+  const { roles } = await getUserRoles(data.user.telegramId)
 
-  return <ShowTelegram username={user.telegramUsername} userId={user.telegramId} />
-}
-
-function ShowTelegram({ username, userId }: { username: string; userId: number }) {
-  const trpc = useTRPC()
-  const { data, isLoading } = useQuery(trpc.tg.permissions.getRoles.queryOptions({ userId }))
   return (
     <>
-      <span>@{username}</span>
-      {!isLoading && data?.roles?.length && (
-        <span className="text-foreground/30 text-xs">(roles: {data.roles.join(", ")})</span>
-      )}
+      <span>@{data.user.telegramUsername}</span>
+      {roles?.length && <span className="text-foreground/30 text-xs">(roles: {roles.join(", ")})</span>}
     </>
   )
 }
diff --git a/src/app/dashboard/(active)/azure/members/create-assoc-member.tsx b/src/app/dashboard/(active)/azure/members/create-assoc-member.tsx
index ffead70..f29d612 100644
--- a/src/app/dashboard/(active)/azure/members/create-assoc-member.tsx
+++ b/src/app/dashboard/(active)/azure/members/create-assoc-member.tsx
@@ -1,5 +1,4 @@
 "use client"
-import { useMutation } from "@tanstack/react-query"
 import { useRouter } from "next/navigation"
 import { useState, useTransition } from "react"
 import { toast } from "sonner"
diff --git a/src/server/actions/users.ts b/src/server/actions/users.ts
index 18d3d7e..2fa5d64 100644
--- a/src/server/actions/users.ts
+++ b/src/server/actions/users.ts
@@ -6,6 +6,10 @@ export async function getUserInfo(userId: number) {
   return (await trpc.tg.users.get.query({ userId })).user ?? null
 }
 
+export async function getUserRoles(userId: number) {
+  return (await trpc.tg.permissions.getRoles.query({ userId })) ?? null
+}
+
 export async function searchUserInfo(username: string) {
   return (await trpc.tg.users.getByUsername.query({ username })).user ?? null
 }

From f264eac50778b6b3cc513b6642ead87a142d2465 Mon Sep 17 00:00:00 2001
From: Lorenzo Corallo <lorenzo.corallo@outlook.it>
Date: Mon, 13 Apr 2026 01:32:21 +0200
Subject: [PATCH 09/22] checkpoint: more grants

---
 .../(active)/telegram/grants/delete-grant.tsx |  7 +--
 .../telegram/user-details/card-user-grant.tsx | 45 ++++++++-----------
 .../telegram/user-details/card-user-info.tsx  |  2 +-
 .../(active)/telegram/user-details/page.tsx   |  7 +--
 src/server/actions/grants.ts                  |  4 ++
 src/server/actions/users.ts                   |  4 +-
 src/server/trpc/types.tsx                     |  1 +
 7 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/src/app/dashboard/(active)/telegram/grants/delete-grant.tsx b/src/app/dashboard/(active)/telegram/grants/delete-grant.tsx
index 332100d..82e74ce 100644
--- a/src/app/dashboard/(active)/telegram/grants/delete-grant.tsx
+++ b/src/app/dashboard/(active)/telegram/grants/delete-grant.tsx
@@ -20,7 +20,7 @@ import { Button } from "@/components/ui/button"
 import { useSession } from "@/lib/auth"
 import { interruptGrant } from "@/server/actions/grants"
 
-export function DeleteGrant({ userId }: { userId: number }) {
+export function DeleteGrant({ userId, onDelete }: { userId: number; onDelete(): void }) {
   const sesh = useSession()
   const removerId = sesh.data?.user.telegramId
 
@@ -37,6 +37,7 @@ export function DeleteGrant({ userId }: { userId: number }) {
     else {
       toast.success("Grant interrupted successfully")
       router.refresh()
+      onDelete()
     }
 
     handleOpenChange(false)
@@ -44,10 +45,6 @@ export function DeleteGrant({ userId }: { userId: number }) {
 
   function handleOpenChange(v: boolean) {
     setOpen(v)
-    if (v === false) {
-      // qc.invalidateQueries(trpc.tg.grants.getOngoing.queryOptions())
-      // qc.invalidateQueries(trpc.tg.grants.checkUser.queryOptions({ userId }))
-    }
   }
 
   return (
diff --git a/src/app/dashboard/(active)/telegram/user-details/card-user-grant.tsx b/src/app/dashboard/(active)/telegram/user-details/card-user-grant.tsx
index 029cf89..05a80ab 100644
--- a/src/app/dashboard/(active)/telegram/user-details/card-user-grant.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/card-user-grant.tsx
@@ -1,35 +1,26 @@
 "use client"
-import { useQuery } from "@tanstack/react-query"
 import { format } from "date-fns"
-import { Sparkle, Star } from "lucide-react"
+import { Sparkle } from "lucide-react"
 import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from "@/components/ui/card"
-// import { useTRPC } from "@/server/trpc"
-import type { TgUser } from "@/server/trpc/types"
+import type { TgGrant, TgUser } from "@/server/trpc/types"
 import { DeleteGrant } from "../grants/delete-grant"
 
-export function UserGrantCard({ user }: { user: TgUser }) {
-  // const trpc = useTRPC()
-  // const { data } = useQuery(trpc.tg.grants.checkUser.queryOptions({ userId: user.id }))
-
-  // if (!data) return null
-  return null
+export function UserGrantCard({ user, grant, onDelete }: { user: TgUser; grant: TgGrant; onDelete(): void }) {
   return (
-    data.grant && (
-      <Card className="w-fit min-w-120">
-        <CardHeader>
-          <CardTitle className="flex gap-2 items-center">
-            <Sparkle size={20} /> Ongoing Grant
-          </CardTitle>
-          <CardDescription>This user has an ongoing grant</CardDescription>
-        </CardHeader>
-        <CardContent className="space-y-2">
-          <p>Start: {format(data.grant.validSince, "yyyy/MM/dd HH:mm")}</p>
-          <p>End: {format(data.grant.validUntil, "yyyy/MM/dd HH:mm")}</p>
-        </CardContent>
-        <CardFooter className="gap-2">
-          <DeleteGrant userId={user.id} />
-        </CardFooter>
-      </Card>
-    )
+    <Card className="h-full">
+      <CardHeader>
+        <CardTitle className="flex gap-2 items-center">
+          <Sparkle size={20} /> Ongoing Grant
+        </CardTitle>
+        <CardDescription>This user has an ongoing grant</CardDescription>
+      </CardHeader>
+      <CardContent className="space-y-2 grow">
+        <p>Start: {format(grant.validSince, "yyyy/MM/dd HH:mm")}</p>
+        <p>End: {format(grant.validUntil, "yyyy/MM/dd HH:mm")}</p>
+      </CardContent>
+      <CardFooter className="gap-2">
+        <DeleteGrant userId={user.id} onDelete={onDelete} />
+      </CardFooter>
+    </Card>
   )
 }
diff --git a/src/app/dashboard/(active)/telegram/user-details/card-user-info.tsx b/src/app/dashboard/(active)/telegram/user-details/card-user-info.tsx
index fabef3a..ca2362a 100644
--- a/src/app/dashboard/(active)/telegram/user-details/card-user-info.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/card-user-info.tsx
@@ -23,7 +23,7 @@ export function UserInfoCard({
   const isSelf = seshUserId && seshUserId === user.id
 
   return (
-    <Card className="w-fit min-w-120">
+    <Card className="">
       <CardHeader>
         <CardTitle>
           # User ID: {user.id}{" "}
diff --git a/src/app/dashboard/(active)/telegram/user-details/page.tsx b/src/app/dashboard/(active)/telegram/user-details/page.tsx
index a842e76..5c8429f 100644
--- a/src/app/dashboard/(active)/telegram/user-details/page.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/page.tsx
@@ -2,7 +2,6 @@
 import { ArrowLeft, RefreshCcw, Search, X } from "lucide-react"
 import Link from "next/link"
 import { Suspense, startTransition, useActionState, useState } from "react"
-import { start } from "repl"
 import { Spinner } from "@/components/spinner"
 import { Button } from "@/components/ui/button"
 import { Input } from "@/components/ui/input"
@@ -75,9 +74,11 @@ export default function TgUsers() {
 
       {data && (
         <>
-          <div className="grid grid-cols-3 items-start">
+          <div className="grid grid-cols-3 items-start gap-4">
             <UserInfoCard user={data.user} roles={data.roles ?? []} onUpdate={() => startTransition(action)} />
-            <UserGrantCard user={data.user} />
+            {data.grant && (
+              <UserGrantCard user={data.user} grant={data.grant} onDelete={() => startTransition(action)} />
+            )}
           </div>
 
           <div className="pt-6 flex gap-4 items-center">
diff --git a/src/server/actions/grants.ts b/src/server/actions/grants.ts
index fb51e53..b84800b 100644
--- a/src/server/actions/grants.ts
+++ b/src/server/actions/grants.ts
@@ -3,6 +3,10 @@
 import { trpc } from "../trpc"
 import type { ApiInput } from "../trpc/types"
 
+export async function getUserGrant(userId: number) {
+  return await trpc.tg.grants.checkUser.query({ userId })
+}
+
 export async function createGrant(input: ApiInput["tg"]["grants"]["create"]) {
   return await trpc.tg.grants.create.mutate(input)
 }
diff --git a/src/server/actions/users.ts b/src/server/actions/users.ts
index 2fa5d64..1b9cd0b 100644
--- a/src/server/actions/users.ts
+++ b/src/server/actions/users.ts
@@ -1,6 +1,7 @@
 "use server"
 import { trpc } from "../trpc"
 import type { TgUserRole } from "../trpc/types"
+import { getUserGrant } from "./grants"
 
 export async function getUserInfo(userId: number) {
   return (await trpc.tg.users.get.query({ userId })).user ?? null
@@ -29,7 +30,8 @@ export async function searchUser(username: string) {
     }))
   )
 
-  return { roles, groupAdmin, user, messages, audits }
+  const { grant } = await getUserGrant(user.id)
+  return { roles, groupAdmin, user, messages, audits, grant }
 }
 
 export async function addGroupAdmin(userId: number, groupId: number, adderId: number) {
diff --git a/src/server/trpc/types.tsx b/src/server/trpc/types.tsx
index 2322671..7962e62 100644
--- a/src/server/trpc/types.tsx
+++ b/src/server/trpc/types.tsx
@@ -6,6 +6,7 @@ export type ApiInput = inferRouterInputs<AppRouter>
 export type ApiError = inferRouterError<AppRouter>
 
 export type TgUser = NonNullable<ApiOutput["tg"]["users"]["get"]["user"]>
+export type TgGrant = NonNullable<ApiOutput["tg"]["grants"]["checkUser"]["grant"]>
 export type TgGroup = NonNullable<ApiOutput["tg"]["groups"]["search"]["groups"][number]>
 export type TgUserRole = NonNullable<ApiInput["tg"]["permissions"]["addRole"]["role"]>
 

From 4b3272dc2ef5ff4e68213fcd4a87fd219bdc97bc Mon Sep 17 00:00:00 2001
From: Lorenzo Corallo <lorenzo.corallo@outlook.it>
Date: Mon, 13 Apr 2026 01:33:40 +0200
Subject: [PATCH 10/22] fix: typos

---
 src/app/dashboard/(active)/telegram/grants/grant-list.tsx    | 2 +-
 .../dashboard/(active)/telegram/user-details/remove-role.tsx | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/app/dashboard/(active)/telegram/grants/grant-list.tsx b/src/app/dashboard/(active)/telegram/grants/grant-list.tsx
index 2a4e931..328e6aa 100644
--- a/src/app/dashboard/(active)/telegram/grants/grant-list.tsx
+++ b/src/app/dashboard/(active)/telegram/grants/grant-list.tsx
@@ -32,7 +32,7 @@ function GrantRow({ row: r }: { row: Grants[number] }) {
       </p>
       <p>{format(r.grant.validSince, "yyyy/MM/dd HH:mm")}</p>
       <p>{format(r.grant.validUntil, "yyyy/MM/dd HH:mm")}</p>
-      <DeleteGrant userId={r.grant.userId} />
+      <DeleteGrant userId={r.grant.userId} onDelete={() => null} />
     </div>
   )
 }
diff --git a/src/app/dashboard/(active)/telegram/user-details/remove-role.tsx b/src/app/dashboard/(active)/telegram/user-details/remove-role.tsx
index 6d66409..2e61c47 100644
--- a/src/app/dashboard/(active)/telegram/user-details/remove-role.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/remove-role.tsx
@@ -1,8 +1,6 @@
 "use client"
 import { USER_ROLE } from "@polinetwork/backend"
-import { useMutation, useQueryClient } from "@tanstack/react-query"
-import { Minus, Plus } from "lucide-react"
-import { useRouter } from "next/navigation"
+import { Minus } from "lucide-react"
 import { useState } from "react"
 import { toast } from "sonner"
 import { Badge } from "@/components/ui/badge"
@@ -20,7 +18,6 @@ import {
 import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
 import { useSession } from "@/lib/auth"
 import { delUserRole } from "@/server/actions/users"
-// import { useTRPC } from "@/server/trpc"
 import type { ApiOutput } from "@/server/trpc/types"
 
 type User = ApiOutput["tg"]["users"]["getByUsername"]["user"]

From bdbef6832ba31614a50181c9a67801628dd91cd9 Mon Sep 17 00:00:00 2001
From: Lorenzo Corallo <lorenzo.corallo@outlook.it>
Date: Mon, 13 Apr 2026 01:51:59 +0200
Subject: [PATCH 11/22] checkpoint: groups

---
 .../(active)/telegram/groups/group-row.tsx    |  70 +++++++
 .../(active)/telegram/groups/page.tsx         | 196 +++---------------
 .../(active)/telegram/groups/search-input.tsx |  43 ++++
 3 files changed, 147 insertions(+), 162 deletions(-)
 create mode 100644 src/app/dashboard/(active)/telegram/groups/group-row.tsx
 create mode 100644 src/app/dashboard/(active)/telegram/groups/search-input.tsx

diff --git a/src/app/dashboard/(active)/telegram/groups/group-row.tsx b/src/app/dashboard/(active)/telegram/groups/group-row.tsx
new file mode 100644
index 0000000..d7dd3f5
--- /dev/null
+++ b/src/app/dashboard/(active)/telegram/groups/group-row.tsx
@@ -0,0 +1,70 @@
+"use client"
+import { Copy, Pen } from "lucide-react"
+import { toast } from "sonner"
+import { Badge } from "@/components/ui/badge"
+import { Button } from "@/components/ui/button"
+import type { TgGroup } from "@/server/trpc/types"
+
+export function GroupRow({ row: r }: { row: TgGroup }) {
+  // const trpc = useTRPC()
+  // const { mutateAsync: hideMutate } = useMutation(trpc.tg.groups.setHide.mutationOptions())
+  //
+  // async function toggleHide() {
+  //   const ok = await hideMutate({ telegramId: r.telegramId, hide: !r.hide }).catch(() => false)
+  //   if (!ok) toast.error("The field cannot be modified")
+  //
+  //   toast.success("Hide option toggled!")
+  //   invalidate()
+  // }
+
+  return (
+    <div className="grid gap-4 items-center grid-cols-5 border-b py-2 w-full">
+      <p>{r.telegramId}</p>
+      <p>{r.title}</p>
+      <p className={r.tag ? "" : "text-muted-foreground italic"}>{r.tag ? `@${r.tag}` : `<unset>`}</p>
+      <div className="flex items-center justify-start gap-2">
+        {r.link && (
+          <a
+            href={r.link}
+            target="_blank"
+            rel="noopener noreferrer"
+            aria-label={`Link for group ${r.title}`}
+            className="hover:underline text-xs"
+          >
+            {r.link}
+          </a>
+        )}
+        <Button
+          type="button"
+          variant="outline"
+          size="icon-sm"
+          className={!r.link ? "hidden" : ""}
+          onClick={async () => {
+            try {
+              if (!r.link) return
+              await navigator.clipboard.writeText(r.link)
+              toast.success("Link copied to clipboard!")
+            } catch (err) {
+              toast.error("Cannot copy link to clipboard")
+              console.error(err)
+            }
+          }}
+        >
+          <Copy />
+        </Button>
+      </div>
+      <div className="flex items-center justify-start gap-2">
+        <p>{r.hide ? <Badge className="bg-yellow-800">HIDDEN</Badge> : <Badge variant="secondary">Visibile</Badge>}</p>
+        <Button
+          type="button"
+          variant="outline"
+          size="icon-sm"
+          className={!r.link ? "hidden" : ""}
+          onClick={() => null /*toggleHide*/}
+        >
+          <Pen />
+        </Button>
+      </div>
+    </div>
+  )
+}
diff --git a/src/app/dashboard/(active)/telegram/groups/page.tsx b/src/app/dashboard/(active)/telegram/groups/page.tsx
index 09c349d..fa41f0a 100644
--- a/src/app/dashboard/(active)/telegram/groups/page.tsx
+++ b/src/app/dashboard/(active)/telegram/groups/page.tsx
@@ -1,162 +1,34 @@
-// "use client"
-// import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"
-// import { ArrowLeft, Copy, Pen, RefreshCcw, Search, X } from "lucide-react"
-// import Link from "next/link"
-// import { useState } from "react"
-// import { toast } from "sonner"
-// import { Badge } from "@/components/ui/badge"
-// import { Button } from "@/components/ui/button"
-// import { Input } from "@/components/ui/input"
-// import { Label } from "@/components/ui/label"
-// import { useTRPC } from "@/server/trpc"
-// import type { ApiOutput } from "@/server/trpc/types"
-//
-// type Groups = ApiOutput["tg"]["groups"]["search"]["groups"]
-//
-// export default function TgGroups() {
-//   const [query, setQuery] = useState("")
-//
-//   const trpc = useTRPC()
-//   const qc = useQueryClient()
-//   const queryOpts = trpc.tg.groups.search.queryOptions({ query, limit: 20, showHidden: true })
-//   const { data: allGroups, isLoading, refetch } = useQuery(trpc.tg.groups.getAll.queryOptions())
-//
-//   const [rows, setRows] = useState<Groups>(!isLoading ? (allGroups ?? []) : [])
-//
-//   async function search() {
-//     const res = await qc.fetchQuery(queryOpts)
-//     setRows(res.groups)
-//     return res
-//   }
-//
-//   async function invalidate() {
-//     await qc.invalidateQueries(queryOpts)
-//     refetch()
-//     await search()
-//   }
-//
-//   async function submit(e: React.FormEvent<HTMLFormElement>) {
-//     e.preventDefault()
-//
-//     const res = await search()
-//     if (res.count === 0) toast.warning("No groups found with this query")
-//     else toast.info(`Found ${res.count} groups`)
-//   }
-//
-//   function reset() {
-//     setRows(allGroups ?? [])
-//     setQuery("")
-//   }
-//
-//   return (
-//     <div className="container p-8">
-//       <Link href="/dashboard/telegram" className="flex gap-1 items-center text-muted-foreground mb-2 hover:underline">
-//         <ArrowLeft size={16} /> Back
-//       </Link>
-//       <form onSubmit={submit} className="pt-2 gap-y-4 flex flex-col justify-start items-start">
-//         <div className="flex gap-2 flex-col items-start justify-start">
-//           <Label htmlFor="email" className="text-base">
-//             Search
-//           </Label>
-//           <div className="flex gap-2 items-center justify-start">
-//             <Input
-//               id="group-query"
-//               type="text"
-//               placeholder="Group name"
-//               className="bg-card w-auto"
-//               required
-//               onChange={(e) => {
-//                 setQuery(e.target.value)
-//               }}
-//               value={query}
-//             />
-//             <Button type="submit" size="icon">
-//               <Search />
-//             </Button>
-//             {rows.length > 0 && (
-//               <Button variant="outline" onClick={reset}>
-//                 <X />
-//                 Reset
-//               </Button>
-//             )}
-//             <Button variant="outline" onClick={invalidate}>
-//               <RefreshCcw />
-//               Refresh
-//             </Button>
-//           </div>
-//           <span className="text-muted-foreground text-xs">Max results: 20</span>
-//         </div>
-//       </form>
-//       <div className="flex flex-col w-full items-start justify-start py-4">
-//         <div className="grid gap-4 items-center grid-cols-5 w-full border-b py-2">
-//           <p>telegram ID</p>
-//           <p>Title</p>
-//           <p>Tag</p>
-//           <p>Invite Link</p>
-//           <p>Hide</p>
-//         </div>
-//         {rows.map((r) => (
-//           <GroupRow row={r} key={r.telegramId} invalidate={invalidate} />
-//         ))}
-//       </div>
-//     </div>
-//   )
-// }
-//
-// function GroupRow({ row: r, invalidate }: { row: Groups[number]; invalidate: () => void }) {
-//   const trpc = useTRPC()
-//   const { mutateAsync: hideMutate } = useMutation(trpc.tg.groups.setHide.mutationOptions())
-//
-//   async function toggleHide() {
-//     const ok = await hideMutate({ telegramId: r.telegramId, hide: !r.hide }).catch(() => false)
-//     if (!ok) toast.error("The field cannot be modified")
-//
-//     toast.success("Hide option toggled!")
-//     invalidate()
-//   }
-//
-//   return (
-//     <div className="grid gap-4 items-center grid-cols-5 border-b py-2 w-full">
-//       <p>{r.telegramId}</p>
-//       <p>{r.title}</p>
-//       <p className={r.tag ? "" : "text-muted-foreground italic"}>{r.tag ? `@${r.tag}` : `<unset>`}</p>
-//       <div className="flex items-center justify-start gap-2">
-//         {r.link && (
-//           <a
-//             href={r.link}
-//             target="_blank"
-//             rel="noopener noreferrer"
-//             aria-label={`Link for group ${r.title}`}
-//             className="hover:underline text-xs"
-//           >
-//             {r.link}
-//           </a>
-//         )}
-//         <Button
-//           type="button"
-//           variant="outline"
-//           size="icon-sm"
-//           className={!r.link ? "hidden" : ""}
-//           onClick={async () => {
-//             try {
-//               if (!r.link) return
-//               await navigator.clipboard.writeText(r.link)
-//               toast.success("Link copied to clipboard!")
-//             } catch (err) {
-//               toast.error("Cannot copy link to clipboard")
-//               console.error(err)
-//             }
-//           }}
-//         >
-//           <Copy />
-//         </Button>
-//       </div>
-//       <div className="flex items-center justify-start gap-2">
-//         <p>{r.hide ? <Badge className="bg-yellow-800">HIDDEN</Badge> : <Badge variant="secondary">Visibile</Badge>}</p>
-//         <Button type="button" variant="outline" size="icon-sm" className={!r.link ? "hidden" : ""} onClick={toggleHide}>
-//           <Pen />
-//         </Button>
-//       </div>
-//     </div>
-//   )
-// }
+"use server"
+import { ArrowLeft } from "lucide-react"
+import Link from "next/link"
+import { trpc } from "@/server/trpc"
+import { GroupRow } from "./group-row"
+import { SearchInput } from "./search-input"
+
+export default async function TgGroups({ searchParams }: { searchParams: Promise<{ q?: string }> }) {
+  const { q } = await searchParams
+
+  const all = await trpc.tg.groups.getAll.query()
+  const rows = q ? (await trpc.tg.groups.search.query({ limit: 20, query: q, showHidden: true })).groups : all
+
+  return (
+    <div className="container p-8">
+      <Link href="/dashboard/telegram" className="flex gap-1 items-center text-muted-foreground mb-2 hover:underline">
+        <ArrowLeft size={16} /> Back
+      </Link>
+      <SearchInput />
+      <div className="flex flex-col w-full items-start justify-start py-4">
+        <div className="grid gap-4 items-center grid-cols-5 w-full border-b py-2">
+          <p>telegram ID</p>
+          <p>Title</p>
+          <p>Tag</p>
+          <p>Invite Link</p>
+          <p>Hide</p>
+        </div>
+        {rows.map((r) => (
+          <GroupRow row={r} key={r.telegramId} />
+        ))}
+      </div>
+    </div>
+  )
+}
diff --git a/src/app/dashboard/(active)/telegram/groups/search-input.tsx b/src/app/dashboard/(active)/telegram/groups/search-input.tsx
new file mode 100644
index 0000000..4c9cf5a
--- /dev/null
+++ b/src/app/dashboard/(active)/telegram/groups/search-input.tsx
@@ -0,0 +1,43 @@
+"use client"
+
+import { RefreshCcw, Search, X } from "lucide-react"
+import { useRouter, useSearchParams } from "next/navigation"
+import { useState } from "react"
+import { Button } from "@/components/ui/button"
+import { Input } from "@/components/ui/input"
+
+export function SearchInput() {
+  const router = useRouter()
+  const searchParams = useSearchParams()
+  const search = searchParams.get("q")
+  const [value, setValue] = useState(searchParams.get("q") ?? "")
+
+  const handleSearch = () => {
+    const params = new URLSearchParams(searchParams.toString())
+    if (value) {
+      params.set("q", value)
+    } else {
+      params.delete("q")
+    }
+    router.replace(`?${params.toString()}`)
+  }
+
+  return (
+    <div className="flex gap-2">
+      <Input
+        value={value}
+        onChange={(e) => setValue(e.target.value)}
+        onKeyDown={(e) => e.key === "Enter" && handleSearch()}
+        placeholder="Search..."
+      />
+      <Button onClick={handleSearch}>
+        <Search />
+        Search
+      </Button>
+      <Button onClick={() => router.refresh()} variant="outline">
+        <RefreshCcw />
+        Refresh
+      </Button>
+    </div>
+  )
+}

From 552ed5f7e714d533ac16029080357c97f44e5638 Mon Sep 17 00:00:00 2001
From: Lorenzo Corallo <lorenzo.corallo@outlook.it>
Date: Mon, 13 Apr 2026 01:54:51 +0200
Subject: [PATCH 12/22] checkpoint: group row hide toggle

---
 .../(active)/telegram/groups/group-row.tsx    | 29 ++++++++-----------
 src/server/actions/groups.ts                  |  4 +++
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/app/dashboard/(active)/telegram/groups/group-row.tsx b/src/app/dashboard/(active)/telegram/groups/group-row.tsx
index d7dd3f5..8f00f6f 100644
--- a/src/app/dashboard/(active)/telegram/groups/group-row.tsx
+++ b/src/app/dashboard/(active)/telegram/groups/group-row.tsx
@@ -1,21 +1,22 @@
 "use client"
 import { Copy, Pen } from "lucide-react"
+import { useRouter } from "next/navigation"
 import { toast } from "sonner"
 import { Badge } from "@/components/ui/badge"
 import { Button } from "@/components/ui/button"
+import { setGroupHide } from "@/server/actions/groups"
 import type { TgGroup } from "@/server/trpc/types"
 
 export function GroupRow({ row: r }: { row: TgGroup }) {
-  // const trpc = useTRPC()
-  // const { mutateAsync: hideMutate } = useMutation(trpc.tg.groups.setHide.mutationOptions())
-  //
-  // async function toggleHide() {
-  //   const ok = await hideMutate({ telegramId: r.telegramId, hide: !r.hide }).catch(() => false)
-  //   if (!ok) toast.error("The field cannot be modified")
-  //
-  //   toast.success("Hide option toggled!")
-  //   invalidate()
-  // }
+  const router = useRouter()
+
+  async function toggleHide() {
+    const ok = await setGroupHide(r.telegramId, !r.hide).catch(() => false)
+    if (!ok) toast.error("The field cannot be modified")
+
+    toast.success("Hide option toggled!")
+    router.refresh()
+  }
 
   return (
     <div className="grid gap-4 items-center grid-cols-5 border-b py-2 w-full">
@@ -55,13 +56,7 @@ export function GroupRow({ row: r }: { row: TgGroup }) {
       </div>
       <div className="flex items-center justify-start gap-2">
         <p>{r.hide ? <Badge className="bg-yellow-800">HIDDEN</Badge> : <Badge variant="secondary">Visibile</Badge>}</p>
-        <Button
-          type="button"
-          variant="outline"
-          size="icon-sm"
-          className={!r.link ? "hidden" : ""}
-          onClick={() => null /*toggleHide*/}
-        >
+        <Button type="button" variant="outline" size="icon-sm" className={!r.link ? "hidden" : ""} onClick={toggleHide}>
           <Pen />
         </Button>
       </div>
diff --git a/src/server/actions/groups.ts b/src/server/actions/groups.ts
index 95a8f29..89b22ac 100644
--- a/src/server/actions/groups.ts
+++ b/src/server/actions/groups.ts
@@ -5,3 +5,7 @@ import { trpc } from "../trpc"
 export async function searchGroup(query: string) {
   return trpc.tg.groups.search.query({ query, limit: 20, showHidden: true })
 }
+
+export async function setGroupHide(groupId: number, hide: boolean) {
+  return trpc.tg.groups.setHide.mutate({ telegramId: groupId, hide })
+}

From 9e476e9f8f85b9a4601dfec37d3064106049851c Mon Sep 17 00:00:00 2001
From: Lorenzo Corallo <lorenzo.corallo@outlook.it>
Date: Mon, 13 Apr 2026 01:59:06 +0200
Subject: [PATCH 13/22] feat: remove react-query

---
 package.json                                  |  3 --
 pnpm-lock.yaml                                | 33 +++----------------
 src/app/(auth)/onboarding/no-role/page.tsx    |  5 ++-
 .../(active)/telegram/groups/search-input.tsx |  4 +--
 .../telegram/user-details/add-role.tsx        |  6 ++--
 src/app/testtrpc/page.tsx                     |  7 ++--
 src/server/actions/test.ts                    |  6 ++++
 src/server/trpc/server.tsx                    | 33 -------------------
 8 files changed, 19 insertions(+), 78 deletions(-)
 create mode 100644 src/server/actions/test.ts
 delete mode 100644 src/server/trpc/server.tsx

diff --git a/package.json b/package.json
index 7140bef..f267757 100644
--- a/package.json
+++ b/package.json
@@ -19,12 +19,9 @@
     "@polinetwork/backend": "^0.15.15",
     "@radix-ui/react-dialog": "^1.1.15",
     "@t3-oss/env-nextjs": "^0.13.10",
-    "@tanstack/react-query": "^5.90.19",
     "@tanstack/react-table": "^8.21.2",
     "@trpc/client": "11.5.1",
     "@trpc/next": "11.5.1",
-    "@trpc/react-query": "11.5.1",
-    "@trpc/tanstack-react-query": "11.5.1",
     "babel-plugin-react-compiler": "1.0.0",
     "better-auth": "^1.5.5",
     "class-variance-authority": "^0.7.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 56e4e8e..fc81580 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -26,9 +26,6 @@ importers:
       '@t3-oss/env-nextjs':
         specifier: ^0.13.10
         version: 0.13.10(typescript@5.7.3)(zod@4.3.5)
-      '@tanstack/react-query':
-        specifier: ^5.90.19
-        version: 5.90.19(react@18.3.1)
       '@tanstack/react-table':
         specifier: ^8.21.2
         version: 8.21.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -38,12 +35,6 @@ importers:
       '@trpc/next':
         specifier: 11.5.1
         version: 11.5.1(@tanstack/react-query@5.90.19(react@18.3.1))(@trpc/client@11.5.1(@trpc/server@11.5.1(typescript@5.7.3))(typescript@5.7.3))(@trpc/react-query@11.5.1(@tanstack/react-query@5.90.19(react@18.3.1))(@trpc/client@11.5.1(@trpc/server@11.5.1(typescript@5.7.3))(typescript@5.7.3))(@trpc/server@11.5.1(typescript@5.7.3))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.7.3))(@trpc/server@11.5.1(typescript@5.7.3))(next@15.5.9(@babel/core@7.29.0)(babel-plugin-react-compiler@1.0.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.7.3)
-      '@trpc/react-query':
-        specifier: 11.5.1
-        version: 11.5.1(@tanstack/react-query@5.90.19(react@18.3.1))(@trpc/client@11.5.1(@trpc/server@11.5.1(typescript@5.7.3))(typescript@5.7.3))(@trpc/server@11.5.1(typescript@5.7.3))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.7.3)
-      '@trpc/tanstack-react-query':
-        specifier: 11.5.1
-        version: 11.5.1(@tanstack/react-query@5.90.19(react@18.3.1))(@trpc/client@11.5.1(@trpc/server@11.5.1(typescript@5.7.3))(typescript@5.7.3))(@trpc/server@11.5.1(typescript@5.7.3))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.7.3)
       babel-plugin-react-compiler:
         specifier: 1.0.0
         version: 1.0.0
@@ -1795,16 +1786,6 @@ packages:
     peerDependencies:
       typescript: '>=5.7.2'
 
-  '@trpc/tanstack-react-query@11.5.1':
-    resolution: {integrity: sha512-1irzKOXhasMq09pHvLqJPTTwaEULIoNfFtoeLNkLnOVHLGvfHkS9qvpVjinRyW1aiQi7OqFDeaUDrQhtbP6tVA==}
-    peerDependencies:
-      '@tanstack/react-query': ^5.80.3
-      '@trpc/client': 11.5.1
-      '@trpc/server': 11.5.1
-      react: '>=18.2.0'
-      react-dom: '>=18.2.0'
-      typescript: '>=5.7.2'
-
   '@ts-morph/common@0.27.0':
     resolution: {integrity: sha512-Wf29UqxWDpc+i61k3oIOzcUfQt79PIT9y/MWfAGlrkjg6lBC1hwDECLXPVJAhWjiGbfBCxZd65F/LIZF3+jeJQ==}
 
@@ -5085,12 +5066,14 @@ snapshots:
       postcss: 8.5.2
       tailwindcss: 4.1.4
 
-  '@tanstack/query-core@5.90.19': {}
+  '@tanstack/query-core@5.90.19':
+    optional: true
 
   '@tanstack/react-query@5.90.19(react@18.3.1)':
     dependencies:
       '@tanstack/query-core': 5.90.19
       react: 18.3.1
+    optional: true
 
   '@tanstack/react-table@8.21.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
@@ -5125,20 +5108,12 @@ snapshots:
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
       typescript: 5.7.3
+    optional: true
 
   '@trpc/server@11.5.1(typescript@5.7.3)':
     dependencies:
       typescript: 5.7.3
 
-  '@trpc/tanstack-react-query@11.5.1(@tanstack/react-query@5.90.19(react@18.3.1))(@trpc/client@11.5.1(@trpc/server@11.5.1(typescript@5.7.3))(typescript@5.7.3))(@trpc/server@11.5.1(typescript@5.7.3))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.7.3)':
-    dependencies:
-      '@tanstack/react-query': 5.90.19(react@18.3.1)
-      '@trpc/client': 11.5.1(@trpc/server@11.5.1(typescript@5.7.3))(typescript@5.7.3)
-      '@trpc/server': 11.5.1(typescript@5.7.3)
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
-      typescript: 5.7.3
-
   '@ts-morph/common@0.27.0':
     dependencies:
       fast-glob: 3.3.3
diff --git a/src/app/(auth)/onboarding/no-role/page.tsx b/src/app/(auth)/onboarding/no-role/page.tsx
index e04ac23..7146387 100644
--- a/src/app/(auth)/onboarding/no-role/page.tsx
+++ b/src/app/(auth)/onboarding/no-role/page.tsx
@@ -2,8 +2,8 @@ import Image from "next/image"
 import { redirect } from "next/navigation"
 import loginSvg2 from "@/assets/svg/login-2.svg"
 import { Card } from "@/components/ui/card"
+import { getUserRoles } from "@/server/actions/users"
 import { getServerSession } from "@/server/auth"
-import { getQueryClient, trpc } from "@/server/trpc/server"
 import { Logout } from "../link/logout"
 
 export default async function OnboardingNoRole() {
@@ -11,8 +11,7 @@ export default async function OnboardingNoRole() {
   if (!session) redirect("/login")
   if (!session.user.telegramId) redirect("/onboarding/link")
 
-  const qc = getQueryClient()
-  const { roles } = await qc.fetchQuery(trpc.tg.permissions.getRoles.queryOptions({ userId: session.user.telegramId }))
+  const { roles } = await getUserRoles(session.user.telegramId)
   if (roles?.includes("creator")) redirect("/onboarding/unauthorized")
   if (roles && roles.length > 0) redirect("/dashboard")
 
diff --git a/src/app/dashboard/(active)/telegram/groups/search-input.tsx b/src/app/dashboard/(active)/telegram/groups/search-input.tsx
index 4c9cf5a..588d9e4 100644
--- a/src/app/dashboard/(active)/telegram/groups/search-input.tsx
+++ b/src/app/dashboard/(active)/telegram/groups/search-input.tsx
@@ -1,6 +1,6 @@
 "use client"
 
-import { RefreshCcw, Search, X } from "lucide-react"
+import { RefreshCcw, Search } from "lucide-react"
 import { useRouter, useSearchParams } from "next/navigation"
 import { useState } from "react"
 import { Button } from "@/components/ui/button"
@@ -9,7 +9,7 @@ import { Input } from "@/components/ui/input"
 export function SearchInput() {
   const router = useRouter()
   const searchParams = useSearchParams()
-  const search = searchParams.get("q")
+  const _search = searchParams.get("q")
   const [value, setValue] = useState(searchParams.get("q") ?? "")
 
   const handleSearch = () => {
diff --git a/src/app/dashboard/(active)/telegram/user-details/add-role.tsx b/src/app/dashboard/(active)/telegram/user-details/add-role.tsx
index 789f04d..fa0dad9 100644
--- a/src/app/dashboard/(active)/telegram/user-details/add-role.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/add-role.tsx
@@ -1,8 +1,6 @@
 "use client"
 import { USER_ROLE } from "@polinetwork/backend"
-import { useMutation, useQueryClient } from "@tanstack/react-query"
-import { Plus, Search, X } from "lucide-react"
-import { useRouter } from "next/navigation"
+import { Plus } from "lucide-react"
 import { useState } from "react"
 import { toast } from "sonner"
 import { Badge } from "@/components/ui/badge"
@@ -20,7 +18,7 @@ import {
 import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
 import { useSession } from "@/lib/auth"
 import { addUserRole } from "@/server/actions/users"
-import type { ApiOutput, TgUser, TgUserRole } from "@/server/trpc/types"
+import type { TgUser, TgUserRole } from "@/server/trpc/types"
 
 const ARRAY_USER_ROLES = [
   USER_ROLE.ADMIN,
diff --git a/src/app/testtrpc/page.tsx b/src/app/testtrpc/page.tsx
index 9794c7c..7e284b7 100644
--- a/src/app/testtrpc/page.tsx
+++ b/src/app/testtrpc/page.tsx
@@ -1,15 +1,14 @@
-import { getQueryClient, trpc } from "@/server/trpc/server"
+import { testDb } from "@/server/actions/test"
 export const dynamic = "force-dynamic"
 
 export default async function TestTRPCPage() {
-  const queryClient = getQueryClient()
-  const rows = await queryClient.fetchQuery(trpc.test.dbQuery.queryOptions({ dbName: "tg" }))
+  const data = await testDb()
 
   return (
     <div className="flex w-full flex-col gap-4 p-4">
       <p>Test with tRPC. Get the table `test.tg`</p>
       <ol className="list-inside px-4">
-        {rows.map((r, i) => (
+        {data.map((r, i) => (
           <li key={i} className="flex-1 list-decimal">
             {r}
           </li>
diff --git a/src/server/actions/test.ts b/src/server/actions/test.ts
new file mode 100644
index 0000000..3925d43
--- /dev/null
+++ b/src/server/actions/test.ts
@@ -0,0 +1,6 @@
+"use server"
+import { trpc } from "../trpc"
+
+export async function testDb() {
+  return trpc.test.dbQuery.query({ dbName: "tg" })
+}
diff --git a/src/server/trpc/server.tsx b/src/server/trpc/server.tsx
deleted file mode 100644
index 2a1bba6..0000000
--- a/src/server/trpc/server.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import "server-only" // <-- ensure this file cannot be imported from the client
-
-import { type AppRouter, TRPC_PATH } from "@polinetwork/backend"
-import { dehydrate, HydrationBoundary } from "@tanstack/react-query"
-import { createTRPCClient, httpLink } from "@trpc/client"
-import { createTRPCOptionsProxy, type TRPCQueryOptions } from "@trpc/tanstack-react-query"
-import { cache } from "react"
-import SuperJSON from "superjson"
-import { getBaseUrl } from "../../lib/utils"
-import { makeQueryClient } from "./query-client"
-
-const url = getBaseUrl() + TRPC_PATH
-export const getQueryClient = cache(makeQueryClient)
-export const trpc = createTRPCOptionsProxy<AppRouter>({
-  client: createTRPCClient({
-    links: [httpLink({ url, transformer: SuperJSON })],
-  }),
-  queryClient: getQueryClient,
-})
-export function HydrateClient(props: { children: React.ReactNode }) {
-  const queryClient = getQueryClient()
-  return <HydrationBoundary state={dehydrate(queryClient)}>{props.children}</HydrationBoundary>
-}
-// biome-ignore lint/suspicious/noExplicitAny: tRPC docs
-export function prefetch<T extends ReturnType<TRPCQueryOptions<any>>>(queryOptions: T) {
-  const queryClient = getQueryClient()
-  if (queryOptions.queryKey[1]?.type === "infinite") {
-    // biome-ignore lint/suspicious/noExplicitAny: tRPC docs
-    void queryClient.prefetchInfiniteQuery(queryOptions as any)
-  } else {
-    void queryClient.prefetchQuery(queryOptions)
-  }
-}

From b25a5ce402dbc166e7f758bde2d141612cc9e256 Mon Sep 17 00:00:00 2001
From: Lorenzo Corallo <lorenzo.corallo@outlook.it>
Date: Mon, 13 Apr 2026 13:18:07 +0200
Subject: [PATCH 14/22] fix: remove exposure of tRPC

---
 src/middleware.ts         | 5 +++--
 src/server/trpc/index.tsx | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/middleware.ts b/src/middleware.ts
index 88a61c4..dedf9f3 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -1,13 +1,14 @@
+import { AUTH_PATH } from "@polinetwork/backend"
 import type { NextRequest } from "next/server"
 import { NextResponse } from "next/server"
 import { env } from "./env"
 
 export const config = {
-  matcher: ["/api/:path*"],
+  matcher: [`${AUTH_PATH}/:path*`],
 }
 
 export function middleware(request: NextRequest) {
-  if (request.nextUrl.pathname.startsWith("/api")) {
+  if (request.nextUrl.pathname.startsWith(AUTH_PATH)) {
     return NextResponse.rewrite(new URL(request.nextUrl.pathname + request.nextUrl.search, env.BACKEND_URL))
   }
 }
diff --git a/src/server/trpc/index.tsx b/src/server/trpc/index.tsx
index 1d68f02..d21bdfe 100644
--- a/src/server/trpc/index.tsx
+++ b/src/server/trpc/index.tsx
@@ -3,9 +3,9 @@ import "server-only"
 import { type AppRouter, TRPC_PATH } from "@polinetwork/backend"
 import { createTRPCClient, httpBatchLink } from "@trpc/client"
 import SuperJSON from "superjson"
-import { getBaseUrl } from "../../lib/utils"
+import { env } from "@/env"
 
-const url = getBaseUrl() + TRPC_PATH
+const url = env.BACKEND_URL + TRPC_PATH
 export const trpc = createTRPCClient<AppRouter>({
   links: [
     httpBatchLink({

From 99ec56d477c6c904f2bff33cc43c8d22a422edbb Mon Sep 17 00:00:00 2001
From: Lorenzo Corallo <lorenzo.corallo@outlook.it>
Date: Mon, 13 Apr 2026 13:21:42 +0200
Subject: [PATCH 15/22] feat: add count for groups and users lists

---
 src/app/dashboard/(active)/telegram/groups/page.tsx    | 3 +++
 src/app/dashboard/(active)/telegram/user-list/page.tsx | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/app/dashboard/(active)/telegram/groups/page.tsx b/src/app/dashboard/(active)/telegram/groups/page.tsx
index fa41f0a..329bcf4 100644
--- a/src/app/dashboard/(active)/telegram/groups/page.tsx
+++ b/src/app/dashboard/(active)/telegram/groups/page.tsx
@@ -17,6 +17,9 @@ export default async function TgGroups({ searchParams }: { searchParams: Promise
         <ArrowLeft size={16} /> Back
       </Link>
       <SearchInput />
+      <p className="pt-4 text-sm text-muted-foreground">
+        Count: <span className="text-foreground">{rows.length}</span>
+      </p>
       <div className="flex flex-col w-full items-start justify-start py-4">
         <div className="grid gap-4 items-center grid-cols-5 w-full border-b py-2">
           <p>telegram ID</p>
diff --git a/src/app/dashboard/(active)/telegram/user-list/page.tsx b/src/app/dashboard/(active)/telegram/user-list/page.tsx
index a7cdba6..7dcb383 100644
--- a/src/app/dashboard/(active)/telegram/user-list/page.tsx
+++ b/src/app/dashboard/(active)/telegram/user-list/page.tsx
@@ -12,6 +12,9 @@ export default async function TgUsers() {
       <Link href="/dashboard/telegram" className="flex gap-1 items-center text-muted-foreground mb-2 hover:underline">
         <ArrowLeft size={16} /> Back
       </Link>
+      <p className="pt-4 text-sm text-muted-foreground">
+        Count: <span className="text-foreground">{data.users?.length}</span>
+      </p>
       <div className="flex flex-col w-full items-start justify-start py-4">
         <div className="grid gap-4 items-center grid-cols-3 w-full border-b py-2 font-bold">
           <p>Telegram ID</p>

From e3a4eaa8f9b2ce43ad84e18f3820c5579d07f855 Mon Sep 17 00:00:00 2001
From: Lorenzo Corallo <lorenzo.corallo@outlook.it>
Date: Mon, 13 Apr 2026 13:36:09 +0200
Subject: [PATCH 16/22] review

---
 src/app/dashboard/(active)/account/telegram.tsx      |  3 ++-
 .../(active)/azure/members/create-assoc-member.tsx   |  7 ++++++-
 .../azure/members/set-assoc-number-dialog.tsx        |  1 +
 .../(active)/telegram/grants/delete-grant.tsx        |  2 +-
 src/app/dashboard/(active)/telegram/grants/page.tsx  |  1 -
 .../dashboard/(active)/telegram/groups/group-row.tsx | 12 +++++++-----
 src/app/dashboard/(active)/telegram/groups/page.tsx  |  5 +++--
 .../(active)/telegram/groups/search-input.tsx        |  9 ++++++---
 .../telegram/user-details/delete-group-admin.tsx     | 12 ++++++++----
 src/middleware.ts                                    |  2 +-
 src/server/actions/users.ts                          |  2 +-
 11 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/src/app/dashboard/(active)/account/telegram.tsx b/src/app/dashboard/(active)/account/telegram.tsx
index a836afa..779c220 100644
--- a/src/app/dashboard/(active)/account/telegram.tsx
+++ b/src/app/dashboard/(active)/account/telegram.tsx
@@ -6,11 +6,12 @@ export async function Telegram() {
   if (!data || !data.user.telegramId) return null
 
   const { roles } = await getUserRoles(data.user.telegramId)
+  const length = roles?.length ?? 0
 
   return (
     <>
       <span>@{data.user.telegramUsername}</span>
-      {roles?.length && <span className="text-foreground/30 text-xs">(roles: {roles.join(", ")})</span>}
+      {roles && length > 0 && <span className="text-foreground/30 text-xs">(roles: {roles.join(", ")})</span>}
     </>
   )
 }
diff --git a/src/app/dashboard/(active)/azure/members/create-assoc-member.tsx b/src/app/dashboard/(active)/azure/members/create-assoc-member.tsx
index f29d612..834a927 100644
--- a/src/app/dashboard/(active)/azure/members/create-assoc-member.tsx
+++ b/src/app/dashboard/(active)/azure/members/create-assoc-member.tsx
@@ -42,7 +42,12 @@ export function CreateAssocUser() {
       firstName,
       lastName,
       sendEmailTo: sendTo,
-    })
+    }).catch(() => null)
+
+    if (!res) {
+      toast.error("There was an error")
+      return
+    }
 
     if (res.error !== null) {
       toast.error(res.error)
diff --git a/src/app/dashboard/(active)/azure/members/set-assoc-number-dialog.tsx b/src/app/dashboard/(active)/azure/members/set-assoc-number-dialog.tsx
index d660a10..ae3e7dc 100644
--- a/src/app/dashboard/(active)/azure/members/set-assoc-number-dialog.tsx
+++ b/src/app/dashboard/(active)/azure/members/set-assoc-number-dialog.tsx
@@ -1,3 +1,4 @@
+"use client"
 import { useRouter } from "next/navigation"
 import { useState, useTransition } from "react"
 import { toast } from "sonner"
diff --git a/src/app/dashboard/(active)/telegram/grants/delete-grant.tsx b/src/app/dashboard/(active)/telegram/grants/delete-grant.tsx
index 82e74ce..b46bcb3 100644
--- a/src/app/dashboard/(active)/telegram/grants/delete-grant.tsx
+++ b/src/app/dashboard/(active)/telegram/grants/delete-grant.tsx
@@ -32,7 +32,7 @@ export function DeleteGrant({ userId, onDelete }: { userId: number; onDelete():
     const { error } = await interruptGrant({ userId, interruptedById: removerId, sendTgLog: true })
 
     if (error === "NOT_FOUND") toast.info("The grant was expired or already interrupted")
-    else if (error === "UNAUTHORIZED") toast.error("You don't have enought permission")
+    else if (error === "UNAUTHORIZED") toast.error("You don't have enough permission")
     else if (error === "INTERNAL_SERVER_ERROR") toast.error("There was an internal server error")
     else {
       toast.success("Grant interrupted successfully")
diff --git a/src/app/dashboard/(active)/telegram/grants/page.tsx b/src/app/dashboard/(active)/telegram/grants/page.tsx
index e2a7359..39537ee 100644
--- a/src/app/dashboard/(active)/telegram/grants/page.tsx
+++ b/src/app/dashboard/(active)/telegram/grants/page.tsx
@@ -1,4 +1,3 @@
-"use server"
 import { ArrowLeft } from "lucide-react"
 import Link from "next/link"
 import { trpc } from "@/server/trpc"
diff --git a/src/app/dashboard/(active)/telegram/groups/group-row.tsx b/src/app/dashboard/(active)/telegram/groups/group-row.tsx
index 8f00f6f..db84982 100644
--- a/src/app/dashboard/(active)/telegram/groups/group-row.tsx
+++ b/src/app/dashboard/(active)/telegram/groups/group-row.tsx
@@ -12,10 +12,12 @@ export function GroupRow({ row: r }: { row: TgGroup }) {
 
   async function toggleHide() {
     const ok = await setGroupHide(r.telegramId, !r.hide).catch(() => false)
-    if (!ok) toast.error("The field cannot be modified")
-
-    toast.success("Hide option toggled!")
-    router.refresh()
+    if (!ok) {
+      toast.error("The field cannot be modified")
+    } else {
+      toast.success("Hide option toggled!")
+      router.refresh()
+    }
   }
 
   return (
@@ -56,7 +58,7 @@ export function GroupRow({ row: r }: { row: TgGroup }) {
       </div>
       <div className="flex items-center justify-start gap-2">
         <p>{r.hide ? <Badge className="bg-yellow-800">HIDDEN</Badge> : <Badge variant="secondary">Visibile</Badge>}</p>
-        <Button type="button" variant="outline" size="icon-sm" className={!r.link ? "hidden" : ""} onClick={toggleHide}>
+        <Button type="button" variant="outline" size="icon-sm" onClick={toggleHide}>
           <Pen />
         </Button>
       </div>
diff --git a/src/app/dashboard/(active)/telegram/groups/page.tsx b/src/app/dashboard/(active)/telegram/groups/page.tsx
index 329bcf4..910a3da 100644
--- a/src/app/dashboard/(active)/telegram/groups/page.tsx
+++ b/src/app/dashboard/(active)/telegram/groups/page.tsx
@@ -1,4 +1,3 @@
-"use server"
 import { ArrowLeft } from "lucide-react"
 import Link from "next/link"
 import { trpc } from "@/server/trpc"
@@ -11,6 +10,8 @@ export default async function TgGroups({ searchParams }: { searchParams: Promise
   const all = await trpc.tg.groups.getAll.query()
   const rows = q ? (await trpc.tg.groups.search.query({ limit: 20, query: q, showHidden: true })).groups : all
 
+  const sorted = rows.sort((a, b) => a.title.localeCompare(b.title))
+
   return (
     <div className="container p-8">
       <Link href="/dashboard/telegram" className="flex gap-1 items-center text-muted-foreground mb-2 hover:underline">
@@ -28,7 +29,7 @@ export default async function TgGroups({ searchParams }: { searchParams: Promise
           <p>Invite Link</p>
           <p>Hide</p>
         </div>
-        {rows.map((r) => (
+        {sorted.map((r) => (
           <GroupRow row={r} key={r.telegramId} />
         ))}
       </div>
diff --git a/src/app/dashboard/(active)/telegram/groups/search-input.tsx b/src/app/dashboard/(active)/telegram/groups/search-input.tsx
index 588d9e4..82ad573 100644
--- a/src/app/dashboard/(active)/telegram/groups/search-input.tsx
+++ b/src/app/dashboard/(active)/telegram/groups/search-input.tsx
@@ -2,15 +2,15 @@
 
 import { RefreshCcw, Search } from "lucide-react"
 import { useRouter, useSearchParams } from "next/navigation"
-import { useState } from "react"
+import { useEffect, useState } from "react"
 import { Button } from "@/components/ui/button"
 import { Input } from "@/components/ui/input"
 
 export function SearchInput() {
   const router = useRouter()
   const searchParams = useSearchParams()
-  const _search = searchParams.get("q")
-  const [value, setValue] = useState(searchParams.get("q") ?? "")
+  const q = searchParams.get("q") ?? ""
+  const [value, setValue] = useState(q)
 
   const handleSearch = () => {
     const params = new URLSearchParams(searchParams.toString())
@@ -21,6 +21,9 @@ export function SearchInput() {
     }
     router.replace(`?${params.toString()}`)
   }
+  useEffect(() => {
+    setValue(q)
+  }, [q])
 
   return (
     <div className="flex gap-2">
diff --git a/src/app/dashboard/(active)/telegram/user-details/delete-group-admin.tsx b/src/app/dashboard/(active)/telegram/user-details/delete-group-admin.tsx
index 1b85966..776f98a 100644
--- a/src/app/dashboard/(active)/telegram/user-details/delete-group-admin.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/delete-group-admin.tsx
@@ -3,6 +3,7 @@
 import { Trash2, Trash2Icon } from "lucide-react"
 import { useState } from "react"
 import { toast } from "sonner"
+import { Spinner } from "@/components/spinner"
 import {
   AlertDialog,
   AlertDialogAction,
@@ -25,9 +26,11 @@ export function DeleteGroupAdmin({ userId, chatId, onDelete }: { userId: number;
   const removerId = sesh.data?.user.telegramId
 
   const [open, setOpen] = useState(false)
+  const [pending, setPending] = useState(false)
 
   async function deleteGroupAdmin() {
     if (!removerId) return toast.error("Invalid session, try to reload the page")
+    setPending(true)
 
     try {
       await delGroupAdmin(userId, chatId, removerId)
@@ -36,9 +39,10 @@ export function DeleteGroupAdmin({ userId, chatId, onDelete }: { userId: number;
     } catch (err) {
       toast.error("There was an error")
       console.error(err)
+    } finally {
+      setOpen(false)
+      setPending(false)
     }
-
-    setOpen(false)
   }
 
   return (
@@ -61,8 +65,8 @@ export function DeleteGroupAdmin({ userId, chatId, onDelete }: { userId: number;
         </AlertDialogHeader>
         <AlertDialogFooter>
           <AlertDialogCancel>Cancel</AlertDialogCancel>
-          <AlertDialogAction onClick={deleteGroupAdmin} variant="destructive">
-            Confirm
+          <AlertDialogAction disabled={pending} onClick={deleteGroupAdmin} variant="destructive">
+            {pending ? <Spinner /> : "Confirm"}
           </AlertDialogAction>
         </AlertDialogFooter>
       </AlertDialogContent>
diff --git a/src/middleware.ts b/src/middleware.ts
index dedf9f3..95fd401 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -4,7 +4,7 @@ import { NextResponse } from "next/server"
 import { env } from "./env"
 
 export const config = {
-  matcher: [`${AUTH_PATH}/:path*`],
+  matcher: [`/api/auth/:path*`],
 }
 
 export function middleware(request: NextRequest) {
diff --git a/src/server/actions/users.ts b/src/server/actions/users.ts
index 1b9cd0b..085e212 100644
--- a/src/server/actions/users.ts
+++ b/src/server/actions/users.ts
@@ -8,7 +8,7 @@ export async function getUserInfo(userId: number) {
 }
 
 export async function getUserRoles(userId: number) {
-  return (await trpc.tg.permissions.getRoles.query({ userId })) ?? null
+  return await trpc.tg.permissions.getRoles.query({ userId })
 }
 
 export async function searchUserInfo(username: string) {

From 1fc874c6435667c7c80df81e4236af482b0ac702 Mon Sep 17 00:00:00 2001
From: Lorenzo Corallo <lorenzo.corallo@outlook.it>
Date: Mon, 13 Apr 2026 13:37:28 +0200
Subject: [PATCH 17/22] fix: avoid double query in groups

---
 src/app/dashboard/(active)/telegram/groups/page.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/dashboard/(active)/telegram/groups/page.tsx b/src/app/dashboard/(active)/telegram/groups/page.tsx
index 910a3da..68366b8 100644
--- a/src/app/dashboard/(active)/telegram/groups/page.tsx
+++ b/src/app/dashboard/(active)/telegram/groups/page.tsx
@@ -7,8 +7,9 @@ import { SearchInput } from "./search-input"
 export default async function TgGroups({ searchParams }: { searchParams: Promise<{ q?: string }> }) {
   const { q } = await searchParams
 
-  const all = await trpc.tg.groups.getAll.query()
-  const rows = q ? (await trpc.tg.groups.search.query({ limit: 20, query: q, showHidden: true })).groups : all
+  const rows = q
+    ? (await trpc.tg.groups.search.query({ limit: 20, query: q, showHidden: true })).groups
+    : await trpc.tg.groups.getAll.query()
 
   const sorted = rows.sort((a, b) => a.title.localeCompare(b.title))
 

From 91d3b7e57327f4aa4252eb7065efd2cd73706d7b Mon Sep 17 00:00:00 2001
From: Lorenzo Corallo <lorenzo.corallo@outlook.it>
Date: Mon, 13 Apr 2026 14:14:38 +0200
Subject: [PATCH 18/22] feat: put role check in actions

---
 .../dashboard/(active)/account/telegram.tsx   |  2 +-
 .../(active)/telegram/grants/delete-grant.tsx | 30 +++++++-------
 .../(active)/telegram/grants/new-grant.tsx    |  2 -
 .../telegram/user-details/add-role.tsx        | 15 +++++--
 .../user-details/delete-group-admin.tsx       | 19 +++++----
 .../telegram/user-details/new-group-admin.tsx | 21 ++++------
 .../telegram/user-details/remove-role.tsx     | 34 ++++++++++-----
 src/server/actions/azure.ts                   |  7 ++++
 src/server/actions/grants.ts                  | 19 +++++++--
 src/server/actions/groups.ts                  |  4 ++
 src/server/actions/users.ts                   | 41 +++++++++++++++----
 src/server/auth/index.ts                      | 11 +++++
 12 files changed, 138 insertions(+), 67 deletions(-)

diff --git a/src/app/dashboard/(active)/account/telegram.tsx b/src/app/dashboard/(active)/account/telegram.tsx
index 779c220..d573433 100644
--- a/src/app/dashboard/(active)/account/telegram.tsx
+++ b/src/app/dashboard/(active)/account/telegram.tsx
@@ -10,7 +10,7 @@ export async function Telegram() {
 
   return (
     <>
-      <span>@{data.user.telegramUsername}</span>
+      <span>{data.user.telegramUsername ? `@${data.user.telegramUsername}` : data.user.id}</span>
       {roles && length > 0 && <span className="text-foreground/30 text-xs">(roles: {roles.join(", ")})</span>}
     </>
   )
diff --git a/src/app/dashboard/(active)/telegram/grants/delete-grant.tsx b/src/app/dashboard/(active)/telegram/grants/delete-grant.tsx
index b46bcb3..8743e65 100644
--- a/src/app/dashboard/(active)/telegram/grants/delete-grant.tsx
+++ b/src/app/dashboard/(active)/telegram/grants/delete-grant.tsx
@@ -17,30 +17,30 @@ import {
   AlertDialogTrigger,
 } from "@/components/ui/alert-dialog"
 import { Button } from "@/components/ui/button"
-import { useSession } from "@/lib/auth"
 import { interruptGrant } from "@/server/actions/grants"
 
 export function DeleteGrant({ userId, onDelete }: { userId: number; onDelete(): void }) {
-  const sesh = useSession()
-  const removerId = sesh.data?.user.telegramId
-
   const router = useRouter()
   const [open, setOpen] = useState(false)
 
   async function interrupt() {
-    if (!removerId) return toast.error("Invalid session, try to reload the page")
-    const { error } = await interruptGrant({ userId, interruptedById: removerId, sendTgLog: true })
+    try {
+      const { error } = await interruptGrant(userId)
 
-    if (error === "NOT_FOUND") toast.info("The grant was expired or already interrupted")
-    else if (error === "UNAUTHORIZED") toast.error("You don't have enough permission")
-    else if (error === "INTERNAL_SERVER_ERROR") toast.error("There was an internal server error")
-    else {
-      toast.success("Grant interrupted successfully")
-      router.refresh()
-      onDelete()
+      if (error === "NOT_FOUND") toast.info("The grant was expired or already interrupted")
+      else if (error === "UNAUTHORIZED") toast.error("You don't have enough permission")
+      else if (error === "INTERNAL_SERVER_ERROR") toast.error("There was an internal server error")
+      else {
+        toast.success("Grant interrupted successfully")
+        router.refresh()
+        onDelete()
+      }
+    } catch (err) {
+      toast.error("There was an error")
+      console.error(err)
+    } finally {
+      handleOpenChange(false)
     }
-
-    handleOpenChange(false)
   }
 
   function handleOpenChange(v: boolean) {
diff --git a/src/app/dashboard/(active)/telegram/grants/new-grant.tsx b/src/app/dashboard/(active)/telegram/grants/new-grant.tsx
index 051b8f2..3f839aa 100644
--- a/src/app/dashboard/(active)/telegram/grants/new-grant.tsx
+++ b/src/app/dashboard/(active)/telegram/grants/new-grant.tsx
@@ -78,11 +78,9 @@ export function NewGrant() {
     if (!user || !startDate || !endDate || !adderId) return
     const res = await createGrant({
       userId: user.id,
-      adderId,
       since: startDate,
       until: endDate,
       reason: reason || undefined,
-      sendTgLog: true,
     })
 
     if (res.error === "UNAUTHORIZED") toast.error("You don't have permission to create grants.")
diff --git a/src/app/dashboard/(active)/telegram/user-details/add-role.tsx b/src/app/dashboard/(active)/telegram/user-details/add-role.tsx
index fa0dad9..b208d5f 100644
--- a/src/app/dashboard/(active)/telegram/user-details/add-role.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/add-role.tsx
@@ -47,14 +47,21 @@ export function AddRole({ user, alreadyRoles, onAdd }: { user: TgUser; alreadyRo
     if (!user) return toast.warning("Invalid user, try restarting the dialog")
 
     try {
-      await addUserRole(user.id, selectedRole, adderId)
-      toast.info(`Role added`)
+      const { error } = await addUserRole(user.id, selectedRole)
+
+      if (error === "UNAUTHORIZED") toast.error("You don't have enough permission")
+      else if (error === "INTERNAL_SERVER_ERROR") toast.error("There was an internal server error")
+      else if (error === "UNAUTHORIZED_SELF_ASSIGN") toast.error("You cannot add roles to yourself")
+      else {
+        toast.success(`Role added!`)
+        onAdd()
+      }
       handleOpenChange(false)
-      onAdd()
     } catch (err) {
       console.error(err)
-      handleOpenChange(false)
       toast.error("There was an error, check logs")
+    } finally {
+      handleOpenChange(false)
     }
   }
 
diff --git a/src/app/dashboard/(active)/telegram/user-details/delete-group-admin.tsx b/src/app/dashboard/(active)/telegram/user-details/delete-group-admin.tsx
index 776f98a..3a2cdcc 100644
--- a/src/app/dashboard/(active)/telegram/user-details/delete-group-admin.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/delete-group-admin.tsx
@@ -17,25 +17,26 @@ import {
   AlertDialogTrigger,
 } from "@/components/ui/alert-dialog"
 import { Button } from "@/components/ui/button"
-import { useSession } from "@/lib/auth"
 import { delGroupAdmin } from "@/server/actions/users"
 
 export function DeleteGroupAdmin({ userId, chatId, onDelete }: { userId: number; chatId: number; onDelete(): void }) {
-  const sesh = useSession()
-
-  const removerId = sesh.data?.user.telegramId
-
   const [open, setOpen] = useState(false)
   const [pending, setPending] = useState(false)
 
   async function deleteGroupAdmin() {
-    if (!removerId) return toast.error("Invalid session, try to reload the page")
     setPending(true)
 
     try {
-      await delGroupAdmin(userId, chatId, removerId)
-      toast.success("Group Admin deleted!")
-      onDelete()
+      const { error } = await delGroupAdmin(userId, chatId)
+
+      if (error === "NOT_FOUND") toast.info("User or group admin not found")
+      else if (error === "UNAUTHORIZED") toast.error("You don't have enough permission")
+      else if (error === "INTERNAL_SERVER_ERROR") toast.error("There was an internal server error")
+      else if (error === "UNAUTHORIZED_SELF_ASSIGN") toast.error("You cannot delete on yourself")
+      else {
+        toast.success("Group Admin deleted!")
+        onDelete()
+      }
     } catch (err) {
       toast.error("There was an error")
       console.error(err)
diff --git a/src/app/dashboard/(active)/telegram/user-details/new-group-admin.tsx b/src/app/dashboard/(active)/telegram/user-details/new-group-admin.tsx
index 1dac5cd..58763cc 100644
--- a/src/app/dashboard/(active)/telegram/user-details/new-group-admin.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/new-group-admin.tsx
@@ -16,7 +16,6 @@ import {
 import { Input } from "@/components/ui/input"
 import { Label } from "@/components/ui/label"
 import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger } from "@/components/ui/select"
-import { useSession } from "@/lib/auth"
 import { searchGroup } from "@/server/actions/groups"
 import { addGroupAdmin } from "@/server/actions/users"
 import type { ApiOutput } from "@/server/trpc/types"
@@ -25,9 +24,6 @@ type Groups = ApiOutput["tg"]["groups"]["search"]["groups"]
 type User = ApiOutput["tg"]["users"]["getByUsername"]["user"]
 
 export function NewGroupAdmin({ user, alreadyIn, onConfirm }: { user: User; alreadyIn: number[]; onConfirm(): void }) {
-  const sesh = useSession()
-  const adderId = sesh.data?.user.telegramId
-
   const [open, setOpen] = useState(false)
   const [groupQuery, setGroupQuery] = useState("")
   const [groups, setGroups] = useState<Groups>([])
@@ -38,22 +34,23 @@ export function NewGroupAdmin({ user, alreadyIn, onConfirm }: { user: User; alre
     setGroups(groups.filter((g) => !alreadyIn.includes(g.telegramId)))
   }
 
-  // const submitMutation = useMutation(trpc.tg.permissions.addGroup.mutationOptions())
-
   async function submit() {
-    if (!adderId) return toast.warning("Invalid session, try reloading the page")
     if (!selectedGroup) return toast.warning("No group selected, cannot proceed")
     if (!user) return toast.warning("Invalid user, try restarting the dialog")
 
     try {
-      await addGroupAdmin(user.id, selectedGroup.telegramId, adderId)
-      toast.info(`Group admin added`)
-      handleOpenChange(false)
-      onConfirm()
+      const { error } = await addGroupAdmin(user.id, selectedGroup.telegramId)
+      if (error) {
+        toast.error("You don't have enough permissions")
+      } else {
+        toast.info(`Group admin added`)
+        onConfirm()
+      }
     } catch (err) {
       console.error(err)
-      handleOpenChange(false)
       toast.error("There was an error, check logs")
+    } finally {
+      handleOpenChange(false)
     }
   }
 
diff --git a/src/app/dashboard/(active)/telegram/user-details/remove-role.tsx b/src/app/dashboard/(active)/telegram/user-details/remove-role.tsx
index 2e61c47..dc86f24 100644
--- a/src/app/dashboard/(active)/telegram/user-details/remove-role.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/remove-role.tsx
@@ -18,10 +18,7 @@ import {
 import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
 import { useSession } from "@/lib/auth"
 import { delUserRole } from "@/server/actions/users"
-import type { ApiOutput } from "@/server/trpc/types"
-
-type User = ApiOutput["tg"]["users"]["getByUsername"]["user"]
-type Roles = NonNullable<ApiOutput["tg"]["permissions"]["getRoles"]["roles"]>
+import type { ApiOutput, TgUser, TgUserRole } from "@/server/trpc/types"
 
 const ARRAY_USER_ROLES = [
   USER_ROLE.ADMIN,
@@ -32,7 +29,15 @@ const ARRAY_USER_ROLES = [
   USER_ROLE.PRESIDENT,
 ] as const
 
-export function RemoveRole({ user, alreadyRoles, onDelete }: { user: User; alreadyRoles: Roles; onDelete(): void }) {
+export function RemoveRole({
+  user,
+  alreadyRoles,
+  onDelete,
+}: {
+  user: TgUser
+  alreadyRoles: TgUserRole[]
+  onDelete(): void
+}) {
   const sesh = useSession()
   const removerId = sesh.data?.user.telegramId
 
@@ -42,7 +47,7 @@ export function RemoveRole({ user, alreadyRoles, onDelete }: { user: User; alrea
   }))
 
   const [open, setOpen] = useState(false)
-  const [selectedRole, setSelectedRole] = useState<Roles[number] | null>(null)
+  const [selectedRole, setSelectedRole] = useState<TgUserRole | null>(null)
 
   async function submit() {
     if (!removerId) return toast.warning("Invalid session, try reloading the page")
@@ -50,14 +55,21 @@ export function RemoveRole({ user, alreadyRoles, onDelete }: { user: User; alrea
     if (!user) return toast.warning("Invalid user, try restarting the dialog")
 
     try {
-      await delUserRole(user.id, selectedRole, removerId)
-      toast.info(`Role removed`)
-      handleOpenChange(false)
-      onDelete()
+      const { error } = await delUserRole(user.id, selectedRole)
+
+      if (error === "NOT_FOUND") toast.info("User or role not found")
+      else if (error === "UNAUTHORIZED") toast.error("You don't have enough permission")
+      else if (error === "INTERNAL_SERVER_ERROR") toast.error("There was an internal server error")
+      else if (error === "UNAUTHORIZED_SELF_ASSIGN") toast.error("You cannot delete on yourself")
+      else {
+        toast.success("Role removed!")
+        onDelete()
+      }
     } catch (err) {
       console.error(err)
-      handleOpenChange(false)
       toast.error("There was an error, check logs")
+    } finally {
+      handleOpenChange(false)
     }
   }
 
diff --git a/src/server/actions/azure.ts b/src/server/actions/azure.ts
index 5e28550..5c7594f 100644
--- a/src/server/actions/azure.ts
+++ b/src/server/actions/azure.ts
@@ -1,5 +1,6 @@
 "use server"
 
+import { requireRole } from "../auth"
 import { trpc } from "../trpc"
 import type { ApiInput } from "../trpc/types"
 
@@ -8,9 +9,15 @@ export async function getAzureMembers() {
 }
 
 export async function createAzureMember(input: ApiInput["azure"]["members"]["create"]) {
+  const { allowed } = await requireRole(["owner", "direttivo", "president"])
+  if (!allowed) return { error: "UNAUTHORIZED" }
+
   return await trpc.azure.members.create.mutate(input)
 }
 
 export async function setAzureMemberNumber(input: ApiInput["azure"]["members"]["setAssocNumber"]) {
+  const { allowed } = await requireRole(["owner", "direttivo", "president"])
+  if (!allowed) return { error: "UNAUTHORIZED" }
+
   return await trpc.azure.members.setAssocNumber.mutate(input)
 }
diff --git a/src/server/actions/grants.ts b/src/server/actions/grants.ts
index b84800b..07f2769 100644
--- a/src/server/actions/grants.ts
+++ b/src/server/actions/grants.ts
@@ -1,5 +1,6 @@
 "use server"
 
+import { requireRole } from "../auth"
 import { trpc } from "../trpc"
 import type { ApiInput } from "../trpc/types"
 
@@ -7,10 +8,20 @@ export async function getUserGrant(userId: number) {
   return await trpc.tg.grants.checkUser.query({ userId })
 }
 
-export async function createGrant(input: ApiInput["tg"]["grants"]["create"]) {
-  return await trpc.tg.grants.create.mutate(input)
+export async function createGrant(input: Omit<ApiInput["tg"]["grants"]["create"], "adderId" | "sendTgLog">) {
+  const { allowed, telegramId } = await requireRole(["owner", "direttivo", "president"])
+  if (!allowed) return { success: false, error: "UNAUTHORIZED" }
+
+  return await trpc.tg.grants.create.mutate({ ...input, adderId: telegramId, sendTgLog: true })
 }
 
-export async function interruptGrant(input: ApiInput["tg"]["grants"]["interrupt"]) {
-  return await trpc.tg.grants.interrupt.mutate(input)
+export async function interruptGrant(userId: number) {
+  const { allowed, telegramId } = await requireRole(["owner", "direttivo", "president"])
+  if (!allowed)
+    return {
+      success: false,
+      error: "UNAUTHORIZED",
+    }
+
+  return await trpc.tg.grants.interrupt.mutate({ userId, interruptedById: telegramId, sendTgLog: true })
 }
diff --git a/src/server/actions/groups.ts b/src/server/actions/groups.ts
index 89b22ac..874bc81 100644
--- a/src/server/actions/groups.ts
+++ b/src/server/actions/groups.ts
@@ -1,5 +1,6 @@
 "use server"
 
+import { requireRole } from "../auth"
 import { trpc } from "../trpc"
 
 export async function searchGroup(query: string) {
@@ -7,5 +8,8 @@ export async function searchGroup(query: string) {
 }
 
 export async function setGroupHide(groupId: number, hide: boolean) {
+  const { allowed } = await requireRole(["owner", "direttivo", "president"])
+  if (!allowed) return false
+
   return trpc.tg.groups.setHide.mutate({ telegramId: groupId, hide })
 }
diff --git a/src/server/actions/users.ts b/src/server/actions/users.ts
index 085e212..f2ee074 100644
--- a/src/server/actions/users.ts
+++ b/src/server/actions/users.ts
@@ -1,6 +1,7 @@
 "use server"
+import { requireRole } from "../auth"
 import { trpc } from "../trpc"
-import type { TgUserRole } from "../trpc/types"
+import type { ApiOutput, TgUserRole } from "../trpc/types"
 import { getUserGrant } from "./grants"
 
 export async function getUserInfo(userId: number) {
@@ -34,18 +35,40 @@ export async function searchUser(username: string) {
   return { roles, groupAdmin, user, messages, audits, grant }
 }
 
-export async function addGroupAdmin(userId: number, groupId: number, adderId: number) {
-  await trpc.tg.permissions.addGroup.mutate({ userId, adderId, groupId })
+export async function addGroupAdmin(userId: number, groupId: number) {
+  const { allowed, telegramId } = await requireRole(["owner", "direttivo", "president"])
+  if (!allowed) return { error: "UNAUTHORIZED" }
+
+  await trpc.tg.permissions.addGroup.mutate({ userId, adderId: telegramId, groupId })
+  return { error: null }
 }
 
-export async function delGroupAdmin(userId: number, groupId: number, removerId: number) {
-  await trpc.tg.permissions.removeGroup.mutate({ userId, removerId, groupId })
+export async function delGroupAdmin(
+  userId: number,
+  groupId: number
+): Promise<ApiOutput["tg"]["permissions"]["removeGroup"]> {
+  const { allowed, telegramId } = await requireRole(["owner", "direttivo", "president"])
+  if (!allowed) return { error: "UNAUTHORIZED" }
+
+  return await trpc.tg.permissions.removeGroup.mutate({ userId, removerId: telegramId, groupId })
 }
 
-export async function addUserRole(userId: number, role: TgUserRole, adderId: number) {
-  await trpc.tg.permissions.addRole.mutate({ userId, role, adderId })
+export async function addUserRole(
+  userId: number,
+  role: TgUserRole
+): Promise<ApiOutput["tg"]["permissions"]["addRole"]> {
+  const { allowed, telegramId } = await requireRole(["owner", "direttivo", "president"])
+  if (!allowed) return { roles: null, error: "UNAUTHORIZED" }
+
+  return await trpc.tg.permissions.addRole.mutate({ userId, role, adderId: telegramId })
 }
 
-export async function delUserRole(userId: number, role: TgUserRole, removerId: number) {
-  await trpc.tg.permissions.removeRole.mutate({ userId, role, removerId })
+export async function delUserRole(
+  userId: number,
+  role: TgUserRole
+): Promise<ApiOutput["tg"]["permissions"]["removeRole"]> {
+  const { allowed, telegramId } = await requireRole(["owner", "direttivo", "president"])
+  if (!allowed) return { roles: null, error: "UNAUTHORIZED" }
+
+  return await trpc.tg.permissions.removeRole.mutate({ userId, role, removerId: telegramId })
 }
diff --git a/src/server/auth/index.ts b/src/server/auth/index.ts
index 645f043..0c8c534 100644
--- a/src/server/auth/index.ts
+++ b/src/server/auth/index.ts
@@ -1,5 +1,7 @@
 import { headers } from "next/headers"
 import { getSession } from "@/lib/auth"
+import { trpc } from "../trpc"
+import type { TgUserRole } from "../trpc/types"
 
 export const getServerSession = async () => {
   const session = await getSession({
@@ -10,3 +12,12 @@ export const getServerSession = async () => {
   // console.log(session);
   return session
 }
+
+export async function requireRole(allowedRoles: TgUserRole[]) {
+  const session = await getServerSession()
+  const telegramId = session.data?.user.telegramId
+  if (!telegramId) return { allowed: false, telegramId: 0 }
+
+  const { roles } = await trpc.tg.permissions.getRoles.query({ userId: telegramId })
+  return { allowed: roles?.some((s) => allowedRoles.includes(s)), telegramId }
+}

From 995237ceff1f22ce1c0f968af228a59e6785466b Mon Sep 17 00:00:00 2001
From: Lorenzo Corallo <lorenzo.corallo@outlook.it>
Date: Mon, 13 Apr 2026 14:19:33 +0200
Subject: [PATCH 19/22] fix: pending states

---
 .../telegram/user-details/add-role.tsx        | 22 ++++++++++++-------
 .../telegram/user-details/remove-role.tsx     | 16 +++++++++++---
 src/components/spinner.tsx                    |  2 +-
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/app/dashboard/(active)/telegram/user-details/add-role.tsx b/src/app/dashboard/(active)/telegram/user-details/add-role.tsx
index b208d5f..dfd5685 100644
--- a/src/app/dashboard/(active)/telegram/user-details/add-role.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/add-role.tsx
@@ -3,6 +3,7 @@ import { USER_ROLE } from "@polinetwork/backend"
 import { Plus } from "lucide-react"
 import { useState } from "react"
 import { toast } from "sonner"
+import { Spinner } from "@/components/spinner"
 import { Badge } from "@/components/ui/badge"
 import { Button } from "@/components/ui/button"
 import {
@@ -16,7 +17,6 @@ import {
   DialogTrigger,
 } from "@/components/ui/dialog"
 import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
-import { useSession } from "@/lib/auth"
 import { addUserRole } from "@/server/actions/users"
 import type { TgUser, TgUserRole } from "@/server/trpc/types"
 
@@ -30,22 +30,21 @@ const ARRAY_USER_ROLES = [
 ] as const
 
 export function AddRole({ user, alreadyRoles, onAdd }: { user: TgUser; alreadyRoles: TgUserRole[]; onAdd(): void }) {
-  const sesh = useSession()
-  const adderId = sesh.data?.user.telegramId
-
   const availableRoles = ARRAY_USER_ROLES.filter((r) => !alreadyRoles.includes(r)).map((g) => ({
     value: g,
     label: `${g.slice(0, 1).toUpperCase()}${g.slice(1)}`,
   }))
 
   const [open, setOpen] = useState(false)
+  const [pending, setPending] = useState(false)
   const [selectedRole, setSelectedRole] = useState<TgUserRole | null>(null)
 
   async function submit() {
-    if (!adderId) return toast.warning("Invalid session, try reloading the page")
     if (!selectedRole) return toast.warning("No group selected, cannot proceed")
     if (!user) return toast.warning("Invalid user, try restarting the dialog")
 
+    setPending(true)
+
     try {
       const { error } = await addUserRole(user.id, selectedRole)
 
@@ -61,6 +60,7 @@ export function AddRole({ user, alreadyRoles, onAdd }: { user: TgUser; alreadyRo
       console.error(err)
       toast.error("There was an error, check logs")
     } finally {
+      setPending(false)
       handleOpenChange(false)
     }
   }
@@ -119,9 +119,15 @@ export function AddRole({ user, alreadyRoles, onAdd }: { user: TgUser; alreadyRo
         </Select>
 
         <DialogFooter>
-          <DialogClose render={<Button variant="outline">Cancel</Button>} />
-          <Button onClick={submit} disabled={!selectedRole}>
-            Confirm
+          <DialogClose
+            render={
+              <Button disabled={pending} variant="outline">
+                Cancel
+              </Button>
+            }
+          />
+          <Button onClick={submit} disabled={!selectedRole || pending}>
+            {pending ? <Spinner /> : "Confirm"}
           </Button>
         </DialogFooter>
       </DialogContent>
diff --git a/src/app/dashboard/(active)/telegram/user-details/remove-role.tsx b/src/app/dashboard/(active)/telegram/user-details/remove-role.tsx
index dc86f24..9235dca 100644
--- a/src/app/dashboard/(active)/telegram/user-details/remove-role.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/remove-role.tsx
@@ -3,6 +3,7 @@ import { USER_ROLE } from "@polinetwork/backend"
 import { Minus } from "lucide-react"
 import { useState } from "react"
 import { toast } from "sonner"
+import { Spinner } from "@/components/spinner"
 import { Badge } from "@/components/ui/badge"
 import { Button } from "@/components/ui/button"
 import {
@@ -47,12 +48,14 @@ export function RemoveRole({
   }))
 
   const [open, setOpen] = useState(false)
+  const [pending, setPending] = useState(false)
   const [selectedRole, setSelectedRole] = useState<TgUserRole | null>(null)
 
   async function submit() {
     if (!removerId) return toast.warning("Invalid session, try reloading the page")
     if (!selectedRole) return toast.warning("No group selected, cannot proceed")
     if (!user) return toast.warning("Invalid user, try restarting the dialog")
+    setPending(true)
 
     try {
       const { error } = await delUserRole(user.id, selectedRole)
@@ -69,6 +72,7 @@ export function RemoveRole({
       console.error(err)
       toast.error("There was an error, check logs")
     } finally {
+      setPending(false)
       handleOpenChange(false)
     }
   }
@@ -127,9 +131,15 @@ export function RemoveRole({
         </Select>
 
         <DialogFooter>
-          <DialogClose render={<Button variant="outline">Cancel</Button>} />
-          <Button onClick={submit} disabled={!selectedRole} variant="destructive">
-            Confirm
+          <DialogClose
+            render={
+              <Button disabled={pending} variant="outline">
+                Cancel
+              </Button>
+            }
+          />
+          <Button onClick={submit} disabled={!selectedRole || pending} variant="destructive">
+            {pending ? <Spinner /> : "Confirm"}
           </Button>
         </DialogFooter>
       </DialogContent>
diff --git a/src/components/spinner.tsx b/src/components/spinner.tsx
index d2d1105..97e5baf 100644
--- a/src/components/spinner.tsx
+++ b/src/components/spinner.tsx
@@ -6,7 +6,7 @@ export function Spinner({ className }: React.HtmlHTMLAttributes<SVGElement>) {
     <div role="status">
       <svg
         aria-hidden="true"
-        className={cn("fill-secondary h-8 w-8 animate-spin text-gray-200 dark:text-gray-600", className)}
+        className={cn("fill-white h-8 w-8 animate-spin text-accent", className)}
         viewBox="0 0 100 101"
         fill="none"
         xmlns="http://www.w3.org/2000/svg"

From 437d9df5d64a0af4299d4f78961191dff3a88d2c Mon Sep 17 00:00:00 2001
From: Lorenzo Corallo <lorenzo.corallo@outlook.it>
Date: Mon, 13 Apr 2026 14:27:11 +0200
Subject: [PATCH 20/22] fix: update auditlog query

---
 package.json                                           |  2 +-
 pnpm-lock.yaml                                         | 10 +++++-----
 .../(active)/telegram/user-details/card-audit-log.tsx  |  2 +-
 src/server/actions/users.ts                            |  9 +--------
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index f267757..b4e204c 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "@base-ui/react": "^1.3.0",
     "@better-auth/passkey": "^1.5.5",
     "@hookform/resolvers": "^3.9.1",
-    "@polinetwork/backend": "^0.15.15",
+    "@polinetwork/backend": "^0.15.16",
     "@radix-ui/react-dialog": "^1.1.15",
     "@t3-oss/env-nextjs": "^0.13.10",
     "@tanstack/react-table": "^8.21.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index fc81580..aef74f8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -18,8 +18,8 @@ importers:
         specifier: ^3.9.1
         version: 3.10.0(react-hook-form@7.55.0(react@18.3.1))
       '@polinetwork/backend':
-        specifier: ^0.15.15
-        version: 0.15.15
+        specifier: ^0.15.16
+        version: 0.15.16
       '@radix-ui/react-dialog':
         specifier: ^1.1.15
         version: 1.1.15(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -841,8 +841,8 @@ packages:
     resolution: {integrity: sha512-C2Xj8FZ0uHWeCXXqX5B4/gVFQmtSkiuOolzAgutjTfseNOHT3pUjljDZsTSxXFGgio54bCzVFqmEOUrIVk8RDA==}
     engines: {node: '>=20.0.0'}
 
-  '@polinetwork/backend@0.15.15':
-    resolution: {integrity: sha512-cgWO5YOeEBl08EWvf+FpsJlEWHkSxsYUqTHjO3+p58VHggkpbXbF+qqbTUhCmfCUek765ZVxO/08VGOXvoM2QQ==}
+  '@polinetwork/backend@0.15.16':
+    resolution: {integrity: sha512-wGJZ3FsJfiYqh0S/pF726aFVNQE+u+ZiN6zUpgjT5D+NaZv3orYwRf5DXvKRm7GjGf+PX/BwXPgTRKnnauv1Ew==}
 
   '@radix-ui/number@1.1.1':
     resolution: {integrity: sha512-MkKCwxlXTgz6CFoJx3pCwn07GKp36+aZyu/u2Ln2VrA5DcdyCZkASEDBTd8x5whTQQL5CiYf4prXKLcgQdv29g==}
@@ -4179,7 +4179,7 @@ snapshots:
       tslib: 2.8.1
       tsyringe: 4.10.0
 
-  '@polinetwork/backend@0.15.15': {}
+  '@polinetwork/backend@0.15.16': {}
 
   '@radix-ui/number@1.1.1': {}
 
diff --git a/src/app/dashboard/(active)/telegram/user-details/card-audit-log.tsx b/src/app/dashboard/(active)/telegram/user-details/card-audit-log.tsx
index 6b17205..681216e 100644
--- a/src/app/dashboard/(active)/telegram/user-details/card-audit-log.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/card-audit-log.tsx
@@ -17,7 +17,7 @@ export function AuditLogCard({ log: m }: { log: Log }) {
           {m.groupTitle && <span>{m.groupTitle}</span>} [{m.groupId}]
         </p>
         <span className="text-muted-foreground">Admin ID: </span>
-        <p>{m.admin?.user && fmtUser(m.admin.user)}</p>
+        <p>{m.admin && fmtUser(m.admin)}</p>
 
         {m.createdAt && (
           <>
diff --git a/src/server/actions/users.ts b/src/server/actions/users.ts
index f2ee074..f8c14ca 100644
--- a/src/server/actions/users.ts
+++ b/src/server/actions/users.ts
@@ -22,14 +22,7 @@ export async function searchUser(username: string) {
 
   const { roles, groupAdmin } = await trpc.tg.permissions.getRoles.query({ userId: user.id })
   const { messages } = await trpc.tg.messages.getLastByUser.query({ userId: user.id, limit: 15 })
-  const audit = await trpc.tg.auditLog.getById.query({ targetId: user.id })
-
-  const audits = await Promise.all(
-    audit.map(async (audit) => ({
-      ...audit,
-      admin: await trpc.tg.users.get.query({ userId: audit.adminId }).catch(() => null),
-    }))
-  )
+  const audits = await trpc.tg.auditLog.getById.query({ targetId: user.id })
 
   const { grant } = await getUserGrant(user.id)
   return { roles, groupAdmin, user, messages, audits, grant }

From 615a092d668d017f0dd09b2833be5affe421162d Mon Sep 17 00:00:00 2001
From: Lorenzo Corallo <lorenzo.corallo@outlook.it>
Date: Mon, 13 Apr 2026 14:31:30 +0200
Subject: [PATCH 21/22] fix: better data fetching

---
 .../(active)/telegram/user-details/page.tsx   | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/app/dashboard/(active)/telegram/user-details/page.tsx b/src/app/dashboard/(active)/telegram/user-details/page.tsx
index 5c8429f..2e2a54f 100644
--- a/src/app/dashboard/(active)/telegram/user-details/page.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/page.tsx
@@ -1,7 +1,7 @@
 "use client"
 import { ArrowLeft, RefreshCcw, Search, X } from "lucide-react"
 import Link from "next/link"
-import { Suspense, startTransition, useActionState, useState } from "react"
+import { Suspense, startTransition, useActionState, useState, useTransition } from "react"
 import { Spinner } from "@/components/spinner"
 import { Button } from "@/components/ui/button"
 import { Input } from "@/components/ui/input"
@@ -18,11 +18,19 @@ type Data = Awaited<ReturnType<typeof searchUser>>
 
 export default function TgUsers() {
   const [username, setUsername] = useState("")
-  const [data, action, pending] = useActionState<Data | null>(() => (username ? searchUser(username) : null), null)
+  const [data, setData] = useState<Data | null>(null)
+  const [pending, startTransition] = useTransition()
 
-  function reset() {
+  async function submit() {
+    startTransition(async () => {
+      const user = await searchUser(username)
+      setData(user)
+    })
+  }
+
+  async function reset() {
     setUsername("")
-    action()
+    setData(null)
   }
 
   return (
@@ -31,7 +39,7 @@ export default function TgUsers() {
         <ArrowLeft size={16} /> Back
       </Link>
 
-      <form action={action} className="pt-2 gap-y-4 flex flex-col justify-start items-start">
+      <form action={submit} className="pt-2 gap-y-4 flex flex-col justify-start items-start">
         <div className="flex gap-2 flex-col items-start justify-start">
           <Label htmlFor="email" className="text-base">
             Search by username
@@ -51,7 +59,7 @@ export default function TgUsers() {
             />
 
             {data ? (
-              <Button variant="outline" onClick={() => startTransition(reset)}>
+              <Button variant="outline" disabled={pending} onClick={() => startTransition(reset)}>
                 <X />
                 Reset
               </Button>

From 2139007bd1b06c0351a1c31e24ac030f2d2f6331 Mon Sep 17 00:00:00 2001
From: Lorenzo Corallo <lorenzo.corallo@outlook.it>
Date: Mon, 13 Apr 2026 14:33:31 +0200
Subject: [PATCH 22/22] fix: old update state

---
 .../(active)/telegram/user-details/page.tsx     | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/app/dashboard/(active)/telegram/user-details/page.tsx b/src/app/dashboard/(active)/telegram/user-details/page.tsx
index 2e2a54f..40d1671 100644
--- a/src/app/dashboard/(active)/telegram/user-details/page.tsx
+++ b/src/app/dashboard/(active)/telegram/user-details/page.tsx
@@ -1,7 +1,7 @@
 "use client"
 import { ArrowLeft, RefreshCcw, Search, X } from "lucide-react"
 import Link from "next/link"
-import { Suspense, startTransition, useActionState, useState, useTransition } from "react"
+import { Suspense, useState, useTransition } from "react"
 import { Spinner } from "@/components/spinner"
 import { Button } from "@/components/ui/button"
 import { Input } from "@/components/ui/input"
@@ -83,10 +83,8 @@ export default function TgUsers() {
       {data && (
         <>
           <div className="grid grid-cols-3 items-start gap-4">
-            <UserInfoCard user={data.user} roles={data.roles ?? []} onUpdate={() => startTransition(action)} />
-            {data.grant && (
-              <UserGrantCard user={data.user} grant={data.grant} onDelete={() => startTransition(action)} />
-            )}
+            <UserInfoCard user={data.user} roles={data.roles ?? []} onUpdate={submit} />
+            {data.grant && <UserGrantCard user={data.user} grant={data.grant} onDelete={submit} />}
           </div>
 
           <div className="pt-6 flex gap-4 items-center">
@@ -94,19 +92,14 @@ export default function TgUsers() {
             <NewGroupAdmin
               user={data.user}
               alreadyIn={data.groupAdmin.map((g) => g?.group.id ?? 0) ?? []}
-              onConfirm={() => startTransition(action)}
+              onConfirm={submit}
             />
           </div>
           <div className="grid grid-cols-4 py-2 gap-4">
             {data.groupAdmin
               .filter((m) => m !== null && m !== undefined)
               .map((m) => (
-                <GroupAdminCard
-                  groupAdminInfo={m}
-                  user={data.user}
-                  key={m.group.id}
-                  onDelete={() => startTransition(action)}
-                />
+                <GroupAdminCard groupAdminInfo={m} user={data.user} key={m.group.id} onDelete={submit} />
               ))}
 
             {data.groupAdmin.length === 0 && (