feat(server): Removed lines and text when conflating changes

This commit is contained in:
Данил 2025-03-26 13:36:11 +03:00
parent 5387a91a2f
commit 6c07e348b3

View file

@ -81,7 +81,6 @@ fastify.addHook('onResponse', async (request, reply) => {
}; };
try { try {
<<<<<<< HEAD
await axios.post( await axios.post(
`https://${config['analytics']['plausible_domain']}/api/event/`, `https://${config['analytics']['plausible_domain']}/api/event/`,
event, event,
@ -91,15 +90,8 @@ fastify.addHook('onResponse', async (request, reply) => {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'User-Agent': userAgent, 'User-Agent': userAgent,
}, },
=======
await axios.post(config['analytics']['plausible_api'], event, {
headers: {
Authorization: `Bearer ${config['analytics']['plausible_token']}`,
'Content-Type': 'application/json',
'User-Agent': userAgent,
>>>>>>> parent of da7134f (chore(server): Changed the name of the keys. Made it easier to change the domain)
}, },
}); );
} catch (error) { } catch (error) {
fastify.log.error('Error sending event to Plausible:', error.message); fastify.log.error('Error sending event to Plausible:', error.message);
} }