Compare commits

..

No commits in common. "2cfde1001e4ddba322af394768df979d717648ea" and "207491583051516bb0a63c6b34018a50cfb04599" have entirely different histories.

19 changed files with 20 additions and 4740 deletions

BIN
bun.lockb

Binary file not shown.

13
config/bots.yml Normal file
View File

@ -0,0 +1,13 @@
# - uri: wss://mppclone.com:8443
# channel:
# id: "✧𝓓𝓔𝓥 𝓡𝓸𝓸𝓶✧"
# allowColorChanging: true
# - uri: wss://mppclone.com:8443
# channel:
# id: "test/fishing"
# allowColorChanging: true
- uri: wss://mppclone.com:8443
channel:
id: "keller room"
allowColorChanging: true

View File

@ -1,8 +0,0 @@
- uri: wss://mppclone.com:8443
channel:
id: "✧𝓓𝓔𝓥 𝓡𝓸𝓸𝓶✧"
allowColorChanging: true
- uri: wss://mppclone.com:8443
channel:
id: "test/fishing"
allowColorChanging: true

View File

@ -4,25 +4,24 @@
"type": "module",
"scripts": {
"start": "bun .",
"start-bot": "bun src/mpp/index.ts",
"start-discord": "bun src/discord/index.ts"
"start-bot": "bun src/mpp/index.ts"
},
"devDependencies": {
"@types/bun": "^1.1.6"
"@types/bun": "^1.1.3"
},
"peerDependencies": {
"typescript": "^5.3.3"
},
"dependencies": {
"@prisma/client": "^5.16.1",
"@prisma/client": "^5.15.0",
"@trpc/client": "next",
"@trpc/server": "next",
"@types/node": "^20.14.10",
"@types/node": "^20.14.2",
"cli-markdown": "^3.4.0",
"discord.js": "^14.15.3",
"mpp-client-net": "^1.2.0",
"prisma": "^5.16.1",
"trpc-bun-adapter": "^1.1.1",
"prisma": "^5.15.0",
"trpc-bun-adapter": "^1.1.0",
"yaml": "^2.4.5",
"zod": "^3.23.8"
}

24
site/.gitignore vendored
View File

@ -1,24 +0,0 @@
# build output
dist/
# generated types
.astro/
# dependencies
node_modules/
# logs
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
# environment variables
.env
.env.production
# macOS-specific files
.DS_Store
# jetbrains setting folder
.idea/

View File

@ -1,4 +0,0 @@
{
"recommendations": ["astro-build.astro-vscode"],
"unwantedRecommendations": []
}

View File

@ -1,11 +0,0 @@
{
"version": "0.2.0",
"configurations": [
{
"command": "./node_modules/.bin/astro dev",
"name": "Development server",
"request": "launch",
"type": "node-terminal"
}
]
}

View File

@ -1,54 +0,0 @@
# Astro Starter Kit: Basics
```sh
npm create astro@latest -- --template basics
```
[![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/withastro/astro/tree/latest/examples/basics)
[![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/p/sandbox/github/withastro/astro/tree/latest/examples/basics)
[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/withastro/astro?devcontainer_path=.devcontainer/basics/devcontainer.json)
> 🧑‍🚀 **Seasoned astronaut?** Delete this file. Have fun!
![just-the-basics](https://github.com/withastro/astro/assets/2244813/a0a5533c-a856-4198-8470-2d67b1d7c554)
## 🚀 Project Structure
Inside of your Astro project, you'll see the following folders and files:
```text
/
├── public/
│ └── favicon.svg
├── src/
│ ├── components/
│ │ └── Card.astro
│ ├── layouts/
│ │ └── Layout.astro
│ └── pages/
│ └── index.astro
└── package.json
```
Astro looks for `.astro` or `.md` files in the `src/pages/` directory. Each page is exposed as a route based on its file name.
There's nothing special about `src/components/`, but that's where we like to put any Astro/React/Vue/Svelte/Preact components.
Any static assets, like images, can be placed in the `public/` directory.
## 🧞 Commands
All commands are run from the root of the project, from a terminal:
| Command | Action |
| :------------------------ | :----------------------------------------------- |
| `npm install` | Installs dependencies |
| `npm run dev` | Starts local dev server at `localhost:4321` |
| `npm run build` | Build your production site to `./dist/` |
| `npm run preview` | Preview your build locally, before deploying |
| `npm run astro ...` | Run CLI commands like `astro add`, `astro check` |
| `npm run astro -- --help` | Get help using the Astro CLI |
## 👀 Want to learn more?
Feel free to check [our documentation](https://docs.astro.build) or jump into our [Discord server](https://astro.build/chat).

View File

@ -1,8 +0,0 @@
import { defineConfig } from 'astro/config';
import tailwind from "@astrojs/tailwind";
// https://astro.build/config
export default defineConfig({
integrations: [tailwind()]
});

View File

@ -1,19 +0,0 @@
{
"name": "site",
"type": "module",
"version": "0.0.1",
"scripts": {
"dev": "astro dev",
"start": "astro dev",
"build": "astro check && astro build",
"preview": "astro preview",
"astro": "astro"
},
"dependencies": {
"@astrojs/check": "^0.7.0",
"@astrojs/tailwind": "^5.1.0",
"astro": "^4.10.2",
"tailwindcss": "^3.4.4",
"typescript": "^5.4.5"
}
}

File diff suppressed because it is too large Load Diff

View File

@ -1,9 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 128 128">
<path d="M50.4 78.5a75.1 75.1 0 0 0-28.5 6.9l24.2-65.7c.7-2 1.9-3.2 3.4-3.2h29c1.5 0 2.7 1.2 3.4 3.2l24.2 65.7s-11.6-7-28.5-7L67 45.5c-.4-1.7-1.6-2.8-2.9-2.8-1.3 0-2.5 1.1-2.9 2.7L50.4 78.5Zm-1.1 28.2Zm-4.2-20.2c-2 6.6-.6 15.8 4.2 20.2a17.5 17.5 0 0 1 .2-.7 5.5 5.5 0 0 1 5.7-4.5c2.8.1 4.3 1.5 4.7 4.7.2 1.1.2 2.3.2 3.5v.4c0 2.7.7 5.2 2.2 7.4a13 13 0 0 0 5.7 4.9v-.3l-.2-.3c-1.8-5.6-.5-9.5 4.4-12.8l1.5-1a73 73 0 0 0 3.2-2.2 16 16 0 0 0 6.8-11.4c.3-2 .1-4-.6-6l-.8.6-1.6 1a37 37 0 0 1-22.4 2.7c-5-.7-9.7-2-13.2-6.2Z" />
<style>
path { fill: #000; }
@media (prefers-color-scheme: dark) {
path { fill: #FFF; }
}
</style>
</svg>

Before

Width:  |  Height:  |  Size: 749 B

1
site/src/env.d.ts vendored
View File

@ -1 +0,0 @@
/// <reference types="astro/client" />

View File

@ -1,36 +0,0 @@
---
interface Props {
title: string;
}
const { title } = Astro.props;
---
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="description" content="Astro description" />
<meta name="viewport" content="width=device-width" />
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
<meta name="generator" content={Astro.generator} />
<title>Fishing - {title}</title>
</head>
<body>
<slot />
</body>
</html>
<style>
html, body {
font: 20pt verdana, "DejaVu Sans", sans-serif;
width: 100%;
height: 100%;
color: white;
text-shadow: #444 1px 1px;
}
body {
background: radial-gradient(rgb(115, 179, 204) 0%, rgb(39, 53, 70) 100%);
}
</style>

View File

@ -1,26 +0,0 @@
---
import Layout from "../layouts/Layout.astro";
---
<Layout title="Home">
<main>
<div id="container" class="px-5 py-2 mx-auto w-[60%]">
<h1 class="text-xl">Fishing Bot</h1>
<br />
<div
id="page-content"
class="bg-[#fea] border border-[#fea] p-[10px]"
>
<h2 class="border-b border-[#f84]">Discord</h2>
<p class="text-[14pt] py-2">
Click <a
href="https://discord.gg/HN7UkGnR9h"
class="text-[#f46] hover:text-[#e05] hover:underline"
>here</a
> to join the Discord server!
</p>
</div>
</div>
</main>
</Layout>

View File

@ -1,8 +0,0 @@
/** @type {import('tailwindcss').Config} */
export default {
content: ['./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}'],
theme: {
extend: {},
},
plugins: [],
}

View File

@ -1,3 +0,0 @@
{
"extends": "astro/tsconfigs/strict"
}

View File

@ -51,19 +51,11 @@ export class MPPNetBot {
this.logger.info(
`Received channel update for channel ID "${msg.ch._id}"`
);
if (msg._id !== this.config.channel.id) {
this.client.setChannel(this.config.channel.id);
}
});
this.client.on("a", async msg => {
let prefixes: string[];
if (this.client.channel._id !== this.config.channel.id) {
return;
}
try {
prefixes = await this.trpc.prefixes.query();
} catch (err) {

View File

@ -6,7 +6,7 @@ const logger = new Logger("big brain");
const bots: MPPNetBot[] = [];
const defaults = loadConfig("config/mpp_bots.yml", [
const defaults = loadConfig("config/bots.yml", [
{
uri: "wss://mppclone.com:8443",
channel: {