Merge branch 'main' into remaining

src/classes/extension.ts

@@ -5,6 +5,7 @@ import { unpack } from "../util.ts"
 export abstract class ExtensionBase implements Extension {
     admin_only = false
     tables = false
+    disabled = false
     initialized_deps: DependencyMap = new DependencyMapImpl()
     name: Extension['name'] = "default_name"
     title: Extension['title'] = "Default Title"

src/extensions/chat/index.html

@@ -2,6 +2,9 @@
 
 {% block head %}
     <link href="/chat/index.css" rel="stylesheet">
+    <script>
+        var dicebear_host = "{{dicebear_host}}"
+    </script>
     <script src="/chat/chat.js"></script>
 {% endblock %}
 

src/extensions/chat/index.ts

@@ -14,7 +14,7 @@ export default class extends ExtensionBase {
         async push(ctx: Context, content: string, knex : Knex){
             const message: message = {
                 name: ctx.context.user?.name,
-                pfp_code: `${ctx.context.dicebear_host}?${ctx.context.user?.pfp_code}`,
+                pfp_code: ctx.context.user?.pfp_code,
                 created_at: (new Date()).toLocaleTimeString('en-US', {hour12: false}),
                 content,
             }

src/extensions/chat/static/chat.js

@@ -31,7 +31,7 @@ function addMessage(msg) {
     }
     const row = messages.insertRow(-1)
     const img_col = row.insertCell(-1)
-    img_col.innerHTML = '<img src="'+msg.pfp_code+'" class="pfp">'
+    img_col.innerHTML = `<img src="${dicebear_host}?${msg.pfp_code}" class="pfp">`
     const col = row.insertCell(-1)
     const info_col = col.appendChild(document.createElement('div'))
     info_col.appendChild(field(msg.name))

src/extensions/invite/static/index.css

@@ -3,6 +3,7 @@ table {
     margin: 2%;
     padding-bottom: 5%;
     text-align: center;
+    font-size: smaller;
 }
 
 table th, td{

src/extensions/minecraft/index.html

@@ -0,0 +1,4 @@
+{% extends "extension.html" %}
+
+{% block body %}
+{% endblock %}

src/extensions/minecraft/index.ts

@@ -0,0 +1,21 @@
+import { ExtensionBase } from "../../modules.js"
+
+export default class extends ExtensionBase {
+    override name = 'minecraft'
+    override title = 'Minecraft'
+
+    override init: Extension['init'] = async (context) => {
+        return ExtensionBase.init(this, context)
+    }
+
+    override handle: Extension['handle'] = (ctx) => {
+        var location = ctx.path.shift()
+
+        switch (location) {
+            case '':
+            case undefined: {
+                return this.return_html(ctx, 'index')
+            }
+        }
+    }
+}

src/extensions/minecraft/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "minecraft",
+  "version": "0.0.1",
+  "type": "module",
+  "dependencies": {
+    "rcon-srcds": "2.1.0"
+  }
+}

src/extensions/profile/index.ts

@@ -6,6 +6,7 @@ export default class extends ExtensionBase {
     override name = 'profile'
     override title = 'Network'
     override tables = true
+    override disabled = true
     wg: any = null
     wg_config: any = null
 

src/extensions/webrtc/package.json

@@ -1,11 +1,7 @@
 {
   "name": "webrtc",
   "version": "0.0.1",
-  "description": "",
   "type": "module",
-  "scripts": {
-    "start": "node server"
-  },
   "dependencies": {
     "socket.io": "4.7.5"
   }

src/extman.ts

@@ -18,6 +18,9 @@ export async function load(modules: any, namespace: string, knex: Knex): Promise
     }
 
     let ext = new (await import(`./extensions/${namespace}/index`)).default as Extension
+    if (ext.disabled)
+        return null
+
     let status = ext.init(context)
 
     if (status instanceof Promise)

src/handle.ts

@@ -26,6 +26,9 @@ export default class implements Handle {
             if (path != 'root') {
                 try {
                     let extension = await load(modules, path, knex) as Extension
+                    if (extension == null) {
+                        continue
+                    }
                     if (extension.admin_only) {
                         this.admin_extensions.set(extension.name, extension)
                     }

types/classes/extension.d.ts

@@ -1,6 +1,7 @@
 declare interface Extension {
     admin_only: boolean
     tables: boolean
+    disabled: boolean
 
     name: string
     title: string