🌟 Code Cleanup

This commit is contained in:
callumok2004
2021-06-21 03:43:22 +01:00
parent bf4f6dab8d
commit b169bbc15d
9 changed files with 111 additions and 172 deletions

View File

@@ -19,6 +19,7 @@
"styled-components": "^5.3.0" "styled-components": "^5.3.0"
}, },
"devDependencies": { "devDependencies": {
"@types/image-to-base64": "^2.1.0",
"@types/react": "17.0.11", "@types/react": "17.0.11",
"eslint": "7.28.0", "eslint": "7.28.0",
"eslint-config-next": "11.0.0", "eslint-config-next": "11.0.0",

View File

@@ -1,6 +1,5 @@
import type { AppProps } from 'next/app' import type { AppProps } from 'next/app'
function MyApp({ Component, pageProps }: AppProps) { export default function LandyardReadMe({ Component, pageProps }: AppProps) {
return <Component {...pageProps} /> return <Component {...pageProps} />
} }
export default MyApp

View File

@@ -2,14 +2,14 @@ import Document from 'next/document'
import { ServerStyleSheet } from 'styled-components' import { ServerStyleSheet } from 'styled-components'
export default class MyDocument extends Document { export default class MyDocument extends Document {
static async getInitialProps(ctx) { static async getInitialProps(ctx: any) {
const sheet = new ServerStyleSheet() const sheet = new ServerStyleSheet(),
const originalRenderPage = ctx.renderPage originalRenderPage = ctx.renderPage
try { try {
ctx.renderPage = () => ctx.renderPage = () =>
originalRenderPage({ originalRenderPage({
enhanceApp: (App) => (props) => enhanceApp: (App: any) => (props: any) =>
sheet.collectStyles(<App {...props} />), sheet.collectStyles(<App {...props} />),
}) })

View File

@@ -17,24 +17,21 @@ export default async function handler(
res: NextApiResponse<Data> res: NextApiResponse<Data>
) { ) {
let params: Parameters = req.query; let params: Parameters = req.query,
let userid = req.query.id[0]; userid = req.query.id[0],
lanyardData: any;
res.setHeader("Content-Type", "image/svg+xml; charset=utf-8"); res.setHeader("Content-Type", "image/svg+xml; charset=utf-8");
res.setHeader("content-security-policy", "default-src 'none'; img-src *; style-src 'unsafe-inline'"); res.setHeader("content-security-policy", "default-src 'none'; img-src * data:; style-src 'unsafe-inline'");
let lanyardData: any; try {
lanyardData = (await axios.get(`https://api.lanyard.rest/v1/users/${userid}`)).data;
await axios.get(`https://api.lanyard.rest/v1/users/${userid}`) } catch (e) {
.then((response) => { console.log(e)
return lanyardData = response;
})
.catch((err) => {
console.log(err);
res.send({ error: `Something went wrong! If everything looks correct and this still occurs, please contact @cnraddd on Twitter.` }) res.send({ error: `Something went wrong! If everything looks correct and this still occurs, please contact @cnraddd on Twitter.` })
}); }
let svg = await renderCard(lanyardData.data, params); let svg = await renderCard(lanyardData.data, params);
res.status(200).send(svg); res.status(200).send(svg as any);
console.log(req.query);
} }

View File

@@ -3,15 +3,13 @@ import styled from 'styled-components';
import { useState } from 'react'; import { useState } from 'react';
export default function Home() { export default function Home() {
const [userId, setUserId] = useState(':id')
let [userId, setUserId] = useState(':id')
return ( return (
<> <>
<Head> <Head>
<link rel="preconnect" href="https://fonts.gstatic.com" /> <link rel="preconnect" href="https://fonts.gstatic.com" />
<link href="https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;1,200;1,300;1,400&display=swap" rel="stylesheet" /> <link href="https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;1,200;1,300;1,400&display=swap" rel="stylesheet" />
<title>Lanyard for GitHub Profile</title> <title>Lanyard for GitHub Profile</title>
</Head> </Head>
@@ -19,28 +17,16 @@ export default function Home() {
<Header> <Header>
🏷 lanyard-profile-readme 🏷 lanyard-profile-readme
</Header> </Header>
<Container> <Container>
<p style={{ fontSize: "1rem", fontWeight: "bold", marginTop: "1rem" }}>Make sure you're in the <a style={{ color: "#fff" }} rel="noreferrer" href="https://discord.com/invite/WScAm7vNGF">Discord</a> for this to work.</p> <p style={{ fontSize: "1rem", fontWeight: "bold", marginTop: "1rem" }}>Make sure you're in the <a style={{ color: "#fff" }} rel="noreferrer" href="https://discord.com/invite/WScAm7vNGF">Discord</a> for this to work.</p>
<Input maxLength={18} type="text" placeholder="Paste your Discord user ID here" onChange={((e) => setUserId(e.target.value))} />
<Input maxLength={18} type="text" placeholder="Paste your Discord user ID here" onChange={((e) => setUserId(e.target.value))}>
</Input>
<span style={{ fontSize: "1rem", marginTop: "1rem" }}>Copy the following and paste it into your README.md</span> <span style={{ fontSize: "1rem", marginTop: "1rem" }}>Copy the following and paste it into your README.md</span>
<Link> <Link>
[![Discord Presence](https://lanyard-profile-readme.vercel.app/api/{userId})](https://discord.com/users/{userId}) [![Discord Presence](https://lanyard-profile-readme.vercel.app/api/{userId})](https://discord.com/users/{userId})
</Link> </Link>
<span style={{ fontSize: "1rem", fontStyle: "italic", marginTop: "1rem" }}>For further customization, check out the <a rel="noreferrer" target="_blank" href="https://github.com/cnrad/lanyard-profile-readme" style={{ color: "#fff", fontWeight: "bold" }}>repo</a>!</span> <span style={{ fontSize: "1rem", fontStyle: "italic", marginTop: "1rem" }}>For further customization, check out the <a rel="noreferrer" target="_blank" href="https://github.com/cnrad/lanyard-profile-readme" style={{ color: "#fff", fontWeight: "bold" }}>repo</a>!</span>
<Example src={`https://lanyard-profile-readme.vercel.app/api/${userId}`} alt="[Please provide a valid user ID!]" style={{ color: "#ff8787" }} /> <Example src={`https://lanyard-profile-readme.vercel.app/api/${userId}`} alt="[Please provide a valid user ID!]" style={{ color: "#ff8787" }} />
</Container> </Container>
</Background> </Background>
</> </>
) )

View File

@@ -1,36 +1,16 @@
export const getFlags = (flag: number): string[] => { export const getFlags = (flag: number): string[] => {
let flags: string[] = []; let flags: string[] = [];
if(flag & 1){ if (flag & 1) flags.push("Discord_Employee")
flags.push("Discord_Employee") if (flag & 2) flags.push("Partnered_Server_Owner")
} if (flag & 4) flags.push("HypeSquad_Events")
if(flag & 2){ if (flag & 8) flags.push("Bug_Hunter_Level_1")
flags.push("Partnered_Server_Owner") if (flag & 64) flags.push("House_Bravery")
} if (flag & 128) flags.push("House_Brilliance")
if(flag & 4){ if (flag & 256) flags.push("House_Balance")
flags.push("HypeSquad_Events") if (flag & 512) flags.push("Early_Supporter")
} if (flag & 16384) flags.push("Bug_Hunter_Level_2")
if(flag & 8){ if (flag & 131072) flags.push("Early_Verified_Bot_Developer")
flags.push("Bug_Hunter_Level_1")
}
if(flag & 64){
flags.push("House_Bravery")
}
if(flag & 128){
flags.push("House_Brilliance")
}
if(flag & 256){
flags.push("House_Balance")
}
if(flag & 512){
flags.push("Early_Supporter")
}
if(flag & 16384){
flags.push("Bug_Hunter_Level_2")
}
if(flag & 131072){
flags.push("Early_Verified_Bot_Developer")
}
return flags; return flags;
} }

View File

@@ -1,9 +1,9 @@
//probably the messiest code i've ever written but it works so :) //probably the messiest code i've ever written but it works so :)
import { Badges } from '../public/assets/badges/BadgesEncoded';
import { getFlags } from './getFlags';
import * as LanyardTypes from './LanyardTypes'; import * as LanyardTypes from './LanyardTypes';
import { getFlags } from "./getFlags"; import { encodeBase64 } from './toBase64';
import encodeBase64 from './toBase64';
import { Badges } from '../public/assets/badges/BadgesEncoded'
type Parameters = { type Parameters = {
theme?: string; theme?: string;
@@ -13,38 +13,29 @@ type Parameters = {
hideStatus?: string; hideStatus?: string;
} }
const renderCard = async (body: LanyardTypes.Root, params: Parameters): Promise<any> => { const renderCard = async (body: LanyardTypes.Root, params: Parameters): Promise<string> => {
const defaultAvatar: string = "iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAMAAABrrFhUAAAAY1BMVEVYZfJib/OMlfahqPeWn/eBi/XLz/vq6/7////19f5tePTq7P22vPnV2Pyrsvirsvl3gvT09f7Axfp3gfRtePNsePPg4v22vPq2u/qCi/WhqPjf4/zf4v2Xn/essvjLzvuXnvdbidFTAAAETElEQVR4AezBgQAAAACAoP2pF6kCAAAAAAAAAAAAAAAAAAAAAIDZudMtV1UlDuCFRKlWIEJ6uOwbzXn/lzzzYc/GWiT6zya/79WrLeYSc5Vq9IFWa3Sr6JehWt0ZZn5RtFJvmHnodPsrPLx1/B9PKx1ziLOPnIRRO84EXaAP/CWnR3pArTWcybpA5G8NsX20pw+cSbpAngEeOQenY+Cf8KIZ4FuDfSV4Ko/7hS7wNjYH7W3MvNeHtn2jvxn+OXcgaP0x8KJo43vgnwqu85EXDfGVULWON9G1BOmDN/M/AnTgDSWC0xve0KAITeSsykFw4qzOQWB4YwNBOfLmPAHpeXsvr5XOgJkjGA3vIlU6A2bvOHvAnXwiCMrwTl5UpUtg5us7BAB2gcg78nXugaC6QORd+bo7AEAXiLwzX+8SANEFNHPdXcAwV90FDgxA037+zwAc7aZlCKnSNTDrADZBdU6DBwbha5wCAabBkWGkSqfAzFa6C8xeADYB9Y2ByEBsbSMAYAy0zHWPActQLPQuKBh3DiwiDRlwzwFOv9JfTpORh5x5rVfQc8CQiLLJiEMaA1oW6XgVq+grVh4yY56JA68x07fm8hCIhXCUPn823zgkG/HK4Rf6kYv8YBt5BQ03BQyv9CMq8M/JQ7IItw+e6cd8QQjKTqCX3OMTtOdCCNZOoCnqkrYgZEFD2/FF/08qDAE4Dji+TtHPKHknVmBboVB2i9HI9zIGahZUhaVqVxCyQEEVQ7rSBMj3QiPUUTCWJkC+8zrQVjzmELBYG2H5jDYUFqAiQDlMtAwKQgjr+nwoq9O2BSEQJQFVWKeNBSEQ6+BYeG3BFIUAHIfasmsLh7IQgLcjDZd0AWXEIZRDMDYCuuj73g95yJGxEuBLPmr6VBSyzMO9Fpzko3kqeA1r8W4GHOWNKQ/JIl4COL4SZf2lPAQhAY4lYrv860rlIVmHlYAsuBhjFwpCwO4LOkb0TMAzAc8EPBPwTMAGngl4JuCZgMig4jMB27AMykJUhCr4ekwzKI10T9hpwzcz6DNSUbRdORzThW/CJSKagd4LjKurof1suFCYVR54MDckpsBXDLk3pliQgxBTHneBrwiaNtOfeUUKCnMQYlKC32x2r7SlmSUpoOQdi5xtoqx1DNP8WW9kKSCVvAu8QnC2USR4/I2bP5vDmhS80pdOjXULw8dc7HSiL6ljYLTmz/ooKvJTdkqTt9G5s/mHczH6qXlV9I32Ehi0+QVfQbn7HryHhvY033V1Tuu3CRncOIj3rL3EV9pf7+53ced0bY+MIZm7ndEt9uNnkxN8OSWhAvjjZ8ktnIoKaMDHF0yH8S416C4Rpv7bU094pWJ9QFv4BJOBvnkFzjWKMvhu4G78IibMIz2EFM3KFUAwCEI+ID9MDia6kd/+enpFj+YE+af+aA8OZAAAAAAG+Vvf46sAAAAAAAAAAAAAAAAAAAAAAFYCeHSjWah9hFcAAAAASUVORK5CYII=";
let avatarBorderColor: string = "#747F8D"; let avatarBorderColor: string = "#747F8D",
let userStatus: string = ""; userStatus: string = "",
let avatarExtension: string = "webp"; avatarExtension: string = "webp",
let statusExtension: string = "webp"; statusExtension: string = "webp",
let activity: any = false; activity: any = false,
let backgroundColor: string = '1a1c1f'; backgroundColor: string = '1a1c1f',
let theme = 'dark'; theme = 'dark',
let discrim = 'show'; discrim = 'show',
let hideStatus = 'false'; hideStatus = 'false';
if(body.data.activities[0]){
if(body.data.activities[0].emoji && body.data.activities[0].emoji.animated === true) statusExtension = "gif";
}
if(body.data.activities.length > 0) {
if(body.data.activities[Object.keys(body.data.activities).length - 1].type === 0) activity = body.data.activities[Object.keys(body.data.activities).length - 1];
}
let defaultAvatar: string = "iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAMAAABrrFhUAAAAY1BMVEVYZfJib/OMlfahqPeWn/eBi/XLz/vq6/7////19f5tePTq7P22vPnV2Pyrsvirsvl3gvT09f7Axfp3gfRtePNsePPg4v22vPq2u/qCi/WhqPjf4/zf4v2Xn/essvjLzvuXnvdbidFTAAAETElEQVR4AezBgQAAAACAoP2pF6kCAAAAAAAAAAAAAAAAAAAAAIDZudMtV1UlDuCFRKlWIEJ6uOwbzXn/lzzzYc/GWiT6zya/79WrLeYSc5Vq9IFWa3Sr6JehWt0ZZn5RtFJvmHnodPsrPLx1/B9PKx1ziLOPnIRRO84EXaAP/CWnR3pArTWcybpA5G8NsX20pw+cSbpAngEeOQenY+Cf8KIZ4FuDfSV4Ko/7hS7wNjYH7W3MvNeHtn2jvxn+OXcgaP0x8KJo43vgnwqu85EXDfGVULWON9G1BOmDN/M/AnTgDSWC0xve0KAITeSsykFw4qzOQWB4YwNBOfLmPAHpeXsvr5XOgJkjGA3vIlU6A2bvOHvAnXwiCMrwTl5UpUtg5us7BAB2gcg78nXugaC6QORd+bo7AEAXiLwzX+8SANEFNHPdXcAwV90FDgxA037+zwAc7aZlCKnSNTDrADZBdU6DBwbha5wCAabBkWGkSqfAzFa6C8xeADYB9Y2ByEBsbSMAYAy0zHWPActQLPQuKBh3DiwiDRlwzwFOv9JfTpORh5x5rVfQc8CQiLLJiEMaA1oW6XgVq+grVh4yY56JA68x07fm8hCIhXCUPn823zgkG/HK4Rf6kYv8YBt5BQ03BQyv9CMq8M/JQ7IItw+e6cd8QQjKTqCX3OMTtOdCCNZOoCnqkrYgZEFD2/FF/08qDAE4Dji+TtHPKHknVmBboVB2i9HI9zIGahZUhaVqVxCyQEEVQ7rSBMj3QiPUUTCWJkC+8zrQVjzmELBYG2H5jDYUFqAiQDlMtAwKQgjr+nwoq9O2BSEQJQFVWKeNBSEQ6+BYeG3BFIUAHIfasmsLh7IQgLcjDZd0AWXEIZRDMDYCuuj73g95yJGxEuBLPmr6VBSyzMO9Fpzko3kqeA1r8W4GHOWNKQ/JIl4COL4SZf2lPAQhAY4lYrv860rlIVmHlYAsuBhjFwpCwO4LOkb0TMAzAc8EPBPwTMAGngl4JuCZgMig4jMB27AMykJUhCr4ekwzKI10T9hpwzcz6DNSUbRdORzThW/CJSKagd4LjKurof1suFCYVR54MDckpsBXDLk3pliQgxBTHneBrwiaNtOfeUUKCnMQYlKC32x2r7SlmSUpoOQdi5xtoqx1DNP8WW9kKSCVvAu8QnC2USR4/I2bP5vDmhS80pdOjXULw8dc7HSiL6ljYLTmz/ooKvJTdkqTt9G5s/mHczH6qXlV9I32Ehi0+QVfQbn7HryHhvY033V1Tuu3CRncOIj3rL3EV9pf7+53ced0bY+MIZm7ndEt9uNnkxN8OSWhAvjjZ8ktnIoKaMDHF0yH8S416C4Rpv7bU094pWJ9QFv4BJOBvnkFzjWKMvhu4G78IibMIz2EFM3KFUAwCEI+ID9MDia6kd/+enpFj+YE+af+aA8OZAAAAAAG+Vvf46sAAAAAAAAAAAAAAAAAAAAAAFYCeHSjWah9hFcAAAAASUVORK5CYII=";
if(body.data.discord_user.avatar !== null && body.data.discord_user.avatar.startsWith("a_")) avatarExtension = "gif";
if (body.data.activities[0] && body.data.activities[0].emoji && body.data.activities[0].emoji.animated) statusExtension = "gif";
if (body.data.activities.length > 0 && body.data.activities[Object.keys(body.data.activities).length - 1].type === 0) activity = body.data.activities[Object.keys(body.data.activities).length - 1];
if (params.animated === "false") avatarExtension = "webp"; if (params.animated === "false") avatarExtension = "webp";
if (params.hideStatus === 'true') hideStatus = 'true';
if (params.hideDiscrim === "true") discrim = "hide"; if (params.hideDiscrim === "true") discrim = "hide";
if (params.bg) backgroundColor = params.bg;
if (params.theme === 'light') { if (params.theme === 'light') {
backgroundColor = '#eee'; backgroundColor = '#eee';
theme = 'light'; theme = 'light';
} }
if(params.bg) backgroundColor = params.bg;
if(params.hideStatus === 'true') hideStatus = 'true';
switch (body.data.discord_status) { switch (body.data.discord_status) {
case "online": case "online":
@@ -61,7 +52,7 @@ const renderCard = async (body: LanyardTypes.Root, params: Parameters): Promise<
break; break;
} }
let flags: string[] = getFlags(body.data.discord_user.public_flags); const flags: string[] = getFlags(body.data.discord_user.public_flags);
if (body.data.activities[0] && body.data.activities[0].type === 4) userStatus = body.data.activities[0].state; if (body.data.activities[0] && body.data.activities[0].type === 4) userStatus = body.data.activities[0].state;
@@ -135,8 +126,7 @@ const renderCard = async (body: LanyardTypes.Root, params: Parameters): Promise<
: ''} : ''}
</h1> </h1>
${ ${flags.map((v) => {
flags.map((v) => {
return ( return (
`<img src="data:image/png;base64,${Badges[v]}" style=" `<img src="data:image/png;base64,${Badges[v]}" style="
width: 20px; width: 20px;

View File

@@ -1,22 +1,3 @@
const imageToBase64 = require('image-to-base64'); import imageToBase64 from "image-to-base64";
const encodeBase64 = async (url: string): Promise<string> => { export const encodeBase64 = async (url: string): Promise<string> => await imageToBase64(url);
let encoded: string = '';
await imageToBase64(url)
.then(
(response: string) => {
return encoded = response;
}
)
.catch(
(error: any) => {
console.log(error);
}
)
return encoded;
}
export default encodeBase64;

View File

@@ -279,6 +279,11 @@
"@types/react" "*" "@types/react" "*"
hoist-non-react-statics "^3.3.0" hoist-non-react-statics "^3.3.0"
"@types/image-to-base64@^2.1.0":
version "2.1.0"
resolved "https://registry.yarnpkg.com/@types/image-to-base64/-/image-to-base64-2.1.0.tgz#8c77b09b7988df3a9a2a4278bbcc27efabbec379"
integrity sha512-UgmqJVJyPIkzzI23TWqLc9iO+hZTzNoVD0rEf+I70FeKtcxxvLIlKJ5CrejkxkvDc/8/lk9yswSYZoAv8eyOYQ==
"@types/json5@^0.0.29": "@types/json5@^0.0.29":
version "0.0.29" version "0.0.29"
resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"