Merge pull request #9 from UltronDevelopment/feat/newDiscordTags

Supports discord's new global/display names

Author: RappyTV

app.js

@@ -4,7 +4,6 @@ const app = express();
 const https = require(`https`);
 const http = require(`http`);
 const path = require(`path`);
-const axios = require(`axios`);
 const { readFileSync, existsSync } = require("fs");
 
 server.cfg = require(`./src/config.json`);
@@ -89,6 +88,9 @@ app.get(`/:id`, async (req, res, next) => {
                 avatar: `https://cdn.discordapp.com/embed/avatars/${Math.floor(Math.random() * 6)}.png`,
                 id,
                 tag: `Clyde#0000`,
+                globalName: `@clyde`,
+                displayName: `Clyde`,
+                migrated: !!Math.floor(Math.random() * 2),
                 bot: false,
                 badges: ``,
                 created,
@@ -121,14 +123,13 @@ app.get(`/:id`, async (req, res, next) => {
 
         const avatar = data.avatar ? `https://cdn.discordapp.com/avatars/${id}/${data.avatar}.${data.avatar.startsWith(`a_`) ? `gif` : `png`}?size=1024` : `https://cdn.discordapp.com/embed/avatars/${data.discriminator % 5}.png`;
         const banner = data.banner ? `https://cdn.discordapp.com/banners/${id}/${data.banner}.${data.banner.startsWith(`a_`) ? `gif` : `png`}?size=1024` : null;
-        const tag = `${data.username}#${data.discriminator}`;
         const badges = server.util.getUserBadges(data.public_flags).map((badge) => {
             return `<span><img src="img/${badge}.png" class="badgepng"></span>`;
         }).join(`\n`);
         const created = new Date(server.util.getTimestamp(id)).toUTCString();
         const color = data.banner_color;
 
-        res.render(`user`, { avatar, banner, id, tag, bot: data.bot, badges, created, color });
+        res.render(`user`, { avatar, banner, id, tag: `${data.username}#${data.discriminator}`, globalName: data.username, displayName: data.display_name, migrated: data.discriminator == '0', bot: data.bot, badges, created, color });
     } else if(invite.success) {
         const { guild, channel, code } = invite;
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "discord.id",
-  "version": "1.3.5",
+  "version": "1.4.0",
   "main": "app.js",
   "description": "This is an inofficial remake of discord.id",
   "repository": {

public/css/app.css

@@ -259,6 +259,10 @@ a {
     content: "\f3a5"
 }
 
+.fa-globe:before {
+    content: "\f57d"
+}
+
 .fas {
     font-family: Font Awesome\ 5 Pro;
     font-weight: 900

views/user.ejs

@@ -58,7 +58,12 @@
                                 </a>
                             <% } %>
                             <p><span class="fas fa-hashtag"></span> <strong>User ID</strong>: <span class="resulth"><%= locals.id %></span></p>
-                            <p><span class="fas fa-user"></span> <strong>Username</strong>: <span class="resulth" style="color: rgb(228, 154, 255);"><%= locals.tag %></span><%- locals.bot ? `<img src="img/15.png" style="vertical-align: text-top; height: 1.2rem; margin-left: 0.2rem; margin-bottom: 0.1rem;">` : `` %></p>
+                            <% if(locals.migrated) { %>
+                                <p><span class="fas fa-globe"></span> <strong>Global Name</strong>: <span class="resulth" style="color: rgb(228, 154, 255);"><%= locals.globalName %></span><%- locals.bot ? `<img src="img/15.png" style="vertical-align: text-top; height: 1.2rem; margin-left: 0.2rem; margin-bottom: 0.1rem;">` : `` %></p>
+                                <p><span class="fas fa-user"></span> <strong>Display Name</strong>: <span class="resulth" style="color: rgb(255, 160, 158);"><%= locals.displayName %></span></p>
+                            <% } else { %>
+                                <p><span class="fas fa-user"></span> <strong>Username</strong>: <span class="resulth" style="color: rgb(228, 154, 255);"><%= locals.tag %></span><%- locals.bot ? `<img src="img/15.png" style="vertical-align: text-top; height: 1.2rem; margin-left: 0.2rem; margin-bottom: 0.1rem;">` : `` %></p>
+                            <% } %>
                             <p><span class="fas fa-tags"></span> <strong>Badges</strong>:
                                 <%- locals.badges || `-` %>
                             </p>