diff --git a/back/api/emojis.js b/back/api/emojis.js
index e16e41e..d50f771 100644
--- a/back/api/emojis.js
+++ b/back/api/emojis.js
@@ -84,6 +84,10 @@ router.get('/:name', async (req, res) => {
return res.status(404).send({ error: 'Emoji not found' });
}
+ if (!fs.existsSync(`data/emojis/${emoji[0].file}`)) {
+ return res.sendFile(path.join(__dirname, `../images/default.png`), { headers: { 'Content-Type': 'image' } });
+ }
+
res.sendFile(path.join(__dirname, `../data/emojis/${emoji[0].file}`), { headers: { 'Content-Type': 'image' } });
});
diff --git a/back/api/users.js b/back/api/users.js
index 5d2720a..ab8a50d 100644
--- a/back/api/users.js
+++ b/back/api/users.js
@@ -81,7 +81,7 @@ router.get('/:username/pfp', async (req, res) => {
const pfp = user[0].pfp;
if (!pfp || !fs.existsSync(path.join(__dirname, `../data/pfps/${pfp}`))) {
- return res.sendFile(path.join(__dirname, `../images/default-pfp.png`), { headers: { 'Content-Type': 'image' } });
+ return res.sendFile(path.join(__dirname, `../images/default.png`), { headers: { 'Content-Type': 'image' } });
}
res.sendFile(path.join(__dirname, `../data/pfps/${pfp}`), { headers: { 'Content-Type': 'image' } });
diff --git a/back/images/default-pfp.png b/back/images/default.png
similarity index 100%
rename from back/images/default-pfp.png
rename to back/images/default.png
diff --git a/front/public/DepartureMonoNerdFontMono-Regular.otf b/front/public/DepartureMonoNerdFontMono-Regular.otf
new file mode 100644
index 0000000..f9dc2e8
Binary files /dev/null and b/front/public/DepartureMonoNerdFontMono-Regular.otf differ
diff --git a/front/src/components/MessageComponent.tsx b/front/src/components/MessageComponent.tsx
index a41f92d..9d21183 100644
--- a/front/src/components/MessageComponent.tsx
+++ b/front/src/components/MessageComponent.tsx
@@ -148,31 +148,30 @@ export default function MessageComponent({ message, user, channel }: {
)}
- {channel?.owner_id == user?.id || user?.admin == 1 || user?.username == message.username ? (
- user?.id === message.user_id || user?.id === channel?.owner_id || user?.admin === 1) && (
-
- ) : (
-
In {message.channel_name}
+ {(channel?.owner_id == user?.id || user?.admin == 1 || user?.id == message.user_id) && ( + )} {channel && user && !reply && ( - + )} {reply && ( -