Compare commits
No commits in common. "main" and "bugfix/video-handling-in-reply" have entirely different histories.
main
...
bugfix/vid
@ -6,6 +6,7 @@ import uuid
|
||||
import signal
|
||||
from datetime import datetime
|
||||
from contextlib import asynccontextmanager
|
||||
import aiohttp_debugtoolbar
|
||||
|
||||
from snek import snode
|
||||
from snek.view.threads import ThreadsView
|
||||
@ -496,6 +497,7 @@ class Application(BaseApplication):
|
||||
raise raised_exception
|
||||
|
||||
app = Application(db_path="sqlite:///snek.db")
|
||||
#aiohttp_debugtoolbar.setup(app)
|
||||
|
||||
|
||||
async def main():
|
||||
|
||||
@ -407,48 +407,34 @@ a {
|
||||
width: 250px;
|
||||
padding-left: 20px;
|
||||
padding-right: 20px;
|
||||
padding-top: 20px;
|
||||
padding-top: 10px;
|
||||
overflow-y: auto;
|
||||
grid-area: sidebar;
|
||||
}
|
||||
|
||||
.sidebar h2 {
|
||||
color: #f05a28;
|
||||
font-size: 0.75em;
|
||||
font-weight: 600;
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 0.5px;
|
||||
margin-bottom: 10px;
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
.sidebar h2:first-child {
|
||||
margin-top: 0;
|
||||
font-size: 1.2em;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.sidebar ul {
|
||||
list-style: none;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
.sidebar ul li {
|
||||
margin-bottom: 4px;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
.sidebar ul li a {
|
||||
color: #ccc;
|
||||
text-decoration: none;
|
||||
font-size: 0.9em;
|
||||
font-size: 1em;
|
||||
transition: color 0.3s;
|
||||
display: block;
|
||||
padding: 4px 8px;
|
||||
border-radius: 4px;
|
||||
transition: background-color 0.2s, color 0.2s;
|
||||
}
|
||||
|
||||
.sidebar ul li a:hover {
|
||||
color: #fff;
|
||||
background-color: rgba(255, 255, 255, 0.05);
|
||||
}
|
||||
|
||||
@keyframes glow {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{% extends "app.html" %}
|
||||
|
||||
{% block header_text %}<h2 style="color:#fff">{{ name }}</h2>{% endblock %}
|
||||
{% block header_text %}<h2 style="color:#fff">{{ name }}</h2>{% endblock %}
|
||||
|
||||
{% block main %}
|
||||
{% include "channel.html" %}
|
||||
@ -8,11 +8,11 @@
|
||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/xterm/css/xterm.css">
|
||||
<script src="https://cdn.jsdelivr.net/npm/xterm/lib/xterm.js"></script>
|
||||
<script src="https://cdn.jsdelivr.net/npm/xterm-addon-fit/lib/xterm-addon-fit.js"></script>
|
||||
|
||||
|
||||
<div id="terminal" class="hidden"></div>
|
||||
<message-list class="chat-messages">
|
||||
{% if not messages %}
|
||||
|
||||
|
||||
<div>
|
||||
<h1>Welcome to your new channel!</h1>
|
||||
<p>This is the start of something great. Use the commands below to get started:</p>
|
||||
@ -37,9 +37,10 @@
|
||||
{% include "dialog_help.html" %}
|
||||
{% include "dialog_online.html" %}
|
||||
<script type="module">
|
||||
import {app} from "/app.js";
|
||||
import { app } from "/app.js";
|
||||
import { Schedule } from "/schedule.js";
|
||||
|
||||
// --- Cache selectors ---
|
||||
// --- Cache selectors ---
|
||||
const chatInputField = document.querySelector("chat-input");
|
||||
const messagesContainer = document.querySelector(".chat-messages");
|
||||
const chatArea = document.querySelector(".chat-area");
|
||||
@ -51,7 +52,7 @@ chatInputField.autoCompletions = {
|
||||
"/clear": () => { messagesContainer.innerHTML = ''; },
|
||||
"/live": () => { chatInputField.liveType = !chatInputField.liveType; },
|
||||
"/help": showHelp,
|
||||
"/container": async() =>{
|
||||
"/container": async() =>{
|
||||
containerDialog.openWithStatus()
|
||||
}
|
||||
};
|
||||
@ -98,61 +99,21 @@ setInterval(() => requestIdleCallback(updateTimes), 30000);
|
||||
|
||||
// --- Paste & drag/drop uploads ---
|
||||
const textBox = chatInputField.textarea;
|
||||
|
||||
function uploadDataTransfer(dt) {
|
||||
if (dt.items.length > 0) {
|
||||
const uploadButton = chatInputField.fileUploadGrid;
|
||||
|
||||
for (const item of dt.items) {
|
||||
if (item.kind === "file") {
|
||||
const file = item.getAsFile();
|
||||
if (file) {
|
||||
uploadButton.uploadsStarted++
|
||||
uploadButton.createTile(file)
|
||||
} else {
|
||||
console.error("Failed to get file from DataTransferItem");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
textBox.addEventListener("paste", async (e) => {
|
||||
try {
|
||||
console.log("Pasted data:", e.clipboardData);
|
||||
if (e.clipboardData.types.every(v => v.startsWith("text/"))) {
|
||||
const codeType = e.clipboardData.types.find(t => !t.startsWith('text/plain') && !t.startsWith('text/html') && !t.startsWith('text/rtf'));
|
||||
const probablyCode = codeType ||e.clipboardData.types.some(t => !t.startsWith('text/plain'));
|
||||
for (const item of e.clipboardData.items) {
|
||||
if (item.kind === "string" && item.type === "text/plain") {
|
||||
e.preventDefault();
|
||||
item.getAsString(text => {
|
||||
const value = chatInputField.value;
|
||||
if (probablyCode) {
|
||||
let code = text;
|
||||
const minIndentDepth = code.split('\n').reduce((acc, line) => {
|
||||
if (!line.trim()) return acc;
|
||||
const match = line.match(/^(\s*)/);
|
||||
return match ? Math.min(acc, match[1].length) : acc;
|
||||
}, 9000);
|
||||
code = code.split('\n').map(line => line.slice(minIndentDepth)).join('\n')
|
||||
text = `\`\`\`${codeType?.split('/')?.[1] ?? ''}\n${code}\n\`\`\`\n`;
|
||||
}
|
||||
const area = chatInputField.textarea
|
||||
if(area){
|
||||
const start = area.selectionStart
|
||||
|
||||
if ("\n" !== value[start - 1]) {
|
||||
text = `\n${text}`;
|
||||
}
|
||||
|
||||
document.execCommand('insertText', false, text);
|
||||
}
|
||||
});
|
||||
break;
|
||||
}
|
||||
const clipboardItems = await navigator.clipboard.read();
|
||||
const dt = new DataTransfer();
|
||||
for (const item of clipboardItems) {
|
||||
for (const type of item.types.filter(t => !t.startsWith('text/'))) {
|
||||
const blob = await item.getType(type);
|
||||
dt.items.add(new File([blob], "image.png", { type }));
|
||||
}
|
||||
} else {
|
||||
uploadDataTransfer(e.clipboardData);
|
||||
}
|
||||
if (dt.items.length > 0) {
|
||||
const uploadButton = chatInputField.uploadButton;
|
||||
const input = uploadButton.shadowRoot.querySelector('.file-input');
|
||||
input.files = dt.files;
|
||||
await uploadButton.uploadFiles();
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("Failed to read clipboard contents: ", error);
|
||||
@ -160,7 +121,13 @@ textBox.addEventListener("paste", async (e) => {
|
||||
});
|
||||
chatArea.addEventListener("drop", async (e) => {
|
||||
e.preventDefault();
|
||||
uploadDataTransfer(e.dataTransfer);
|
||||
const dt = e.dataTransfer;
|
||||
if (dt.items.length > 0) {
|
||||
const uploadButton = chatInputField.uploadButton;
|
||||
const input = uploadButton.shadowRoot.querySelector('.file-input');
|
||||
input.files = dt.files;
|
||||
await uploadButton.uploadFiles();
|
||||
}
|
||||
});
|
||||
chatArea.addEventListener("dragover", e => {
|
||||
e.preventDefault();
|
||||
@ -213,7 +180,7 @@ app.ws.addEventListener("starfield.render_word", (data) => {
|
||||
|
||||
// --- Channel message event ---
|
||||
app.addEventListener("channel-message", (data) => {
|
||||
|
||||
|
||||
let display = data.text && data.text.trim() ? 'block' : 'none';
|
||||
|
||||
if (data.channel_uid !== channelUid) {
|
||||
@ -254,7 +221,7 @@ document.addEventListener('keydown', function(event) {
|
||||
clearTimeout(keyTimeout);
|
||||
keyTimeout = setTimeout(() => { gPressCount = 0; }, 300);
|
||||
if (gPressCount === 2) {
|
||||
gPressCount = 0;
|
||||
gPressCount = 0;
|
||||
messagesContainer.lastElementChild?.scrollIntoView({ block: "end", inline: "nearest" });
|
||||
loadExtra();
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user