@@ -264,8 +290,16 @@ function updatePresence(data) {
desktop: data.active_on_discord_desktop,
};
+ let status = "offline";
+ console.log(data.activities.some((activity) => activity.type === 1));
+ if (data.activities.some((activity) => activity.type === 1)) {
+ status = "streaming";
+ } else {
+ status = data.discord_status;
+ }
+
if (statusIndicator) {
- statusIndicator.className = `status-indicator ${data.discord_status}`;
+ statusIndicator.className = `status-indicator ${status}`;
}
if (platform.mobile && !mobileIcon) {
@@ -276,7 +310,7 @@ function updatePresence(data) {
`;
} else if (!platform.mobile && mobileIcon) {
mobileIcon.remove();
- avatarWrapper.innerHTML += `
`;
+ avatarWrapper.innerHTML += `
`;
}
const custom = data.activities?.find((a) => a.type === 4);
diff --git a/src/routes/[id].ts b/src/routes/[id].ts
index b970485..bdfc975 100644
--- a/src/routes/[id].ts
+++ b/src/routes/[id].ts
@@ -31,10 +31,18 @@ async function handler(request: ExtendedRequest): Promise
{
const presence: LanyardData = data.data;
const readme: string | Promise | null = await handleReadMe(presence);
+ let status: string;
+ if (presence.activities.some((activity) => activity.type === 1)) {
+ status = "streaming";
+ } else {
+ status = presence.discord_status;
+ }
+
const ejsTemplateData: EjsTemplateData = {
- title: `${presence.discord_user.username || "Unknown"}`,
- username: presence.discord_user.username,
- status: presence.discord_status,
+ title: presence.discord_user.global_name || presence.discord_user.username,
+ username:
+ presence.discord_user.global_name || presence.discord_user.username,
+ status: status,
activities: presence.activities,
user: presence.discord_user,
platform: {
diff --git a/src/routes/index.ts b/src/routes/index.ts
index faa9e61..829d105 100644
--- a/src/routes/index.ts
+++ b/src/routes/index.ts
@@ -30,11 +30,18 @@ async function handler(): Promise {
const presence: LanyardData = data.data;
const readme: string | Promise | null = await handleReadMe(presence);
+ let status: string;
+ if (presence.activities.some((activity) => activity.type === 1)) {
+ status = "streaming";
+ } else {
+ status = presence.discord_status;
+ }
+
const ejsTemplateData: EjsTemplateData = {
title: presence.discord_user.global_name || presence.discord_user.username,
username:
presence.discord_user.global_name || presence.discord_user.username,
- status: presence.discord_status,
+ status: status,
activities: presence.activities,
user: presence.discord_user,
platform: {
diff --git a/src/views/index.ejs b/src/views/index.ejs
index 4b1e1bb..0611579 100644
--- a/src/views/index.ejs
+++ b/src/views/index.ejs
@@ -76,20 +76,32 @@
const total = (start && end) ? end - start : null;
const progress = (total && elapsed > 0) ? Math.min(100, Math.floor((elapsed / total) * 100)) : null;
- const img = activity.assets?.large_image;
let art = null;
+ let smallArt = null;
- if (img?.startsWith("mp:external/")) {
- art = `https://media.discordapp.net/external/${img.slice("mp:external/".length)}`;
- } else if (img?.includes("/https/")) {
- const clean = img.split("/https/")[1];
- if (clean) art = `https://${clean}`;
- } else if (img?.startsWith("spotify:")) {
- art = `https://i.scdn.co/image/${img.split(":")[1]}`;
- } else if (img) {
- art = `https://cdn.discordapp.com/app-assets/${activity.application_id}/${img}.png`;
+ function resolveActivityImage(img, applicationId) {
+ if (!img) return null;
+
+ if (img.startsWith("mp:external/")) {
+ return `https://media.discordapp.net/external/${img.slice("mp:external/".length)}`;
+ }
+
+ if (img.includes("/https/")) {
+ const clean = img.split("/https/")[1];
+ return clean ? `https://${clean}` : null;
+ }
+
+ if (img.startsWith("spotify:")) {
+ return `https://i.scdn.co/image/${img.split(":")[1]}`;
+ }
+
+ return `https://cdn.discordapp.com/app-assets/${applicationId}/${img}.png`;
}
+ if (activity.assets) {
+ art = resolveActivityImage(activity.assets.large_image, activity.application_id);
+ smallArt = resolveActivityImage(activity.assets.small_image, activity.application_id);
+ }
const activityTypeMap = {
0: "Playing",
@@ -124,7 +136,12 @@
<% if (art) { %>
-
+
+
>
+ <% if (smallArt) { %>
+
>
+ <% } %>
+
<% } %>