Skip to content

Commit 6d457e8

Browse files
Merge pull request #27 from jothamteshome/feature/header-and-playlist-panel
Feature/header and playlist panel
2 parents 04f972d + 687091f commit 6d457e8

31 files changed

Lines changed: 973 additions & 1054 deletions

backend/package-lock.json

Lines changed: 523 additions & 736 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"name": "watch-together-backend",
3-
"version": "1.3.1",
3+
"version": "1.4.0",
44
"type": "module",
55
"scripts": {
6-
"dev": "node --loader ts-node/esm src/server.ts",
6+
"dev": "tsx watch src/server.ts",
77
"build": "tsc",
88
"start": "node dist/server.js"
99
},
@@ -14,15 +14,14 @@
1414
"nanoid": "^5.1.5",
1515
"socket.io": "^4.7.1",
1616
"unique-names-generator": "^4.7.1",
17-
"uuid": "^9.0.0"
17+
"uuid": "^14.0.1"
1818
},
1919
"devDependencies": {
2020
"@types/dotenv": "^8.2.3",
2121
"@types/express": "^4.17.17",
2222
"@types/node": "^20.5.6",
2323
"@types/uuid": "^9.0.2",
24-
"ts-node": "^10.9.2",
25-
"ts-node-dev": "^2.0.0",
24+
"tsx": "^4.22.4",
2625
"typescript": "^5.2.2"
2726
}
2827
}

backend/src/interfaces/ChatMessage.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ export default interface ChatMessage {
22
id: string;
33
author: string;
44
authorIcon?: string | undefined;
5+
authorId?: string | undefined;
56
text: string;
67
timestamp: number;
78
isSystemMessage: boolean;

backend/src/sockets/chatEventHandlers.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ function handleChatMessage(io: Server, socket: Socket, { roomId, msg }: ChatMess
3535
id: nanoid(8),
3636
author: user ? user.username : socket.id,
3737
authorIcon: user?.icon,
38+
authorId: socket.id,
3839
text: msg,
3940
timestamp: Date.now(),
4041
isSystemMessage: false

0 commit comments

Comments
 (0)