o7 last-modified

This commit is contained in:
Cynthia Foxwell 2025-04-30 15:52:34 -06:00
parent 79041eee98
commit 70dbc62394
Signed by: Cynosphere
SSH key fingerprint: SHA256:H3SM8ufP/uxqLwKSH7xY89TDnbR9uOHzjLoBr0tlajk
3 changed files with 34 additions and 40 deletions

View file

@ -84,7 +84,7 @@ avatar.callback = async function (msg, line, [user], {server, guild}) {
const normalUrl = normalAvatar ? CDNEndpoints.USER_AVATAR(id, normalAvatar) : defaultAvatar; const normalUrl = normalAvatar ? CDNEndpoints.USER_AVATAR(id, normalAvatar) : defaultAvatar;
const guildUrl = guildAvatar && CDNEndpoints.GUILD_MEMBER_AVATAR(guildObj.id, id, guildAvatar); const guildUrl = guildAvatar && CDNEndpoints.GUILD_MEMBER_AVATAR(guildObj.id, id, guildAvatar);
const res = await fetch(normalUrl, {method: "HEAD"}); /*const res = await fetch(normalUrl, {method: "HEAD"});
const mod = res.headers.get("last-modified"); const mod = res.headers.get("last-modified");
let modStr = ""; let modStr = "";
if (mod && normalUrl != defaultAvatar) { if (mod && normalUrl != defaultAvatar) {
@ -100,10 +100,9 @@ avatar.callback = async function (msg, line, [user], {server, guild}) {
const modDate = Math.floor(new Date(guildMod).getTime() / 1000); const modDate = Math.floor(new Date(guildMod).getTime() / 1000);
modStrGuild = ` \u2022 Updated <t:${modDate}:R>`; modStrGuild = ` \u2022 Updated <t:${modDate}:R>`;
} }
} }*/
baseEmbed.description = baseEmbed.description = `[Normal avatar](${normalUrl})${guildAvatar ? `\n[Guild avatar](${guildUrl})` : ""}`;
`[Normal avatar](${normalUrl})${modStr}` + (guildAvatar ? `\n[Guild avatar](${guildUrl})${modStrGuild}` : "");
baseEmbed.url = normalUrl; baseEmbed.url = normalUrl;
const guildEmbed = {...baseEmbed}; const guildEmbed = {...baseEmbed};

View file

@ -21,19 +21,19 @@ banner.callback = async function (msg, line, [user], {server, guild}) {
const url = CDNEndpoints.BANNER(guildObj.id, guildObj.banner); const url = CDNEndpoints.BANNER(guildObj.id, guildObj.banner);
const res = await fetch(url, {method: "HEAD"}); /*const res = await fetch(url, {method: "HEAD"});
const mod = res.headers.get("last-modified"); const mod = res.headers.get("last-modified");
let description; let description;
if (mod) { if (mod) {
const modDate = Math.floor(new Date(mod).getTime() / 1000); const modDate = Math.floor(new Date(mod).getTime() / 1000);
description = `Updated <t:${modDate}:R>`; description = `Updated <t:${modDate}:R>`;
} }*/
return { return {
embeds: [ embeds: [
{ {
title: "Server Banner", title: "Server Banner",
description, //description,
url, url,
image: { image: {
url, url,
@ -63,7 +63,7 @@ banner.callback = async function (msg, line, [user], {server, guild}) {
const url = userObj.banner && CDNEndpoints.BANNER(userObj.id, userObj.banner); const url = userObj.banner && CDNEndpoints.BANNER(userObj.id, userObj.banner);
const guildUrl = memberObj?.banner && CDNEndpoints.GUILD_MEMBER_BANNER(msg.guildID, userObj.id, memberObj.banner); const guildUrl = memberObj?.banner && CDNEndpoints.GUILD_MEMBER_BANNER(msg.guildID, userObj.id, memberObj.banner);
const res = await fetch(url, {method: "HEAD"}); /*const res = await fetch(url, {method: "HEAD"});
const mod = res.headers.get("last-modified"); const mod = res.headers.get("last-modified");
let modStr; let modStr;
if (mod) { if (mod) {
@ -79,13 +79,13 @@ banner.callback = async function (msg, line, [user], {server, guild}) {
const modDate = Math.floor(new Date(guildMod).getTime() / 1000); const modDate = Math.floor(new Date(guildMod).getTime() / 1000);
modStrGuild = `Updated <t:${modDate}:R>`; modStrGuild = `Updated <t:${modDate}:R>`;
} }
} }*/
return { return {
embeds: [ embeds: [
url && { url && {
title: `Banner for \`${formatUsername(userObj)}\``, title: `Banner for \`${formatUsername(userObj)}\``,
description: modStr, //description: modStr,
url, url,
image: { image: {
url, url,
@ -93,7 +93,7 @@ banner.callback = async function (msg, line, [user], {server, guild}) {
}, },
guildUrl && { guildUrl && {
title: `Server banner for \`${formatUsername(userObj)}\``, title: `Server banner for \`${formatUsername(userObj)}\``,
description: modStrGuild, //description: modStrGuild,
url: guildUrl, url: guildUrl,
image: { image: {
url: guildUrl, url: guildUrl,

View file

@ -238,51 +238,51 @@ userinfo.callback = async function (msg, line) {
const images = []; const images = [];
const avatarRes = await fetch(avatar, {method: "HEAD"}); //const avatarRes = await fetch(avatar, {method: "HEAD"});
const avatarMod = avatarRes.headers.get("last-modified"); //const avatarMod = avatarRes.headers.get("last-modified");
let avatarUrl = `[Avatar](${avatar})`; const avatarUrl = `[Avatar](${avatar})`;
if (avatarMod && avatar != defaultAvatar) { /*if (avatarMod && avatar != defaultAvatar) {
const modDate = Math.floor(new Date(avatarMod).getTime() / 1000); const modDate = Math.floor(new Date(avatarMod).getTime() / 1000);
avatarUrl += ` \u2022 Updated <t:${modDate}:R>`; avatarUrl += ` \u2022 Updated <t:${modDate}:R>`;
} }*/
images.push(avatarUrl); images.push(avatarUrl);
if (banner) { if (banner) {
const bannerRes = await fetch(banner, {method: "HEAD"}); //const bannerRes = await fetch(banner, {method: "HEAD"});
const bannerMod = bannerRes.headers.get("last-modified"); //const bannerMod = bannerRes.headers.get("last-modified");
let bannerUrl = `[Banner](${banner})`; const bannerUrl = `[Banner](${banner})`;
if (bannerMod) { /*if (bannerMod) {
const modDate = Math.floor(new Date(bannerMod).getTime() / 1000); const modDate = Math.floor(new Date(bannerMod).getTime() / 1000);
bannerUrl += ` \u2022 Updated <t:${modDate}:R>`; bannerUrl += ` \u2022 Updated <t:${modDate}:R>`;
} }*/
images.push(bannerUrl); images.push(bannerUrl);
} }
const guildImages = []; //const guildImages = [];
if (member) { if (member) {
const guildAvatar = member.avatar && CDNEndpoints.GUILD_MEMBER_AVATAR(msg.guildID, id, member.avatar); const guildAvatar = member.avatar && CDNEndpoints.GUILD_MEMBER_AVATAR(msg.guildID, id, member.avatar);
if (guildAvatar) { if (guildAvatar) {
const avatarRes = await fetch(guildAvatar, {method: "HEAD"}); //const avatarRes = await fetch(guildAvatar, {method: "HEAD"});
const avatarMod = avatarRes.headers.get("last-modified"); //const avatarMod = avatarRes.headers.get("last-modified");
let avatarUrl = `[Guild Avatar](${guildAvatar})`; const avatarUrl = `[Guild Avatar](${guildAvatar})`;
if (avatarMod) { /*if (avatarMod) {
const modDate = Math.floor(new Date(avatarMod).getTime() / 1000); const modDate = Math.floor(new Date(avatarMod).getTime() / 1000);
avatarUrl += ` \u2022 Updated <t:${modDate}:R>`; avatarUrl += ` \u2022 Updated <t:${modDate}:R>`;
} }*/
guildImages.push(avatarUrl); images.push(avatarUrl);
} }
const memberObj = await hf.bot.requestHandler.request("GET", APIEndpoints.GUILD_MEMBER(msg.guildID, id), true); const memberObj = await hf.bot.requestHandler.request("GET", APIEndpoints.GUILD_MEMBER(msg.guildID, id), true);
const guildBanner = memberObj.banner && CDNEndpoints.GUILD_MEMBER_BANNER(msg.guildID, id, memberObj.banner); const guildBanner = memberObj.banner && CDNEndpoints.GUILD_MEMBER_BANNER(msg.guildID, id, memberObj.banner);
if (guildBanner) { if (guildBanner) {
const bannerRes = await fetch(guildBanner, {method: "HEAD"}); //const bannerRes = await fetch(guildBanner, {method: "HEAD"});
const bannerMod = bannerRes.headers.get("last-modified"); //const bannerMod = bannerRes.headers.get("last-modified");
let bannerUrl = `[Guild Banner](${guildBanner})`; const bannerUrl = `[Guild Banner](${guildBanner})`;
if (bannerMod) { /*if (bannerMod) {
const modDate = Math.floor(new Date(bannerMod).getTime() / 1000); const modDate = Math.floor(new Date(bannerMod).getTime() / 1000);
bannerUrl += ` \u2022 Updated <t:${modDate}:R>`; bannerUrl += ` \u2022 Updated <t:${modDate}:R>`;
} }*/
guildImages.push(bannerUrl); images.push(bannerUrl);
} }
} }
@ -420,12 +420,7 @@ userinfo.callback = async function (msg, line) {
}, },
images.length > 0 && { images.length > 0 && {
name: "\u200b", name: "\u200b",
value: images.join("\n"), value: images.join("\u3000"),
inline: true,
},
guildImages.length > 0 && {
name: "\u200b",
value: guildImages.join("\n"),
inline: true, inline: true,
}, },
].filter((x) => !!x), ].filter((x) => !!x),