kauft.es/linkylinky
4
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Compare commits

base: kauft.es:9d7125a31186f3b7f33df4875db12c67cf91f536
Branches Tags
kauft.es:main
kauft.es:0.8.0
kauft.es:0.7.2
kauft.es:0.7.1
kauft.es:0.7.0
kauft.es:0.6.1
kauft.es:0.6.0
kauft.es:0.5.1
kauft.es:0.5.0
kauft.es:0.4.3
kauft.es:0.4.2
kauft.es:0.4.1
kauft.es:0.4.0
kauft.es:0.3.0
kauft.es:0.2.0
kauft.es:0.1.4
kauft.es:0.1.3
kauft.es:0.1.2
kauft.es:0.1.1
kauft.es:0.1.0
kauft.es:0.0.2
..
compare: kauft.es:e1621b72ade1fce381f30bcf310a6dcf8d1c65ea
Branches Tags
kauft.es:main
kauft.es:0.8.0
kauft.es:0.7.2
kauft.es:0.7.1
kauft.es:0.7.0
kauft.es:0.6.1
kauft.es:0.6.0
kauft.es:0.5.1
kauft.es:0.5.0
kauft.es:0.4.3
kauft.es:0.4.2
kauft.es:0.4.1
kauft.es:0.4.0
kauft.es:0.3.0
kauft.es:0.2.0
kauft.es:0.1.4
kauft.es:0.1.3
kauft.es:0.1.2
kauft.es:0.1.1
kauft.es:0.1.0
kauft.es:0.0.2

3 Commits
9d7125a311 ... e1621b72ad

Author SHA1 Message Date
Nicolai Ort
e1621b72ad
Added rudementary page content
All checks were successful
continuous-integration/drone/push Build is passing
Details
2021-09-25 17:44:34 +02:00
Nicolai Ort
b64a8436e7
Updated opengraph type 
ref #2
 2021-09-25 17:42:44 +02:00
Nicolai Ort
d8ed9a149f
Switched docker base images to odit mirror 2021-09-25 17:38:11 +02:00
2 changed files with 15 additions and 10 deletions
Show Stats Expand all files Collapse all files

4
Dockerfile
View File

@ -1,4 +1,4 @@
FROM node:16.6.2-alpine3.14 FROM registry.odit.services/hub/library/node:16.6.2-alpine3.14
WORKDIR /app WORKDIR /app
COPY package.json . COPY package.json .
COPY yarn.lock . COPY yarn.lock .
@ -9,7 +9,7 @@ COPY knexfile.js ./
RUN mkdir db RUN mkdir db
# #
# FROM astefanutti/scratch-node:16.0.0 # FROM astefanutti/scratch-node:16.0.0
FROM node:16.6.2-alpine3.14 FROM registry.odit.services/hub/library/node:16.6.2-alpine3.14
WORKDIR /app WORKDIR /app
COPY --from=0 /app /app COPY --from=0 /app /app
ENV NODE_ENV production ENV NODE_ENV production

21
src/server.js
View File

@ -112,7 +112,7 @@ fastify.get('/:shortcode', async (req, res) => {
return 404 return 404
} }
if(isBot(req.headers['user-agent']) && target[0].no_preview){ if (isBot(req.headers['user-agent']) && target[0].no_preview) {
return ` return `
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
@ -123,15 +123,20 @@ fastify.get('/:shortcode', async (req, res) => {
<meta property="og:title" content="LinkyLinky"> <meta property="og:title" content="LinkyLinky">
<meta property="og:site_name" content="LinkyLinky by Kauft.es"> <meta property="og:site_name" content="LinkyLinky by Kauft.es">
<meta property="og:url" content="https://kauft.es/"> <meta property="og:url" content="https://kauft.es/">
<meta property="og:description" content="LinkyLinky by Kauft.es is a custom url shortener. <meta property="og:description" content="LinkyLinky by Kauft.es is a custom url shortener. You're reading this, b/c someone doesn't want their shorturl to be indexed by bots/crawlers/spiders.">
You're reading this, b/c someone doesn't want their shorturl to be indexed by bots/crawlers/spiders. <meta property="og:type" content="article">
T">
<meta property="og:type" content="product">
<meta property="og:image" content="https://kauft.es/dashboard/icon_128.png"> <meta property="og:image" content="https://kauft.es/dashboard/icon_128.png">
<title>LinkyLinky</title> <title>LinkyLinky</title>
</head> </head>
<body> <body>
<p align="center">
<img height="150" src="https://kauft.es/dashboard/icon_128.png">
<h1 align="center">LinkyLinky 🔗</h1>
<h3 align="center">A small url shortener, originaly developed for kauft.es</h3>
<p>LinkyLinky by Kauft.es is a custom url shortener.<br>
You're reading this, b/c someone doesn't want their shorturl to be indexed by bots/crawlers/spiders.</p>
</p>
</body> </body>
</html> </html>
`; `;
@ -317,10 +322,10 @@ fastify.after(() => {
//Get all visits api route //Get all visits api route
fastify.get('/api/visits', { onRequest: fastify.auth([fastify.basicAuth, fastify.verifyJWT]) }, async (req, res) => { fastify.get('/api/visits', { onRequest: fastify.auth([fastify.basicAuth, fastify.verifyJWT]) }, async (req, res) => {
if(req.query.provider){ if (req.query.provider) {
return await knex.select('shortcode', 'provider', 'timestamp') return await knex.select('shortcode', 'provider', 'timestamp')
.from('visits') .from('visits')
.where("provider", "=", req.query.provider); .where("provider", "=", req.query.provider);
} }
return await knex.select('shortcode', 'provider', 'timestamp') return await knex.select('shortcode', 'provider', 'timestamp')
.from('visits'); .from('visits');