Hotfix... ready for PRIME TIME!

This commit is contained in:
Atridad Lahiji 2023-07-25 12:40:00 -06:00
parent e6507d5088
commit 01ab0a43ae
No known key found for this signature in database
GPG key ID: 7CB8245F56BC3880
5 changed files with 32 additions and 35 deletions

View file

@ -21,7 +21,7 @@ const Navbar: React.FC<NavbarProps> = ({ title }) => {
); );
} else if (sessionStatus === "unauthenticated") { } else if (sessionStatus === "unauthenticated") {
return ( return (
<button className="btn btn-secondary" onClick={ () => void signIn() }> <button className="btn btn-secondary" onClick={() => void signIn()}>
Sign In Sign In
</button> </button>
); );
@ -40,40 +40,40 @@ const Navbar: React.FC<NavbarProps> = ({ title }) => {
className="md:mr-2" className="md:mr-2"
src="/logo.webp" src="/logo.webp"
alt="Nav Logo" alt="Nav Logo"
width={ 32 } width={32}
height={ 32 } height={32}
priority priority
/> />
<span className="hidden md:inline-flex"> <span className="hidden md:inline-flex">
{ title } {title}
{ env.NEXT_PUBLIC_APP_ENV === "development" && " >> Staging" } {env.NEXT_PUBLIC_APP_ENV === "development" && " >> Staging"}
</span> </span>
</Link> </Link>
</div> </div>
{ sessionStatus === "loading" ? ( {sessionStatus === "loading" ? (
<div className="flex items-center justify-center"> <div className="flex items-center justify-center">
<span className="loading loading-dots loading-lg"></span> <span className="loading loading-dots loading-lg"></span>
</div> </div>
) : ( ) : (
navigationMenu() navigationMenu()
) } )}
{ sessionData?.user.image && ( {sessionData?.user.image && (
<div className="flex-none gap-2"> <div className="flex-none gap-2">
<div className="dropdown dropdown-end"> <div className="dropdown dropdown-end">
<label tabIndex={ 0 } className="btn btn-ghost btn-circle avatar"> <label tabIndex={0} className="btn btn-ghost btn-circle avatar">
<div className="w-10 rounded-full"> <div className="w-10 rounded-full">
<Image <Image
src={ sessionData.user.image } src={sessionData.user.image}
alt="Profile picture." alt="Profile picture."
height={ 32 } height={32}
width={ 32 } width={32}
/> />
</div> </div>
</label> </label>
<ul <ul
tabIndex={ 0 } tabIndex={0}
className="mt-3 p-2 shadow menu menu-compact dropdown-content bg-base-100 rounded-box z-50" className="mt-3 p-2 shadow menu menu-compact dropdown-content bg-base-100 rounded-box z-50"
> >
<li> <li>
@ -85,7 +85,7 @@ const Navbar: React.FC<NavbarProps> = ({ title }) => {
Profile Profile
</Link> </Link>
</li> </li>
{ sessionData.user.role === "ADMIN" && ( {sessionData.user.role === "ADMIN" && (
<li> <li>
<Link <Link
about="Admin Page" about="Admin Page"
@ -95,16 +95,17 @@ const Navbar: React.FC<NavbarProps> = ({ title }) => {
Admin Admin
</Link> </Link>
</li> </li>
) } )}
<li> <button
<a onClick={ () => void signOut({ callbackUrl: "/" }) }> className="btn btn-secondary btn-sm text-center whitespace-nowrap"
Sign Out onClick={() => void signOut({ callbackUrl: "/" })}
</a> >
</li> Sign Out
</button>
</ul> </ul>
</div> </div>
</div> </div>
) } )}
</nav> </nav>
); );
}; };

View file

@ -2,16 +2,12 @@ import Ably from "ably";
import { env } from "~/env.mjs"; import { env } from "~/env.mjs";
import type { EventType } from "../utils/types"; import type { EventType } from "../utils/types";
const ablyRest = new Ably.Rest(env.ABLY_PRIVATE_KEY); export const publishToChannel = async (
export const publishToChannel = (
channel: string, channel: string,
event: EventType, event: EventType,
message: string message: string
) => { ) => {
try { const ably = new Ably.Rest.Promise(env.ABLY_PRIVATE_KEY);
ablyRest.channels.get(`${env.APP_ENV}-${channel}`).publish(event, message); const ablyChannel = ably.channels.get(`${env.APP_ENV}-${channel}`);
} catch (error) { await ablyChannel.publish(event, message, { quickAck: true });
console.log(`❌❌❌ Failed to send message!`);
}
}; };

View file

@ -27,7 +27,7 @@ export const roomRouter = createTRPCRouter({
await invalidateCache(`kv_roomcount_admin`); await invalidateCache(`kv_roomcount_admin`);
await invalidateCache(`kv_roomlist_${ctx.session.user.id}`); await invalidateCache(`kv_roomlist_${ctx.session.user.id}`);
publishToChannel( await publishToChannel(
`${ctx.session.user.id}`, `${ctx.session.user.id}`,
"ROOM_LIST_UPDATE", "ROOM_LIST_UPDATE",
"CREATE" "CREATE"
@ -201,7 +201,7 @@ export const roomRouter = createTRPCRouter({
}); });
if (newRoom) { if (newRoom) {
publishToChannel(`${newRoom.id}`, "ROOM_UPDATE", "UPDATE"); await publishToChannel(`${newRoom.id}`, "ROOM_UPDATE", "UPDATE");
} }
return !!newRoom; return !!newRoom;
@ -222,13 +222,13 @@ export const roomRouter = createTRPCRouter({
await invalidateCache(`kv_votecount_admin`); await invalidateCache(`kv_votecount_admin`);
await invalidateCache(`kv_roomlist_${ctx.session.user.id}`); await invalidateCache(`kv_roomlist_${ctx.session.user.id}`);
publishToChannel( await publishToChannel(
`${ctx.session.user.id}`, `${ctx.session.user.id}`,
"ROOM_LIST_UPDATE", "ROOM_LIST_UPDATE",
"DELETE" "DELETE"
); );
publishToChannel(`${deletedRoom.id}`, "ROOM_UPDATE", "DELETE"); await publishToChannel(`${deletedRoom.id}`, "ROOM_UPDATE", "DELETE");
} }
return !!deletedRoom; return !!deletedRoom;

View file

@ -100,7 +100,7 @@ export const voteRouter = createTRPCRouter({
await invalidateCache(`kv_votecount_admin`); await invalidateCache(`kv_votecount_admin`);
await invalidateCache(`kv_votes_${input.roomId}`); await invalidateCache(`kv_votes_${input.roomId}`);
publishToChannel(`${vote.roomId}`, "VOTE_UPDATE", "UPDATE"); await publishToChannel(`${vote.roomId}`, "VOTE_UPDATE", "UPDATE");
} }
return !!vote; return !!vote;

View file

@ -118,7 +118,7 @@ const enforceRouteProtection = t.middleware(async ({ ctx, next }) => {
const { success } = await rateLimit.limit( const { success } = await rateLimit.limit(
`${env.APP_ENV}_${ctx.session.user.id}` `${env.APP_ENV}_${ctx.session.user.id}`
); );
console.log(success);
if (!success) throw new TRPCError({ code: "TOO_MANY_REQUESTS" }); if (!success) throw new TRPCError({ code: "TOO_MANY_REQUESTS" });
return next({ return next({