Compare commits

...

82 Commits

Author SHA1 Message Date
renovate[bot]
2239748348 chore(deps): update prom/prometheus docker tag to v3.12.0 2026-05-28 21:35:58 +00:00
184ea9c973 chore(deps): regenerate pnpm-lock.yaml 2026-05-24 15:33:11 +02:00
beec80fee6 fix(styling): userinfocard not able to be seen in certain places 2026-05-17 16:13:17 +02:00
796313348b fix(docker): change pnpm home path 2026-05-15 18:29:55 +02:00
8d13c86159 chore(types): fix type issues and update other packages 2026-05-15 18:19:08 +02:00
a2dfe81265 chore(deps): migrate to tailwind v4 and patch nextjs 2026-05-15 17:58:47 +02:00
ed3ebc9e3a chore(deps): update ALL packages 2026-05-15 17:40:52 +02:00
50d92f6787 fix(settings): the other server aint showing up 2026-05-15 17:38:09 +02:00
renovate[bot]
3ac4f59efd chore(deps): update dependency next to v16.2.3 [security] (#74)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-05-15 00:35:14 +02:00
renovate[bot]
3de374392c chore(deps): update dependency next to v16.1.7 [security] (#69)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-05-15 00:28:28 +02:00
61c005a585 Merge pull request #67 from SrIzan10/renovate/configure
chore: Configure Renovate
2026-05-15 00:02:22 +02:00
renovate[bot]
c35e3ae1ba Add renovate.json 2026-05-13 14:22:06 +00:00
7481006dbe chore(bs): filter out whipEnabled on server selection 2026-04-29 23:37:50 +02:00
d5aa3217ac feat(bs): add beforeunload to prevent accidental closings 2026-04-29 23:27:28 +02:00
6701090c7a fix(mediamtx): remake the docker image with alpine 2026-04-29 23:23:49 +02:00
d95b935c7a fix(mediamtx): use my mediamtx image instead 2026-04-29 23:21:01 +02:00
efec8602fc fix(mediamtx): put authhttpfingerprint there 2026-04-29 18:41:31 +02:00
0597cb1157 fix(mediamtx): auth http fingerprint 2026-04-29 18:38:42 +02:00
8a924f2d52 fix(mediamtx): set the ssl cert file 2026-04-29 18:22:50 +02:00
79093c5057 fix(mediamtx): schema wasnt right 2026-04-29 17:56:43 +02:00
2bf452c9ed fix(mediamtx): authentication issues 2026-04-29 17:11:57 +02:00
01b2e88969 fix(mirror): put mediamtx client there 2026-04-29 16:59:31 +02:00
b42b4be2d9 fix(mirror): log level debug again oops 2026-04-29 16:48:24 +02:00
22f3cff3c1 fix(mirror): use cloudflare 2026-04-29 16:47:49 +02:00
d01cc9f68d fix(mirror): log level debug 2026-04-29 16:43:23 +02:00
12617b3d59 fix(mirror): bump traefik to latest instead 2026-04-29 16:38:59 +02:00
aff01be9e1 fix(mirror): bump traefik version 2026-04-29 16:37:39 +02:00
995a14387c fix(ts): region typescript issue 2026-04-29 16:32:16 +02:00
2ce6fea782 fix(bs): server not right 2026-04-29 16:27:23 +02:00
ab6a788b36 Merge pull request #66 from SrIzan10/feat/browser-streaming
feat: #68 feat/browser streaming
2026-04-29 16:16:40 +02:00
953bc38c12 feat(bs): production prepping 2026-04-29 16:14:48 +02:00
728dcd9712 chore(bs): config file edits 2026-04-23 21:58:07 +02:00
9e60e1dfe2 feat(bs): redesign ui and add preview 2026-04-23 20:20:06 +02:00
90d73275b2 feat(bs): error handling and stuff 2026-04-22 21:56:54 +02:00
da968232ad feat(bs): server selector 2026-04-22 21:27:42 +02:00
be758685d1 feat(bs): select channels and switch sources 2026-04-22 20:35:11 +02:00
0add39f8e1 feat(bs): initial browser streaming impl 2026-04-21 22:06:19 +02:00
5c4284d552 feat: add webrtc tooling 2026-04-19 18:08:17 +00:00
Freddie Yershon
ae5dee33bb docs(stguide): improve the streaming guide (#65)
* fix(docs): update stream key regeneration icon in streaming guide

* fix(docs): format steps in the streaming guide for better readability

* fix(docs): remove unnecessary dashes from section headers in streaming guide and swap <svg> for a cleaner <img>

* Update apps/docs/src/content/docs/guides/start-stream.mdx

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* docs(stguide): move to steps and change up some stuff

* Delete apps/docs/public/guides/lock.png

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: SrIzan10 <66965250+SrIzan10@users.noreply.github.com>
2026-04-17 10:25:55 +02:00
4a708ac92f feat(admin): show deleted message content on audit logs 2026-04-07 16:07:58 +02:00
2b270db2ed fix(ui): hackclubbers => Hack Clubbers 2026-04-06 18:12:34 +02:00
1a77980218 fix(ui): blahaj heart not displaying in onboarding 2026-04-06 18:12:12 +02:00
cc5a6a4fd3 feat(ui): redesign profile dropdown 2026-04-06 18:08:46 +02:00
503e863fe7 chore(ui): use simpler vectorized favicon 2026-04-06 17:38:31 +02:00
27a65a1893 feat(ui): add logo to navbar 2026-04-06 17:31:54 +02:00
56eb49b52f feat(ui): favicon!!!!! 2026-04-06 17:18:26 +02:00
dcd643784f chore(ui): fix eye icon size 2026-04-06 17:08:42 +02:00
dee32a03d9 feat(ui): player redesign 2026-04-06 17:04:43 +02:00
abffa281d1 chore(ui): make the reload stream button a bit less foreign 2026-04-06 16:46:44 +02:00
77a0d6c945 chore(ui): fix import error 2026-04-05 20:37:21 +02:00
7974d4434e fix(ui): multiple things that look bad on this 2026-04-05 20:03:02 +02:00
bcdc4122f8 fix(ui): do not show not live 24/7 streamers 2026-04-05 20:02:46 +02:00
d552836845 fix(playback): try to recover stream 2026-04-05 19:43:11 +02:00
ca6218c494 chore(ui): divide 24/7 streams and live streams 2026-04-04 23:53:52 +02:00
a14762d3a1 feat(notif): actually send messages 2026-04-04 22:49:16 +02:00
f1f6d20d53 feat(notif): initial custom channel sending 2026-04-04 22:28:10 +02:00
4d63552254 fix(auth): forgot to pass some metadata 2026-03-31 17:47:17 +02:00
81e78a622f fix(chat): newlines not rendered 2026-03-30 01:03:11 +02:00
3dcb726207 feat(auth): add the ability for users to bypass idv checks 2026-03-30 00:49:48 +02:00
5b7e9e7a82 chore(ut): add prefixes for all user uploaded files 2026-03-28 15:25:34 +01:00
462a51e376 feat(bot): upload profile picture 2026-03-28 15:20:24 +01:00
9caeb9f97e feat: merge #64 from hippogriff101/main 2026-03-27 18:42:11 +01:00
1c06020092 fix: images wont build unless we move it to public folder 2026-03-27 18:37:35 +01:00
1697530ac0 fix: improve chat text wrap 2026-03-27 18:28:30 +01:00
hippogriff101
29c5b2c24d Merge branch 'main' of https://github.com/hippogriff101/hctv-fork 2026-03-27 16:45:32 +00:00
hippogriff101
616110dba6 Replace OBS settings GIFs with compressed coppies 2026-03-27 16:45:27 +00:00
fe888d2e72 chore: Apply suggestions from code review
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2026-03-27 15:46:17 +01:00
c4774a53f1 docs: refactor some python wrapper documentation 2026-03-27 15:45:32 +01:00
Freddie Yershon
671dadde08 Merge pull request #1 from christianwell/add-wrapper-docs
docs: add emojis, keyword-only args, and example bots to python wrapper guide
2026-03-25 21:03:47 +00:00
christianwell
f7634010d6 docs(guides): add emojis section, keyword-only args, and example bots to python wrapper guide
Amp-Thread-ID: https://ampcode.com/threads/T-019d26c4-b9b7-77d9-9171-2114ebdeb70d
Co-authored-by: Amp <amp@ampcode.com>
2026-03-25 21:57:50 +01:00
Freddie Yershon
dd122ffa92 Update apps/docs/src/content/docs/guides/start-stream.mdx
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2026-03-22 23:16:33 +00:00
Freddie Yershon
f1fb3f7bf6 docs(guides): enhance development setup instructions for clarity and structure (with assistance from github copilot) 2026-03-22 23:03:14 +00:00
Freddie Yershon
7b29aa10d4 docs(guides): update start-stream guide for clarity and consistency; add python wrapper guide 2026-03-22 23:00:25 +00:00
Freddie Yershon
484aa30878 Rewrite Guide with new images 2026-03-22 22:17:03 +00:00
e31c7a1620 fix(ui): show restricted streams and fix bot combobox search 2026-03-20 20:31:09 +01:00
3e86ad70c2 chore(platform): make sure that the slack id is a full user and not deactivated or otherwise 2026-03-17 07:55:25 +01:00
14a0ecd763 fix(platform): actually check idv status
i'm sorry
2026-03-16 22:32:38 +01:00
43ead562a8 docs(readme): add streaming info to comply with shipwrights 2026-03-15 01:41:45 +01:00
71a48c29c3 fix(metrics): the classic mistake 2026-03-14 21:24:09 +01:00
1f0ba1cd08 fix(metrics): prometheus password file 2026-03-14 20:15:02 +01:00
63fc35c62c chore: use auth file instead of env on prometheus 2026-03-13 09:59:32 +01:00
38ec518695 feat: #63 from SrIzan10/feat/metrics
feat: metrics
2026-03-13 09:33:33 +01:00
111 changed files with 9374 additions and 6531 deletions

4
.gitignore vendored
View File

@@ -50,4 +50,6 @@ slack-import-emojis/target
.idea
/apps/docs/src/content/docs/typedoc-sdk
/apps/docs/src/content/docs/typedoc-sdk
.codex

View File

@@ -1,7 +1,11 @@
# hackclub.tv
This is the source code for [hackclub.tv](https://hackclub.tv), a livestreaming website for hackclubbers.
This is the source code for [hackclub.tv](https://hackclub.tv), a livestreaming website for Hack Clubbers.
The development setup guide can be read at <https://docs.hackclub.tv/guides/dev/>
Join [#hctv](https://hackclub.slack.com/archives/C08HGLXGXAB) on the Hack Club Slack for discussion and updates!
## Streaming
To stream to the platform, open [hackclub.tv](https://hackclub.tv), log in, create a channel, press "Edit Livestream" and follow the streaming guide under the "Stream" tab. You can also find the streaming guide at <https://docs.hackclub.tv/guides/streaming/>.

View File

@@ -1,6 +1,6 @@
FROM node:lts-alpine AS base
ENV PNPM_HOME="/pnpm"
ENV PATH="$PNPM_HOME:$PATH"
ENV PATH="$PNPM_HOME/bin:$PATH"
RUN corepack enable
FROM base AS builder
@@ -44,4 +44,4 @@ WORKDIR /app/apps/chat
EXPOSE 8000
ENTRYPOINT ["node", "dist/index.js"]
ENTRYPOINT ["node", "dist/index.js"]

View File

@@ -10,16 +10,16 @@
"@hctv/auth": "workspace:*",
"@hctv/db": "workspace:*",
"@hctv/hono-ws": "workspace:*",
"@hono/node-server": "^1.14.0",
"@hono/node-ws": "^1.1.0",
"@leeoniya/ufuzzy": "^1.0.18",
"@hono/node-server": "^2.0.1",
"@hono/node-ws": "^1.3.1",
"@leeoniya/ufuzzy": "^1.0.19",
"@oslojs/encoding": "^1.1.0",
"hono": "^4.7.5",
"hono": "^4.12.16",
"prom-client": "^15.1.3"
},
"devDependencies": {
"@types/node": "^20.11.17",
"tsx": "^4.7.1",
"typescript": "^5.8.2"
"@types/node": "^25.6.0",
"tsx": "^4.21.0",
"typescript": "^6.0.3"
}
}

View File

@@ -280,23 +280,32 @@ async function logModerationEvent(payload: {
});
}
async function deleteMessageFromHistory(targetUsername: string, msgId: string): Promise<boolean> {
async function deleteMessageFromHistory(
targetUsername: string,
msgId: string
): Promise<{ deleted: boolean; messageContent?: string }> {
const channelKey = `chat:history:${targetUsername}`;
const history = await redis.zrange(channelKey, 0, -1);
for (const entry of history) {
try {
const parsed = JSON.parse(entry) as { msgId?: string };
const parsed = JSON.parse(entry) as { msgId?: string; message?: string };
if (parsed.msgId === msgId) {
await redis.zrem(channelKey, entry);
return true;
return {
deleted: true,
messageContent:
typeof parsed.message === 'string' && parsed.message.length > 0
? parsed.message
: undefined,
};
}
} catch {
continue;
}
}
return false;
return { deleted: false };
}
const app = new Hono();
@@ -304,7 +313,7 @@ const { injectWebSocket, upgradeWebSocket } = createNodeWebSocket({ app });
if (process.env.NODE_ENV === 'production') {
app.use(
'/metrics',
basicAuth({ username: process.env.METRICS_USER!, password: process.env.METRICS_PASS! })
basicAuth({ username: process.env.METRICS_USER!, password: process.env.METRICS_PASSWORD! })
);
}

View File

@@ -26,7 +26,10 @@ type ModerationContext = {
};
type DeleteMessageDeps = {
deleteMessageFromHistory: (targetUsername: string, msgId: string) => Promise<boolean>;
deleteMessageFromHistory: (
targetUsername: string,
msgId: string
) => Promise<{ deleted: boolean; messageContent?: string }>;
logModerationEvent: (payload: {
action: ChatModerationAction;
channelId: string;
@@ -258,8 +261,8 @@ export async function handleDeleteMessageCommand(
return;
}
const deleted = await deps.deleteMessageFromHistory(context.targetUsername, msgId);
if (!deleted) {
const deletedMessage = await deps.deleteMessageFromHistory(context.targetUsername, msgId);
if (!deletedMessage.deleted) {
sendModerationError(socket, 'NOT_FOUND', 'Message not found.');
return;
}
@@ -269,7 +272,10 @@ export async function handleDeleteMessageCommand(
channelId: context.channelId,
moderatorId: context.chatUser.moderatorUserId,
reason: 'Message deleted by moderator',
details: { msgId },
details: {
msgId,
messageContent: deletedMessage.messageContent,
},
});
recordChatModerationAction('message_deleted');

View File

@@ -10,14 +10,14 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/starlight": "^0.35.2",
"@catppuccin/starlight": "^1.0.2",
"astro": "^5.6.1",
"astro-mermaid": "^1.0.4",
"mermaid": "^11.10.1",
"sharp": "^0.34.2",
"@astrojs/starlight": "^0.38.4",
"@catppuccin/starlight": "^2.0.1",
"astro": "^6.3.3",
"astro-mermaid": "^2.0.1",
"mermaid": "^11.14.0",
"sharp": "^0.34.5",
"starlight-typedoc": "^0.21.5",
"typedoc": "^0.28.16",
"typedoc-plugin-markdown": "^4.9.0"
"typedoc": "^0.28.19",
"typedoc-plugin-markdown": "^4.11.0"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.4 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.8 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.4 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.8 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

View File

@@ -3,20 +3,42 @@ title: Development Setup
description: Instructions to set up a local development environment for hackclub.tv
---
1. clone repo
2. `pnpm install`
3. `cp apps/web/.env.example apps/web/.env && cp packages/db/.env.example packages/db/.env`
4. `pnpm dev`
5. `pnpm db:migrate` (RUN THIS AFTER POPULATING ENV)
Follow these steps to run hackclub.tv locally:
- slack notifier app manifest is as follows:
1. Clone the repository.
2. Install dependencies:
```
pnpm install
```
3. Create environment files:
```
cp apps/web/.env.example apps/web/.env && cp packages/db/.env.example packages/db/.env
```
4. Fill in the required values in both .env files.
5. Start the development servers:
```
pnpm dev
```
6. Run database migrations (after environment variables are set):
```
pnpm db:migrate
```
- Slack notifier app manifest:
```
display_information:
# please change the name to something that can be linked to you if possible
# Please change the name to something linked to you.
name: hctv notifier dev
features:
bot_user:
# same with this :pray:
# Same here.
display_name: hctv notifier dev
always_online: false
oauth_config:

View File

@@ -0,0 +1,333 @@
---
title: Python wrapper
description: How to use hctv's unofficial Python wrapper.
---
A Pycord-style Python wrapper for [hackclub.tv](https://hackclub.tv), made by [Christian](https://github.com/christianwell). Build chat bots with decorators and minimal boilerplate.
Check it out on PyPI: https://pypi.org/project/hctvwrapper/
You can take a look at the code [here](https://github.com/christianwell/hctvwrapper)
```
pip install hctvwrapper
```
## Quick Start
```python
import os
from hctvwrapper import Bot
bot = Bot(command_prefix="!")
@bot.event
async def on_ready(session):
print(f"Logged in as {session.viewer.username}")
@bot.event
async def on_message(message):
print(f"{message.author.username}: {message.content}")
@bot.command()
async def ping(ctx):
await ctx.reply("pong!")
bot.run(os.environ['BOT_TOKEN'], channel="bot-playground")
```
### Getting a Bot Token
1. Go to [hackclub.tv](https://hackclub.tv)
2. Create a bot account and get your API key (starts with `hctvb_`)
3. Set it as an environment variable: `export BOT_TOKEN=hctvb_xxx`
## Guide
### Events
Register event handlers with `@bot.event`. The function name determines which event it handles.
```python
@bot.event
async def on_ready(session):
"""Fired when the bot connects and receives session info."""
print(f"Logged in as {session.viewer.username}")
print(f"Can moderate: {session.permissions.can_moderate}")
print(f"Max message length: {session.moderation.max_message_length}")
@bot.event
async def on_message(message):
"""Fired on every chat message."""
print(f"[{message.channel}] {message.author.username}: {message.content}")
# message.author.id, .pfp_url, .display_name, .is_bot,
# .is_platform_admin, .channel_role
# message.msg_id, .timestamp, .type
@bot.event
async def on_history(messages):
"""Fired once on connect with up to 100 recent messages."""
print(f"Got {len(messages)} historical messages")
@bot.event
async def on_system_message(message):
"""Fired on system notifications (bans, unbans, etc.)."""
print(f"System: {message.content}")
@bot.event
async def on_message_deleted(event):
"""Fired when a message is deleted by a moderator."""
print(f"Message {event.msg_id} deleted in {event.channel}")
@bot.event
async def on_chat_access(access, channel):
"""Fired when chat permissions change (timeouts, bans)."""
print(f"Can send in {channel}: {access.can_send}")
if access.restriction:
print(f" Restriction: {access.restriction.type}")
@bot.event
async def on_moderation_error(error, channel):
"""Fired when a moderation action or message is rejected."""
print(f"Error in {channel}: {error.code} — {error.message}")
# error.code is one of: FORBIDDEN, RATE_LIMIT, SLOW_MODE,
# TIMED_OUT, BANNED, MESSAGE_TOO_LONG, BLOCKED_TERM,
# INVALID_TARGET, INVALID_REQUEST, NOT_FOUND
```
### Commands
Register commands with `@bot.command()`. The bot automatically parses messages starting with the prefix.
```python
bot = Bot(command_prefix="!")
# Simple command, no arguments
@bot.command()
async def ping(ctx):
await ctx.reply("pong!")
# Named command with aliases
@bot.command(name="say", aliases=["echo", "repeat"])
async def say_cmd(ctx, *, text):
await ctx.send(text)
# Positional arguments (split by whitespace)
@bot.command()
async def greet(ctx, name, greeting="hello"):
await ctx.reply(f"{greeting}, {name}!")
# Keyword-only (rest of message)
# Use *, text to capture everything after the command as a single string:
@bot.command()
async def echo(ctx, *, text):
await ctx.reply(text)
# !echo hello world foo → text = "hello world foo"
```
> The bot automatically ignores its own messages to prevent loops.
### Context
The `ctx` object passed to commands gives you everything you need:
```python
@bot.command()
async def info(ctx):
ctx.message # the full Message object
ctx.author # shortcut to ctx.message.author (Author)
ctx.channel # channel name (str)
ctx.bot # reference to the Bot
await ctx.reply("text") # sends "@username text"
await ctx.send("text") # sends "text" without mention
await ctx.delete() # deletes the triggering message (needs mod perms)
```
### Sending Messages
```python
# Inside a command
await ctx.reply("mentioned reply")
await ctx.send("plain message")
# Anywhere (if you have a reference to the bot)
await bot.send("hello!", channel="bot-playground")
```
### Multi-Channel
Connect to multiple channels at once:
```python
bot.run("hctvb_xxx", channels=["channel1", "channel2", "bot-playground"])
```
Messages and commands work across all channels. Use `ctx.channel` or `message.channel` to know which channel a message came from.
```python
@bot.event
async def on_message(message):
print(f"[{message.channel}] {message.author.username}: {message.content}")
@bot.command()
async def where(ctx):
await ctx.reply(f"you're in {ctx.channel}")
```
### Moderation
Bots with moderation permissions can manage users:
```python
# Timeout a user for 5 minutes (default)
await bot.timeout_user("channel", user_id="user123", duration=300, reason="spam")
# Ban a user
await bot.ban_user("channel", user_id="user123", reason="repeated violations")
# Remove a timeout
await bot.lift_timeout("channel", user_id="user123")
# Unban a user
await bot.unban_user("channel", user_id="user123")
# Delete a specific message
await bot.delete_message("channel", msg_id="msg-uuid")
```
### Emojis
Look up or search emojis from the Slack. Results come back via events.
```python
# Look up emoji URLs
await bot.lookup_emojis(["yay", "aga"])
# Search emojis
await bot.search_emojis("yay")
# Handle results
@bot.event
async def on_emoji_response(emojis):
# emojis = {"yay": "https://...", "aga": "https://..."}
print(emojis)
@bot.event
async def on_emoji_search(results):
# results = ["yay", "yay-bounce", "yay-spin", ...]
print(results)
```
### Async Entry Point
If you manage your own event loop:
```python
import asyncio
async def main():
bot = Bot(command_prefix="!")
@bot.event
async def on_ready(session):
print("Connected!")
await bot.start("hctvb_xxx", channel="bot-playground")
asyncio.run(main())
```
## Examples
### Echo Bot
```python
from hctvwrapper import Bot
import os
bot = Bot(command_prefix="!")
@bot.event
async def on_ready(session):
print(f"✅ Logged in as {session.viewer}")
@bot.command()
async def ping(ctx):
await ctx.reply("pong! 🏓")
@bot.command(name="echo", aliases=["say"])
async def echo_cmd(ctx, *, text):
await ctx.send(text)
bot.run(os.environ["BOT_TOKEN"], channel="bot-playground")
```
### AI Bot
```python
from hctvwrapper import Bot
import aiohttp, os
bot = Bot(command_prefix="/")
@bot.command(name="ai")
async def ai_cmd(ctx, *, prompt):
async with aiohttp.ClientSession() as http:
resp = await http.post(
"https://ai.hackclub.com/proxy/v1/chat/completions",
headers={"Authorization": f"Bearer {os.environ['AI_TOKEN']}"},
json={
"model": "google/gemini-3-flash-preview",
"messages": [{"role": "user", "content": prompt}],
},
)
data = await resp.json()
answer = data["choices"][0]["message"]["content"]
await ctx.reply(answer)
bot.run(os.environ["BOT_TOKEN"], channel="bot-playground")
```
### Moderation Bot
```python
from hctvwrapper import Bot
import os
bot = Bot(command_prefix="!")
@bot.command()
async def timeout(ctx, user_id, seconds="300"):
await bot.timeout_user(ctx.channel, user_id, duration=int(seconds))
await ctx.send(f"⏰ Timed out for {seconds}s")
@bot.event
async def on_moderation_error(error, channel):
print(f"⚠️ {error.code}: {error.message}")
bot.run(os.environ["BOT_TOKEN"], channel="my-channel")
```
## Models Reference
| Model | Fields |
|---|---|
| `Message` | `content`, `author`, `channel`, `msg_id`, `timestamp`, `type`, `is_bot` |
| `Author` | `id`, `username`, `pfp_url`, `display_name`, `is_bot`, `is_platform_admin`, `channel_role` |
| `Session` | `viewer` (Author), `permissions`, `moderation` |
| `Permissions` | `can_moderate` |
| `ModerationSettings` | `has_blocked_terms`, `slow_mode_seconds`, `max_message_length` |
| `SystemMessage` | `type`, `channel`, `content`, `timestamp` |
| `ChatAccess` | `can_send`, `restriction` |
| `Restriction` | `type` (timeout/ban), `reason`, `expires_at` |
| `ModerationError` | `code`, `message`, `restriction` |
| `ModerationEvent` | `type`, `msg_id`, `channel` |
## Requirements
- Python 3.10+
- `websockets` (only dependency)
## License
Copyright (c) 2026 Christian Well - [MIT License](https://github.com/christianwell/hctvwrapper/blob/main/LICENSE)

View File

@@ -2,14 +2,50 @@
title: How to stream
description: Get started with OBS and streaming on hackclub.tv
---
import { Steps } from '@astrojs/starlight/components';
import { Aside } from '@astrojs/starlight/components';
- open obs
- open settings
- open "Stream"
- set service to custom
- set url to `srt://localhost:8890?streamid=publish:CHANNEL_NAME:thisusernameislongonpurposesoyoudontaccidentallyleakyourstreamkey:STREAM_KEY&pkt_size=1316`
- on the website, click "Regenerate key"
- paste the key into your obs "Stream Key"
- start streaming!
_This guide demonstrates how to stream with hackclub.tv via OBS Studio. For other streaming software, you will need to adapt these steps for your chosen software._
(screenshots to be added soon)
<Steps>
1. Open OBS Studio.
(_If it is not installed, head to [this webpage](https://obsproject.com/) to download the installer._)
![OBS in Windows start menu](../../../assets/obs.png)
2. In OBS, click `File > Settings` in the top navigation bar.
<img alt="Animated GIF of opening the settings page" src="/guides/obs-open-settings-op.gif" />
3. In the Settings popup, open `Stream` from the sidebar.
4. Set `Service` to `Custom...`.
<img
alt="Animated GIF of opening 'Stream' settings and changing to 'Custom'"
src="/guides/obs-changing-settings-op.gif"
/>
5. Go to https://hackclub.tv/settings/channel/ in your web browser.
(_If you are not logged in, you may have to log in again and then try again._)
6. Under `Stream Settings`, you will find your `Stream Key` and `Stream URL`. Copy the `Stream URL` and paste it into OBS.
![Hack Club TV Stream Settings](../../../assets/hctv-settings.png)
7. Go back to the website and copy the streaming key and paste it into the `Stream Key` box in OBS.
<Aside type="caution">You must keep your stream key secret and never share it with anyone.</Aside>
<Aside type="tip">
You can regenerate your stream key at any time if compromised! Just click the key icon and copy the new key. Remember to update your streaming software with the new key if you do this.
</Aside>
![OBS Stream Settings with data filled in](../../../assets/obs-custom.png)
(_Your OBS settings should now look like this_)
8. You can now safely apply the changes in OBS and start streaming.
</Steps>
Thanks for using this guide and happy streaming!

View File

@@ -1,5 +1,8 @@
{
"extends": "astro/tsconfigs/strict",
"compilerOptions": {
"ignoreDeprecations": "6.0"
},
"include": [".astro/types.d.ts", "**/*"],
"exclude": ["dist"]
}

View File

@@ -21,11 +21,14 @@ HCID_REDIRECT_URI=http://localhost:3000/auth/hackclub/callback
NEXT_PUBLIC_MEDIAMTX_URL_HQ=http://localhost:8891
MEDIAMTX_API_HQ=http://localhost:9997
NEXT_PUBLIC_MEDIAMTX_INGEST_ROUTE_HQ=localhost:8890
NEXT_PUBLIC_MEDIAMTX_WHIP_ROUTE_HQ=http://localhost:8889
# commented because we don't have another ingest server as of right now
# NEXT_PUBLIC_MEDIAMTX_URL_ASIA=http://localhost:8991
# MEDIAMTX_API_ASIA=http://localhost:9999
# NEXT_PUBLIC_MEDIAMTX_INGEST_ROUTE_ASIA=localhost:8990
# optional EU mirror
# NEXT_PUBLIC_MEDIAMTX_URL_ETHANDE=https://hls-eu.example.com
# MEDIAMTX_API_ETHANDE=https://mediamtx-api-eu.example.com
# NEXT_PUBLIC_MEDIAMTX_INGEST_ROUTE_ETHANDE=ingest-eu.example.com:8890
# NEXT_PUBLIC_MEDIAMTX_WHIP_ROUTE_ETHANDE=https://webrtc-eu.example.com
# idt you should change this
MEDIAMTX_PUBLISH_KEY=rjq1xdpCPA4qyt3jge
# generate with `openssl rand -base64 20`
MEDIAMTX_PUBLISH_KEY=
MEDIAMTX_API_KEY=

View File

@@ -1,6 +1,6 @@
FROM node:22-slim AS base
ENV PNPM_HOME="/pnpm"
ENV PATH="$PNPM_HOME:$PATH"
ENV PATH="$PNPM_HOME/bin:$PATH"
RUN corepack enable
FROM base AS builder

View File

@@ -4,7 +4,7 @@
"rsc": true,
"tsx": true,
"tailwind": {
"config": "tailwind.config.ts",
"config": "tailwind.config.mts",
"css": "src/app/globals.css",
"baseColor": "slate",
"cssVariables": true,
@@ -14,4 +14,4 @@
"components": "@/components",
"utils": "@/lib/utils"
}
}
}

View File

@@ -36,6 +36,9 @@ const nextConfig = {
{
hostname: 'eoceqrx2r7.ufs.sh'
},
{
hostname: 'thesvg.org',
}
],
minimumCacheTTL: 120,
},

View File

@@ -17,82 +17,83 @@
"dependencies": {
"@hctv/auth": "workspace:*",
"@hctv/db": "workspace:*",
"@hookform/resolvers": "^3.9.1",
"@hookform/resolvers": "^5.2.2",
"@lucia-auth/adapter-prisma": "^4.0.1",
"@node-rs/argon2": "^2.0.2",
"@omit/react-confirm-dialog": "^1.2.0",
"@omit/react-confirm-dialog": "^2.0.0",
"@radix-ui/react-alert-dialog": "^1.1.15",
"@radix-ui/react-avatar": "^1.0.4",
"@radix-ui/react-checkbox": "^1.1.4",
"@radix-ui/react-dialog": "^1.1.5",
"@radix-ui/react-dropdown-menu": "^2.1.2",
"@radix-ui/react-hover-card": "^1.1.14",
"@radix-ui/react-label": "^2.1.1",
"@radix-ui/react-popover": "^1.1.5",
"@radix-ui/react-select": "^2.1.5",
"@radix-ui/react-separator": "^1.1.1",
"@radix-ui/react-avatar": "^1.1.11",
"@radix-ui/react-checkbox": "^1.3.3",
"@radix-ui/react-dialog": "^1.1.15",
"@radix-ui/react-dropdown-menu": "^2.1.16",
"@radix-ui/react-hover-card": "^1.1.15",
"@radix-ui/react-label": "^2.1.8",
"@radix-ui/react-popover": "^1.1.15",
"@radix-ui/react-select": "^2.2.6",
"@radix-ui/react-separator": "^1.1.8",
"@radix-ui/react-slot": "^1.2.4",
"@radix-ui/react-switch": "^1.1.3",
"@radix-ui/react-tabs": "^1.1.12",
"@radix-ui/react-tooltip": "^1.2.7",
"@scalar/api-reference-react": "^0.7.42",
"@sentry/nextjs": "^10",
"@slack/web-api": "^7.9.1",
"@radix-ui/react-switch": "^1.2.6",
"@radix-ui/react-tabs": "^1.1.13",
"@radix-ui/react-tooltip": "^1.2.8",
"@scalar/api-reference-react": "^0.9.32",
"@sentry/nextjs": "^10.51.0",
"@slack/web-api": "^7.15.1",
"@uidotdev/usehooks": "^2.4.1",
"@uploadthing/react": "^7.3.1",
"ajv": "^8.17.1",
"@uploadthing/react": "^7.3.3",
"ajv": "^8.20.0",
"arctic": "^3.7.0",
"bullmq": "^5.45.2",
"cheerio": "^1.0.0",
"bullmq": "^5.76.4",
"cheerio": "^1.2.0",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.0",
"cmdk": "1.0.0",
"clsx": "^2.1.1",
"cmdk": "1.1.1",
"date-fns": "^4.1.0",
"embla-carousel-react": "^8.6.0",
"hls-video-element": "^1.5.0",
"hls.js": "^1.6.15",
"hls-video-element": "^1.5.11",
"hls.js": "^1.6.16",
"lucia": "^3.2.2",
"lucide-react": "^0.473.0",
"media-chrome": "^4.8.0",
"next": "^16.1.0",
"next-themes": "^0.4.4",
"node-cron": "^3.0.3",
"nuqs": "^2.4.3",
"pg": "^8.14.1",
"pg-boss": "^10.1.6",
"lucide-react": "^1.14.0",
"media-chrome": "^4.19.0",
"next": "^16.2.6",
"next-themes": "^0.4.6",
"node-cron": "^4.2.1",
"nuqs": "^2.8.9",
"pg": "^8.20.0",
"pg-boss": "^12.18.1",
"prom-client": "^15.1.3",
"react": "^19.2.3",
"react-day-picker": "^9.13.0",
"react-dom": "^19.2.3",
"react-hook-form": "^7.54.2",
"react": "^19.2.5",
"react-day-picker": "^9.14.0",
"react-dom": "^19.2.5",
"react-hook-form": "^7.74.0",
"rehype-raw": "^7.0.0",
"rehype-react": "^8.0.0",
"rehype-sanitize": "^6.0.0",
"remark-parse": "^11.0.0",
"remark-rehype": "^11.1.2",
"sharp": "^0.34.3",
"sonner": "^1.4.41",
"swr": "^2.3.0",
"tailwind-merge": "^2.2.2",
"tailwindcss-animate": "^1.0.7",
"sharp": "^0.34.5",
"sonner": "^2.0.7",
"swr": "^2.4.1",
"tailwind-merge": "^3.5.0",
"unified": "^11.0.5",
"uploadthing": "^7.7.2",
"uploadthing": "^7.7.4",
"util-utils": "^1.0.3",
"valtio": "^2.1.2",
"ws": "^8.18.1",
"zod": "^3.24.1"
"valtio": "^2.3.2",
"ws": "^8.20.0",
"zod": "^4.4.2"
},
"devDependencies": {
"@types/node": "^20",
"@types/node": "^25.6.0",
"@types/node-cron": "^3.0.11",
"@types/react": "^18",
"@types/react-dom": "^18",
"@types/ws": "^8.18.0",
"eslint": "^8",
"eslint-config-next": "15.1.3",
"postcss": "^8",
"shadcn": "^2.7.0",
"tailwindcss": "^3.4.1",
"typescript": "^5"
"@types/react": "^19.2.14",
"@types/react-dom": "^19.2.3",
"@types/ws": "^8.18.1",
"@tailwindcss/postcss": "^4.2.4",
"eslint": "^10.3.0",
"eslint-config-next": "16.2.4",
"postcss": "^8.5.13",
"shadcn": "^4.6.0",
"tailwindcss": "^4.2.4",
"tw-animate-css": "^1.4.0",
"typescript": "^6.0.3"
}
}

View File

@@ -1,7 +1,7 @@
/** @type {import('postcss-load-config').Config} */
const config = {
plugins: {
tailwindcss: {},
'@tailwindcss/postcss': {},
},
};

View File

@@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 394 80"><path fill="#000" d="M262 0h68.5v12.7h-27.2v66.6h-13.6V12.7H262V0ZM149 0v12.7H94v20.4h44.3v12.6H94v21h55v12.6H80.5V0h68.7zm34.3 0h-17.8l63.8 79.4h17.9l-32-39.7 32-39.6h-17.9l-23 28.6-23-28.6zm18.3 56.7-9-11-27.1 33.7h17.8l18.3-22.7z"/><path fill="#000" d="M81 79.3 17 0H0v79.3h13.6V17l50.2 62.3H81Zm252.6-.4c-1 0-1.8-.4-2.5-1s-1.1-1.6-1.1-2.6.3-1.8 1-2.5 1.6-1 2.6-1 1.8.3 2.5 1a3.4 3.4 0 0 1 .6 4.3 3.7 3.7 0 0 1-3 1.8zm23.2-33.5h6v23.3c0 2.1-.4 4-1.3 5.5a9.1 9.1 0 0 1-3.8 3.5c-1.6.8-3.5 1.3-5.7 1.3-2 0-3.7-.4-5.3-1s-2.8-1.8-3.7-3.2c-.9-1.3-1.4-3-1.4-5h6c.1.8.3 1.6.7 2.2s1 1.2 1.6 1.5c.7.4 1.5.5 2.4.5 1 0 1.8-.2 2.4-.6a4 4 0 0 0 1.6-1.8c.3-.8.5-1.8.5-3V45.5zm30.9 9.1a4.4 4.4 0 0 0-2-3.3 7.5 7.5 0 0 0-4.3-1.1c-1.3 0-2.4.2-3.3.5-.9.4-1.6 1-2 1.6a3.5 3.5 0 0 0-.3 4c.3.5.7.9 1.3 1.2l1.8 1 2 .5 3.2.8c1.3.3 2.5.7 3.7 1.2a13 13 0 0 1 3.2 1.8 8.1 8.1 0 0 1 3 6.5c0 2-.5 3.7-1.5 5.1a10 10 0 0 1-4.4 3.5c-1.8.8-4.1 1.2-6.8 1.2-2.6 0-4.9-.4-6.8-1.2-2-.8-3.4-2-4.5-3.5a10 10 0 0 1-1.7-5.6h6a5 5 0 0 0 3.5 4.6c1 .4 2.2.6 3.4.6 1.3 0 2.5-.2 3.5-.6 1-.4 1.8-1 2.4-1.7a4 4 0 0 0 .8-2.4c0-.9-.2-1.6-.7-2.2a11 11 0 0 0-2.1-1.4l-3.2-1-3.8-1c-2.8-.7-5-1.7-6.6-3.2a7.2 7.2 0 0 1-2.4-5.7 8 8 0 0 1 1.7-5 10 10 0 0 1 4.3-3.5c2-.8 4-1.2 6.4-1.2 2.3 0 4.4.4 6.2 1.2 1.8.8 3.2 2 4.3 3.4 1 1.4 1.5 3 1.5 5h-5.8z"/></svg>

Before

Width:  |  Height:  |  Size: 1.3 KiB

View File

@@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 283 64"><path fill="black" d="M141 16c-11 0-19 7-19 18s9 18 20 18c7 0 13-3 16-7l-7-5c-2 3-6 4-9 4-5 0-9-3-10-7h28v-3c0-11-8-18-19-18zm-9 15c1-4 4-7 9-7s8 3 9 7h-18zm117-15c-11 0-19 7-19 18s9 18 20 18c6 0 12-3 16-7l-8-5c-2 3-5 4-8 4-5 0-9-3-11-7h28l1-3c0-11-8-18-19-18zm-10 15c2-4 5-7 10-7s8 3 9 7h-19zm-39 3c0 6 4 10 10 10 4 0 7-2 9-5l8 5c-3 5-9 8-17 8-11 0-19-7-19-18s8-18 19-18c8 0 14 3 17 8l-8 5c-2-3-5-5-9-5-6 0-10 4-10 10zm83-29v46h-9V5h9zM37 0l37 64H0L37 0zm92 5-27 48L74 5h10l18 30 17-30h10zm59 12v10l-3-1c-6 0-10 4-10 10v15h-9V17h9v9c0-5 6-9 13-9z"/></svg>

Before

Width:  |  Height:  |  Size: 629 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

View File

@@ -1,8 +1,10 @@
import LiveStream from "@/components/app/Livestream/Livestream";
import LiveStream from '@/components/app/Livestream/Livestream';
import { validateRequest } from '@/lib/auth/validate';
import { prisma } from '@hctv/db';
export default async function Page({ params }: { params: Promise<{ username: string }> }) {
const { username } = await params;
const { user } = await validateRequest();
const streamInfo = await prisma.streamInfo.findUnique({
where: { username },
include: {
@@ -17,23 +19,31 @@ export default async function Page({ params }: { params: Promise<{ username: str
return <div>Stream not found</div>;
}
if (streamInfo.channel.restriction) {
const isExpired = streamInfo.channel.restriction.expiresAt &&
new Date(streamInfo.channel.restriction.expiresAt) < new Date();
if (!isExpired) {
return (
<div className="flex flex-col items-center justify-center h-[calc(100vh-64px)] p-4">
<h1 className="text-2xl font-bold text-destructive mb-2">Channel Restricted</h1>
<p className="text-muted-foreground text-center max-w-md">
This channel has been restricted by a moderator and is not currently available for viewing.
</p>
</div>
);
}
const hasActiveRestriction = streamInfo.channel.restriction
? !streamInfo.channel.restriction.expiresAt ||
new Date(streamInfo.channel.restriction.expiresAt) >= new Date()
: false;
const canBypassRestriction = Boolean(user?.isAdmin);
if (hasActiveRestriction && !canBypassRestriction) {
return (
<div className="flex flex-col items-center justify-center h-[calc(100vh-64px)] p-4">
<h1 className="text-2xl font-bold text-destructive mb-2">Channel Restricted</h1>
<p className="text-muted-foreground text-center max-w-md">
This channel has been restricted by a moderator and is not currently available for
viewing.
</p>
</div>
);
}
return (
<LiveStream username={username} streamInfo={streamInfo} />
<LiveStream
username={username}
streamInfo={streamInfo}
canViewRestrictedStream={canBypassRestriction}
initialRestrictionActive={hasActiveRestriction}
initialRestrictionExpiresAt={streamInfo.channel.restriction?.expiresAt?.toISOString() ?? null}
/>
);
}

View File

@@ -8,11 +8,11 @@ import { Input } from '@/components/ui/input';
import { Textarea } from '@/components/ui/textarea';
import { Calendar } from '@/components/ui/calendar';
import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
import { Separator } from '@/components/ui/separator';
import {
Users,
Tv,
Ban,
LogOut,
ShieldOff,
Search,
CalendarIcon,
@@ -33,6 +33,7 @@ import {
Activity,
Hash,
ShieldAlert,
Settings,
} from 'lucide-react';
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip';
import {
@@ -43,15 +44,14 @@ import {
DialogHeader,
DialogTitle,
} from '@/components/ui/dialog';
import { useConfirm } from '@omit/react-confirm-dialog';
import { toast } from 'sonner';
import type { User } from '@hctv/db';
import { cn } from '@/lib/utils';
import { parseAsString, useQueryState } from 'nuqs';
import { useRouter } from 'next/navigation';
// ─── Constants ───────────────────────────────────────────────────────────────
const ADMIN_TABS = ['users', 'channels', 'audit', 'reports'] as const;
const ADMIN_TABS = ['users', 'channels', 'audit', 'reports', 'settings'] as const;
type AdminTab = (typeof ADMIN_TABS)[number];
const NAV_ITEMS: Array<{ id: AdminTab; label: string; icon: React.ReactNode }> = [
@@ -59,9 +59,9 @@ const NAV_ITEMS: Array<{ id: AdminTab; label: string; icon: React.ReactNode }> =
{ id: 'channels', label: 'Channels', icon: <Tv className="h-4 w-4" /> },
{ id: 'audit', label: 'Audit Log', icon: <ClipboardList className="h-4 w-4" /> },
{ id: 'reports', label: 'Reports', icon: <Flag className="h-4 w-4" /> },
{ id: 'settings', label: 'Settings', icon: <Settings className="h-4 w-4" /> },
];
// Audit action colour coding
const AUDIT_SOURCE_DOT: Record<string, string> = {
platform: 'bg-primary',
chat: 'bg-amber-500',
@@ -81,6 +81,8 @@ const AUDIT_ACTION_COLOR: Record<string, string> = {
TIMEOUT_USER: 'text-amber-500',
BAN_FROM_CHAT: 'text-destructive',
LIFT_CHAT_BAN: 'text-green-600 dark:text-green-400',
BYPASS_VERIFICATION_ENABLED: 'text-green-600 dark:text-green-400',
BYPASS_VERIFICATION_DISABLED: 'text-amber-500',
};
const REPORT_STATUS_CONFIG = {
@@ -116,8 +118,6 @@ const LAST_ACTION_LABELS: Record<string, string> = {
UNBAN_PLATFORM: 'Platform unbanned',
};
// ─── Small helpers ───────────────────────────────────────────────────────────
function SectionHeader({
icon,
title,
@@ -166,8 +166,6 @@ function LoadingRows({ cols }: { cols: number }) {
);
}
// ─── Date/time picker shared component ──────────────────────────────────────
function DateTimePicker({
value,
onChange,
@@ -232,9 +230,8 @@ function DateTimePicker({
);
}
// ─── Main component ──────────────────────────────────────────────────────────
export default function AdminPanelClient({ currentUser }: AdminPanelClientProps) {
const confirm = useConfirm();
const router = useRouter();
const [tabParam, setTabParam] = useQueryState('tab', parseAsString.withDefault('users'));
const [reportIdParam, setReportIdParam] = useQueryState('reportId');
@@ -247,6 +244,7 @@ export default function AdminPanelClient({ currentUser }: AdminPanelClientProps)
const [channelsLoading, setChannelsLoading] = useState(false);
const [auditLoading, setAuditLoading] = useState(false);
const [reportsLoading, setReportsLoading] = useState(false);
const [loggingOutOthers, setLoggingOutOthers] = useState(false);
const [auditLogs, setAuditLogs] = useState<AuditLog[]>([]);
const [reports, setReports] = useState<ChatReport[]>([]);
const [highlightReportId, setHighlightReportId] = useState<string | null>(null);
@@ -258,8 +256,6 @@ export default function AdminPanelClient({ currentUser }: AdminPanelClientProps)
const [reason, setReason] = useState('');
const [expiresAt, setExpiresAt] = useState<Date | undefined>(undefined);
// ── Data fetchers ──────────────────────────────────────────────────────────
const fetchUsers = useCallback(async (search: string) => {
setUsersLoading(true);
try {
@@ -313,8 +309,6 @@ export default function AdminPanelClient({ currentUser }: AdminPanelClientProps)
}
}, []);
// ── Effects ────────────────────────────────────────────────────────────────
useEffect(() => {
if (tabParam && ADMIN_TABS.includes(tabParam as AdminTab)) {
setActiveTab(tabParam as AdminTab);
@@ -353,8 +347,6 @@ export default function AdminPanelClient({ currentUser }: AdminPanelClientProps)
return () => clearTimeout(timer);
}, [channelSearch, fetchChannels]);
// ── Actions ────────────────────────────────────────────────────────────────
const resetDialogState = () => {
setReason('');
setExpiresAt(undefined);
@@ -498,12 +490,66 @@ export default function AdminPanelClient({ currentUser }: AdminPanelClientProps)
}
};
// ── Derived stats ─────────────────────────────────────────────────────────
const handleToggleBypassVerification = async (userId: string) => {
try {
const res = await fetch('/api/admin/users', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ userId, action: 'toggle_bypass_verification' }),
});
if (res.ok) {
const data = await res.json();
toast.success(data.message);
fetchUsers(userSearch);
fetchAuditLogs();
} else {
toast.error((await res.text()) || 'Failed to toggle bypass verification');
}
} catch {
toast.error('Failed to toggle bypass verification');
}
};
const handleLogoutOthers = async () => {
const confirmed = await confirm({
title: 'Log Out Everyone Else',
description:
'This will immediately sign out every other active session on hackclub.tv and keep only your current session active.',
confirmText: 'Log Out Others',
cancelText: 'Cancel',
});
if (!confirmed) return;
setLoggingOutOthers(true);
try {
const res = await fetch('/api/admin/users', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ action: 'logout_others' }),
});
if (!res.ok) {
toast.error((await res.text()) || 'Failed to log out other sessions');
return;
}
const data = (await res.json()) as { invalidatedSessions: number };
toast.success(
data.invalidatedSessions > 0
? `Logged out ${data.invalidatedSessions} other session${data.invalidatedSessions === 1 ? '' : 's'}`
: 'No other active sessions were found'
);
router.refresh();
} catch {
toast.error('Failed to log out other sessions');
} finally {
setLoggingOutOthers(false);
}
};
const openReports = reports.filter((r) => r.status === 'OPEN').length;
// ── Tab switch helper ─────────────────────────────────────────────────────
const switchTab = async (tab: AdminTab) => {
setActiveTab(tab);
await setTabParam(tab);
@@ -513,8 +559,6 @@ export default function AdminPanelClient({ currentUser }: AdminPanelClientProps)
}
};
// ── Render ────────────────────────────────────────────────────────────────
return (
<div className="min-h-screen">
{/* ── Page header ─────────────────────────────────────────────────── */}
@@ -534,24 +578,25 @@ export default function AdminPanelClient({ currentUser }: AdminPanelClientProps)
</div>
</div>
{/* Quick stats */}
<div className="hidden sm:flex items-center gap-1 rounded-full border border-border bg-background px-3 py-1.5">
<StatPill icon={<Users className="h-3 w-3" />} label={`${users.length} users`} />
<span className="text-border mx-1">|</span>
<StatPill
icon={<Activity className="h-3 w-3" />}
label={`${auditLogs.length} events`}
/>
{openReports > 0 && (
<>
<span className="text-border mx-1">|</span>
<StatPill
icon={<Flag className="h-3 w-3" />}
label={`${openReports} open`}
className="text-destructive"
/>
</>
)}
<div className="flex flex-col items-end gap-3">
<div className="hidden sm:flex items-center gap-1 rounded-full border border-border bg-background px-3 py-1.5">
<StatPill icon={<Users className="h-3 w-3" />} label={`${users.length} users`} />
<span className="text-border mx-1">|</span>
<StatPill
icon={<Activity className="h-3 w-3" />}
label={`${auditLogs.length} events`}
/>
{openReports > 0 && (
<>
<span className="text-border mx-1">|</span>
<StatPill
icon={<Flag className="h-3 w-3" />}
label={`${openReports} open`}
className="text-destructive"
/>
</>
)}
</div>
</div>
</div>
</div>
@@ -974,6 +1019,20 @@ export default function AdminPanelClient({ currentUser }: AdminPanelClientProps)
{log.reason}
</p>
)}
{log.deletedMessageContent && (
<div className="mt-2 flex items-start gap-2 rounded-md border border-border bg-muted/40 px-3 py-2">
<MessageSquare className="mt-0.5 h-3.5 w-3.5 shrink-0 text-muted-foreground" />
<div className="min-w-0">
<p className="text-[10px] font-medium uppercase tracking-wide text-muted-foreground">
Deleted message
</p>
<p className="mt-1 break-words text-xs leading-relaxed text-foreground/90">
{log.deletedMessageContent}
</p>
</div>
</div>
)}
</div>
</div>
);
@@ -1140,6 +1199,177 @@ export default function AdminPanelClient({ currentUser }: AdminPanelClientProps)
)}
</div>
)}
{activeTab === 'settings' && (
<div>
<SectionHeader
icon={<Settings className="h-4 w-4" />}
title="Platform Settings"
description="Manage verification bypass and platform configuration."
/>
<div className="space-y-5">
<div className="rounded-xl border-2 border-primary/20 bg-gradient-to-br from-primary/5 via-background to-background p-5 shadow-lg">
<div className="mb-5 flex items-start gap-3">
<div className="flex h-10 w-10 shrink-0 items-center justify-center rounded-lg bg-primary/10 ring-2 ring-primary/20">
<ShieldAlert className="h-5 w-5 text-primary" />
</div>
<div className="flex-1">
<h3 className="text-base font-bold tracking-tight">
ID Verification Bypass
</h3>
<p className="mt-0.5 text-xs text-muted-foreground leading-relaxed">
Allow existing users to bypass HCA verification and let them access the
platform.
</p>
</div>
</div>
<div className="relative mb-4">
<Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
<Input
placeholder="Search by email or username to manage bypass…"
value={userSearch}
onChange={(e) => setUserSearch(e.target.value)}
className="pl-10 h-9 bg-background/50 border-2 focus:border-primary/50 transition-colors"
/>
</div>
{usersLoading ? (
<LoadingRows cols={1} />
) : !userSearch ? (
<div className="rounded-lg border-2 border-dashed border-primary/20 bg-primary/5 p-6 text-center">
<div className="mx-auto w-fit rounded-full bg-primary/10 p-3 mb-2">
<Search className="h-5 w-5 text-primary" />
</div>
<p className="text-sm font-medium text-foreground mb-1">
Start searching to manage users
</p>
<p className="text-xs text-muted-foreground">
Type an email or username above to find users and toggle their
verification bypass
</p>
</div>
) : users.length === 0 ? (
<div className="rounded-lg border-2 border-dashed border-border bg-muted/30 p-6 text-center">
<XCircle className="mx-auto h-8 w-8 text-muted-foreground/50 mb-2" />
<p className="text-sm font-medium text-foreground mb-1">No users found</p>
<p className="text-xs text-muted-foreground">Try a different search term</p>
</div>
) : (
<>
<div className="space-y-2 mb-3">
{users.map((user) => (
<div
key={user.id}
className={cn(
'group relative overflow-hidden rounded-lg border-2 bg-card transition-all duration-200',
user.bypassVerification
? 'border-primary/40 bg-primary/5 hover:border-primary/50 hover:shadow-md hover:shadow-primary/5'
: 'border-border hover:border-primary/30 hover:shadow-sm'
)}
>
<div className="flex items-center gap-3 px-3 py-2.5">
<Avatar className="h-9 w-9 shrink-0 ring-2 ring-background">
<AvatarImage src={user.pfpUrl} />
<AvatarFallback className="text-xs font-semibold">
{user.personalChannel?.name?.[0]?.toUpperCase() ?? 'U'}
</AvatarFallback>
</Avatar>
<div className="flex-1 min-w-0">
<div className="flex items-center gap-1.5 flex-wrap mb-0.5">
<span className="font-semibold text-sm">
{user.personalChannel?.name ?? user.slack_id}
</span>
{user.isAdmin && (
<span className="inline-flex items-center gap-0.5 text-[10px] font-bold px-1.5 py-0.5 rounded-full bg-primary/10 text-primary border border-primary/30">
<Shield className="h-2.5 w-2.5" />
Admin
</span>
)}
{user.bypassVerification && (
<span className="inline-flex items-center gap-0.5 text-[10px] font-bold px-1.5 py-0.5 rounded-full bg-primary/10 text-primary border border-primary/30 animate-in fade-in zoom-in duration-200">
<CheckCircle2 className="h-2.5 w-2.5" />
Bypass Active
</span>
)}
</div>
<p className="text-xs text-muted-foreground truncate">
{user.email ?? 'No email'}
</p>
</div>
<Button
variant={user.bypassVerification ? 'outline' : 'default'}
size="sm"
onClick={() => handleToggleBypassVerification(user.id)}
className={cn(
'h-7 text-xs gap-1 shrink-0 font-semibold transition-all duration-200',
user.bypassVerification &&
'border-primary/30 hover:bg-primary/10 hover:border-primary/50'
)}
>
{user.bypassVerification ? (
<>
<XCircle className="h-3 w-3" />
Disable
</>
) : (
<>
<CheckCircle2 className="h-3 w-3" />
Enable
</>
)}
</Button>
</div>
{user.bypassVerification && (
<div className="absolute inset-x-0 bottom-0 h-0.5 bg-gradient-to-r from-primary/0 via-primary/50 to-primary/0" />
)}
</div>
))}
</div>
</>
)}
</div>
<div className="rounded-xl border-2 border-border bg-card p-4 shadow-lg">
<div className="flex items-start gap-3">
<div className="flex h-10 w-10 shrink-0 items-center justify-center rounded-lg bg-muted ring-2 ring-border">
<LogOut className="h-5 w-5 text-foreground" />
</div>
<div className="flex-1">
<h3 className="text-base font-bold tracking-tight">Session Management</h3>
<p className="mt-0.5 text-xs text-muted-foreground mb-3 leading-relaxed">
Force logout all other sessions except your current one. Useful for
security maintenance.
</p>
<Button
variant="outline"
size="sm"
onClick={handleLogoutOthers}
disabled={loggingOutOthers}
className="h-7 gap-1.5 font-semibold text-xs"
>
{loggingOutOthers ? (
<>
<RefreshCw className="h-3.5 w-3.5 animate-spin" />
Logging out...
</>
) : (
<>
<LogOut className="h-3.5 w-3.5" />
Logout All Other Sessions
</>
)}
</Button>
</div>
</div>
</div>
</div>
</div>
)}
</div>
</div>
</div>
@@ -1277,6 +1507,7 @@ interface UserWithBan {
email: string | null;
pfpUrl: string;
isAdmin: boolean;
bypassVerification: boolean;
ban: {
id: string;
reason: string;
@@ -1321,6 +1552,7 @@ interface AuditLog {
reason: string | null;
details?: unknown;
channelName?: string;
deletedMessageContent?: string | null;
}
interface ChatReport {

View File

@@ -2,6 +2,15 @@ import { validateRequest } from '@/lib/auth/validate';
import { prisma } from '@hctv/db';
import { NextRequest } from 'next/server';
function getDeletedMessageContent(details: unknown): string | null {
if (!details || typeof details !== 'object' || Array.isArray(details)) {
return null;
}
const messageContent = (details as { messageContent?: unknown }).messageContent;
return typeof messageContent === 'string' && messageContent.length > 0 ? messageContent : null;
}
export async function GET(request: NextRequest) {
const { user } = await validateRequest();
if (!user?.isAdmin) {
@@ -136,6 +145,7 @@ export async function GET(request: NextRequest) {
(log.targetUserId ? (targetUserMap.get(log.targetUserId) ?? log.targetUserId) : null),
reason: log.reason,
details: log.details,
deletedMessageContent: getDeletedMessageContent(log.details),
actorMeta: {
isPlatformAdmin: log.actor.isAdmin,
isChannelModerator: channelModSet.has(log.actorId),
@@ -157,6 +167,7 @@ export async function GET(request: NextRequest) {
target: log.targetUser?.personalChannel?.name ?? log.channel.name,
reason: log.reason,
details: log.details,
deletedMessageContent: getDeletedMessageContent(log.details),
channelName: log.channel.name,
actorMeta: {
isPlatformAdmin: log.moderator.isAdmin,

View File

@@ -292,6 +292,7 @@ export async function POST(request: NextRequest) {
details: {
reportId,
msgId: report.reportedMessageId,
messageContent: report.reportedMessage,
} as any,
},
});
@@ -307,6 +308,7 @@ export async function POST(request: NextRequest) {
reportId,
enforcement: 'DELETE_REPORTED_MESSAGE',
msgId: report.reportedMessageId,
messageContent: report.reportedMessage,
} as any,
},
});

View File

@@ -1,5 +1,5 @@
import { validateRequest } from '@/lib/auth/validate';
import { AdminAuditAction, prisma } from '@hctv/db';
import { AdminAuditAction, getRedisConnection, prisma } from '@hctv/db';
import { NextRequest } from 'next/server';
export async function GET(request: NextRequest) {
@@ -22,7 +22,13 @@ export async function GET(request: NextRequest) {
hasOnboarded: true,
}
: undefined,
include: {
select: {
id: true,
slack_id: true,
email: true,
pfpUrl: true,
isAdmin: true,
bypassVerification: true,
ban: true,
personalChannel: { select: { name: true } },
},
@@ -32,14 +38,14 @@ export async function GET(request: NextRequest) {
}
export async function POST(request: NextRequest) {
const { user } = await validateRequest();
const { user, session } = await validateRequest();
if (!user?.isAdmin) {
return new Response('Forbidden', { status: 403 });
}
let body: {
userId: string;
action: 'ban' | 'unban' | 'promote' | 'demote';
userId?: string;
action: 'ban' | 'unban' | 'promote' | 'demote' | 'logout_others' | 'toggle_bypass_verification';
reason?: string;
expiresAt?: string;
};
@@ -52,6 +58,42 @@ export async function POST(request: NextRequest) {
const { userId, action, reason, expiresAt } = body;
if (action === 'logout_others') {
if (!session) {
return new Response('No active session found', { status: 400 });
}
const sessionsToDelete = await prisma.session.findMany({
where: {
id: {
not: session.id,
},
},
select: {
id: true,
},
});
if (sessionsToDelete.length > 0) {
const redis = getRedisConnection();
await prisma.session.deleteMany({
where: {
id: {
in: sessionsToDelete.map((existingSession) => existingSession.id),
},
},
});
await redis.unlink(
...sessionsToDelete.map((existingSession) => `sessions:${existingSession.id}`)
);
}
return Response.json({
success: true,
invalidatedSessions: sessionsToDelete.length,
});
}
if (!userId || !action) {
return new Response('Missing required fields', { status: 400 });
}
@@ -174,5 +216,32 @@ export async function POST(request: NextRequest) {
return Response.json({ success: true, message: 'User demoted from admin' });
}
if (action === 'toggle_bypass_verification') {
const newBypassStatus = !targetUser.bypassVerification;
await prisma.user.update({
where: { id: userId },
data: { bypassVerification: newBypassStatus },
});
await prisma.adminAuditLog.create({
data: {
action: newBypassStatus
? AdminAuditAction.BYPASS_VERIFICATION_ENABLED
: AdminAuditAction.BYPASS_VERIFICATION_DISABLED,
actorId: user.id,
targetUserId: userId,
},
});
return Response.json({
success: true,
message: newBypassStatus
? 'Email verification bypass enabled'
: 'Email verification bypass disabled',
bypassVerification: newBypassStatus,
});
}
return new Response('Invalid action', { status: 400 });
}

View File

@@ -22,13 +22,17 @@ export async function POST(request: NextRequest) {
const parsed = schema.safeParse(body);
if (!parsed.success) {
if (process.env.NODE_ENV !== 'production') {
console.error('Invalid MediaMTX auth request:', parsed.error.flatten());
}
return finish('invalid request', 400, 'invalid_request');
}
const { action: parsedAction, protocol: parsedProtocol, path, password } = parsed.data;
const { action: parsedAction, protocol: parsedProtocol, path, password, token } = parsed.data;
action = parsedAction;
protocol = parsedProtocol;
protocol = parsedProtocol || 'none';
if (parsedAction === 'publish' && parsedProtocol === 'srt') {
if (parsedAction === 'publish' && (parsedProtocol === 'srt' || parsedProtocol === 'webrtc')) {
const channelKey = await redis.get(`streamKey:${path}`);
if (channelKey) {
@@ -69,7 +73,8 @@ export async function POST(request: NextRequest) {
return finish('youre in yay', 200, 'authorized_publish');
}
} else if (parsedAction === 'read' && parsedProtocol === 'hls') {
}
if (parsedAction === 'read' && parsedProtocol === 'hls') {
if (password === process.env.MEDIAMTX_PUBLISH_KEY) {
return finish('authorized (hls read key for thumbs)', 200, 'authorized_thumbnail');
}
@@ -79,18 +84,33 @@ export async function POST(request: NextRequest) {
}
return finish('authorized', 200, 'authorized_read');
}
if (parsedAction === 'api') {
if (password === process.env.MEDIAMTX_API_KEY || token === process.env.MEDIAMTX_API_KEY) {
return finish('authorized api', 200, 'authorized_api');
}
return finish('unauthorized api', 401, 'unauthorized_api');
}
return finish('uhh', 401, 'unauthorized');
}
const emptyableString = z
.string()
.nullish()
.transform((value) => value ?? '');
const schema = z.object({
user: z.string(),
password: z.string(),
token: z.string(),
ip: z.string(),
user: emptyableString,
password: emptyableString,
token: emptyableString,
ip: emptyableString,
action: z.enum(['publish', 'read', 'playback', 'api', 'metrics', 'pprof']),
path: z.string(),
protocol: z.enum(['rtsp', 'rtmp', 'hls', 'webrtc', 'srt']),
id: z.string().nullable(),
query: z.string(),
path: emptyableString,
protocol: z
.union([z.enum(['rtsp', 'rtmp', 'hls', 'webrtc', 'srt']), z.literal('')])
.nullish()
.transform((value) => value ?? ''),
id: z.string().nullable().default(null),
query: emptyableString,
});

View File

@@ -1,46 +1,106 @@
import { NextRequest } from 'next/server';
import { validateRequest } from '@/lib/auth/validate';
import { prisma } from '@hctv/db';
import { NextRequest } from "next/server";
import { regenerateStreamKey } from '@/lib/db/streamKey';
import { prisma } from '@hctv/db';
export async function POST(request: NextRequest) {
const channelName = await readChannelNameFromBody(request);
if (!channelName) {
return badRequestResponse();
}
const result = await getAuthorizedChannel(channelName);
if ('response' in result) {
return result.response;
}
const streamKey = await regenerateStreamKey(result.channel.id, channelName);
return Response.json({ key: streamKey.key });
}
export async function GET(request: NextRequest) {
const channelName = request.nextUrl.searchParams.get('channel');
if (!isValidChannelName(channelName)) {
return badRequestResponse();
}
const result = await getAuthorizedChannel(channelName);
if ('response' in result) {
return result.response;
}
const streamKey = await prisma.streamKey.findUnique({
where: { channelId: result.channel.id },
select: { key: true },
});
if (!streamKey) {
return new Response('Stream key not found', { status: 404 });
}
return Response.json({ key: streamKey.key });
}
async function getAuthorizedChannel(channelName: string): Promise<AuthorizedChannelResult> {
const { user } = await validateRequest();
const body = await request.json();
const { channel } = body;
if (!user) {
return new Response('Unauthorized', { status: 401 });
return { response: unauthorizedResponse() };
}
if (!channel || typeof channel !== 'string') {
return new Response('Bad Request', { status: 400 });
}
const channelInfo = await prisma.channel.findUnique({
where: { name: channel },
include: {
owner: true,
managers: true
}
const channel = await prisma.channel.findUnique({
where: { name: channelName },
select: {
id: true,
ownerId: true,
managers: {
where: { id: user.id },
select: { id: true },
},
},
});
if (!channelInfo) {
return new Response('Channel not found', { status: 404 });
if (!channel) {
return { response: new Response('Channel not found', { status: 404 }) };
}
const isBroadcaster =
channelInfo.ownerId === user.id ||
channelInfo.managers.some(m => m.id === user.id);
const isBroadcaster = channel.ownerId === user.id || channel.managers.length > 0;
if (!isBroadcaster) {
return new Response('Unauthorized', { status: 401 });
return { response: unauthorizedResponse() };
}
const streamKey = await regenerateStreamKey(channelInfo.id, channel);
return { channel: { id: channel.id } };
}
return new Response(JSON.stringify({ key: streamKey.key }), {
status: 200,
headers: {
'Content-Type': 'application/json'
async function readChannelNameFromBody(request: NextRequest) {
try {
const body = await request.json();
return isValidChannelName(body?.channel) ? body.channel : null;
} catch {
return null;
}
}
function isValidChannelName(channelName: unknown): channelName is string {
return typeof channelName === 'string' && channelName.length > 0;
}
function badRequestResponse() {
return new Response('Bad Request', { status: 400 });
}
function unauthorizedResponse() {
return new Response('Unauthorized', { status: 401 });
}
type AuthorizedChannelResult =
| {
channel: {
id: string;
};
}
});
}
| {
response: Response;
};

View File

@@ -19,7 +19,13 @@ export async function POST(request: NextRequest, segmentData: { params: Params }
const body = await request.json();
const parsedBody = bodySchema.safeParse(body);
if (!parsedBody.success) {
return new Response(JSON.stringify({ success: false, error: parsedBody.error.errors.map(e => e.message).join(', ') }), { status: 400 });
return new Response(
JSON.stringify({
success: false,
error: parsedBody.error.issues.map((issue) => issue.message).join(', '),
}),
{ status: 400 }
);
}
const { action, name } = parsedBody.data;
@@ -121,4 +127,4 @@ export async function GET(request: NextRequest, segmentData: { params: Params })
function generateApiKey() {
const uuid = crypto.randomUUID().replace(/-/g, '');
return `hctvb_${uuid}`;
}
}

View File

@@ -1,18 +1,21 @@
'use client';
import { UniversalForm } from '@/components/app/UniversalForm/UniversalForm';
import {
Card,
CardContent,
CardDescription,
CardHeader,
CardTitle,
} from '@/components/ui/card';
import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar';
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
import { editBot } from '@/lib/form/actions';
import { BotAccount } from '@hctv/db';
import { useRouter } from 'next/navigation';
import { Button } from '@/components/ui/button';
import { UploadButton } from '@/lib/uploadthing';
import { toast } from 'sonner';
import React from 'react';
export function GeneralSettings(props: BotAccount) {
const router = useRouter();
const [isUploading, setIsUploading] = React.useState(false);
const [uploadError, setUploadError] = React.useState<string | null>(null);
const formRef = React.useRef<HTMLFormElement>(null);
return (
<Card>
<CardHeader>
@@ -21,6 +24,7 @@ export function GeneralSettings(props: BotAccount) {
</CardHeader>
<CardContent>
<UniversalForm
formRef={formRef}
fields={[
{
name: 'from',
@@ -42,7 +46,7 @@ export function GeneralSettings(props: BotAccount) {
label: 'Bot Slug',
placeholder: 'Enter bot slug',
required: true,
value: props.slug
value: props.slug,
},
{
name: 'description',
@@ -52,11 +56,96 @@ export function GeneralSettings(props: BotAccount) {
value: props.description,
textArea: true,
},
{
name: 'pfpUrl',
label: 'Profile Picture',
type: 'url',
value: props.pfpUrl,
component: ({ field }) => {
return (
<div className="space-y-4">
<input type="hidden" {...field} />
{field.value && (
<div className="flex items-center space-x-4">
<Avatar className="h-16 w-16">
<AvatarImage src={field.value} alt="Current profile picture" />
<AvatarFallback>{props.displayName[0]?.toUpperCase()}</AvatarFallback>
</Avatar>
<div className="flex-1">
<p className="text-sm font-medium">Current profile picture</p>
<p className="text-xs text-muted-foreground">
Click &quot;Upload new image&quot; to replace
</p>
</div>
<Button
type="button"
variant="outline"
size="sm"
onClick={() => {
field.onChange('');
setUploadError(null);
}}
>
Remove
</Button>
</div>
)}
<div>
<UploadButton
endpoint="pfpUpload"
className="mt-2 ut-button:bg-mantle ut-button:text-mantle-foreground ut-allowed-content:text-muted-foreground/70"
content={{
button: field.value ? 'Upload new image' : 'Upload profile picture',
allowedContent: 'Image (1MB max)',
}}
onUploadBegin={() => {
setIsUploading(true);
setUploadError(null);
}}
onClientUploadComplete={(res) => {
setIsUploading(false);
if (res && res[0]) {
field.onChange(res[0].ufsUrl);
toast.success('Profile picture uploaded successfully!');
setTimeout(() => {
formRef.current?.requestSubmit();
}, 0);
}
}}
onUploadError={(error) => {
setIsUploading(false);
setUploadError(error.message);
toast.error(`Upload failed: ${error.message}`);
}}
disabled={isUploading}
/>
{isUploading && <p className="mt-2 text-sm text-primary">Uploading...</p>}
{uploadError && <p className="mt-2 text-sm text-red-600">{uploadError}</p>}
{!field.value && !isUploading && !uploadError && (
<p className="mt-2 text-sm text-muted-foreground">
Upload a profile picture for your channel.
</p>
)}
</div>
</div>
);
},
},
]}
schemaName={'editBot'}
action={editBot}
onActionComplete={(result) => {
if (result?.success) {
router.refresh();
}
}}
/>
</CardContent>
</Card>
)
}
);
}

View File

@@ -1,6 +1,6 @@
'use client';
import { useState, useCallback } from 'react';
import { useState, useCallback, useRef } from 'react';
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
import { Badge } from '@/components/ui/badge';
@@ -39,6 +39,7 @@ import {
editStreamInfo,
changeUsername,
updateChatModeration,
updateNotificationChannels,
} from '@/lib/form/actions';
import { Switch } from '@/components/ui/switch';
import { toast } from 'sonner';
@@ -66,6 +67,7 @@ import { parseAsString, useQueryState } from 'nuqs';
import { Write } from '@/components/ui/channel-desc-fancy-area/write';
import { Preview } from '@/components/ui/channel-desc-fancy-area/preview';
import { UploadButton } from '@/lib/uploadthing';
import { useChannelStreamKey } from '@/lib/hooks/useChannelStreamKey';
import { useOwnedChannels } from '@/lib/hooks/useUserList';
import { ChannelSelect } from '@/components/app/ChannelSelect/ChannelSelect';
import { useRouter } from 'next/navigation';
@@ -78,8 +80,12 @@ import {
SelectTrigger,
SelectValue,
} from '@/components/ui/select';
import { getMediamtxClientEnvs } from '@/lib/utils/mediamtx/client';
import {
getMediamtxClientEnvs,
getMediamtxClientRegionOptions,
} from '@/lib/utils/mediamtx/client';
import type { MediaMTXRegion } from '@/lib/utils/mediamtx/regions';
import { Textarea } from '@/components/ui/textarea';
interface ChannelSettingsClientProps {
channel: Channel & {
@@ -107,11 +113,9 @@ interface ChannelSettingsClientProps {
export default function ChannelSettingsClient({
channel,
isOwner,
currentUser,
isPersonal,
}: ChannelSettingsClientProps) {
const confirm = useConfirm();
const [streamKey, setStreamKey] = useState(channel.streamKey?.key || '');
const [keyVisible, setKeyVisible] = useState(false);
const [copied, setCopied] = useState({
streamKey: false,
@@ -120,9 +124,16 @@ export default function ChannelSettingsClient({
const [selTab, setSelTab] = useQueryState('tab', parseAsString.withDefault('general'));
const [isUploading, setIsUploading] = useState(false);
const [uploadError, setUploadError] = useState<string | null>(null);
const serverOptions = getMediamtxClientRegionOptions();
const [region, setRegion] = useState<MediaMTXRegion>('hq');
const channelList = useOwnedChannels();
const {
streamKey,
isRegenerating: isRegeneratingStreamKey,
regenerateStreamKey,
} = useChannelStreamKey(channel.name, channel.streamKey?.key);
const router = useRouter();
const channelSettingsFormRef = useRef<HTMLFormElement>(null);
const handleStreamInfoActionComplete = useCallback((result: any) => {
if (result?.success) {
@@ -142,6 +153,12 @@ export default function ChannelSettingsClient({
}
}, []);
const handleNotifChannelsActionComplete = useCallback((result: any) => {
if (result?.success) {
toast.success('Notification channels updated');
}
}, []);
const handleUsernameChangeComplete = useCallback(
(result: any) => {
if (result?.success && result?.newUsername) {
@@ -177,22 +194,11 @@ export default function ChannelSettingsClient({
}
};
const regenerateStreamKey = async () => {
const handleRegenerateStreamKey = async () => {
try {
const response = await fetch('/api/rtmp/streamKey', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ channel: channel.name }),
});
if (response.ok) {
const data = await response.json();
setStreamKey(data.key);
toast.success('Stream key regenerated successfully');
} else {
toast.error('Failed to regenerate stream key');
}
} catch (error) {
await regenerateStreamKey();
toast.success('Stream key regenerated successfully');
} catch {
toast.error('Failed to regenerate stream key');
}
};
@@ -239,6 +245,7 @@ export default function ChannelSettingsClient({
<div>
<ChannelSelect
channelList={channelList.channels.map((c) => c.channel)}
includeCreate
value={channel.name}
onSelect={(value) => {
if (value === 'create') {
@@ -275,9 +282,9 @@ export default function ChannelSettingsClient({
<MessageSquareWarning className="h-4 w-4" />
Moderation
</TabsTrigger>
<TabsTrigger value="utilities" className="flex items-center gap-2">
<TabsTrigger value="integrations" className="flex items-center gap-2">
<Wrench className="size-4" />
Utilities
Integrations
</TabsTrigger>
</TabsList>
@@ -291,6 +298,7 @@ export default function ChannelSettingsClient({
</CardHeader>
<CardContent className="space-y-6">
<UniversalForm
formRef={channelSettingsFormRef}
fields={[
{ name: 'channelId', type: 'hidden', value: channel.id, label: 'Channel ID' },
{
@@ -346,6 +354,9 @@ export default function ChannelSettingsClient({
if (res && res[0]) {
field.onChange(res[0].ufsUrl);
toast.success('Profile picture uploaded successfully!');
setTimeout(() => {
channelSettingsFormRef.current?.requestSubmit();
}, 0);
}
}}
onUploadError={(error) => {
@@ -549,7 +560,12 @@ export default function ChannelSettingsClient({
)}
</button>
</div>
<Button onClick={regenerateStreamKey} variant="outline" size="smicon">
<Button
onClick={handleRegenerateStreamKey}
variant="outline"
size="smicon"
loading={isRegeneratingStreamKey}
>
<Key className="h-4 w-4" />
</Button>
<Button
@@ -575,7 +591,11 @@ export default function ChannelSettingsClient({
<SelectValue placeholder="Select region" />
</SelectTrigger>
<SelectContent>
<SelectItem value="hq">HQ Server A 🇺🇸</SelectItem>
{serverOptions.map((server) => (
<SelectItem key={server.value} value={server.value}>
{server.label} {server.emoji}
</SelectItem>
))}
</SelectContent>
</Select>
</div>
@@ -1048,11 +1068,13 @@ export default function ChannelSettingsClient({
</CardContent>
</Card>
</TabsContent>
<TabsContent value="utilities">
<TabsContent value="integrations">
<Card>
<CardHeader>
<CardTitle>Utilities</CardTitle>
<CardDescription>OBS overlays, APIs... everything in one neat place!</CardDescription>
<CardTitle>Integrations</CardTitle>
<CardDescription>
OBS overlays, Slack... everything in one neat place!
</CardDescription>
</CardHeader>
<CardContent className="space-y-6">
<div className="space-y-4">
@@ -1070,11 +1092,58 @@ export default function ChannelSettingsClient({
className="w-full px-3 py-2 border rounded-md bg-mantle font-mono text-sm"
/>
</div>
<Button variant="outline" size="sm" onClick={() => setKeyVisible(!keyVisible)}>
{keyVisible ? 'Hide' : 'Show'}
<Button
variant="outline"
size="smicon"
onClick={() => setKeyVisible(!keyVisible)}
>
{keyVisible ? <EyeOff className='size-4' /> : <Eye className='size-4' />}
</Button>
</div>
</div>
<UniversalForm
fields={[
{ name: 'channelId', type: 'hidden', value: channel.id, label: 'Channel ID' },
{
name: 'channels',
label: 'Notification channels',
value: channel.notifChannels.join('\n'),
textArea: true,
textAreaRows: 4,
component: ({ field }) => (
<div>
<Textarea
name={field.name}
ref={field.ref}
value={
typeof field.value === 'string'
? field.value
: ''
}
disabled={channel.is247}
rows={4}
placeholder={
channel.is247
? 'Notifications are disabled for 24/7 channels'
: 'Enter channel IDs, one per line'
}
onBlur={field.onBlur}
onChange={field.onChange}
/>
<p className="text-xs text-muted-foreground mt-1">
{channel.is247
? '24/7 channels do not send go-live notifications, so notification channels cannot be edited.'
: 'Enter one channel ID per line. You can find channel IDs in their URLs.'}
</p>
</div>
),
},
]}
schemaName="updateNotificationChannels"
action={updateNotificationChannels}
submitText="Save notification channels"
onActionComplete={handleNotifChannelsActionComplete}
/>
</div>
</CardContent>
</Card>

View File

@@ -0,0 +1,411 @@
'use client';
import { useEffect, useState } from 'react';
import type { ReactNode } from 'react';
import type { LucideIcon } from 'lucide-react';
import {
AlertTriangle,
CircleAlert,
Globe,
LoaderCircle,
Monitor,
Radio,
RefreshCw,
Square,
Video,
} from 'lucide-react';
import { ChannelSelect } from '@/components/app/ChannelSelect/ChannelSelect';
import { cn } from '@/lib/utils';
import { Button } from '@/components/ui/button';
import { Badge } from '@/components/ui/badge';
import { Card, CardContent } from '@/components/ui/card';
import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from '@/components/ui/select';
import { useChannelStreamKey } from '@/lib/hooks/useChannelStreamKey';
import { useOwnedChannels } from '@/lib/hooks/useUserList';
import { useScreensharePublisher } from '@/lib/hooks/useScreensharePublisher';
import { getMediamtxClientRegionOptions } from '@/lib/utils/mediamtx/client';
import type { MediaMTXRegion } from '@/lib/utils/mediamtx/regions';
export default function Page() {
const serverOptions = getMediamtxClientRegionOptions();
const whipEnabledServerOptions = serverOptions.filter((server) => server.whipEnabled);
const defaultRegion = whipEnabledServerOptions[0]?.value ?? 'hq';
const [selectedChannel, setSelectedChannel] = useState('');
const [selectedRegion, setSelectedRegion] = useState<MediaMTXRegion>(defaultRegion);
const { channels, isLoading: isLoadingChannels } = useOwnedChannels();
const ownedChannels = channels.map(({ channel }) => channel);
const {
streamKey,
error: streamKeyError,
isLoading: isLoadingStreamKey,
} = useChannelStreamKey(selectedChannel || undefined);
const {
browserWarning,
changeSource,
hasPreview,
issue,
isLive,
isPreviewReady,
isPreviewingSource,
isSessionActive,
isStarting,
isSwitchingSource,
previewRef,
previewSource,
startPublishing,
stopPublishing,
} = useScreensharePublisher({
channelName: selectedChannel,
region: selectedRegion,
streamKey,
});
const hasChannels = ownedChannels.length > 0;
const selectedServer = whipEnabledServerOptions.find((server) => server.value === selectedRegion);
const hasWhipEnabledServerOptions = whipEnabledServerOptions.length > 0;
const canStartPublishing =
!isSessionActive &&
!isPreviewingSource &&
Boolean(selectedChannel) &&
Boolean(streamKey) &&
Boolean(selectedServer?.whipEnabled) &&
!isLoadingStreamKey;
const channelPlaceholder = isLoadingChannels ? 'Loading channels...' : 'Select a channel';
const primaryIssue = issue ?? browserWarning;
useEffect(() => {
if (isSessionActive) {
return;
}
if (!ownedChannels.some((channel) => channel.name === selectedChannel)) {
setSelectedChannel(ownedChannels[0]?.name ?? '');
}
}, [isSessionActive, ownedChannels, selectedChannel]);
useEffect(() => {
if (!isLive) {
return;
}
const handleBeforeUnload = (event: BeforeUnloadEvent) => {
event.preventDefault();
event.returnValue = '';
};
window.addEventListener('beforeunload', handleBeforeUnload);
return () => {
window.removeEventListener('beforeunload', handleBeforeUnload);
};
}, [isLive]);
const statusLabel = isLive
? 'LIVE'
: isSwitchingSource
? 'Switching'
: isStarting
? 'Connecting'
: isPreviewingSource
? hasPreview
? 'Updating Preview'
: 'Preparing Preview'
: isPreviewReady
? 'Preview'
: 'Ready';
return (
<div className="relative flex min-h-[calc(100vh-4rem)] flex-col">
{/* Video Stage */}
<div className="flex flex-1 items-center justify-center px-4 py-4 md:px-6">
<div className="w-full max-w-6xl">
<div className="relative overflow-hidden rounded-3xl border border-border/60 bg-black shadow-2xl">
<div className="relative aspect-video w-full bg-black">
<video
ref={previewRef}
autoPlay
muted
playsInline
className="h-full w-full object-contain"
/>
{!hasPreview && (
<div className="absolute inset-0 flex flex-col items-center justify-center gap-5 px-6 text-muted-foreground">
<div className="flex h-24 w-24 items-center justify-center rounded-full border border-secondary bg-secondary/80">
<Monitor className="h-10 w-10 text-primary/80" />
</div>
<div className="max-w-md text-center space-y-1.5">
<p className="text-lg font-medium text-zinc-200">
Ready to livestream
</p>
<p className="text-sm text-zinc-400">
Select a tab, window, or display to preview.
</p>
</div>
</div>
)}
{(isPreviewingSource || isStarting || isSwitchingSource) && (
<div className="absolute inset-0 flex flex-col items-center justify-center gap-3 bg-black/60 text-white backdrop-blur-sm">
<LoaderCircle className="h-8 w-8 animate-spin" />
<p className="text-sm font-medium">
{isPreviewingSource
? hasPreview
? 'Updating preview...'
: 'Preparing preview...'
: isStarting
? 'Starting broadcast...'
: 'Switching source...'}
</p>
</div>
)}
<div className="absolute left-6 top-6">
<Badge
variant={isLive ? 'default' : hasPreview ? 'secondary' : 'outline'}
className={cn(
'gap-2 px-3 py-1 text-xs font-semibold shadow-lg backdrop-blur-md transition-all',
isLive && 'bg-red-500 text-white hover:bg-red-600',
!isLive && !hasPreview && 'border-zinc-800 bg-black/50 text-zinc-400'
)}
>
{isLive && <span className="h-2 w-2 animate-pulse rounded-full bg-white shadow-[0_0_8px_rgba(255,255,255,0.8)]" />}
{statusLabel}
</Badge>
</div>
</div>
</div>
</div>
</div>
{(streamKeyError || primaryIssue) && (
<div className="absolute inset-x-0 top-4 z-10 mx-auto max-w-xl px-4 md:top-6">
{streamKeyError ? (
<AlertCard
actions={
<Button onClick={() => window.location.reload()} size="sm" variant="outline">
<RefreshCw className="mr-2 h-4 w-4" />
Reload page
</Button>
}
description={getStreamKeyErrorDescription(streamKeyError.message)}
icon={CircleAlert}
title="Could not load the stream key"
tone="destructive"
/>
) : null}
{primaryIssue ? (
<AlertCard
actions={
<div className="flex flex-wrap gap-2">
{!isSessionActive && primaryIssue.context === 'preview' ? (
<Button
onClick={previewSource}
disabled={isPreviewingSource}
loading={isPreviewingSource}
size="sm"
>
Preview again
</Button>
) : null}
{!isSessionActive &&
primaryIssue.context !== 'warning' &&
primaryIssue.context !== 'preview' ? (
<Button onClick={startPublishing} disabled={!canStartPublishing} size="sm">
Try again
</Button>
) : null}
{primaryIssue.context === 'switch' && isLive ? (
<Button
onClick={changeSource}
disabled={isSwitchingSource}
loading={isSwitchingSource}
size="sm"
>
Try switching again
</Button>
) : null}
{isSessionActive && primaryIssue.context !== 'warning' ? (
<Button onClick={stopPublishing} size="sm" variant="outline">
Stop stream
</Button>
) : null}
</div>
}
description={primaryIssue.description}
icon={primaryIssue.tone === 'warning' ? AlertTriangle : CircleAlert}
title={primaryIssue.title}
tone={primaryIssue.tone}
/>
) : null}
</div>
)}
<div className="shrink-0 border-t border-border/50 bg-background/95 px-4 py-4 backdrop-blur supports-[backdrop-filter]:bg-background/60">
<div className="mx-auto flex max-w-6xl flex-col items-stretch gap-4 sm:flex-row sm:items-center sm:justify-between">
<div className="flex flex-wrap items-center gap-5">
<div className="flex items-center gap-3">
<Video className="h-4 w-4 text-muted-foreground" />
<ChannelSelect
channelList={ownedChannels}
disabled={isSessionActive || isLoadingChannels || !hasChannels}
placeholder={channelPlaceholder}
value={selectedChannel || undefined}
onSelect={setSelectedChannel}
triggerClassName="w-48"
/>
</div>
<div className="flex items-center gap-3">
<Globe className="h-4 w-4 text-muted-foreground" />
<Select
value={selectedRegion}
onValueChange={(value) => setSelectedRegion(value as MediaMTXRegion)}
disabled={isSessionActive || !hasWhipEnabledServerOptions}
>
<SelectTrigger className="w-44">
<SelectValue placeholder="Select server" />
</SelectTrigger>
<SelectContent>
{whipEnabledServerOptions.map((server) => (
<SelectItem key={server.value} value={server.value}>
{server.label} {server.emoji}
</SelectItem>
))}
</SelectContent>
</Select>
</div>
{!hasChannels && !isLoadingChannels ? (
<p className="text-xs text-muted-foreground">Create a channel to stream.</p>
) : null}
</div>
{/* Right: Actions */}
<div className="flex flex-wrap items-center justify-end gap-2">
{!isSessionActive ? (
<div className="flex flex-wrap items-center gap-2">
<Button
variant="secondary"
onClick={previewSource}
disabled={isPreviewingSource}
loading={isPreviewingSource}
size="default"
>
<Monitor className="mr-2 h-4 w-4" />
{hasPreview ? 'Change Preview' : 'Preview'}
</Button>
{hasPreview ? (
<Button
onClick={stopPublishing}
disabled={isPreviewingSource}
variant="outline"
size="default"
>
<Square className="mr-2 h-4 w-4" />
Clear Preview
</Button>
) : null}
<Button
onClick={startPublishing}
disabled={!canStartPublishing || isSwitchingSource}
loading={isStarting}
size="default"
>
<Radio className="mr-2 h-4 w-4" />
Start
</Button>
</div>
) : (
<div className="flex flex-wrap items-center gap-2">
<Button
variant="secondary"
onClick={changeSource}
disabled={!isLive}
loading={isSwitchingSource}
size="default"
>
<RefreshCw className="mr-2 h-4 w-4" />
Switch
</Button>
<Button
onClick={stopPublishing}
disabled={isPreviewingSource || isSwitchingSource}
variant="outline"
size="default"
>
<Square className="mr-2 h-4 w-4" />
Stop
</Button>
</div>
)}
</div>
</div>
</div>
</div>
);
}
function AlertCard({ actions, description, icon: Icon, title, tone }: AlertCardProps) {
const isWarning = tone === 'warning';
return (
<Card
className={cn(
'overflow-hidden border-l-4 shadow-xl backdrop-blur-md',
isWarning
? 'border-l-amber-500 bg-amber-500/[0.03]'
: 'border-l-destructive bg-destructive/[0.03]'
)}
>
<CardContent className="flex flex-col gap-4 p-4 md:flex-row md:items-start md:justify-between">
<div className="flex items-start gap-3">
<Icon
className={cn(
'mt-0.5 h-5 w-5 shrink-0',
isWarning ? 'text-amber-500' : 'text-destructive'
)}
/>
<div className="space-y-1">
<p className="text-sm font-semibold">{title}</p>
<p className="text-sm text-muted-foreground">{description}</p>
</div>
</div>
{actions ? <div className="flex flex-wrap gap-2 md:shrink-0">{actions}</div> : null}
</CardContent>
</Card>
);
}
function getStreamKeyErrorDescription(message: string) {
if (message.toLowerCase().includes('unauthorized')) {
return 'You no longer have permission to stream to this channel. Try another channel or sign in again.';
}
if (message.toLowerCase().includes('not found')) {
return 'This channel does not have a valid stream key yet. Regenerate it in channel settings, then retry.';
}
return 'Refresh the page and try again. If it keeps failing, check channel settings and server config.';
}
type AlertCardProps = {
actions?: ReactNode;
description: string;
icon: LucideIcon;
title: string;
tone: 'warning' | 'destructive';
};

View File

@@ -1,3 +1,4 @@
import slackNotifier from '@/lib/services/slackNotifier';
import { hackClub, lucia, HCID_TOKEN_URL, HCID_USER_INFO_URL } from '@hctv/auth';
import { cookies as nextCookies } from 'next/headers';
import { OAuth2RequestError } from 'arctic';
@@ -8,34 +9,59 @@ import { getRedisConnection } from '@hctv/db';
export async function GET(request: Request): Promise<Response> {
const cookies = await nextCookies();
const url = new URL(request.url);
const code = url.searchParams.get("code");
const state = url.searchParams.get("state");
const storedState = cookies.get("hackclub_oauth_state")?.value ?? null;
if (!code || !state || !storedState || state !== storedState) {
const code = url.searchParams.get('code');
const state = url.searchParams.get('state');
const storedState = cookies.get('hackclub_oauth_state')?.value ?? null;
if (!code || !state || !storedState || state !== storedState) {
console.log('invalid state stuff');
return new Response(null, {
status: 400
});
}
return new Response(null, {
status: 400,
});
}
try {
const tokens = await hackClub.validateAuthorizationCode(HCID_TOKEN_URL, code, null);
const accessToken = tokens.accessToken();
const userResponse = await fetch(HCID_USER_INFO_URL, {
headers: {
'Authorization': `Bearer ${accessToken}`,
Authorization: `Bearer ${accessToken}`,
},
});
if (!userResponse.ok) {
return new Response('Unable to verify your Hack Club identity right now. Please try again.', {
status: 502,
});
}
const userResult: HackClubUserResponse = await userResponse.json();
const identity = userResult.identity;
const bypass = await checkIfBypass(identity.primary_email);
if (identity.verification_status !== 'verified') {
if (!bypass) {
return new Response(getVerificationErrorMessage(identity.verification_status), {
status: 403,
});
}
}
const slackId = identity.slack_id;
if (!slackId) {
return new Response("Please make sure to have a Slack account before continuing.", {
return new Response('Please make sure to have a Slack account before continuing.', {
status: 400,
});
}
const slackValidation = await validateSlackUser(slackId);
if (!slackValidation.success) {
if (!bypass) {
return new Response(slackValidation.message, {
status: slackValidation.status,
});
}
}
const existingUser = await prisma.user.findFirst({
where: {
slack_id: slackId,
@@ -70,7 +96,9 @@ export async function GET(request: Request): Promise<Response> {
id: userId,
slack_id: slackId,
email: identity.primary_email,
pfpUrl: identity.slack_id ? `https://cachet.dunkirk.sh/users/${identity.slack_id}/r` : 'https://github.com/hackclub.png',
pfpUrl: identity.slack_id
? `https://cachet.dunkirk.sh/users/${identity.slack_id}/r`
: 'https://github.com/hackclub.png',
hasOnboarded: false,
},
});
@@ -106,9 +134,85 @@ interface HackClubIdentity {
first_name: string;
last_name: string;
primary_email: string;
verification_status: VerificationStatus;
}
interface HackClubUserResponse {
identity: HackClubIdentity;
}
type VerificationStatus = 'needs_submission' | 'pending' | 'verified' | 'ineligible';
type SlackValidationResult =
| {
success: true;
}
| {
success: false;
message: string;
status: number;
};
function getVerificationErrorMessage(status: VerificationStatus): string {
switch (status) {
case 'needs_submission':
return 'Please complete Hack Club Identity verification before signing in to hackclub.tv.';
case 'pending':
return 'Your Hack Club Identity verification is still being reviewed. Please try again once it is approved.';
case 'ineligible':
return 'Your Hack Club Identity verification was rejected, so you cannot access hackclub.tv right now.';
case 'verified':
return 'Verified users can continue.';
}
}
async function validateSlackUser(slackId: string): Promise<SlackValidationResult> {
if (!process.env.SLACK_NOTIFIER_TOKEN) {
return {
success: false,
message: 'Slack verification is not configured right now. Please try again later.',
status: 503,
};
}
try {
const response = await slackNotifier.users.info({ user: slackId });
if (!response.ok || !response.user) {
return {
success: false,
message: 'Unable to verify your Slack account right now. Please try again later.',
status: 502,
};
}
if (response.user.deleted) {
return {
success: false,
message: 'Your Slack account is deactivated, so you cannot access hackclub.tv.',
status: 403,
};
}
if (response.user.is_restricted || response.user.is_ultra_restricted) {
return {
success: false,
message:
'Guest Slack accounts cannot access hackclub.tv. Please sign in with a full Hack Club Slack account.',
status: 403,
};
}
return { success: true };
} catch {
return {
success: false,
message: 'Unable to verify your Slack account right now. Please try again later.',
status: 502,
};
}
}
async function checkIfBypass(email: string): Promise<boolean> {
const user = await prisma.user.findFirst({ where: { email } });
return user?.bypassVerification ?? false;
}

View File

@@ -7,6 +7,7 @@ import { useSession } from '@/lib/providers/SessionProvider';
import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar';
import { User, Tv, Heart, MessageSquare } from 'lucide-react';
import Image from 'next/image';
import BlahajHeart from '@/lib/assets/blahaj-heart.webp';
export default function OnboardingClient() {
const { user } = useSession();
@@ -31,7 +32,7 @@ export default function OnboardingClient() {
Welcome to hackclub.tv!
</h1>
<p className="text-lg text-muted-foreground flex gap-2 justify-center">
Let&apos;s get you set up <Image src="https://emoji.slack-edge.com/T0266FRGM/blahaj-heart/db9adf8229e9a4fb.png" alt=":blahaj-heart:" width={24} height={24} />
Let&apos;s get you set up <Image src={BlahajHeart} alt=":blahaj-heart:" height={28} />
</p>
</div>
</div>
@@ -73,7 +74,7 @@ export default function OnboardingClient() {
<Heart className="w-4 h-4 text-primary" />
</div>
<div>
<h3 className="font-semibold text-sm">Follow hackclubbers</h3>
<h3 className="font-semibold text-sm">Follow Hack Clubbers</h3>
<p className="text-xs text-muted-foreground">
Stay updated with your favorite creators and streams
</p>

View File

@@ -1,5 +1,4 @@
import type { Metadata } from 'next';
import { Inter } from 'next/font/google';
import { cookies } from 'next/headers';
import '../globals.css';
import Navbar from '@/components/app/NavBar/NavBar';
@@ -9,7 +8,6 @@ import { Toaster } from '@/components/ui/sonner';
import { ThemeProvider } from '@/lib/providers/ThemeProvider';
import { SidebarProvider } from '@/components/ui/sidebar';
import Sidebar from '@/components/app/Sidebar/Sidebar';
import { cn } from '@/lib/utils';
import EditLivestream from '@/components/app/EditLivestream/EditLivestream';
import { StreamInfoProvider } from '@/lib/providers/StreamInfoProvider';
import { NextSSRPlugin } from "@uploadthing/react/next-ssr-plugin";
@@ -19,8 +17,6 @@ import { NuqsAdapter } from 'nuqs/adapters/next/app'
import SonnerNewVersion from '@/components/app/SonnerNewVersion/SonnerNewVersion';
import ConfirmDialogProvider from '@/lib/providers/ConfirmProvider';
const inter = Inter({ subsets: ['latin'] });
export const metadata: Metadata = {
title: 'hackclub.tv',
description: "Hack Club's livestreaming platform",
@@ -37,7 +33,7 @@ export default async function RootLayout({
return (
<html lang="en">
<body className={cn('flex flex-col h-screen', inter.className)}>
<body className="flex h-screen flex-col">
<SessionProvider value={sessionData}>
<ThemeProvider
attribute="class"

View File

@@ -54,5 +54,5 @@ function isAuthenticated(req: NextRequest) {
const user = decoded.substring(0, separatorIndex);
const pass = decoded.substring(separatorIndex + 1);
return user === process.env.METRICS_USER && pass === process.env.METRICS_PASS;
return user === process.env.METRICS_USER && pass === process.env.METRICS_PASSWORD;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View File

@@ -1,128 +1,163 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
@import "tailwindcss";
@import "tw-animate-css";
@layer base {
:root {
/* Light theme - based on your color scheme */
@config "../../tailwind.config.mts";
@custom-variant dark (&:is(.dark *));
/* Main background and foreground */
--background: 350 59% 98%; /* FDF7F8 - main background */
--foreground: 351 34% 30%; /* 5D3A3F - main text */
@font-face {
font-family: 'Phantom Sans';
src:
url('https://assets.hackclub.com/fonts/Phantom_Sans_0.7/Regular.woff2') format('woff2'),
url('https://assets.hackclub.com/fonts/Phantom_Sans_0.7/Regular.woff') format('woff');
font-weight: normal;
font-style: normal;
font-display: swap;
}
/* Muted elements */
--muted: 350 40% 93%; /* F8E8EA - muted background */
--muted-foreground: 350 30% 45%; /* Lighter version of main text */
@font-face {
font-family: 'Phantom Sans';
src:
url('https://assets.hackclub.com/fonts/Phantom_Sans_0.7/Italic.woff2') format('woff2'),
url('https://assets.hackclub.com/fonts/Phantom_Sans_0.7/Italic.woff') format('woff');
font-weight: normal;
font-style: italic;
font-display: swap;
}
/* Popover and card */
--popover: 0 0% 100%; /* FFFFFF - popover background */
--popover-foreground: 351 34% 30%; /* 5D3A3F - popover text */
--card: 0 0% 100%; /* FFFFFF - card background */
--card-foreground: 351 34% 30%; /* 5D3A3F - card text */
@font-face {
font-family: 'Phantom Sans';
src:
url('https://assets.hackclub.com/fonts/Phantom_Sans_0.7/Bold.woff2') format('woff2'),
url('https://assets.hackclub.com/fonts/Phantom_Sans_0.7/Bold.woff') format('woff');
font-weight: bold;
font-style: normal;
font-display: swap;
}
/* Border and input */
--border: 350 30% 85%; /* Derived border color */
--input: 350 30% 85%; /* Input background */
:root {
--background: hsl(350 59% 98%);
--foreground: hsl(351 34% 30%);
--muted: hsl(350 40% 93%);
--muted-foreground: hsl(350 30% 45%);
--popover: hsl(0 0% 100%);
--popover-foreground: hsl(351 34% 30%);
--card: hsl(0 0% 100%);
--card-foreground: hsl(351 34% 30%);
--border: hsl(350 30% 85%);
--input: hsl(350 30% 85%);
--primary: hsl(350 70% 50%);
--primary-foreground: hsl(0 0% 100%);
--secondary: hsl(350 40% 93%);
--secondary-foreground: hsl(351 34% 30%);
--accent: hsl(350 70% 40%);
--accent-foreground: hsl(0 0% 100%);
--destructive: hsl(350 70% 55%);
--destructive-foreground: hsl(0 0% 100%);
--ring: hsl(350 70% 50%);
--surface-1: hsl(350 40% 93%);
--surface-2: hsl(350 35% 88%);
--mantle: hsl(350 59% 98%);
--mantle-foreground: hsl(351 34% 30%);
--radius: 0.5rem;
--sidebar-background: hsl(350 59% 98%);
--sidebar-foreground: hsl(351 34% 30%);
--sidebar-primary: hsl(350 70% 50%);
--sidebar-primary-foreground: hsl(0 0% 100%);
--sidebar-accent: hsl(350 40% 93%);
--sidebar-accent-foreground: hsl(351 34% 30%);
--sidebar-border: hsl(350 30% 85%);
--sidebar-ring: hsl(350 70% 50%);
}
/* Primary actions */
--primary: 350 70% 50%; /* C8394F - primary button */
--primary-foreground: 0 0% 100%; /* FFFFFF - text on primary */
.dark {
--background: hsl(350 20% 15%);
--foreground: hsl(350 30% 92%);
--muted: hsl(350 20% 25%);
--muted-foreground: hsl(350 30% 75%);
--popover: hsl(350 20% 15%);
--popover-foreground: hsl(350 30% 92%);
--card: hsl(350 20% 15%);
--card-foreground: hsl(350 30% 92%);
--border: hsl(350 20% 35%);
--input: hsl(350 20% 35%);
--primary: hsl(350 100% 75%);
--primary-foreground: hsl(350 20% 15%);
--secondary: hsl(350 20% 25%);
--secondary-foreground: hsl(350 30% 92%);
--accent: hsl(350 100% 80%);
--accent-foreground: hsl(350 20% 15%);
--destructive: hsl(350 100% 70%);
--destructive-foreground: hsl(350 20% 15%);
--ring: hsl(350 100% 75%);
--surface-1: hsl(350 20% 25%);
--surface-2: hsl(350 20% 35%);
--mantle: hsl(350 20% 12%);
--mantle-foreground: hsl(350 30% 92%);
--sidebar-background: hsl(350 20% 12%);
--sidebar-foreground: hsl(350 30% 92%);
--sidebar-primary: hsl(350 100% 75%);
--sidebar-primary-foreground: hsl(350 20% 15%);
--sidebar-accent: hsl(350 20% 25%);
--sidebar-accent-foreground: hsl(350 30% 92%);
--sidebar-border: hsl(350 20% 35%);
--sidebar-ring: hsl(350 100% 75%);
}
/* Secondary elements */
--secondary: 350 40% 93%; /* F8E8EA - secondary background */
--secondary-foreground: 351 34% 30%; /* 5D3A3F - text on secondary */
@theme inline {
--font-sans: 'Phantom Sans', ui-sans-serif, system-ui, sans-serif;
--color-background: var(--background);
--color-foreground: var(--foreground);
--color-muted: var(--muted);
--color-muted-foreground: var(--muted-foreground);
--color-popover: var(--popover);
--color-popover-foreground: var(--popover-foreground);
--color-card: var(--card);
--color-card-foreground: var(--card-foreground);
--color-border: var(--border);
--color-input: var(--input);
--color-primary: var(--primary);
--color-primary-foreground: var(--primary-foreground);
--color-secondary: var(--secondary);
--color-secondary-foreground: var(--secondary-foreground);
--color-accent: var(--accent);
--color-accent-foreground: var(--accent-foreground);
--color-destructive: var(--destructive);
--color-destructive-foreground: var(--destructive-foreground);
--color-ring: var(--ring);
--color-surface1: var(--surface-1);
--color-surface2: var(--surface-2);
--color-mantle: var(--mantle);
--color-mantle-foreground: var(--mantle-foreground);
--color-sidebar: var(--sidebar-background);
--color-sidebar-foreground: var(--sidebar-foreground);
--color-sidebar-primary: var(--sidebar-primary);
--color-sidebar-primary-foreground: var(--sidebar-primary-foreground);
--color-sidebar-accent: var(--sidebar-accent);
--color-sidebar-accent-foreground: var(--sidebar-accent-foreground);
--color-sidebar-border: var(--sidebar-border);
--color-sidebar-ring: var(--sidebar-ring);
--radius-sm: calc(var(--radius) - 4px);
--radius-md: calc(var(--radius) - 2px);
--radius-lg: var(--radius);
--animate-accordion-down: accordion-down 0.2s ease-out;
--animate-accordion-up: accordion-up 0.2s ease-out;
}
/* Accent elements */
--accent: 350 70% 40%; /* A12D3E - accent color */
--accent-foreground: 0 0% 100%; /* FFFFFF - text on accent */
/* Destructive actions */
--destructive: 350 70% 55%; /* D63C56 - error/destroy */
--destructive-foreground: 0 0% 100%; /* FFFFFF - text on destructive */
/* Focus ring */
--ring: 350 70% 50%; /* C8394F - focus ring */
/* Surface colors */
--surface-1: 350 40% 93%; /* F8E8EA - surface 1 */
--surface-2: 350 35% 88%; /* Derived surface 2 */
/* Mantle */
--mantle: 350 59% 98%; /* FDF7F8 - mantle */
/* Radius */
--radius: 0.5rem;
/* Sidebar specific */
--sidebar-background: 350 59% 98%; /* FDF7F8 - sidebar bg */
--sidebar-foreground: 351 34% 30%; /* 5D3A3F - sidebar text */
--sidebar-primary: 350 70% 50%; /* C8394F - sidebar primary */
--sidebar-primary-foreground: 0 0% 100%; /* FFFFFF - text on sidebar primary */
--sidebar-accent: 350 40% 93%; /* F8E8EA - sidebar accent */
--sidebar-accent-foreground: 351 34% 30%; /* 5D3A3F - text on sidebar accent */
--sidebar-border: 350 30% 85%; /* Derived border */
--sidebar-ring: 350 70% 50%; /* C8394F - sidebar focus ring */
@keyframes accordion-down {
from {
height: 0;
}
to {
height: var(--radix-accordion-content-height);
}
}
.dark {
/* Dark theme - based on your color scheme */
/* Main background and foreground */
--background: 350 20% 15%; /* 2A1F21 - main background */
--foreground: 350 30% 92%; /* F5E6E8 - main text */
/* Muted elements */
--muted: 350 20% 25%; /* 4A2D31 - muted background */
--muted-foreground: 350 30% 75%; /* Lighter version of main text */
/* Popover and card */
--popover: 350 20% 15%; /* 2A1F21 - popover background */
--popover-foreground: 350 30% 92%; /* F5E6E8 - popover text */
--card: 350 20% 15%; /* 2A1F21 - card background */
--card-foreground: 350 30% 92%; /* F5E6E8 - card text */
/* Border and input */
--border: 350 20% 35%; /* Derived border color */
--input: 350 20% 35%; /* Input background */
/* Primary actions */
--primary: 350 100% 75%; /* FF7A8A - primary button */
--primary-foreground: 350 20% 15%; /* 2A1F21 - text on primary */
/* Secondary elements */
--secondary: 350 20% 25%; /* 4A2D31 - secondary background */
--secondary-foreground: 350 30% 92%; /* F5E6E8 - text on secondary */
/* Accent elements */
--accent: 350 100% 80%; /* FF9AAA - accent color */
--accent-foreground: 350 20% 15%; /* 2A1F21 - text on accent */
/* Destructive actions */
--destructive: 350 100% 70%; /* FF6B7D - error/destroy */
--destructive-foreground: 350 20% 15%; /* 2A1F21 - text on destructive */
/* Focus ring */
--ring: 350 100% 75%; /* FF7A8A - focus ring */
/* Surface colors */
--surface-1: 350 20% 25%; /* 4A2D31 - surface 1 */
--surface-2: 350 20% 35%; /* Derived surface 2 */
/* Mantle */
--mantle: 350 20% 12%; /* 1F1617 - mantle */
/* Radius */
--radius: 0.5rem;
/* Sidebar specific */
--sidebar-background: 350 20% 12%; /* 1F1617 - sidebar bg */
--sidebar-foreground: 350 30% 92%; /* F5E6E8 - sidebar text */
--sidebar-primary: 350 100% 75%; /* FF7A8A - sidebar primary */
--sidebar-primary-foreground: 350 20% 15%; /* 2A1F21 - text on sidebar primary */
--sidebar-accent: 350 20% 25%; /* 4A2D31 - sidebar accent */
--sidebar-accent-foreground: 350 30% 92%; /* F5E6E8 - text on sidebar accent */
--sidebar-border: 350 20% 35%; /* Derived border */
--sidebar-ring: 350 100% 75%; /* FF7A8A - sidebar focus ring */
@keyframes accordion-up {
from {
height: var(--radix-accordion-content-height);
}
to {
height: 0;
}
}
@@ -131,76 +166,113 @@
@apply border-border;
}
body {
font-family: 'Phantom Sans', ui-sans-serif, system-ui, sans-serif;
@apply bg-background text-foreground;
}
.scrollbar-hide::-webkit-scrollbar { display: none; }
.scrollbar-hide { -ms-overflow-style: none; scrollbar-width: none; }
.scrollbar-hide::-webkit-scrollbar {
display: none;
}
.scrollbar-hide {
-ms-overflow-style: none;
scrollbar-width: none;
}
}
h1 {
@apply scroll-m-20 text-4xl font-extrabold tracking-tight lg:text-5xl;
}
h2 {
@apply scroll-m-20 pb-2 text-3xl font-semibold tracking-tight first:mt-0;
}
/* Media controller styles remain unchanged */
media-controller {
--media-primary-color: #ffffff;
--media-secondary-color: hsla(var(--background), 0.85);
--media-control-hover-background: hsla(var(--accent), 0.85);
--media-control-background: hsla(var(--secondary), 0.85);
--media-loading-icon-color: #ffffff;
border-radius: var(--radius);
--media-secondary-color: transparent;
--media-control-background: transparent;
--media-control-hover-background: color-mix(in oklab, var(--primary) 40%, transparent);
/* Range colors */
--media-range-track-background: hsla(0, 0%, 100%, 0.3);
--media-range-bar-color: var(--primary);
--media-range-thumb-background: var(--primary);
--media-range-thumb-border-radius: 50%;
--media-range-thumb-height: 12px;
--media-range-thumb-width: 12px;
--media-range-track-height: 4px;
/* Layout & structure */
border-radius: calc(var(--radius) * 1.5);
overflow: hidden;
border: 1px solid hsl(var(--border));
border: 1px solid color-mix(in oklab, var(--border) 20%, transparent);
background-color: #000;
box-shadow: 0 10px 30px -10px rgba(0,0,0,0.3);
}
media-control-bar {
background-color: hsla(var(--background), 0.8);
backdrop-filter: blur(8px);
background: linear-gradient(to top, rgba(0,0,0,0.85) 0%, rgba(0,0,0,0) 100%);
backdrop-filter: blur(4px);
-webkit-mask-image: linear-gradient(to top, black 50%, transparent 100%);
mask-image: linear-gradient(to top, black 50%, transparent 100%);
width: 100%;
box-sizing: border-box;
justify-content: space-between;
padding: 2rem 0.75rem 0.75rem;
align-items: center;
}
media-time-range {
--media-range-track-height: 6px;
--media-range-thumb-height: 14px;
--media-range-thumb-width: 14px;
--media-range-thumb-border-radius: 50%;
--media-range-bar-color: #ffffff;
--media-range-thumb-background: #ffffff;
--media-preview-background: hsla(var(--card), 0.9);
--media-preview-background: color-mix(in oklab, var(--card) 95%, transparent);
--media-preview-border-radius: var(--radius);
--media-time-display-color: var(--foreground);
}
media-time-display {
--media-text-color: #ffffff;
font-weight: 500;
font-variant-numeric: tabular-nums;
letter-spacing: 0.5px;
}
media-controller::part(centered-layer) {
background-color: hsla(var(--background), 0.2);
transition: opacity 0.3s ease;
background-color: transparent;
transition: opacity 0.4s cubic-bezier(0.4, 0, 0.2, 1);
}
media-controller:not([mediapaused])[userinactive]::part(centered-layer) {
opacity: 0;
transition: opacity 1s ease;
transition: opacity 0.8s ease;
}
media-loading-indicator {
--media-loading-icon-width: 48px;
--media-loading-icon-height: 48px;
--media-loading-icon-color: #ffffff;
--media-loading-icon-width: 56px;
--media-loading-icon-height: 56px;
--media-loading-icon-color: var(--primary);
filter: drop-shadow(0 0 8px color-mix(in oklab, var(--primary) 40%, transparent));
}
media-play-button,
media-mute-button,
media-fullscreen-button,
media-chrome-button {
transition: all 0.2s cubic-bezier(0.4, 0, 0.2, 1);
border-radius: var(--radius);
margin: 0 2px;
}
media-play-button:hover,
media-mute-button:hover,
media-fullscreen-button:hover,
media-seek-backward-button:hover,
media-seek-forward-button:hover {
--media-control-hover-background: rgba(255, 255, 255, 0.2);
}
media-chrome-button:hover {
transform: scale(1.1);
--media-control-background: color-mix(in oklab, var(--primary) 85%, transparent);
--media-button-icon-color: #ffffff;
}
/* A pulse animation for the live/retry indicator if needed */
@keyframes stream-pulse {
0%, 100% { opacity: 1; }
50% { opacity: 0.5; }
}
.stream-live-indicator {
animation: stream-pulse 2s cubic-bezier(0.4, 0, 0.6, 1) infinite;
}
media-volume-range {
width: 90px;
height: 40px; /* Aligns with standard media button heights */
}

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 362 KiB

BIN
apps/web/src/app/icon1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

View File

@@ -0,0 +1,21 @@
{
"name": "MyWebSite",
"short_name": "MySite",
"icons": [
{
"src": "/web-app-manifest-192x192.png",
"sizes": "192x192",
"type": "image/png",
"purpose": "maskable"
},
{
"src": "/web-app-manifest-512x512.png",
"sizes": "512x512",
"type": "image/png",
"purpose": "maskable"
}
],
"theme_color": "#ffffff",
"background_color": "#ffffff",
"display": "standalone"
}

View File

@@ -61,6 +61,7 @@ export function BotCombobox({ bots, filter, value, modal, onValueChange }: Props
<CommandItem
key={bot.id}
value={bot.id}
keywords={[bot.displayName, bot.slug]}
onSelect={(currentValue) => {
onValueChange(currentValue === value ? '' : currentValue);
setOpen(false);

View File

@@ -1,8 +1,7 @@
'use client'
'use client';
import type { Channel } from "@hctv/db";
import * as React from 'react';
import { Plus } from 'lucide-react';
import { cn } from '@/lib/utils';
import {
Select,
SelectContent,
@@ -11,13 +10,21 @@ import {
SelectValue,
} from '@/components/ui/select';
import { Avatar, AvatarImage, AvatarFallback } from '@/components/ui/avatar';
import type { Channel } from '@hctv/db';
export function ChannelSelect(props: Props) {
const { channelList } = props;
const {
channelList,
disabled = false,
includeCreate = false,
placeholder = 'Channel',
triggerClassName,
} = props;
return (
<Select onValueChange={props.onSelect} value={props.value}>
<SelectTrigger className="w-[180px]">
<SelectValue placeholder="Channel" />
<Select disabled={disabled} onValueChange={props.onSelect} value={props.value}>
<SelectTrigger className={cn('w-[180px]', triggerClassName)}>
<SelectValue placeholder={placeholder} />
</SelectTrigger>
<SelectContent>
{channelList.map((channel) => (
@@ -25,15 +32,22 @@ export function ChannelSelect(props: Props) {
<div className="flex items-center gap-3">
<Avatar className="h-8 w-8">
<AvatarImage src={channel.pfpUrl} alt={channel.name} />
<AvatarFallback>{channel.name[0]}</AvatarFallback>
<AvatarFallback>{channel.name[0]?.toUpperCase()}</AvatarFallback>
</Avatar>
<div className="font-medium">{channel.name}</div>
</div>
</SelectItem>
))}
<SelectItem key="create" value="create" icon={<Plus className="h-4 w-4" />} className='h-11'>
Create Channel
</SelectItem>
{includeCreate ? (
<SelectItem
key="create"
value="create"
icon={<Plus className="h-4 w-4" />}
className="h-11"
>
Create Channel
</SelectItem>
) : null}
</SelectContent>
</Select>
);
@@ -42,5 +56,9 @@ export function ChannelSelect(props: Props) {
interface Props {
channelList: Channel[];
value?: string;
disabled?: boolean;
includeCreate?: boolean;
onSelect: (value: string) => void;
}
placeholder?: string;
triggerClassName?: string;
}

View File

@@ -300,7 +300,7 @@ export default function ChatPanel(props: Props) {
return (
<div
className={`${props.isObsPanel ? 'w-full text-white' : 'md:border-l border-border bg-mantle w-[350px] max-w-[350px]'} flex flex-col h-full`}
className={`${props.isObsPanel ? 'w-full text-white' : 'w-full max-w-none md:w-[350px] md:max-w-[350px] md:border-l border-border bg-mantle'} flex flex-col h-full min-w-0`}
>
<div
ref={scrollRef}

View File

@@ -9,7 +9,7 @@ interface EmojiSearchProps {
onSelect: (emoji: string) => void;
socket: WebSocket | null;
emojiMap: Map<string, string>;
textareaRef: React.RefObject<HTMLTextAreaElement>;
textareaRef: React.RefObject<HTMLTextAreaElement | null>;
}
export function EmojiSearch({

View File

@@ -59,7 +59,9 @@ function TooltipIcon({
return (
<Tooltip delayDuration={200}>
<TooltipTrigger asChild>
<Icon className={cn('size-3.5 shrink-0', className)} />
<span className={cn('inline-flex align-[-0.15em]', className)}>
<Icon className="size-[1.1em] shrink-0" />
</span>
</TooltipTrigger>
<TooltipContent side="top">{label}</TooltipContent>
</Tooltip>
@@ -71,15 +73,25 @@ function UsernameRow({ user, displayName }: { user?: User; displayName?: string
return (
<TooltipProvider>
<span className="font-semibold text-primary shrink-0 flex items-center gap-1">
{user?.isBot && <TooltipIcon icon={Bot} label="Bot" className="text-muted-foreground" />}
{role && <TooltipIcon icon={role.icon} label={role.label} className={role.className} />}
{user?.isPlatformAdmin && (
<TooltipIcon icon={ShieldAlert} label="Platform Admin" className="text-destructive" />
)}
<span>{displayName}</span>
<span className="font-normal text-muted-foreground select-none">:</span>
</span>
{user?.isBot && (
<TooltipIcon icon={Bot} label="Bot" className="text-muted-foreground mr-[0.3em]" />
)}
{role && (
<TooltipIcon
icon={role.icon}
label={role.label}
className={cn(role.className, 'mr-[0.3em]')}
/>
)}
{user?.isPlatformAdmin && (
<TooltipIcon
icon={ShieldAlert}
label="Platform Admin"
className="text-destructive mr-[0.3em]"
/>
)}
<span className="font-semibold text-primary">{displayName}</span>
<span className="font-normal text-muted-foreground select-none">: </span>
</TooltipProvider>
);
}
@@ -116,7 +128,7 @@ function ReportDialog({
<div className="text-sm text-muted-foreground rounded-md border p-3 bg-muted/30">
<p className="font-medium text-foreground mb-1">Reported user</p>
<p>{displayName}</p>
<p className="mt-2">{message}</p>
<p className="mt-2 whitespace-pre-wrap break-words">{message}</p>
</div>
<div>
<label className="text-sm font-medium">Reason</label>
@@ -215,14 +227,16 @@ export function Message({
<>
<div className="group hover:bg-primary/5 rounded px-2 py-1 -mx-2 transition-colors">
<div className="flex items-start gap-1.5">
<UsernameRow user={user} displayName={displayName} />
<span
<div
lang="en"
className="text-foreground min-w-0 flex-1"
className="text-foreground min-w-0 flex-1 leading-normal"
style={{ overflowWrap: 'anywhere', wordBreak: 'break-word' }}
>
<EmojiRenderer text={message} emojiMap={emojiMap} />
</span>
<UsernameRow user={user} displayName={displayName} />
<span className="whitespace-pre-wrap break-words">
<EmojiRenderer text={message} emojiMap={emojiMap} />
</span>
</div>
{type === 'message' && user?.id && (
<MessageActionsMenu
user={user}

View File

@@ -2,6 +2,7 @@
import { useEffect, useState } from 'react';
import { format } from 'date-fns';
import { AlertTriangle, RefreshCw } from 'lucide-react';
import StreamPlayer from '../StreamPlayer/StreamPlayer';
import UserInfoCard from '../UserInfoCard/UserInfoCard';
import ChatPanel from '../ChatPanel/ChatPanel';
@@ -9,13 +10,14 @@ import { Button } from '@/components/ui/button';
import type { StreamInfo, Channel } from '@hctv/db';
import { useIsMobile } from '@/lib/hooks/useMobile';
import { useAllChannels } from '@/lib/hooks/useUserList';
import { RefreshCw } from 'lucide-react';
export default function LiveStream(props: Props) {
const isMobile = useIsMobile();
const { channels, refresh } = useAllChannels(5000);
const [isRestricted, setIsRestricted] = useState(false);
const [restrictionExpiresAt, setRestrictionExpiresAt] = useState<string | null>(null);
const [isRestricted, setIsRestricted] = useState(props.initialRestrictionActive);
const [restrictionExpiresAt, setRestrictionExpiresAt] = useState<string | null>(
props.initialRestrictionExpiresAt
);
const [isRefreshing, setIsRefreshing] = useState(false);
useEffect(() => {
@@ -38,7 +40,7 @@ export default function LiveStream(props: Props) {
}
};
if (isRestricted) {
if (isRestricted && !props.canViewRestrictedStream) {
return (
<div className="flex flex-col items-center justify-center h-[calc(100vh-64px)] p-4">
<h1 className="text-2xl font-bold text-destructive mb-2">Channel Restricted</h1>
@@ -59,11 +61,30 @@ export default function LiveStream(props: Props) {
}
return (
<div className={`${isMobile ? 'flex flex-col' : 'flex'} h-[calc(100vh-64px)] w-full`}>
<div className={`${isMobile ? 'flex flex-col' : 'flex'} h-[calc(100vh-64px)] w-full min-w-0`}>
<div className="flex-1 flex flex-col min-w-0 overflow-hidden">
<StreamPlayer />
{isRestricted && props.canViewRestrictedStream && (
<div className="flex items-start gap-3 border-b border-amber-500/30 bg-amber-500/10 px-4 py-3 text-foreground">
<AlertTriangle className="mt-0.5 h-4 w-4 shrink-0" />
<div className="text-sm">
<p className="font-medium">Restricted stream override</p>
<p>
This channel is restricted and unavailable to regular viewers. You are watching it
because you are a platform admin.
</p>
{restrictionExpiresAt && (
<p className="mt-1 text-muted-foreground">
Restriction lifts: {format(new Date(restrictionExpiresAt), 'PPP p')}
</p>
)}
</div>
</div>
)}
<div className="min-h-0 flex-1 overflow-hidden bg-black">
<StreamPlayer />
</div>
{isMobile && (
<div className="flex-1 min-h-[250px] max-h-[400px] border-t border-border">
<div className="w-full min-w-0 flex-1 min-h-[250px] max-h-[400px] border-t border-border">
<ChatPanel />
</div>
)}
@@ -82,4 +103,7 @@ export default function LiveStream(props: Props) {
interface Props {
username: string;
streamInfo: StreamInfo & { channel: Channel };
canViewRestrictedStream: boolean;
initialRestrictionActive: boolean;
initialRestrictionExpiresAt: string | null;
}

View File

@@ -15,96 +15,177 @@ import { logout } from '@/lib/auth/actions';
import { useSession } from '@/lib/providers/SessionProvider';
import Link from 'next/link';
import { ThemeSwitcher } from '../ThemeSwitcher/ThemeSwitcher';
import { IdCard, Shield } from 'lucide-react';
import {
IdCard,
Shield,
Settings,
Users,
PenSquare,
LogOut,
Code,
Heart,
Radio,
} from 'lucide-react';
import { SidebarTrigger } from '@/components/ui/sidebar';
import Image from 'next/image';
import Logo from '@/lib/assets/logo.webp';
import { usePersonalChannels } from '@/lib/hooks/useUserList';
import { JSX } from 'react';
export default function Navbar(props: Props) {
const { user } = useSession();
const { channels: personalChannels } = usePersonalChannels();
const personalChannel = personalChannels.find((channel) => channel.channelId === user?.personalChannelId);
const username = personalChannel?.username || 'not-onboarded';
const menuItemClass = "cursor-pointer rounded-lg px-3 py-2 text-sm font-medium hover:bg-primary/10 focus:bg-primary/10 hover:text-primary focus:text-primary";
const iconClass = "w-4 h-4 mr-3 text-muted-foreground";
return (
<>
<nav className="flex items-center justify-between h-14 md:h-16 px-2 md:px-4 border-b gap-1 md:gap-3 w-full z-40 fixed top-0 left-0 shadow-md bg-mantle">
<div className="flex items-center space-x-2 md:space-x-5 shrink-0">
<Link href="/" className="flex items-center">
<Button variant={'ghost'} className="px-2 md:px-3 text-sm md:text-base">
hackclub.tv
<Link href="/" className="flex items-center">
<Button
variant="ghost"
size="icon"
className="rounded-sm hover:scale-105 transition-transform duration-200 "
>
<Image
src={Logo}
alt="HCTV Logo"
className="h-6 w-6 md:h-8 md:w-8"
/>
</Button>
</Link>
</Link>
<SidebarTrigger />
</div>
{/* Right Side Items */}
<div className="flex items-center gap-1 md:gap-3 shrink-0">
{user && (
<Link href="/stream">
<Button variant="outline" size="sm" className="gap-1 md:gap-2 text-xs md:text-sm">
<Radio className="w-3 h-3 md:w-4 md:h-4" />
<span className="hidden sm:inline">Go live</span>
<span className="sm:hidden">Live</span>
</Button>
</Link>
)}
{props.editLivestream && <div className="hidden sm:block">{props.editLivestream}</div>}
{user ? (
<DropdownMenu>
<DropdownMenuTrigger asChild className="cursor-pointer">
<Avatar className="h-8 w-8 md:h-10 md:w-10">
<AvatarImage src={user.pfpUrl} alt={`@${user.id}`} />
<AvatarImage src={user.pfpUrl} alt={`@${username || '(not onboarded)'}`} />
<AvatarFallback>{user.pfpUrl}</AvatarFallback>
</Avatar>
</DropdownMenuTrigger>
<DropdownMenuContent className="w-56">
<DropdownMenuLabel>My Account</DropdownMenuLabel>
<DropdownMenuSeparator />
<DropdownMenuGroup>
<DropdownMenuContent className="w-64 mt-2 p-2 rounded-xl border-border/50 shadow-xl backdrop-blur-xl bg-mantle/95" align="end" sideOffset={5}>
<div className="flex items-center gap-3 p-2 mb-2">
<Avatar className="h-10 w-10 border border-border/50">
<AvatarImage src={user.pfpUrl} alt={`@${username}`} />
<AvatarFallback>{username[0]?.toUpperCase()}</AvatarFallback>
</Avatar>
<div className="flex flex-col space-y-0.5">
<p className="text-sm font-semibold tracking-tight text-foreground">@{username}</p>
<p className="text-xs text-muted-foreground truncate max-w-[140px]">Manage your account</p>
</div>
</div>
<DropdownMenuSeparator className="bg-border/40 mb-2" />
<DropdownMenuGroup className="space-y-1">
<Link href={`/settings/follows`}>
<DropdownMenuItem className="cursor-pointer">Follows</DropdownMenuItem>
<DropdownMenuItem className={menuItemClass}>
<Users className={iconClass} />
Follows
</DropdownMenuItem>
</Link>
<Link href={`/settings/channel/create`}>
<DropdownMenuItem className="cursor-pointer">Create channel</DropdownMenuItem>
<DropdownMenuItem className={menuItemClass}>
<PenSquare className={iconClass} />
Create channel
</DropdownMenuItem>
</Link>
<Link href={`/settings/bot`}>
<DropdownMenuItem className="cursor-pointer">Bot accounts</DropdownMenuItem>
<DropdownMenuItem className={menuItemClass}>
<Settings className={iconClass} />
Bot accounts
</DropdownMenuItem>
</Link>
{user.isAdmin && (
<>
<DropdownMenuSeparator />
<div>
<DropdownMenuSeparator className="bg-border/40 my-2" />
<Link href={`/admin`}>
<DropdownMenuItem className="cursor-pointer text-primary">
<Shield className="w-4 h-4 mr-2" />
<DropdownMenuItem className={`${menuItemClass} text-primary hover:text-primary`}>
<Shield className={`w-4 h-4 mr-3 text-primary`} />
Admin Panel
</DropdownMenuItem>
</Link>
</>
</div>
)}
<DropdownMenuSeparator />
</DropdownMenuGroup>
<DropdownMenuSeparator className="bg-border/40 my-2" />
<DropdownMenuGroup className="space-y-1">
<Link href={'https://docs.hackclub.tv'} target="_blank" rel="noreferrer">
<DropdownMenuItem className="cursor-pointer">API Docs</DropdownMenuItem>
</Link>
<Link href={'https://github.com/SrIzan10/hctv'} target="_blank" rel="noreferrer">
<DropdownMenuItem className="cursor-pointer">Github</DropdownMenuItem>
</Link>
<Link href={'https://github.com/sponsors/SrIzan10'} target="_blank" rel="noreferrer">
<DropdownMenuItem className="cursor-pointer">Sponsor</DropdownMenuItem>
<DropdownMenuItem className={menuItemClass}>
<Code className={iconClass} />
API Docs
</DropdownMenuItem>
</Link>
<div className="grid grid-cols-2 gap-1">
<Link href={'https://github.com/SrIzan10/hctv'} target="_blank" rel="noreferrer">
<DropdownMenuItem className={`${menuItemClass} justify-center text-xs gap-2`}>
<Image
src="https://thesvg.org/icons/github/dark.svg"
alt="GitHub"
width={14}
height={14}
/>
Github
</DropdownMenuItem>
</Link>
<Link href={'https://github.com/sponsors/SrIzan10'} target="_blank" rel="noreferrer">
<DropdownMenuItem className={`${menuItemClass} justify-center text-xs text-pink-500 hover:text-pink-500 hover:bg-pink-500/10 focus:bg-pink-500/10`}>
<Heart className="w-3.5 h-3.5 mr-1.5" />
Sponsor
</DropdownMenuItem>
</Link>
</div>
</DropdownMenuGroup>
<DropdownMenuSeparator />
<DropdownMenuGroup>
<DropdownMenuItem
className="cursor-pointer"
onClick={() => {
logout();
}}
>
Sign out
</DropdownMenuItem>
</DropdownMenuGroup>
<DropdownMenuSeparator />
<DropdownMenuGroup>
<DropdownMenuSeparator className="bg-border/40 my-2" />
<div className="flex items-center justify-between px-1">
<ThemeSwitcher />
</DropdownMenuGroup>
<DropdownMenuGroup>
<p className="text-gray-500 dark:text-gray-400 text-sm px-2">
v{process.env.version}-{process.env.NODE_ENV === 'development' ? 'dev' : 'prod'}, commit{' '}
<Button
variant="ghost"
size="sm"
className="rounded-lg text-red-500 hover:text-red-600 hover:bg-red-500/10"
onClick={() => logout()}
>
<LogOut className="w-4 h-4 mr-2" />
Sign out
</Button>
</div>
<div className="mt-2 pt-3 border-t border-border/40 px-2">
<p className="text-[10px] text-muted-foreground/60 text-center font-mono">
v{process.env.version}-{process.env.NODE_ENV === 'development' ? 'dev' : 'prod'} {' '}
<Link
href={`https://github.com/SrIzan10/hctv/commit/${process.env.commit}`}
target="_blank"
className="hover:text-primary underline decoration-border/50 underline-offset-2"
>
{process.env.commit}
{process.env.commit?.substring(0, 7) || 'unknown'}
</Link>
</p>
</DropdownMenuGroup>
</div>
</DropdownMenuContent>
</DropdownMenu>
) : (

View File

@@ -25,7 +25,8 @@ export default function Sidebar({ ...props }: React.ComponentProps<typeof UISide
if (isLoading) return <SidebarSkeleton {...props} />;
const liveStreamers = stream?.filter((s) => s.isLive) || [];
const alwaysOnStreamers = stream?.filter((s) => s.isLive && s.channel.is247) || [];
const liveStreamers = stream?.filter((s) => s.isLive && !s.channel.is247) || [];
const offlineStreamers = stream?.filter((s) => !s.isLive) || [];
return (
@@ -55,6 +56,31 @@ export default function Sidebar({ ...props }: React.ComponentProps<typeof UISide
</SidebarGroupContent>
</SidebarGroup>
<Separator className="group-data-[collapsible=icon]:block hidden" />
<SidebarGroup>
<SidebarGroupLabel className="flex items-center justify-between px-2 py-1.5">
<span className="text-xs font-semibold uppercase text-muted-foreground group-data-[collapsible=icon]:opacity-0 transition-opacity duration-200">
24/7 Channels
</span>
<span className="text-xs text-muted-foreground group-data-[collapsible=icon]:opacity-0 transition-opacity duration-200">
{alwaysOnStreamers.length}
</span>
</SidebarGroupLabel>
<SidebarGroupContent>
<SidebarMenu>
{alwaysOnStreamers.length === 0 && !isCollapsed && (
<div className="px-4 py-2 text-sm text-muted-foreground">
No 24/7 channels
</div>
)}
{alwaysOnStreamers.map((streamer) => (
<StreamerItem key={streamer.id} streamer={streamer} isCollapsed={isCollapsed} />
))}
</SidebarMenu>
</SidebarGroupContent>
</SidebarGroup>
<Separator className="group-data-[collapsible=icon]:block hidden" />
<SidebarGroup>
@@ -182,4 +208,4 @@ function StreamerItemSkeleton({ isCollapsed }: { isCollapsed: boolean }) {
</SidebarMenuButton>
</SidebarMenuItem>
);
}
}

View File

@@ -21,11 +21,29 @@ interface StreamGridProps {
}
export default function StreamGrid({ liveStreams, offlineStreams }: StreamGridProps) {
const sortedLiveStreams = [...liveStreams].sort((a, b) => b.viewers - a.viewers);
const sortedLiveStreams = liveStreams
.filter((stream) => !stream.channel.is247)
.sort((a, b) => b.viewers - a.viewers);
const alwaysOnStreams = [...liveStreams, ...offlineStreams]
.filter((stream) => stream.isLive && stream.channel.is247)
.sort((a, b) => {
if (a.isLive !== b.isLive) {
return Number(b.isLive) - Number(a.isLive);
}
if (a.viewers !== b.viewers) {
return b.viewers - a.viewers;
}
return a.channel.name.localeCompare(b.channel.name);
});
const sortedOfflineStreams = offlineStreams
.sort((a, b) => a.channel.name.localeCompare(b.channel.name));
const hasVisibleLiveStreams = sortedLiveStreams.length > 0 || alwaysOnStreams.some((stream) => stream.isLive);
return (
<div className="space-y-8 md:space-y-10 min-w-0">
{sortedLiveStreams.length === 0 && (
{!hasVisibleLiveStreams && (
<div className="flex flex-col items-center gap-4 py-10 text-center">
<ConfusedDino className="h-24 w-24 opacity-70" />
<div className="space-y-1">
@@ -52,13 +70,24 @@ export default function StreamGrid({ liveStreams, offlineStreams }: StreamGridPr
</section>
)}
{offlineStreams.length > 0 && (
<section className="w-full min-w-0">
<SectionHeading label="Offline channels" count={offlineStreams.length} />
{alwaysOnStreams.length > 0 && (
<section>
<SectionHeading label="24/7 channels" count={alwaysOnStreams.length} />
<div className="grid grid-cols-1 gap-3 sm:grid-cols-2 md:gap-4 lg:grid-cols-3 xl:grid-cols-4">
{alwaysOnStreams.map((stream) => (
<StreamCard key={stream.id} stream={stream} />
))}
</div>
</section>
)}
{sortedOfflineStreams.length > 0 && (
<section className="w-full min-w-0">
<SectionHeading label="Offline channels" count={sortedOfflineStreams.length} />
<div className="px-10">
<Carousel className="w-full max-w-full" opts={{ dragFree: true, containScroll: 'trimSnaps' }}>
<CarouselContent className="-ml-2">
{offlineStreams.map((stream) => (
{sortedOfflineStreams.map((stream) => (
<CarouselItem key={stream.id} className="basis-auto pl-2 md:pl-3">
<OfflineCard stream={stream} />
</CarouselItem>
@@ -87,12 +116,16 @@ function StreamCard({ stream }: { stream: StreamWithChannel }) {
decoding="async"
/>
<div className="absolute inset-0 bg-gradient-to-t from-black/60 via-transparent to-transparent" />
<div className="absolute bottom-1.5 left-1.5 md:bottom-2 md:left-2">
<LiveBadge small />
</div>
<div className="absolute bottom-1.5 right-1.5 md:bottom-2 md:right-2">
<ViewerCount count={stream.viewers} small />
</div>
{stream.isLive && (
<>
<div className="absolute bottom-1.5 left-1.5 md:bottom-2 md:left-2">
<LiveBadge small />
</div>
<div className="absolute bottom-1.5 right-1.5 md:bottom-2 md:right-2">
<ViewerCount count={stream.viewers} small />
</div>
</>
)}
</div>
<div className="flex items-start gap-2 p-2 md:gap-3 md:p-3">
<Avatar className="h-7 w-7 shrink-0 ring-1 ring-primary/20 md:h-8 md:w-8">

View File

@@ -1,7 +1,7 @@
'use client';
import { useParams } from 'next/navigation';
import { useRef, useEffect } from 'react';
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import {
MediaController,
MediaLoadingIndicator,
@@ -10,26 +10,92 @@ import {
MediaMuteButton,
MediaVolumeRange,
MediaFullscreenButton,
MediaChromeButton,
} from 'media-chrome/react';
import { RefreshCw, RotateCw } from 'lucide-react';
import HlsVideo from 'hls-video-element/react';
import type { HlsVideoElement } from 'hls-video-element';
import { Button } from '@/components/ui/button';
import { useSession } from '@/lib/providers/SessionProvider';
import { useUserStreamInfo } from '@/lib/hooks/useUserList';
import { getMediamtxClientEnvs } from '@/lib/utils/mediamtx/client';
import type { MediaMTXRegion } from '@/lib/utils/mediamtx/regions';
import { cn } from '@/lib/utils';
const WAITING_RECOVERY_DELAY_MS = 8000;
const RECOVERY_COOLDOWN_MS = 2000;
export default function StreamPlayer() {
const { username } = useParams();
const { session } = useSession();
const { streamInfo: userInfo } = useUserStreamInfo(username!.toString());
const resolvedUsername = Array.isArray(username) ? username[0] : username;
const { streamInfo: userInfo } = useUserStreamInfo(resolvedUsername, true, 5000);
const videoRef = useRef(null);
const videoRef = useRef<HlsVideoElement | null>(null);
const waitingTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
const lastRecoveryAtRef = useRef(0);
const [playerKey, setPlayerKey] = useState(0);
const [isRecovering, setIsRecovering] = useState(false);
const streamSrc = useMemo(() => {
if (!resolvedUsername || !userInfo?.isLive || !userInfo.streamRegion) {
return null;
}
return `${getMediamtxClientEnvs(userInfo.streamRegion as MediaMTXRegion).publicUrl}/${resolvedUsername}/index.m3u8?reload=${playerKey}`;
}, [playerKey, resolvedUsername, userInfo?.isLive, userInfo?.streamRegion]);
const clearWaitingTimeout = useCallback(() => {
if (waitingTimeoutRef.current) {
clearTimeout(waitingTimeoutRef.current);
waitingTimeoutRef.current = null;
}
}, []);
const triggerRecovery = useCallback(
(reason: string) => {
if (!session || !resolvedUsername || !userInfo?.isLive) {
return;
}
const now = Date.now();
if (now - lastRecoveryAtRef.current < RECOVERY_COOLDOWN_MS) {
return;
}
lastRecoveryAtRef.current = now;
clearWaitingTimeout();
setIsRecovering(true);
setPlayerKey((currentKey) => currentKey + 1);
if (process.env.NODE_ENV === 'development') {
console.debug('[StreamPlayer] Recovering playback', {
reason,
username: resolvedUsername,
});
}
},
[clearWaitingTimeout, resolvedUsername, session, userInfo?.isLive]
);
useEffect(() => {
if (!isRecovering) {
return;
}
const timeout = setTimeout(() => {
setIsRecovering(false);
}, 1200);
return () => clearTimeout(timeout);
}, [isRecovering]);
useEffect(() => {
const video = videoRef.current;
if (video && username && session) {
if (video && streamSrc && session) {
const user = 'skibiditoilet';
const credentials = btoa(`${user}:${session.id}`);
// @ts-ignore
video.config = {
xhrSetup: (xhr: XMLHttpRequest) => {
xhr.setRequestHeader('Authorization', `Basic ${credentials}`);
@@ -43,32 +109,110 @@ export default function StreamPlayer() {
liveMaxLatencyDurationCount: 4,
};
// @ts-ignore
video.src = `${getMediamtxClientEnvs(userInfo?.streamRegion!).publicUrl}/${username}/index.m3u8`;
video.src = streamSrc;
video.load();
void video.play().catch(() => {
// Ignore autoplay rejections; the controls remain available for manual playback.
});
} else if (video) {
clearWaitingTimeout();
video.removeAttribute('src');
video.load();
}
return () => {
if (video) {
// @ts-ignore
video.src = '';
clearWaitingTimeout();
video.removeAttribute('src');
video.load();
}
};
}, [username, session]);
}, [clearWaitingTimeout, session, streamSrc]);
useEffect(() => {
const video = videoRef.current;
if (!video) {
return;
}
const handleWaiting = () => {
clearWaitingTimeout();
waitingTimeoutRef.current = setTimeout(() => {
triggerRecovery('waiting_timeout');
}, WAITING_RECOVERY_DELAY_MS);
};
const clearRecoverySignals = () => {
clearWaitingTimeout();
setIsRecovering(false);
};
const handlePlaybackFailure = () => {
triggerRecovery('media_event');
};
video.addEventListener('waiting', handleWaiting);
video.addEventListener('stalled', handlePlaybackFailure);
video.addEventListener('error', handlePlaybackFailure);
video.addEventListener('abort', handlePlaybackFailure);
video.addEventListener('emptied', handlePlaybackFailure);
video.addEventListener('ended', handlePlaybackFailure);
video.addEventListener('playing', clearRecoverySignals);
video.addEventListener('canplay', clearRecoverySignals);
video.addEventListener('loadeddata', clearRecoverySignals);
return () => {
clearWaitingTimeout();
video.removeEventListener('waiting', handleWaiting);
video.removeEventListener('stalled', handlePlaybackFailure);
video.removeEventListener('error', handlePlaybackFailure);
video.removeEventListener('abort', handlePlaybackFailure);
video.removeEventListener('emptied', handlePlaybackFailure);
video.removeEventListener('ended', handlePlaybackFailure);
video.removeEventListener('playing', clearRecoverySignals);
video.removeEventListener('canplay', clearRecoverySignals);
video.removeEventListener('loadeddata', clearRecoverySignals);
};
}, [clearWaitingTimeout, playerKey, triggerRecovery]);
return (
<MediaController className="w-full aspect-video">
<HlsVideo ref={videoRef} slot="media" crossOrigin="anonymous" autoplay />
<MediaLoadingIndicator slot="centered-chrome" noAutohide />
<MediaControlBar className="w-full px-2">
<div className="flex items-center gap-2">
<MediaPlayButton />
<MediaMuteButton />
<MediaVolumeRange />
</div>
<div className="flex items-center gap-2">
<MediaFullscreenButton />
</div>
</MediaControlBar>
</MediaController>
<div className="relative flex h-full w-full min-w-0 items-center justify-center bg-black">
<MediaController className="h-full w-full">
<HlsVideo
key={playerKey}
ref={videoRef}
slot="media"
crossOrigin="anonymous"
playsInline
autoplay
className="h-full w-full object-contain"
/>
<MediaLoadingIndicator slot="centered-chrome" noAutohide />
<MediaControlBar className="w-full px-2 sm:px-4 pb-1">
<div className="flex items-center gap-1 sm:gap-4">
<div className="flex items-center">
<MediaPlayButton />
<MediaMuteButton />
<MediaVolumeRange className="hidden sm:block opacity-80 hover:opacity-100 transition-opacity pl-4" />
</div>
</div>
<div className="flex items-center gap-1 sm:gap-2">
{(process.env.NODE_ENV === 'development' || userInfo?.isLive) && (
<MediaChromeButton onClick={() => triggerRecovery('manual_reload')}>
<span className="flex h-4 w-4 items-center justify-center">
<RefreshCw
className={cn('h-5 w-5 shrink-0', isRecovering && 'animate-spin')}
strokeWidth={2.5}
/>
</span>
<span slot="tooltip-content">Retry stream</span>
</MediaChromeButton>
)}
<MediaFullscreenButton />
</div>
</MediaControlBar>
</MediaController>
</div>
);
}

View File

@@ -18,9 +18,9 @@ export function ThemeSwitcher() {
return (
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button variant="outline" size="icon">
<Sun className="h-[1.2rem] w-[1.2rem] rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0" />
<Moon className="absolute h-[1.2rem] w-[1.2rem] rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100" />
<Button variant="ghost" size="smicon">
<Sun className="h-4 w-4 rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0" />
<Moon className="absolute h-4 w-4 rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100" />
<span className="sr-only">Toggle theme</span>
</Button>
</DropdownMenuTrigger>

View File

@@ -1,6 +1,6 @@
'use client';
import { zodResolver } from '@hookform/resolvers/zod';
import { Path, useForm } from 'react-hook-form';
import { FieldValues, Path, useForm } from 'react-hook-form';
import {
Form,
FormControl,
@@ -11,7 +11,6 @@ import {
FormMessage,
} from '@/components/ui/form';
import { Input } from '@/components/ui/input';
import { z } from 'zod';
import type { UniversalFormProps } from './types';
import SubmitButton from '../SubmitButton/SubmitButton';
import { useActionState } from 'react';
@@ -28,6 +27,7 @@ import {
streamInfoEditSchema,
updateChatModerationSchema,
updateChannelSettingsSchema,
updateNotificationChannelsSchema,
} from '@/lib/form/zod';
export const schemaDb = [
@@ -39,19 +39,21 @@ export const schemaDb = [
{ name: 'editBot', zod: editBotSchema },
{ name: 'changeUsername', zod: changeUsernameSchema },
{ name: 'updateChatModeration', zod: updateChatModerationSchema },
{ name: 'updateNotificationChannels', zod: updateNotificationChannelsSchema },
] as const;
export function UniversalForm<T extends z.ZodType>({
export function UniversalForm({
fields,
schemaName,
action,
onActionComplete,
defaultValues,
formRef,
submitText = 'Submit',
submitClassname,
otherSubmitButton,
submitButtonDivClassname,
}: UniversalFormProps<T>) {
}: UniversalFormProps) {
// @ts-expect-error - idk
const [state, formAction] = useActionState<{ success: boolean; error?: string }>(action, null);
const schema = schemaDb.find((s) => s.name === schemaName)?.zod;
@@ -69,11 +71,9 @@ export function UniversalForm<T extends z.ZodType>({
return { ...values, ...defaultValues };
}, [fields, defaultValues]);
type FormData = z.infer<T>;
const form = useForm<FormData>({
const form = useForm<FieldValues>({
resolver: zodResolver(schema as any),
defaultValues: initialValues as FormData,
defaultValues: initialValues,
});
React.useEffect(() => {
@@ -87,12 +87,12 @@ export function UniversalForm<T extends z.ZodType>({
return (
<Form {...form}>
<form action={formAction} className="space-y-2">
<form ref={formRef} action={formAction} className="space-y-2">
{fields.map((field) => (
<FormField
key={field.name}
control={form.control}
name={field.name as Path<FormData>}
name={field.name as Path<FieldValues>}
render={({ field: formField }) => (
<FormItem className={field.type === 'hidden' ? 'hidden' : undefined}>
{field.type !== 'hidden' && field.label && <FormLabel>{field.label}</FormLabel>}

View File

@@ -1,32 +1,38 @@
import { z } from 'zod';
import { HTMLInputTypeAttribute } from 'react';
import { ControllerRenderProps } from 'react-hook-form';
import type { HTMLInputTypeAttribute, Ref } from 'react';
import { ControllerRenderProps, FieldValues } from 'react-hook-form';
import { schemaDb } from './UniversalForm';
type FormFieldValue = string | number | boolean | null | undefined;
export type FormFieldConfig = {
name: string;
label?: string;
type?: HTMLInputTypeAttribute;
placeholder?: string;
description?: string;
value?: any;
value?: FormFieldValue;
textArea?: boolean;
textAreaRows?: number;
maxChars?: number;
inputFilter?: RegExp;
component?: (props: { field: ControllerRenderProps<any, any> } & any) => React.ReactNode;
component?: (
props: {
field: ControllerRenderProps<FieldValues>;
} & Record<string, unknown>
) => React.ReactNode;
componentProps?: Record<string, any>;
required?: boolean;
};
export type UniversalFormProps<T extends z.ZodType> = {
export type UniversalFormProps = {
fields: FormFieldConfig[];
schemaName: (typeof schemaDb)[number]['name'];
action: (prev: any, formData: FormData) => void;
onActionComplete?: (result: any) => void;
defaultValues?: Partial<z.infer<T>>;
defaultValues?: Partial<FieldValues>;
formRef?: Ref<HTMLFormElement>;
submitText?: string;
submitClassname?: string;
otherSubmitButton?: React.ReactNode;
submitButtonDivClassname?: string;
};
};

View File

@@ -8,7 +8,7 @@ import { Preview } from '@/components/ui/channel-desc-fancy-area/preview';
export default function UserInfoCard(props: Props) {
return (
<div className="bg-mantle p-4 border-b h-48 flex flex-col">
<div className="bg-mantle p-4 border-b h-48 shrink-0 flex flex-col">
<div className="flex items-start justify-between mb-4 flex-shrink-0">
<div className="flex items-center space-x-4">
<Avatar className="h-16 w-16">

View File

@@ -26,7 +26,6 @@ export function useProcessor(md: string) {
mention: ["handle"],
},
})
// @ts-expect-error because mention is not valid html-tag
.use(rehypeReact, {
createElement,
Fragment,
@@ -37,7 +36,7 @@ export function useProcessor(md: string) {
},
})
.process(text)
.then((file) => {
.then((file: { result: React.ReactNode }) => {
setContent(file.result);
});
}, [text]);

View File

@@ -141,7 +141,7 @@ const SidebarProvider = React.forwardRef<
} as React.CSSProperties
}
className={cn(
"group/sidebar-wrapper flex min-h-svh has-[[data-variant=inset]]:bg-sidebar",
"group/sidebar-wrapper flex min-h-svh flex-col has-[[data-variant=inset]]:bg-sidebar",
className
)}
ref={ref}
@@ -181,7 +181,7 @@ const Sidebar = React.forwardRef<
return (
<div
className={cn(
"flex h-full w-[--sidebar-width] flex-col bg-sidebar text-sidebar-foreground",
"flex h-full w-[var(--sidebar-width)] flex-col bg-sidebar text-sidebar-foreground",
className
)}
ref={ref}
@@ -198,7 +198,7 @@ const Sidebar = React.forwardRef<
<SheetContent
data-sidebar="sidebar"
data-mobile="true"
className="w-[--sidebar-width] bg-sidebar p-0 text-sidebar-foreground [&>button]:hidden"
className="w-[var(--sidebar-width)] bg-sidebar p-0 text-sidebar-foreground [&>button]:hidden"
style={
{
"--sidebar-width": SIDEBAR_WIDTH_MOBILE,
@@ -224,24 +224,24 @@ const Sidebar = React.forwardRef<
{/* This is what handles the sidebar gap on desktop */}
<div
className={cn(
"duration-200 relative h-[calc(100vh-4rem)] w-[--sidebar-width] transition-[left,right,width] ease-linear md:flex",
"duration-200 relative h-[calc(100vh-4rem)] w-[var(--sidebar-width)] transition-[left,right,width] ease-linear md:flex",
"group-data-[collapsible=offcanvas]:w-0",
"group-data-[side=right]:rotate-180",
variant === "floating" || variant === "inset"
? "group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)_+_theme(spacing.4))]"
: "group-data-[collapsible=icon]:w-[--sidebar-width-icon]"
? "group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)+var(--spacing)*4)]"
: "group-data-[collapsible=icon]:w-[var(--sidebar-width-icon)]"
)}
/>
<div
className={cn(
"duration-200 fixed inset-y-0 z-10 hidden h-svh w-[--sidebar-width] transition-[left,right,width] ease-linear md:flex",
"duration-200 fixed inset-y-0 z-10 hidden h-svh w-[var(--sidebar-width)] transition-[left,right,width] ease-linear md:flex",
side === "left"
? "left-0 group-data-[collapsible=offcanvas]:left-[calc(var(--sidebar-width)*-1)]"
: "right-0 group-data-[collapsible=offcanvas]:right-[calc(var(--sidebar-width)*-1)]",
// Adjust the padding for floating and inset variants.
variant === "floating" || variant === "inset"
? "p-2 group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)_+_theme(spacing.4)_+2px)]"
: "group-data-[collapsible=icon]:w-[--sidebar-width-icon] group-data-[side=left]:border-r group-data-[side=right]:border-l",
? "p-2 group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)+var(--spacing)*4+2px)]"
: "group-data-[collapsible=icon]:w-[var(--sidebar-width-icon)] group-data-[side=left]:border-r group-data-[side=right]:border-l",
className
)}
{...props}
@@ -323,7 +323,7 @@ const SidebarInset = React.forwardRef<
ref={ref}
className={cn(
"relative flex min-h-svh flex-1 flex-col bg-background",
"peer-data-[variant=inset]:min-h-[calc(100svh-theme(spacing.4))] md:peer-data-[variant=inset]:m-2 md:peer-data-[state=collapsed]:peer-data-[variant=inset]:ml-2 md:peer-data-[variant=inset]:ml-0 md:peer-data-[variant=inset]:rounded-xl md:peer-data-[variant=inset]:shadow",
"peer-data-[variant=inset]:min-h-[calc(100svh-var(--spacing)*4)] md:peer-data-[variant=inset]:m-2 md:peer-data-[state=collapsed]:peer-data-[variant=inset]:ml-2 md:peer-data-[variant=inset]:ml-0 md:peer-data-[variant=inset]:rounded-xl md:peer-data-[variant=inset]:shadow",
className
)}
{...props}
@@ -518,7 +518,7 @@ const sidebarMenuButtonVariants = cva(
variant: {
default: "hover:bg-sidebar-accent hover:text-sidebar-accent-foreground",
outline:
"bg-background shadow-[0_0_0_1px_hsl(var(--sidebar-border))] hover:bg-sidebar-accent hover:text-sidebar-accent-foreground hover:shadow-[0_0_0_1px_hsl(var(--sidebar-accent))]",
"bg-background shadow-[0_0_0_1px_var(--sidebar-border)] hover:bg-sidebar-accent hover:text-sidebar-accent-foreground hover:shadow-[0_0_0_1px_var(--sidebar-accent)]",
},
size: {
default: "h-8 text-sm",
@@ -669,7 +669,7 @@ const SidebarMenuSkeleton = React.forwardRef<
/>
)}
<Skeleton
className="h-4 flex-1 max-w-[--skeleton-width]"
className="h-4 flex-1 max-w-[var(--skeleton-width)]"
data-sidebar="menu-skeleton-text"
style={
{

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

View File

@@ -13,6 +13,7 @@ import {
streamInfoEditSchema,
updateChatModerationSchema,
updateChannelSettingsSchema,
updateNotificationChannelsSchema,
} from './zod';
import { initializeStreamInfo } from '../instrumentation/streamInfo';
import {
@@ -23,6 +24,7 @@ import {
import { can } from '../auth/abac';
import { genIdenticonUpload } from '../utils/genIdenticonUpload';
import { generateStreamKey } from '../db/streamKey';
import slackNotifierClient from '../services/slackNotifier';
export async function editStreamInfo(prev: any, formData: FormData) {
const { user } = await validateRequest();
@@ -614,7 +616,7 @@ export async function createBot(prev: any, formData: FormData) {
slug: zod.data.slug,
ownerId: user.id,
description: zod.data.description,
pfpUrl: await genIdenticonUpload(zod.data.slug, 'botpfp'),
pfpUrl: await genIdenticonUpload(zod.data.slug, 'botpfp'),
},
});
@@ -647,14 +649,21 @@ export async function editBot(prev: any, formData: FormData) {
if (botExists) {
return { success: false, error: 'Bot slug already exists' };
}
}
if (zod.data.pfpUrl === '') {
const identicon = await genIdenticonUpload(zod.data.name, 'pfp');
zod.data.pfpUrl = identicon;
}
// i feel like you could just append the data instead of manually changing each field but oh well
const updatedBot = await prisma.botAccount.update({
where: { id: zod.data.from },
data: {
displayName: zod.data.name,
slug: zod.data.slug,
description: zod.data.description,
pfpUrl: zod.data.pfpUrl,
},
});
@@ -784,3 +793,56 @@ export async function changeUsername(prev: any, formData: FormData) {
return { success: false, error: 'Failed to change username. Please try again.' };
}
}
export async function updateNotificationChannels(prev: any, formData: FormData) {
const { user } = await validateRequest();
if (!user) {
return { success: false, error: 'Unauthorized' };
}
const zod = await zodVerify(updateNotificationChannelsSchema, formData);
if (!zod.success) {
return zod;
}
const channel = await prisma.channel.findUnique({
where: { id: zod.data.channelId },
include: {
owner: true,
managers: true,
streamInfo: true,
},
});
if (!channel) {
return { success: false, error: 'Channel not found' };
}
if (!can(user, 'update', 'channel', { channel })) {
return { success: false, error: 'Unauthorized' };
}
const newDifference = zod.data.channels.filter((c: string) => !channel.notifChannels.includes(c));
for (const channelId of newDifference) {
try {
await slackNotifierClient.chat.postMessage({
channel: channelId,
text: `:yay: I'll send livestream notifications for <https://hackclub.tv/${channel.name}|${channel.name}> here from now on!`,
});
} catch (error) {
console.error('Failed to validate Slack notification channel:', error);
return {
success: false,
error: `Failed to send a test notification to ${channelId}. Check that the channel ID is valid and that the bot has access, then try again.`,
};
}
}
await prisma.channel.updateMany({
where: { id: channel.id },
data: { notifChannels: zod.data.channels },
});
revalidatePath(`/settings/channel/${channel.name}`);
return { success: true };
}

View File

@@ -50,6 +50,7 @@ export const createBotSchema = z.object({
export const editBotSchema = createBotSchema.and(
z.object({
from: z.string().min(1),
pfpUrl: z.string(),
})
);
@@ -57,3 +58,23 @@ export const changeUsernameSchema = z.object({
channelId: z.string().min(1),
newUsername: username,
});
const notificationChannelsSchema = z
.union([z.string(), z.array(z.string())])
.transform((value) => {
if (typeof value === 'string') {
return value
.replace(/\r\n/g, '\n')
.split('\n')
.map((channel) => channel.trim())
.filter(Boolean);
}
return value.map((channel) => channel.trim()).filter(Boolean);
})
.pipe(z.array(z.string()).max(10));
export const updateNotificationChannelsSchema = z.object({
channelId: z.string().min(1),
channels: notificationChannelsSchema,
});

View File

@@ -0,0 +1,81 @@
'use client';
import { useCallback } from 'react';
import useSWR from 'swr';
import useSWRMutation from 'swr/mutation';
interface StreamKeyResponse {
key: string;
}
async function parseStreamKeyResponse(response: Response): Promise<StreamKeyResponse> {
if (!response.ok) {
const message = await response.text();
throw new Error(message || 'Failed to load stream key');
}
return response.json();
}
async function fetchStreamKey(
[url, channelName]: readonly [string, string]
): Promise<StreamKeyResponse> {
const response = await fetch(`${url}?channel=${encodeURIComponent(channelName)}`);
return parseStreamKeyResponse(response);
}
async function regenerateStreamKey(
url: string,
{ arg: channelName }: { arg: string }
): Promise<StreamKeyResponse> {
const response = await fetch(url, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify({ channel: channelName }),
});
return parseStreamKeyResponse(response);
}
export function useChannelStreamKey(channelName?: string, initialKey?: string | null) {
const swrKey = channelName ? (['/api/rtmp/streamKey', channelName] as const) : null;
const { data, error, isLoading, isValidating, mutate } = useSWR<StreamKeyResponse>(
swrKey,
fetchStreamKey,
{
fallbackData: initialKey ? { key: initialKey } : undefined,
revalidateOnFocus: false,
}
);
const { trigger, isMutating } = useSWRMutation('/api/rtmp/streamKey', regenerateStreamKey);
const refreshStreamKey = useCallback(async () => {
if (!channelName) {
return undefined;
}
return mutate();
}, [channelName, mutate]);
const handleRegenerateStreamKey = useCallback(async () => {
if (!channelName) {
throw new Error('Select a channel before regenerating its stream key');
}
const nextStreamKey = await trigger(channelName);
await mutate(nextStreamKey, { revalidate: false });
return nextStreamKey.key;
}, [channelName, mutate, trigger]);
return {
streamKey: data?.key ?? initialKey ?? '',
error,
isLoading,
isRefreshing: isValidating && !isLoading,
isRegenerating: isMutating,
refreshStreamKey,
regenerateStreamKey: handleRegenerateStreamKey,
};
}

View File

@@ -0,0 +1,440 @@
'use client';
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { getMediamtxClientEnvs } from '@/lib/utils/mediamtx/client';
import type { MediaMTXRegion } from '@/lib/utils/mediamtx/regions';
import MediaMTXWebRTCPublisher from '@/lib/utils/mediamtx/webrtc';
const HLS_COMPATIBLE_VIDEO_CODECS = [
['h264', 'h264/90000'],
['vp9', 'vp9/90000'],
['av1', 'av1/90000'],
['h265', 'h265/90000'],
] as const;
const DISPLAY_MEDIA_OPTIONS: ScreenCaptureOptions = {
video: true,
audio: true,
monitorTypeSurfaces: 'include',
selfBrowserSurface: 'exclude',
surfaceSwitching: 'include',
systemAudio: 'include',
};
export function useScreensharePublisher({
channelName,
region,
streamKey,
}: UseScreensharePublisherOptions) {
const previewRef = useRef<HTMLVideoElement>(null);
const captureStreamRef = useRef<MediaStream | null>(null);
const captureCleanupRef = useRef<(() => void) | null>(null);
const publisherRef = useRef<MediaMTXWebRTCPublisher | null>(null);
const [publishState, setPublishState] = useState<PublishState>('idle');
const [hasPreview, setHasPreview] = useState(false);
const [issue, setIssue] = useState<PublisherIssue | null>(null);
const browserWarning = useMemo(() => getBrowserWarning(), []);
const setPreviewStream = useCallback((stream: MediaStream | null) => {
if (previewRef.current) {
previewRef.current.srcObject = stream;
}
}, []);
const detachCaptureCleanup = useCallback(() => {
captureCleanupRef.current?.();
captureCleanupRef.current = null;
}, []);
const clearCaptureStream = useCallback(() => {
detachCaptureCleanup();
stopTracks(captureStreamRef.current);
captureStreamRef.current = null;
setHasPreview(false);
setPreviewStream(null);
}, [detachCaptureCleanup, setPreviewStream]);
const closePublisher = useCallback(() => {
const publisher = publisherRef.current;
publisherRef.current = null;
publisher?.close();
}, []);
const disposeCurrentSession = useCallback(() => {
closePublisher();
clearCaptureStream();
}, [clearCaptureStream, closePublisher]);
const stopPublishing = useCallback(() => {
disposeCurrentSession();
setIssue(null);
setPublishState('idle');
}, [disposeCurrentSession]);
const attachCaptureStopListener = useCallback(
(stream: MediaStream) => {
const [videoTrack] = stream.getVideoTracks();
if (!videoTrack) {
captureCleanupRef.current = null;
return;
}
const handleEnded = () => {
stopPublishing();
};
videoTrack.addEventListener('ended', handleEnded);
captureCleanupRef.current = () => {
videoTrack.removeEventListener('ended', handleEnded);
};
},
[stopPublishing]
);
const commitCaptureStream = useCallback(
(nextStream: MediaStream) => {
const previousStream = captureStreamRef.current;
detachCaptureCleanup();
captureStreamRef.current = nextStream;
setHasPreview(true);
setPreviewStream(nextStream);
attachCaptureStopListener(nextStream);
stopTracks(previousStream);
},
[attachCaptureStopListener, detachCaptureCleanup, setPreviewStream]
);
const previewSource = useCallback(async () => {
try {
setIssue(null);
setPublishState('previewing');
const stream = await requestCaptureStream();
commitCaptureStream(stream);
setPublishState('preview');
} catch (err) {
setPublishState(captureStreamRef.current ? 'preview' : 'idle');
setIssue(classifyPublisherIssue(err, 'preview'));
}
}, [commitCaptureStream]);
const startPublishing = useCallback(async () => {
if (!channelName) {
setIssue({
context: 'start',
description: 'Pick a channel first so we know where to publish.',
title: 'Choose a channel before starting',
tone: 'warning',
});
return;
}
if (!streamKey) {
setIssue({
context: 'start',
description: 'Wait for the stream key to load, then try starting again.',
title: 'Stream key is still unavailable',
tone: 'warning',
});
return;
}
try {
setIssue(null);
setPublishState('connecting');
const videoCodec = await getPreferredVideoCodec();
let stream = captureStreamRef.current;
if (!stream) {
stream = await requestCaptureStream();
commitCaptureStream(stream);
}
const publisher = new MediaMTXWebRTCPublisher({
url: getWhipUrl(channelName, region),
stream,
videoCodec,
videoBitrate: 2000,
audioCodec: 'opus',
audioBitrate: 64,
audioVoice: true,
user: 'user',
pass: streamKey,
onConnected: () => {
if (publisherRef.current !== publisher) {
return;
}
setPublishState('live');
},
onError: (message) => {
if (publisherRef.current !== publisher) {
return;
}
setIssue(classifyPublisherIssue(message, 'publish'));
setPublishState('connecting');
},
});
publisherRef.current = publisher;
} catch (err) {
closePublisher();
setPublishState(captureStreamRef.current ? 'preview' : 'idle');
setIssue(classifyPublisherIssue(err, 'start'));
}
}, [channelName, closePublisher, commitCaptureStream, region, streamKey]);
const changeSource = useCallback(async () => {
const publisher = publisherRef.current;
if (!publisher) {
return;
}
let nextStream: MediaStream | null = null;
try {
setIssue(null);
setPublishState('switching');
nextStream = await requestCaptureStream();
await publisher.replaceStream(nextStream);
commitCaptureStream(nextStream);
setPublishState('live');
} catch (err) {
stopTracks(nextStream);
setPublishState(publisherRef.current ? 'live' : 'idle');
setIssue(classifyPublisherIssue(err, 'switch'));
}
}, [commitCaptureStream]);
useEffect(() => {
return () => {
disposeCurrentSession();
};
}, [disposeCurrentSession]);
return {
browserWarning,
changeSource,
hasPreview,
issue,
isLive: publishState === 'live',
isPreviewReady: publishState === 'preview',
isPreviewingSource: publishState === 'previewing',
isSessionActive:
publishState === 'connecting' || publishState === 'live' || publishState === 'switching',
isStarting: publishState === 'connecting',
isSwitchingSource: publishState === 'switching',
publishState,
previewRef,
previewSource,
startPublishing,
stopPublishing,
};
}
async function requestCaptureStream() {
return navigator.mediaDevices.getDisplayMedia(DISPLAY_MEDIA_OPTIONS as DisplayMediaStreamOptions);
}
function getWhipUrl(channelName: string, region: MediaMTXRegion) {
const { whip } = getMediamtxClientEnvs(region);
return `${whip.replace(/\/$/, '')}/${encodeURIComponent(channelName)}/whip`;
}
function stopTracks(stream: MediaStream | null) {
stream?.getTracks().forEach((track) => track.stop());
}
function getErrorMessage(error: unknown, fallback: string) {
return error instanceof Error ? error.message : fallback;
}
function classifyPublisherIssue(error: unknown, context: PublisherIssueContext): PublisherIssue {
const message = getErrorMessage(
error,
context === 'switch'
? 'Failed to change screenshare source'
: context === 'preview'
? 'Failed to preview the selected source'
: 'Failed to start publishing'
);
const normalizedMessage = message.toLowerCase();
if (normalizedMessage.includes('notallowederror') || normalizedMessage.includes('permission')) {
return {
context,
description:
context === 'switch'
? 'Choose a new tab, window, or display in the browser picker to continue the broadcast.'
: context === 'preview'
? 'Approve the browser screen-share prompt so we can load your preview.'
: 'Approve the browser screen-share prompt, then try again.',
title:
context === 'switch'
? 'Source switch was cancelled or blocked'
: context === 'preview'
? 'Preview permission was denied'
: 'Screen-share permission was denied',
tone: 'warning',
};
}
if (normalizedMessage.includes('notfounderror')) {
return {
context,
description:
'Open the window or tab you want to capture, then retry the screen-share picker.',
title: 'No capturable source was found',
tone: 'warning',
};
}
if (
normalizedMessage.includes('getdisplaymedia') ||
normalizedMessage.includes('secure context') ||
normalizedMessage.includes('browser environment')
) {
return {
context,
description:
'Use HackClub.tv over HTTPS or localhost in a Chromium-based browser, then try again.',
title: 'This browser or page cannot start screen sharing',
tone: 'destructive',
};
}
if (normalizedMessage.includes('hls-compatible webrtc video codec')) {
return {
context,
description:
'Switch to a Chromium-based browser. Firefox and Safari can expose codecs that our ingest pipeline cannot use reliably yet.',
title: 'This browser cannot publish a compatible stream codec',
tone: 'destructive',
};
}
if (normalizedMessage.includes('invalid stream key') || normalizedMessage.includes('403')) {
return {
context,
description:
'Refresh the page or regenerate the stream key in channel settings if this keeps happening.',
title: 'The ingest server rejected your stream key',
tone: 'destructive',
};
}
if (normalizedMessage.includes('404')) {
return {
context,
description:
'The selected ingest server may be misconfigured or offline. Try another server or retry in a moment.',
title: 'The selected ingest server could not be reached',
tone: 'destructive',
};
}
if (normalizedMessage.includes('retrying in some seconds')) {
return {
context,
description:
'We are retrying automatically. Keep this page open, or stop and start again if it does not recover.',
title: 'Connection to the ingest server dropped',
tone: 'warning',
};
}
return {
context,
description:
context === 'switch'
? 'Try choosing the source again. If it keeps failing, stop the stream and start a new session.'
: context === 'preview'
? 'Try choosing the source again. If it keeps failing, reload the page or switch browsers.'
: 'Try again. If it keeps failing, switch servers or reload the page.',
title:
context === 'switch'
? 'Could not switch the shared source'
: context === 'preview'
? 'Could not load the preview'
: 'Could not start the stream',
tone: 'destructive',
};
}
function getBrowserWarning(): PublisherIssue | null {
if (typeof navigator === 'undefined') {
return null;
}
const userAgent = navigator.userAgent.toLowerCase();
const isChromium =
userAgent.includes('chrome') || userAgent.includes('chromium') || userAgent.includes('edg/');
if (isChromium) {
return null;
}
return {
context: 'warning',
description:
'You can still try this here, but screen capture and source switching are most reliable in Chrome or another Chromium-based browser.',
title: 'This browser is supported on a best-effort basis',
tone: 'warning',
};
}
async function getPreferredVideoCodec(): Promise<string> {
const tempPc = new RTCPeerConnection();
try {
tempPc.addTransceiver('video', { direction: 'sendonly' });
const offer = await tempPc.createOffer();
const sdp = offer.sdp?.toLowerCase() ?? '';
for (const [codec, needle] of HLS_COMPATIBLE_VIDEO_CODECS) {
if (sdp.includes(needle)) {
return codec;
}
}
} finally {
tempPc.close();
}
throw new Error(
'This browser does not expose an HLS-compatible WebRTC video codec. MediaMTX HLS supports AV1, VP9, H265, and H264, but not VP8.'
);
}
type PublishState = 'idle' | 'previewing' | 'preview' | 'connecting' | 'live' | 'switching';
type UseScreensharePublisherOptions = {
channelName: string;
region: MediaMTXRegion;
streamKey?: string | null;
};
type PublisherIssue = {
context: PublisherIssueContext;
description: string;
title: string;
tone: 'warning' | 'destructive';
};
type PublisherIssueContext = 'preview' | 'publish' | 'start' | 'switch' | 'warning';
type ScreenCaptureOptions = DisplayMediaStreamOptions & {
monitorTypeSurfaces?: 'include' | 'exclude';
selfBrowserSurface?: 'include' | 'exclude';
surfaceSwitching?: 'include' | 'exclude';
systemAudio?: 'include' | 'exclude';
};

View File

@@ -90,7 +90,20 @@ export async function syncStream() {
for (const r of regions) {
const region = MEDIAMTX_SERVER_REGIONS[r];
const response = await fetch(`${region.apiUrl}/v3/paths/list?itemsPerPage=1000`);
if (!region) {
// continuing bc of the next if check
continue;
}
if (!region.apiAuthHeader) {
throw new Error('MEDIAMTX_API_KEY is required when querying the MediaMTX API');
}
const response = await fetch(`${region.apiUrl}/v3/paths/list?itemsPerPage=1000`, {
headers: {
Authorization: region.apiAuthHeader,
},
});
if (!response.ok) {
recordStreamSyncScrape(r, 'error');
@@ -141,7 +154,13 @@ export async function syncStream() {
for (const [username, regionKey] of allActiveStreams) {
const existingStream = await prisma.streamInfo.findUnique({
where: { username },
include: { channel: true },
include: {
channel: {
include: {
owner: true,
},
},
},
});
if (existingStream && !existingStream.isLive) {
@@ -173,6 +192,20 @@ export async function syncStream() {
channel: process.env.NOTIFICATION_CHANNEL_ID!,
unfurl_links: true,
});
for (const channelId of existingStream.channel.notifChannels) {
queue.add(`streamStartChannel:${existingStream.username}`, {
text: `${existingStream.username} is now *live*, streaming *${existingStream.title}* (${existingStream.category})!\n<https://hackclub.tv/${existingStream.username}|Go check them out>`,
channel: channelId,
unfurl_links: true,
metadata: {
type: 'custom_stream_announcement',
managedChannelId: existingStream.channel.id,
ownerSlackId: existingStream.channel.owner.slack_id,
ownerChannelName: existingStream.channel.name,
},
});
}
}
if (existingStream.enableNotifications && !existingStream.channel.is247) {

View File

@@ -1,6 +1,6 @@
import { createUploadthing, type FileRouter } from "uploadthing/next";
import { UploadThingError } from "uploadthing/server";
import { validateRequest } from "../../auth/validate";
import { createUploadthing, type FileRouter } from 'uploadthing/next';
import { UTFiles, UploadThingError } from 'uploadthing/server';
import { validateRequest } from '../../auth/validate';
const f = createUploadthing();
@@ -9,6 +9,17 @@ const auth = async () => {
return req.user;
};
const getRenamedFile = (file: { name: string }) => {
const suffix = crypto.randomUUID().replace(/-/g, '').slice(0, 4).toLowerCase();
const dotIndex = file.name.lastIndexOf('.');
const hasExtension = dotIndex > 0;
const rawBaseName = hasExtension ? file.name.slice(0, dotIndex) : file.name;
const extension = hasExtension ? file.name.slice(dotIndex) : '';
const safeBaseName = rawBaseName.replace(/[^a-zA-Z0-9-_]/g, '-');
return `pfpup-${safeBaseName}-${suffix}${extension}`;
};
// FileRouter for your app, can contain multiple FileRoutes
export const ourFileRouter = {
// Define as many FileRoutes as you like, each with a unique routeSlug
@@ -18,26 +29,32 @@ export const ourFileRouter = {
* For full list of options and defaults, see the File Route API reference
* @see https://docs.uploadthing.com/file-routes#route-config
*/
maxFileSize: "1MB",
maxFileSize: '1MB',
maxFileCount: 1,
},
})
// Set permissions and file types for this FileRoute
.middleware(async () => {
.middleware(async ({ files }) => {
// This code runs on your server before upload
const user = await auth();
// If you throw, the user will not be able to upload
if (!user) throw new UploadThingError("Unauthorized");
if (!user) throw new UploadThingError('Unauthorized');
// Whatever is returned here is accessible in onUploadComplete as `metadata`
return { userId: user.id };
return {
userId: user.id,
[UTFiles]: files.map((file) => ({
...file,
name: getRenamedFile(file),
})),
};
})
.onUploadComplete(async ({ metadata, file }) => {
// This code RUNS ON YOUR SERVER after upload
console.log("Upload complete for userId:", metadata.userId);
console.log('Upload complete for userId:', metadata.userId);
console.log("file url", file.ufsUrl);
console.log('file url', file.ufsUrl);
// !!! Whatever is returned here is sent to the clientside `onClientUploadComplete` callback
return { uploadedBy: metadata.userId };

View File

@@ -4,18 +4,37 @@ import { getEnv } from '@/lib/env';
export interface MediaMTXClientEnvs {
publicUrl: string;
ingestRoute: string;
whip: string;
whipEnabled: boolean;
emoji: string;
string: string;
}
export interface MediaMTXClientRegionOption {
value: MediaMTXRegion;
emoji: string;
label: string;
whipEnabled: boolean;
}
export function getMediamtxClientEnvs(region: MediaMTXRegion = 'hq'): MediaMTXClientEnvs {
const envs: Record<MediaMTXRegion, MediaMTXClientEnvs> = {
hq: {
publicUrl: getEnv('NEXT_PUBLIC_MEDIAMTX_URL_HQ')!,
ingestRoute: getEnv('NEXT_PUBLIC_MEDIAMTX_INGEST_ROUTE_HQ')!,
whip: getEnv('NEXT_PUBLIC_MEDIAMTX_WHIP_ROUTE_HQ')!,
whipEnabled: false,
emoji: '🇺🇸',
string: 'HQ Server A',
},
ethande: {
publicUrl: getEnv('NEXT_PUBLIC_MEDIAMTX_URL_ETHANDE')!,
ingestRoute: getEnv('NEXT_PUBLIC_MEDIAMTX_INGEST_ROUTE_ETHANDE')!,
whip: getEnv('NEXT_PUBLIC_MEDIAMTX_WHIP_ROUTE_ETHANDE')!,
whipEnabled: true,
emoji: '🇩🇪',
string: 'eth0\'s VPS',
},
};
const regionEnvs = envs[region];
@@ -27,3 +46,19 @@ export function getMediamtxClientEnvs(region: MediaMTXRegion = 'hq'): MediaMTXCl
return regionEnvs;
}
export function getMediamtxClientRegionOptions(): MediaMTXClientRegionOption[] {
return [
{
value: 'hq',
emoji: '🇺🇸',
label: 'HQ Server A',
whipEnabled: false,
},
{
value: 'ethande',
emoji: '🇩🇪',
label: 'eth0\'s VPS',
whipEnabled: true,
},
];
}

View File

@@ -1 +1 @@
export type MediaMTXRegion = 'hq';
export type MediaMTXRegion = 'hq' | 'ethande';

View File

@@ -2,12 +2,12 @@ import { MediaMTXRegion } from './regions';
export interface MediaMTXEnvs {
apiUrl: string;
apiAuthHeader?: string;
}
export const MEDIAMTX_SERVER_REGIONS: Record<MediaMTXRegion, MediaMTXEnvs> = {
hq: {
apiUrl: process.env.MEDIAMTX_API_HQ!,
},
export const MEDIAMTX_SERVER_REGIONS: Partial<Record<MediaMTXRegion, MediaMTXEnvs>> = {
hq: createMediamtxEnvs(process.env.MEDIAMTX_API_HQ),
ethande: createMediamtxEnvs(process.env.MEDIAMTX_API_ETHANDE),
};
export function getMediamtxEnvs(region: MediaMTXRegion = 'hq'): MediaMTXEnvs {
@@ -19,3 +19,24 @@ export function getMediamtxEnvs(region: MediaMTXRegion = 'hq'): MediaMTXEnvs {
return envs;
}
function getMediamtxApiAuthHeader() {
const apiKey = process.env.MEDIAMTX_API_KEY;
if (!apiKey) {
return undefined;
}
return `Basic ${Buffer.from(`hctv-api:${apiKey}`).toString('base64')}`;
}
function createMediamtxEnvs(apiUrl?: string): MediaMTXEnvs | undefined {
if (!apiUrl) {
return undefined;
}
return {
apiUrl,
apiAuthHeader: getMediamtxApiAuthHeader(),
};
}

View File

@@ -0,0 +1,531 @@
// based off https://github.com/bluenviron/mediamtx/blob/v1.17.1/internal/servers/webrtc/publisher.js
// modified by codex to typescript and to suit the platform's needs!
export type OnError = (err: string) => void;
export type OnConnected = () => void;
export type PublisherState = 'running' | 'restarting' | 'closed';
type MediaKind = 'audio' | 'video';
export type PublisherConfig = {
url: string;
user?: string;
pass?: string;
token?: string;
stream: MediaStream;
videoCodec: string;
videoBitrate: number;
audioCodec: string;
audioBitrate: number;
audioVoice: boolean;
onError?: OnError;
onConnected?: OnConnected;
};
type OfferData = {
iceUfrag: string;
icePwd: string;
medias: string[];
};
type ParsedIceServer = RTCIceServer & {
credentialType?: 'password';
};
/** WebRTC/WHIP publisher. */
export class MediaMTXWebRTCPublisher {
private readonly retryPause = 2000;
private readonly conf: PublisherConfig;
private stream: MediaStream;
private state: PublisherState = 'running';
private restartTimeout: ReturnType<typeof setTimeout> | null = null;
private pc: RTCPeerConnection | null = null;
private offerData: OfferData | null = null;
private sessionUrl: string | null = null;
private queuedCandidates: RTCIceCandidate[] = [];
private trackSenders: Partial<Record<MediaKind, RTCRtpSender>> = {};
constructor(conf: PublisherConfig) {
if (
typeof window === 'undefined' ||
typeof RTCPeerConnection === 'undefined' ||
typeof MediaStream === 'undefined'
) {
throw new Error('MediaMTXWebRTCPublisher can only be used in a browser environment.');
}
this.conf = conf;
this.stream = conf.stream;
this.start();
}
close = (): void => {
this.state = 'closed';
if (this.restartTimeout !== null) {
clearTimeout(this.restartTimeout);
}
this.resetConnection();
this.disposeSession();
};
replaceStream = async (stream: MediaStream): Promise<void> => {
if (this.state !== 'running' || this.pc === null) {
throw new Error('publisher is not running');
}
const nextTracks: Record<MediaKind, MediaStreamTrack | null> = {
audio: stream.getAudioTracks()[0] ?? null,
video: stream.getVideoTracks()[0] ?? null,
};
await Promise.all(
(['audio', 'video'] as const).map(async (kind) => {
const sender = this.trackSenders[kind];
if (!sender) {
return;
}
await sender.replaceTrack(nextTracks[kind]);
})
);
this.stream = stream;
};
private resetConnection(): void {
if (this.pc !== null) {
this.pc.close();
this.pc = null;
}
this.offerData = null;
this.queuedCandidates = [];
this.trackSenders = {};
}
private disposeSession(): void {
if (this.sessionUrl !== null) {
void fetch(this.sessionUrl, {
method: 'DELETE',
});
this.sessionUrl = null;
}
}
static #unquoteCredential(value: string): string {
return JSON.parse(`"${value}"`) as string;
}
static #linkToIceServers(links: string | null): ParsedIceServer[] {
if (links === null) {
return [];
}
return links.split(', ').flatMap((link) => {
const match = link.match(
/^<(.+?)>; rel="ice-server"(; username="(.*?)"; credential="(.*?)"; credential-type="password")?/i
);
if (!match) {
return [];
}
const iceServer: ParsedIceServer = {
urls: [match[1]],
};
if (match[3] !== undefined && match[4] !== undefined) {
iceServer.username = this.#unquoteCredential(match[3]);
iceServer.credential = this.#unquoteCredential(match[4]);
iceServer.credentialType = 'password';
}
return [iceServer];
});
}
static #parseOffer(offer: string): OfferData {
const parsedOffer: OfferData = {
iceUfrag: '',
icePwd: '',
medias: [],
};
for (const line of offer.split('\r\n')) {
if (line.startsWith('m=')) {
parsedOffer.medias.push(line.slice('m='.length));
} else if (parsedOffer.iceUfrag === '' && line.startsWith('a=ice-ufrag:')) {
parsedOffer.iceUfrag = line.slice('a=ice-ufrag:'.length);
} else if (parsedOffer.icePwd === '' && line.startsWith('a=ice-pwd:')) {
parsedOffer.icePwd = line.slice('a=ice-pwd:'.length);
}
}
return parsedOffer;
}
static #generateSdpFragment(offerData: OfferData, candidates: RTCIceCandidate[]): string {
const candidatesByMedia: Record<number, RTCIceCandidate[]> = {};
for (const candidate of candidates) {
const mid = candidate.sdpMLineIndex;
if (mid === null) {
continue;
}
if (candidatesByMedia[mid] === undefined) {
candidatesByMedia[mid] = [];
}
candidatesByMedia[mid].push(candidate);
}
let fragment = `a=ice-ufrag:${offerData.iceUfrag}\r\n` + `a=ice-pwd:${offerData.icePwd}\r\n`;
let mid = 0;
for (const media of offerData.medias) {
if (candidatesByMedia[mid] !== undefined) {
fragment += `m=${media}\r\n` + `a=mid:${mid}\r\n`;
for (const candidate of candidatesByMedia[mid]) {
fragment += `a=${candidate.candidate}\r\n`;
}
}
mid++;
}
return fragment;
}
static #setCodec(section: string, codec: string): string {
const normalizedCodec = codec.toLowerCase();
const lines = section.split('\r\n');
const filteredLines: string[] = [];
const payloadFormats: string[] = [];
for (const line of lines) {
if (!line.startsWith('a=rtpmap:')) {
filteredLines.push(line);
} else if (line.toLowerCase().includes(normalizedCodec)) {
payloadFormats.push(line.slice('a=rtpmap:'.length).split(' ')[0]);
filteredLines.push(line);
}
}
const rewrittenLines: string[] = [];
let firstLine = true;
for (const line of filteredLines) {
if (firstLine) {
firstLine = false;
rewrittenLines.push(line.split(' ').slice(0, 3).concat(payloadFormats).join(' '));
} else if (line.startsWith('a=fmtp:')) {
if (payloadFormats.includes(line.slice('a=fmtp:'.length).split(' ')[0])) {
rewrittenLines.push(line);
}
} else if (line.startsWith('a=rtcp-fb:')) {
if (payloadFormats.includes(line.slice('a=rtcp-fb:'.length).split(' ')[0])) {
rewrittenLines.push(line);
}
} else {
rewrittenLines.push(line);
}
}
return rewrittenLines.join('\r\n');
}
static #setVideoBitrate(section: string, bitrate: number): string {
let lines = section.split('\r\n');
for (let i = 0; i < lines.length; i++) {
if (lines[i].startsWith('c=')) {
lines = [
...lines.slice(0, i + 1),
`b=TIAS:${(bitrate * 1024).toString()}`,
...lines.slice(i + 1),
];
break;
}
}
return lines.join('\r\n');
}
static #setAudioBitrate(section: string, bitrate: number, voice: boolean): string {
let opusPayloadFormat = '';
const lines = section.split('\r\n');
for (const line of lines) {
if (line.startsWith('a=rtpmap:') && line.toLowerCase().includes('opus/')) {
opusPayloadFormat = line.slice('a=rtpmap:'.length).split(' ')[0];
break;
}
}
if (opusPayloadFormat === '') {
return section;
}
for (let i = 0; i < lines.length; i++) {
if (lines[i].startsWith(`a=fmtp:${opusPayloadFormat} `)) {
if (voice) {
lines[i] =
`a=fmtp:${opusPayloadFormat} minptime=10;useinbandfec=1;maxaveragebitrate=${(bitrate * 1024).toString()}`;
} else {
lines[i] =
`a=fmtp:${opusPayloadFormat} maxplaybackrate=48000;stereo=1;sprop-stereo=1;maxaveragebitrate=${(bitrate * 1024).toString()}`;
}
}
}
return lines.join('\r\n');
}
static #editOffer(
sdp: string,
videoCodec: string,
audioCodec: string,
audioBitrate: number,
audioVoice: boolean
): string {
const sections = sdp.split('m=');
for (let i = 0; i < sections.length; i++) {
if (sections[i].startsWith('video')) {
sections[i] = this.#setCodec(sections[i], videoCodec);
} else if (sections[i].startsWith('audio')) {
sections[i] = this.#setAudioBitrate(
this.#setCodec(sections[i], audioCodec),
audioBitrate,
audioVoice
);
}
}
return sections.join('m=');
}
static #editAnswer(sdp: string, videoBitrate: number): string {
const sections = sdp.split('m=');
for (let i = 0; i < sections.length; i++) {
if (sections[i].startsWith('video')) {
sections[i] = this.#setVideoBitrate(sections[i], videoBitrate);
}
}
return sections.join('m=');
}
private async start(): Promise<void> {
try {
const iceServers = await this.requestIceServers();
const offer = await this.setupPeerConnection(iceServers);
const answer = await this.sendOffer(offer);
await this.setAnswer(answer);
} catch (error) {
this.handleError(error instanceof Error ? error.message : String(error));
}
}
private handleError(err: string): void {
if (this.state === 'running') {
this.resetConnection();
this.disposeSession();
this.state = 'restarting';
this.restartTimeout = setTimeout(() => {
this.restartTimeout = null;
this.state = 'running';
void this.start();
}, this.retryPause);
this.conf.onError?.(`${err}, retrying in some seconds`);
}
}
private authHeader(): HeadersInit {
if (this.conf.user !== undefined && this.conf.user !== '') {
const credentials = btoa(`${this.conf.user}:${this.conf.pass ?? ''}`);
return { Authorization: `Basic ${credentials}` };
}
if (this.conf.token !== undefined && this.conf.token !== '') {
return { Authorization: `Bearer ${this.conf.token}` };
}
return {};
}
private async requestIceServers(): Promise<ParsedIceServer[]> {
const response = await fetch(this.conf.url, {
method: 'OPTIONS',
headers: {
...this.authHeader(),
},
});
return MediaMTXWebRTCPublisher.#linkToIceServers(response.headers.get('Link'));
}
private async setupPeerConnection(iceServers: RTCIceServer[]): Promise<string> {
if (this.state !== 'running') {
throw new Error('closed');
}
this.pc = new RTCPeerConnection({
iceServers,
});
this.pc.onicecandidate = (event) => this.onLocalCandidate(event);
this.pc.onconnectionstatechange = () => this.onConnectionState();
this.trackSenders = {};
this.stream.getTracks().forEach((track) => {
const sender = this.pc?.addTrack(track, this.stream);
if (sender && (track.kind === 'audio' || track.kind === 'video')) {
this.trackSenders[track.kind] = sender;
}
});
const offer = await this.pc.createOffer();
if (!offer.sdp) {
throw new Error('missing offer SDP');
}
this.offerData = MediaMTXWebRTCPublisher.#parseOffer(offer.sdp);
await this.pc.setLocalDescription(offer);
return offer.sdp;
}
private async sendOffer(offer: string): Promise<string> {
if (this.state !== 'running') {
throw new Error('closed');
}
const editedOffer = MediaMTXWebRTCPublisher.#editOffer(
offer,
this.conf.videoCodec,
this.conf.audioCodec,
this.conf.audioBitrate,
this.conf.audioVoice
);
const response = await fetch(this.conf.url, {
method: 'POST',
headers: {
...this.authHeader(),
'Content-Type': 'application/sdp',
},
body: editedOffer,
});
switch (response.status) {
case 201:
break;
case 400: {
const errorBody = (await response.json()) as { error?: string };
throw new Error(errorBody.error ?? 'bad request');
}
default:
throw new Error(`bad status code ${response.status}`);
}
const location = response.headers.get('location');
if (!location) {
throw new Error('missing session location');
}
this.sessionUrl = new URL(location, this.conf.url).toString();
return response.text();
}
private async setAnswer(answer: string): Promise<void> {
if (this.state !== 'running') {
throw new Error('closed');
}
const peerConnection = this.pc;
if (peerConnection === null) {
throw new Error('missing peer connection');
}
const editedAnswer = MediaMTXWebRTCPublisher.#editAnswer(answer, this.conf.videoBitrate);
await peerConnection.setRemoteDescription(
new RTCSessionDescription({
type: 'answer',
sdp: editedAnswer,
})
);
if (this.state !== 'running') {
return;
}
if (this.queuedCandidates.length !== 0) {
this.sendLocalCandidates(this.queuedCandidates);
this.queuedCandidates = [];
}
}
private onLocalCandidate(event: RTCPeerConnectionIceEvent): void {
if (this.state !== 'running') {
return;
}
if (event.candidate !== null) {
if (this.sessionUrl === null) {
this.queuedCandidates.push(event.candidate);
} else {
this.sendLocalCandidates([event.candidate]);
}
}
}
private sendLocalCandidates(candidates: RTCIceCandidate[]): void {
if (this.sessionUrl === null || this.offerData === null) {
return;
}
void fetch(this.sessionUrl, {
method: 'PATCH',
headers: {
'Content-Type': 'application/trickle-ice-sdpfrag',
'If-Match': '*',
},
body: MediaMTXWebRTCPublisher.#generateSdpFragment(this.offerData, candidates),
})
.then((response) => {
switch (response.status) {
case 204:
break;
case 404:
throw new Error('stream not found');
default:
throw new Error(`bad status code ${response.status}`);
}
})
.catch((error) => {
this.handleError(error instanceof Error ? error.message : String(error));
});
}
private onConnectionState(): void {
if (this.state !== 'running' || this.pc === null) {
return;
}
if (this.pc.connectionState === 'failed' || this.pc.connectionState === 'closed') {
this.handleError('peer connection closed');
} else if (this.pc.connectionState === 'connected') {
this.conf.onConnected?.();
}
}
}
export default MediaMTXWebRTCPublisher;

View File

@@ -1,8 +1,20 @@
import { Queue, Worker } from 'bullmq';
import { getRedisConnection } from '@hctv/db';
export type SlackNotificationJobData = {
channel: string;
text: string;
unfurl_links?: boolean;
metadata?: {
type: 'custom_stream_announcement';
managedChannelId: string;
ownerSlackId: string;
ownerChannelName: string;
};
};
const globalForNotifier = global as unknown as {
notificationQueue: Queue | null;
notificationQueue: Queue<SlackNotificationJobData> | null;
notificationWorker: Worker | null;
thumbnailQueue: Queue | null;
@@ -14,9 +26,9 @@ if (!globalForNotifier.notificationQueue) {
globalForNotifier.notificationWorker = null;
}
export function getNotificationQueue(): Queue {
export function getNotificationQueue(): Queue<SlackNotificationJobData> {
if (!globalForNotifier.notificationQueue) {
globalForNotifier.notificationQueue = new Queue('notifications', {
globalForNotifier.notificationQueue = new Queue<SlackNotificationJobData>('notifications', {
connection: getRedisConnection().options,
defaultJobOptions: {
attempts: 3,
@@ -44,4 +56,4 @@ export function getThumbnailQueue(): Queue {
});
}
return globalForNotifier.thumbnailQueue;
}
}

View File

@@ -1,6 +1,7 @@
import { Worker } from 'bullmq';
import { getRedisConnection } from '@hctv/db';
import { getRedisConnection, prisma } from '@hctv/db';
import snClient from '@/lib/services/slackNotifier';
import type { SlackNotificationJobData } from '@/lib/workers';
const globalForWorker = global as unknown as {
notificationWorker: Worker | null;
@@ -18,14 +19,47 @@ export async function registerNotificationWorker(): Promise<void> {
console.log('Registering notification worker...');
const worker = new Worker('notifications', async (job) => {
const worker = new Worker<SlackNotificationJobData>('notifications', async (job) => {
try {
await snClient.chat.postMessage(job.data);
const { metadata: _metadata, ...slackMessage } = job.data;
await snClient.chat.postMessage(slackMessage);
return { success: true };
} catch (e) {
console.error('Slack notification failed:', e);
// @ts-ignore e is unknown
return { success: false, error: e.message };
if (job.data.metadata?.type === 'custom_stream_announcement') {
const channel = await prisma.channel.findUnique({
where: { id: job.data.metadata.managedChannelId },
select: {
notifChannels: true,
},
});
if (channel?.notifChannels.includes(job.data.channel)) {
await prisma.channel.update({
where: { id: job.data.metadata.managedChannelId },
data: {
notifChannels: channel.notifChannels.filter(
(channelId) => channelId !== job.data.channel
),
},
});
}
try {
await snClient.chat.postMessage({
channel: job.data.metadata.ownerSlackId,
text: `I couldn't send a go-live notification for *${job.data.metadata.ownerChannelName}* to Slack channel \`${job.data.channel}\`, so I removed it from that channel's notification list.\nIf you still want notifications there, please make sure the bot can post in that channel and add it again in settings.`,
});
} catch (ownerNotificationError) {
console.error('Failed to notify channel owner about Slack notification removal:', ownerNotificationError);
}
}
return {
success: false,
error: e instanceof Error ? e.message : 'Unknown Slack notification error',
};
}
}, {
connection: getRedisConnection().options,
@@ -45,4 +79,4 @@ export async function closeNotificationWorker(): Promise<void> {
await globalForWorker.notificationWorker.close();
globalForWorker.notificationWorker = null;
}
}
}

View File

@@ -45,7 +45,8 @@ export async function registerThumbnailWorker(): Promise<void> {
);
return { success: true };
} catch (ffmpegError) {
console.error(`FFmpeg error for ${name} on server ${server}:`, ffmpegError);
// commenting since its mostly due to the fact that the stream is likely offline
// console.error(`FFmpeg error for ${name} on server ${server}:`, ffmpegError);
return { success: false, error: ffmpegError instanceof Error ? ffmpegError.message : String(ffmpegError) };
}
} catch (e) {

View File

@@ -1,6 +1,6 @@
'use server';
import { ZodType } from 'zod';
import { z } from 'zod';
type SuccessResult<T> = {
success: true;
@@ -14,7 +14,10 @@ type ErrorResult = {
type VerifyResult<T> = SuccessResult<T> | ErrorResult;
export default async function zodVerify<T>(schema: ZodType<T>, data: FormData | Object): Promise<VerifyResult<T>> {
export default async function zodVerify<TSchema extends z.ZodTypeAny>(
schema: TSchema,
data: FormData | Object
): Promise<VerifyResult<z.output<TSchema>>> {
let obj: any = data;
if (data instanceof FormData) {
obj = Object.fromEntries(data.entries());
@@ -27,8 +30,11 @@ export default async function zodVerify<T>(schema: ZodType<T>, data: FormData |
const zod = schema.safeParse(obj);
if (!zod.success) {
const [issue] = zod.error.issues;
const path = issue.path[0] === undefined ? 'form' : String(issue.path[0]);
return {
error: `From ${zod.error.errors[0].path[0]}: ${zod.error.errors[0].message}`,
error: `From ${path}: ${issue.message}`,
success: false,
};
}
@@ -36,4 +42,4 @@ export default async function zodVerify<T>(schema: ZodType<T>, data: FormData |
success: true,
data: zod.data,
};
}
}

View File

@@ -1,109 +1,20 @@
import type { Config } from "tailwindcss"
import { uploadthingPlugin } from 'uploadthing/tw'
import * as tan from 'tailwindcss-animate'
import { uploadthingPlugin } from 'uploadthing/tw';
import type { Config } from 'tailwindcss';
const config = {
darkMode: ["class"],
content: [
'./pages/**/*.{ts,tsx}',
'./components/**/*.{ts,tsx}',
'./app/**/*.{ts,tsx}',
'./src/**/*.{ts,tsx}',
],
prefix: "",
darkMode: 'class',
content: ['./src/**/*.{ts,tsx}'],
prefix: '',
theme: {
container: {
center: true,
padding: '2rem',
screens: {
'2xl': '1400px'
}
},
extend: {
colors: {
border: 'hsl(var(--border))',
input: 'hsl(var(--input))',
ring: 'hsl(var(--ring))',
background: 'hsl(var(--background))',
foreground: 'hsl(var(--foreground))',
primary: {
DEFAULT: 'hsl(var(--primary))',
foreground: 'hsl(var(--primary-foreground))'
},
secondary: {
DEFAULT: 'hsl(var(--secondary))',
foreground: 'hsl(var(--secondary-foreground))'
},
destructive: {
DEFAULT: 'hsl(var(--destructive))',
foreground: 'hsl(var(--destructive-foreground))'
},
muted: {
DEFAULT: 'hsl(var(--muted))',
foreground: 'hsl(var(--muted-foreground))'
},
accent: {
DEFAULT: 'hsl(var(--accent))',
foreground: 'hsl(var(--accent-foreground))'
},
popover: {
DEFAULT: 'hsl(var(--popover))',
foreground: 'hsl(var(--popover-foreground))'
},
card: {
DEFAULT: 'hsl(var(--card))',
foreground: 'hsl(var(--card-foreground))'
},
surface1: {
DEFAULT: 'hsl(var(--surface-1))'
},
surface2: {
DEFAULT: 'hsl(var(--surface-2))'
},
mantle: {
DEFAULT: 'hsl(var(--mantle))'
},
sidebar: {
DEFAULT: 'hsl(var(--sidebar-background))',
foreground: 'hsl(var(--sidebar-foreground))',
primary: 'hsl(var(--sidebar-primary))',
'primary-foreground': 'hsl(var(--sidebar-primary-foreground))',
accent: 'hsl(var(--sidebar-accent))',
'accent-foreground': 'hsl(var(--sidebar-accent-foreground))',
border: 'hsl(var(--sidebar-border))',
ring: 'hsl(var(--sidebar-ring))'
}
},
borderRadius: {
lg: 'var(--radius)',
md: 'calc(var(--radius) - 2px)',
sm: 'calc(var(--radius) - 4px)'
},
keyframes: {
'accordion-down': {
from: {
height: '0'
},
to: {
height: 'var(--radix-accordion-content-height)'
}
},
'accordion-up': {
from: {
height: 'var(--radix-accordion-content-height)'
},
to: {
height: '0'
}
}
},
animation: {
'accordion-down': 'accordion-down 0.2s ease-out',
'accordion-up': 'accordion-up 0.2s ease-out'
}
}
container: {
center: true,
padding: '2rem',
screens: {
'2xl': '1400px',
},
},
},
plugins: [tan, uploadthingPlugin],
} satisfies Config
plugins: [uploadthingPlugin],
} satisfies Config;
export default config
export default config;

View File

@@ -61,6 +61,10 @@ services:
build:
context: .
dockerfile: docker/mediamtx/Dockerfile
environment:
SSL_CERT_FILE: /etc/ssl/certs/ca-certificates.crt
MTX_AUTHHTTPADDRESS: ${MEDIAMTX_AUTH_HTTP_ADDRESS:-http://hctv:3000/api/mediamtx/publish}
MTX_WEBRTCADDITIONALHOSTS: ${MEDIAMTX_WEBRTC_ADDITIONAL_HOSTS:-}
ports:
- '8890:8890/udp'
postgres-exporter:
@@ -72,16 +76,15 @@ services:
environment:
REDIS_ADDR: 'redis://redis:6379'
prometheus:
image: 'prom/prometheus:v3.4.2'
image: 'prom/prometheus:v3.12.0'
command:
- '--config.file=/etc/prometheus/prometheus.yml'
- '--config.expand-env'
- '--storage.tsdb.path=/prometheus'
- '--web.enable-lifecycle'
env_file:
- .env
volumes:
- './observability/prometheus.yml:/etc/prometheus/prometheus.yml:ro'
- './observability/web_username:/etc/prometheus/web_username'
- './observability/web_password:/etc/prometheus/web_password'
- 'hctv_prometheus_data:/prometheus'
extra_hosts:
- 'host.docker.internal:host-gateway'

View File

@@ -28,6 +28,7 @@ services:
ports:
- 8890:8890/udp
- 8891:8888
- 8889:8889
- 9997:9997
- 9998:9998
volumes:
@@ -35,7 +36,7 @@ services:
extra_hosts:
- 'host.docker.internal:host-gateway'
prometheus:
image: prom/prometheus:v3.4.2
image: prom/prometheus:v3.12.0
command:
- --config.file=/etc/prometheus/prometheus.yml
- --storage.tsdb.path=/prometheus

View File

@@ -11,6 +11,8 @@ hlsSegmentDuration: 2s
hlsPartDuration: 500ms
hlsSegmentCount: 10
webrtc: yes
authMethod: http
authHTTPAddress: http://host.docker.internal:3000/api/mediamtx/publish

View File

@@ -1,6 +1,8 @@
FROM bluenviron/mediamtx:1 AS mediamtx
FROM ubuntu:24.04
FROM alpine:3.21
RUN apk add --no-cache ca-certificates
COPY --from=mediamtx /mediamtx /
COPY ./docker/mediamtx/mediamtx.yml /mediamtx.yml

View File

@@ -11,9 +11,15 @@ hlsSegmentDuration: 2s
hlsPartDuration: 1s
hlsSegmentCount: 10
webrtc: yes
webrtcAddress: :8889
webrtcLocalUDPAddress: :8189
webrtcAdditionalHosts: []
authMethod: http
authHTTPAddress: http://hctv:3000/api/mediamtx/publish
authHTTPAddress: https://hackclub.tv/api/mediamtx/publish
api: yes
apiAddress: 0.0.0.0:9997
metrics: yes
metricsAddress: :9998

View File

@@ -0,0 +1,13 @@
ACME_EMAIL=ops@hackclub.tv
CF_DNS_API_TOKEN=cloudflare_dns_edit_token
# public hostnames and stuff
MEDIAMTX_HLS_HOST=hls.hackclub.tv
MEDIAMTX_WEBRTC_HOST=whip.hackclub.tv
MEDIAMTX_API_HOST=mmtxapi.hackclub.tv
# public ip for webrtc stuff
MEDIAMTX_WEBRTC_ADDITIONAL_HOSTS=203.0.113.10
MEDIAMTX_AUTH_HTTP_ADDRESS=https://hackclub.tv/api/mediamtx/publish
MEDIAMTX_AUTH_HTTP_FINGERPRINT=

View File

@@ -0,0 +1,68 @@
services:
traefik:
image: traefik:latest
command:
- --providers.docker=true
- --providers.docker.exposedbydefault=false
- --entrypoints.web.address=:80
- --entrypoints.websecure.address=:443
- --entrypoints.srt.address=:8890/udp
- --entrypoints.webrtc-ice.address=:8189/udp
- --certificatesresolvers.letsencrypt.acme.email=${ACME_EMAIL}
- --certificatesresolvers.letsencrypt.acme.storage=/letsencrypt/acme.json
- --certificatesresolvers.letsencrypt.acme.dnschallenge=true
- --certificatesresolvers.letsencrypt.acme.dnschallenge.provider=cloudflare
- --certificatesresolvers.letsencrypt.acme.dnschallenge.resolvers=1.1.1.1:53,1.0.0.1:53
environment:
CF_DNS_API_TOKEN: ${CF_DNS_API_TOKEN}
ports:
- 80:80
- 443:443
- 8890:8890/udp
- 8189:8189/udp
volumes:
- /var/run/docker.sock:/var/run/docker.sock:ro
- letsencrypt:/letsencrypt
restart: unless-stopped
mediamtx:
image: srizan10/hclive-mediamtx
volumes:
- ./mediamtx.yml:/mediamtx.yml:ro
environment:
SSL_CERT_FILE: /etc/ssl/certs/ca-certificates.crt
MTX_WEBRTCADDITIONALHOSTS: ${MEDIAMTX_WEBRTC_ADDITIONAL_HOSTS}
MTX_AUTHHTTPADDRESS: ${MEDIAMTX_AUTH_HTTP_ADDRESS}
MTX_AUTHHTTPFINGERPRINT: ${MEDIAMTX_AUTH_HTTP_FINGERPRINT:-}
labels:
- traefik.enable=true
- traefik.http.routers.mediamtx-hls.rule=Host(`${MEDIAMTX_HLS_HOST}`)
- traefik.http.routers.mediamtx-hls.entrypoints=websecure
- traefik.http.routers.mediamtx-hls.tls.certresolver=letsencrypt
- traefik.http.routers.mediamtx-hls.service=mediamtx-hls
- traefik.http.services.mediamtx-hls.loadbalancer.server.port=8888
- traefik.http.routers.mediamtx-webrtc.rule=Host(`${MEDIAMTX_WEBRTC_HOST}`)
- traefik.http.routers.mediamtx-webrtc.entrypoints=websecure
- traefik.http.routers.mediamtx-webrtc.tls.certresolver=letsencrypt
- traefik.http.routers.mediamtx-webrtc.service=mediamtx-webrtc
- traefik.http.services.mediamtx-webrtc.loadbalancer.server.port=8889
- traefik.http.routers.mediamtx-api.rule=Host(`${MEDIAMTX_API_HOST}`)
- traefik.http.routers.mediamtx-api.entrypoints=websecure
- traefik.http.routers.mediamtx-api.tls.certresolver=letsencrypt
- traefik.http.routers.mediamtx-api.service=mediamtx-api
- traefik.http.services.mediamtx-api.loadbalancer.server.port=9997
- traefik.udp.routers.mediamtx-srt.entrypoints=srt
- traefik.udp.routers.mediamtx-srt.service=mediamtx-srt
- traefik.udp.services.mediamtx-srt.loadbalancer.server.port=8890
- traefik.udp.routers.mediamtx-webrtc-ice.entrypoints=webrtc-ice
- traefik.udp.routers.mediamtx-webrtc-ice.service=mediamtx-webrtc-ice
- traefik.udp.services.mediamtx-webrtc-ice.loadbalancer.server.port=8189
restart: unless-stopped
volumes:
letsencrypt:

View File

@@ -0,0 +1,26 @@
paths:
all:
source: publisher
srt: yes
srtAddress: :8890
hls: yes
hlsVariant: lowLatency
hlsSegmentDuration: 2s
hlsPartDuration: 1s
hlsSegmentCount: 10
webrtc: yes
webrtcAddress: :8889
webrtcLocalUDPAddress: :8189
webrtcAdditionalHosts: []
authMethod: http
authHTTPAddress: https://hackclub.tv/api/mediamtx/publish
api: yes
apiAddress: :9997
metrics: yes
metricsAddress: :9998

View File

@@ -6,8 +6,8 @@ scrape_configs:
- job_name: web
metrics_path: /api/metrics
basic_auth:
username: ${METRICS_USER}
password: ${METRICS_PASS}
username: prometheus
password_file: /etc/prometheus/web_password
static_configs:
- targets:
- hctv:3000
@@ -15,8 +15,8 @@ scrape_configs:
- job_name: chat
metrics_path: /metrics
basic_auth:
username: ${METRICS_USER}
password: ${METRICS_PASS}
username: prometheus
password_file: /etc/prometheus/web_password
static_configs:
- targets:
- chat:8000

View File

@@ -15,6 +15,7 @@
"docker:chat": "dotenvx run -f .env.docker -- docker buildx build --platform linux/amd64 -f apps/chat/Dockerfile . --secret id=TURBO_TOKEN,env=TURBO_TOKEN --secret id=TURBO_TEAM,env=TURBO_TEAM --no-cache",
"act": "act --secret-file .env.ci",
"db:migrate": "pnpm --filter=@hctv/db db:migrate",
"db:studio": "pnpm --filter=@hctv/db db:studio",
"ui:add": "pnpm --filter=@hctv/web ui:add",
"prisma": "pnpm --filter=@hctv/db prisma",
"r:rtmp": "docker compose -f dev/docker-compose.yml restart nginx-rtmp -t 0",
@@ -22,8 +23,8 @@
"sdk:example": "dotenvx run -f .env.sdk -- pnpm --filter=@hctv/sdk example"
},
"devDependencies": {
"prettier": "^3.6.2",
"turbo": "^2.4.4"
"prettier": "^3.8.3",
"turbo": "^2.9.7"
},
"packageManager": "pnpm@10.6.5"
}

View File

@@ -20,6 +20,6 @@
"lucia": "^3.2.2"
},
"devDependencies": {
"typescript": "^5.8.2"
"typescript": "^6.0.3"
}
}

View File

@@ -10,9 +10,9 @@ export const hackClub = new OAuth2Client(
process.env.HCID_REDIRECT_URI!
);
export const HCID_AUTH_URL = "https://auth.hackclub.com/oauth/authorize";
export const HCID_TOKEN_URL = "https://auth.hackclub.com/oauth/token";
export const HCID_USER_INFO_URL = "https://auth.hackclub.com/api/v1/me";
export const HCID_AUTH_URL = 'https://auth.hackclub.com/oauth/authorize';
export const HCID_TOKEN_URL = 'https://auth.hackclub.com/oauth/token';
export const HCID_USER_INFO_URL = 'https://auth.hackclub.com/api/v1/me';
export const lucia = new Lucia(adapter, {
sessionCookie: {
@@ -29,6 +29,9 @@ export const lucia = new Lucia(adapter, {
slack_id: attributes.slack_id,
email: attributes.email,
pfpUrl: attributes.pfpUrl,
hackClubVerificationResult: attributes.hackClubVerificationResult,
hackClubVerificationCheckedAt: attributes.hackClubVerificationCheckedAt,
bypassVerification: attributes.bypassVerification,
hasOnboarded: attributes.hasOnboarded,
personalChannelId: attributes.personalChannelId,
isAdmin: attributes.isAdmin,
@@ -47,6 +50,9 @@ interface DatabaseUserAttributes {
slack_id: string;
email: string | null;
pfpUrl: string;
hackClubVerificationResult: string | null;
hackClubVerificationCheckedAt: Date | null;
bypassVerification: boolean;
hasOnboarded: boolean;
personalChannelId: string | null;
isAdmin: boolean;

View File

@@ -3,6 +3,7 @@
"target": "ESNext",
"module": "NodeNext",
"moduleResolution": "nodenext",
"ignoreDeprecations": "6.0",
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"strict": true,
@@ -15,4 +16,4 @@
},
"include": ["src/**/*"],
"exclude": ["node_modules", "dist"]
}
}

View File

@@ -18,11 +18,14 @@
"db:generate": "prisma generate",
"db:migrate": "prisma migrate dev",
"db:deploy": "prisma migrate deploy",
"db:populate-verification": "tsx src/populateHackClubVerification.ts",
"db:studio": "prisma studio",
"build": "prisma generate && tsc --build",
"dev": "tsc --watch --preserveWatchOutput"
},
"devDependencies": {
"@types/node": "^24.0.1",
"typescript": "^5.8.2"
"tsx": "^4.7.1",
"typescript": "^6.0.3"
}
}
}

View File

@@ -0,0 +1,4 @@
-- AlterTable
ALTER TABLE "User"
ADD COLUMN "hackClubVerificationCheckedAt" TIMESTAMP(3),
ADD COLUMN "hackClubVerificationResult" TEXT;

View File

@@ -0,0 +1,2 @@
-- AlterTable
ALTER TABLE "User" ADD COLUMN "bypassVerification" BOOLEAN NOT NULL DEFAULT false;

View File

@@ -0,0 +1,10 @@
-- AlterEnum
-- This migration adds more than one value to an enum.
-- With PostgreSQL versions 11 and earlier, this is not possible
-- in a single migration. This can be worked around by creating
-- multiple migrations, each migration adding only one value to
-- the enum.
ALTER TYPE "AdminAuditAction" ADD VALUE 'BYPASS_VERIFICATION_ENABLED';
ALTER TYPE "AdminAuditAction" ADD VALUE 'BYPASS_VERIFICATION_DISABLED';

Some files were not shown because too many files have changed in this diff Show More