JonKazama-Hellion/HellionChat
1
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 28 Activity

Adjust emote size and implement load delay

Browse Source
This commit is contained in:
Infi
2024-08-26 00:10:56 +02:00
parent bb3e1fd98b
commit f6ea2c0dd3
3 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChatTwo/Http/Processing.cs
+1 -1
View File
@@ -63,7 +63,7 @@ public class Processing
// The emote name should be safe, it is checked against a list from BTTV. // The emote name should be safe, it is checked against a list from BTTV.
// Still sanitizing it for the extra safety. // Still sanitizing it for the extra safety.
if (image is { Failed: false }) if (image is { Failed: false })
return $"<span style\"height: 1em\"><img src=\"/emote/{Sanitizer.Sanitize(emotePayload.Code)}\"></span>"; return $"<span style=\"zoom:calc(16 * 4 / 3 / 40 * 1.4)\"><img class=\"emote-icon emote-icon-hq\" src=\"/emote/{Sanitizer.Sanitize(emotePayload.Code)}\"></span>";
} }
var colour = text.Foreground; var colour = text.Foreground;
ChatTwo/Http/RouteController.cs
+9 -1
View File
@@ -100,13 +100,21 @@ public class RouteController
var emote = EmoteCache.GetEmote(name); var emote = EmoteCache.GetEmote(name);
if (emote is not { IsLoaded: true }) if (emote is null)
{ {
ctx.Response.StatusCode = 400; ctx.Response.StatusCode = 400;
await ctx.Response.Send("Emote not valid."); await ctx.Response.Send("Emote not valid.");
return; return;
} }
// Wait for the emote to be loaded a maximum of 5 times
var timeout = 5;
while (!emote.IsLoaded && timeout > 0)
{
timeout--;
await Task.Delay(25);
}
ctx.Response.Headers.Add("Cache-Control", "max-age=86400"); ctx.Response.Headers.Add("Cache-Control", "max-age=86400");
await ctx.Response.Send(emote.RawData); await ctx.Response.Send(emote.RawData);
} }
ChatTwo/Http/static/start.js
+8 -1
View File
@@ -180,12 +180,17 @@ async function AddGfdStylesheet(gfdPath, texPath) {
const gfdPromise = LoadGfd(gfdPath); const gfdPromise = LoadGfd(gfdPath);
const texUrl = URL.createObjectURL(await texPromise); const texUrl = URL.createObjectURL(await texPromise);
const gfd = await gfdPromise; const gfd = await gfdPromise;
let width = 0;
let height = 0;
let stylesheets = []; let stylesheets = [];
for (const entry of gfd) { for (const entry of gfd) {
if (entry.width * entry.height <= 0) if (entry.width * entry.height <= 0)
continue; continue;
width = entry.width;
height = entry.height;
if (entry.redirect !== 0) { if (entry.redirect !== 0) {
stylesheets[entry.redirect][0].push(entry.id); stylesheets[entry.redirect][0].push(entry.id);
continue; continue;
@@ -210,7 +215,7 @@ async function AddGfdStylesheet(gfdPath, texPath) {
]; ];
} }
let stylesheet = ".gfd-icon::before { content: ''; display: inline-block; overflow: hidden; vertical-align: top; height:0; }"; let stylesheet = ".gfd-icon::before { content: ''; display: inline-block; overflow: hidden; vertical-align: top; height:0; }\n";
for (const entry of stylesheets) { for (const entry of stylesheets) {
if (!entry) if (!entry)
continue; continue;
@@ -218,6 +223,8 @@ async function AddGfdStylesheet(gfdPath, texPath) {
stylesheet += `\n${entry[0].map(x => `.gfd-icon.gfd-icon-${x}::before`).join(', ')}{${entry[1]};}`; stylesheet += `\n${entry[0].map(x => `.gfd-icon.gfd-icon-${x}::before`).join(', ')}{${entry[1]};}`;
stylesheet += `\n${entry[0].map(x => `.gfd-icon.gfd-icon-hq-${x}::before`).join(', ')}{${entry[2]};}`; stylesheet += `\n${entry[0].map(x => `.gfd-icon.gfd-icon-hq-${x}::before`).join(', ')}{${entry[2]};}`;
} }
stylesheet += "\n.emote-icon { content: ''; display: inline-block; overflow: hidden; vertical-align: top; }";
stylesheet += `\n.emote-icon.emote-icon-hq {width: ${width * 2}px; height: ${height * 2}px; margin-bottom: -40px}`;
const styleNode = document.createElement("style"); const styleNode = document.createElement("style");
styleNode.type = "text/css"; styleNode.type = "text/css";