diff --git a/src/index.js b/src/index.js index d8b7b80..ca9b1a8 100644 --- a/src/index.js +++ b/src/index.js @@ -1,7 +1,6 @@ const {Client, Collection, Channel, Permission} = require("@projectdysnomia/dysnomia"); const fs = require("node:fs"); const {resolve} = require("node:path"); -const dns = require("node:dns"); const sqlite3 = require("sqlite3"); const {instead, before} = require("@marshift/strawberry"); @@ -253,13 +252,6 @@ instead(bot.shards, "spawn", function (args, orig) { return ret; }); -before(dns, "lookup", (args) => { - if (args[0].includes(".discord.media")) { - if (args[1] == null) args[1] = {}; - args[1].family = 6; - } -}); - process.title = `HiddenPhox`; bot.connect(); diff --git a/src/modules/fedimbed.js b/src/modules/fedimbed.js index 9519b56..902d9e0 100644 --- a/src/modules/fedimbed.js +++ b/src/modules/fedimbed.js @@ -1019,6 +1019,7 @@ async function processUrl(msg, url, spoiler = false, command = false, inQuote = if (platform == "Nitter") { if (!OWN_TW_DOMAINS.includes(hostname)) logger.info("fedimbed", `Got new Nitter domain running fork: ${hostname}`); + if (url.endsWith(".mp4")) return {}; if (canTwitter === false) return {}; } } diff --git a/src/modules/misc/chatsounds.js b/src/modules/misc/chatsounds.js index de68973..0fba76d 100644 --- a/src/modules/misc/chatsounds.js +++ b/src/modules/misc/chatsounds.js @@ -6,19 +6,23 @@ const {default: Chatsounds, defaultModifiers} = require("sh"); const sh = new Chatsounds({modifiers: defaultModifiers, gitHubToken: hf.apikeys.github}); (async () => { - await sh.useSourcesFromGitHubMsgPack("PAC3-Server/chatsounds-valve-games", "master", "csgo"); - await sh.useSourcesFromGitHubMsgPack("PAC3-Server/chatsounds-valve-games", "master", "css"); - await sh.useSourcesFromGitHubMsgPack("PAC3-Server/chatsounds-valve-games", "master", "ep1"); - await sh.useSourcesFromGitHubMsgPack("PAC3-Server/chatsounds-valve-games", "master", "ep2"); - await sh.useSourcesFromGitHubMsgPack("PAC3-Server/chatsounds-valve-games", "master", "hl1"); - await sh.useSourcesFromGitHubMsgPack("PAC3-Server/chatsounds-valve-games", "master", "hl2"); - await sh.useSourcesFromGitHubMsgPack("PAC3-Server/chatsounds-valve-games", "master", "l4d"); - await sh.useSourcesFromGitHubMsgPack("PAC3-Server/chatsounds-valve-games", "master", "l4d2"); - await sh.useSourcesFromGitHubMsgPack("PAC3-Server/chatsounds-valve-games", "master", "portal"); - await sh.useSourcesFromGitHubMsgPack("PAC3-Server/chatsounds-valve-games", "master", "tf2"); - await sh.useSourcesFromGitHub("PAC3-Server/chatsounds", "master", "sounds/chatsounds"); - await sh.useSourcesFromGitHub("Metastruct/garrysmod-chatsounds", "master", "sound/chatsounds/autoadd"); - sh.mergeSources(); + try { + await sh.useSourcesFromGitHubMsgPack("PAC3-Server/chatsounds-valve-games", "master", "csgo"); + await sh.useSourcesFromGitHubMsgPack("PAC3-Server/chatsounds-valve-games", "master", "css"); + await sh.useSourcesFromGitHubMsgPack("PAC3-Server/chatsounds-valve-games", "master", "ep1"); + await sh.useSourcesFromGitHubMsgPack("PAC3-Server/chatsounds-valve-games", "master", "ep2"); + await sh.useSourcesFromGitHubMsgPack("PAC3-Server/chatsounds-valve-games", "master", "hl1"); + await sh.useSourcesFromGitHubMsgPack("PAC3-Server/chatsounds-valve-games", "master", "hl2"); + await sh.useSourcesFromGitHubMsgPack("PAC3-Server/chatsounds-valve-games", "master", "l4d"); + await sh.useSourcesFromGitHubMsgPack("PAC3-Server/chatsounds-valve-games", "master", "l4d2"); + await sh.useSourcesFromGitHubMsgPack("PAC3-Server/chatsounds-valve-games", "master", "portal"); + await sh.useSourcesFromGitHubMsgPack("PAC3-Server/chatsounds-valve-games", "master", "tf2"); + await sh.useSourcesFromGitHub("PAC3-Server/chatsounds", "master", "sounds/chatsounds"); + await sh.useSourcesFromGitHub("Metastruct/garrysmod-chatsounds", "master", "sound/chatsounds/autoadd"); + sh.mergeSources(); + } catch { + // noop + } })(); const chatsounds = new Command("chatsounds"); diff --git a/src/modules/music.js b/src/modules/music.js index 9e769a5..3e7880e 100644 --- a/src/modules/music.js +++ b/src/modules/music.js @@ -314,6 +314,11 @@ async function enqueue({guild_id, voice_id, text_id, url, type, addedBy, suppres info.tags.ALBUM_ARTIST ?? "" } - ${info.tags.title ?? info.tags.TITLE ?? ""}`; + + if (title == " - ") { + const urlObj = new URL(url); + title = urlObj.pathname.substring(urlObj.pathname.lastIndexOf("/") + 1); + } } length = info.duration ? Math.floor(info.duration) * 1000 : 0;