o7 last-modified
This commit is contained in:
parent
79041eee98
commit
70dbc62394
3 changed files with 34 additions and 40 deletions
|
@ -84,7 +84,7 @@ avatar.callback = async function (msg, line, [user], {server, guild}) {
|
|||
const normalUrl = normalAvatar ? CDNEndpoints.USER_AVATAR(id, normalAvatar) : defaultAvatar;
|
||||
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");
|
||||
let modStr = "";
|
||||
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);
|
||||
modStrGuild = ` \u2022 Updated <t:${modDate}:R>`;
|
||||
}
|
||||
}
|
||||
}*/
|
||||
|
||||
baseEmbed.description =
|
||||
`[Normal avatar](${normalUrl})${modStr}` + (guildAvatar ? `\n[Guild avatar](${guildUrl})${modStrGuild}` : "");
|
||||
baseEmbed.description = `[Normal avatar](${normalUrl})${guildAvatar ? `\n[Guild avatar](${guildUrl})` : ""}`;
|
||||
baseEmbed.url = normalUrl;
|
||||
|
||||
const guildEmbed = {...baseEmbed};
|
||||
|
|
|
@ -21,19 +21,19 @@ banner.callback = async function (msg, line, [user], {server, guild}) {
|
|||
|
||||
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");
|
||||
let description;
|
||||
if (mod) {
|
||||
const modDate = Math.floor(new Date(mod).getTime() / 1000);
|
||||
description = `Updated <t:${modDate}:R>`;
|
||||
}
|
||||
}*/
|
||||
|
||||
return {
|
||||
embeds: [
|
||||
{
|
||||
title: "Server Banner",
|
||||
description,
|
||||
//description,
|
||||
url,
|
||||
image: {
|
||||
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 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");
|
||||
let modStr;
|
||||
if (mod) {
|
||||
|
@ -79,13 +79,13 @@ banner.callback = async function (msg, line, [user], {server, guild}) {
|
|||
const modDate = Math.floor(new Date(guildMod).getTime() / 1000);
|
||||
modStrGuild = `Updated <t:${modDate}:R>`;
|
||||
}
|
||||
}
|
||||
}*/
|
||||
|
||||
return {
|
||||
embeds: [
|
||||
url && {
|
||||
title: `Banner for \`${formatUsername(userObj)}\``,
|
||||
description: modStr,
|
||||
//description: modStr,
|
||||
url,
|
||||
image: {
|
||||
url,
|
||||
|
@ -93,7 +93,7 @@ banner.callback = async function (msg, line, [user], {server, guild}) {
|
|||
},
|
||||
guildUrl && {
|
||||
title: `Server banner for \`${formatUsername(userObj)}\``,
|
||||
description: modStrGuild,
|
||||
//description: modStrGuild,
|
||||
url: guildUrl,
|
||||
image: {
|
||||
url: guildUrl,
|
||||
|
|
|
@ -238,51 +238,51 @@ userinfo.callback = async function (msg, line) {
|
|||
|
||||
const images = [];
|
||||
|
||||
const avatarRes = await fetch(avatar, {method: "HEAD"});
|
||||
const avatarMod = avatarRes.headers.get("last-modified");
|
||||
let avatarUrl = `[Avatar](${avatar})`;
|
||||
if (avatarMod && avatar != defaultAvatar) {
|
||||
//const avatarRes = await fetch(avatar, {method: "HEAD"});
|
||||
//const avatarMod = avatarRes.headers.get("last-modified");
|
||||
const avatarUrl = `[Avatar](${avatar})`;
|
||||
/*if (avatarMod && avatar != defaultAvatar) {
|
||||
const modDate = Math.floor(new Date(avatarMod).getTime() / 1000);
|
||||
avatarUrl += ` \u2022 Updated <t:${modDate}:R>`;
|
||||
}
|
||||
}*/
|
||||
images.push(avatarUrl);
|
||||
|
||||
if (banner) {
|
||||
const bannerRes = await fetch(banner, {method: "HEAD"});
|
||||
const bannerMod = bannerRes.headers.get("last-modified");
|
||||
let bannerUrl = `[Banner](${banner})`;
|
||||
if (bannerMod) {
|
||||
//const bannerRes = await fetch(banner, {method: "HEAD"});
|
||||
//const bannerMod = bannerRes.headers.get("last-modified");
|
||||
const bannerUrl = `[Banner](${banner})`;
|
||||
/*if (bannerMod) {
|
||||
const modDate = Math.floor(new Date(bannerMod).getTime() / 1000);
|
||||
bannerUrl += ` \u2022 Updated <t:${modDate}:R>`;
|
||||
}
|
||||
}*/
|
||||
images.push(bannerUrl);
|
||||
}
|
||||
|
||||
const guildImages = [];
|
||||
//const guildImages = [];
|
||||
if (member) {
|
||||
const guildAvatar = member.avatar && CDNEndpoints.GUILD_MEMBER_AVATAR(msg.guildID, id, member.avatar);
|
||||
if (guildAvatar) {
|
||||
const avatarRes = await fetch(guildAvatar, {method: "HEAD"});
|
||||
const avatarMod = avatarRes.headers.get("last-modified");
|
||||
let avatarUrl = `[Guild Avatar](${guildAvatar})`;
|
||||
if (avatarMod) {
|
||||
//const avatarRes = await fetch(guildAvatar, {method: "HEAD"});
|
||||
//const avatarMod = avatarRes.headers.get("last-modified");
|
||||
const avatarUrl = `[Guild Avatar](${guildAvatar})`;
|
||||
/*if (avatarMod) {
|
||||
const modDate = Math.floor(new Date(avatarMod).getTime() / 1000);
|
||||
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 guildBanner = memberObj.banner && CDNEndpoints.GUILD_MEMBER_BANNER(msg.guildID, id, memberObj.banner);
|
||||
if (guildBanner) {
|
||||
const bannerRes = await fetch(guildBanner, {method: "HEAD"});
|
||||
const bannerMod = bannerRes.headers.get("last-modified");
|
||||
let bannerUrl = `[Guild Banner](${guildBanner})`;
|
||||
if (bannerMod) {
|
||||
//const bannerRes = await fetch(guildBanner, {method: "HEAD"});
|
||||
//const bannerMod = bannerRes.headers.get("last-modified");
|
||||
const bannerUrl = `[Guild Banner](${guildBanner})`;
|
||||
/*if (bannerMod) {
|
||||
const modDate = Math.floor(new Date(bannerMod).getTime() / 1000);
|
||||
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 && {
|
||||
name: "\u200b",
|
||||
value: images.join("\n"),
|
||||
inline: true,
|
||||
},
|
||||
guildImages.length > 0 && {
|
||||
name: "\u200b",
|
||||
value: guildImages.join("\n"),
|
||||
value: images.join("\u3000"),
|
||||
inline: true,
|
||||
},
|
||||
].filter((x) => !!x),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue