Skip to content
Merged
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
2dc02ac
Fix: Remove CORS Error
DongilMin Jul 29, 2025
f973a38
Merge branch 'ON-AIR-mate:main' into main
DongilMin Jul 30, 2025
9ec0e84
Merge branch 'ON-AIR-mate:main' into main
DongilMin Jul 31, 2025
cd56562
Merge branch 'ON-AIR-mate:main' into main
DongilMin Jul 31, 2025
3281ab3
Merge branch 'ON-AIR-mate:main' into main
DongilMin Aug 1, 2025
7c9b937
Merge branch 'ON-AIR-mate:main' into main
DongilMin Aug 1, 2025
2e3d05f
Merge branch 'ON-AIR-mate:main' into main
DongilMin Aug 2, 2025
2aea0ec
Merge branch 'ON-AIR-mate:main' into main
DongilMin Aug 3, 2025
38f1772
Merge branch 'ON-AIR-mate:main' into main
DongilMin Aug 6, 2025
4935061
Fix: CORS 설정 수정
DongilMin Aug 6, 2025
f08807f
Merge branch 'ON-AIR-mate:main' into main
DongilMin Aug 6, 2025
63b6ca0
fix: 경로 수정
DongilMin Aug 6, 2025
82c1705
Merge branch 'ON-AIR-mate:main' into main
DongilMin Aug 7, 2025
1765f83
Merge branch 'ON-AIR-mate:main' into main
DongilMin Aug 7, 2025
8f39666
Merge branch 'ON-AIR-mate:main' into main
DongilMin Aug 7, 2025
138f543
Fix: Remove Auto Migration
DongilMin Aug 7, 2025
d9c6f4a
Merge branch 'main' of https://github.com/DongilMin/on-air-mate-backe…
DongilMin Aug 7, 2025
5ae7600
Merge branch 'ON-AIR-mate:main' into main
DongilMin Aug 9, 2025
3c522e4
Refacot: Ai-prompt
DongilMin Aug 9, 2025
605a787
Refact: AI PROMPT 수정
DongilMin Aug 9, 2025
da96021
Refact: 프롬프트 수정
DongilMin Aug 9, 2025
cee6f64
Merge branch 'main' into main
DongilMin Aug 9, 2025
c2c34b8
Refact: Prompt-ai
DongilMin Aug 9, 2025
b8f57b0
Merge branch 'main' of https://github.com/DongilMin/on-air-mate-backe…
DongilMin Aug 9, 2025
708db47
Fix: Add Friend route
DongilMin Aug 9, 2025
3bee22e
Prisma 파일 서버 DB와 동기화
DongilMin Aug 9, 2025
06b3554
Merge branch 'ON-AIR-mate:main' into main
DongilMin Aug 9, 2025
047a26a
Feat: Add Redirection HTTP to HTTPS Nginx System
DongilMin Aug 9, 2025
c455ba4
chore: Revert schema.prisma to upstream version
DongilMin Aug 9, 2025
cb992de
fix: Add HTTPS redirect middleware for production
DongilMin Aug 9, 2025
3880179
Merge branch 'main' into main
DongilMin Aug 9, 2025
89ac146
Formatting
DongilMin Aug 9, 2025
0ed1a91
Merge branch 'main' of https://github.com/DongilMin/on-air-mate-backe…
DongilMin Aug 9, 2025
b352403
DOCS: 서버 URL 설정
DongilMin Aug 9, 2025
6236c01
Merge branch 'ON-AIR-mate:main' into main
DongilMin Aug 10, 2025
54b16b6
Merge branch 'ON-AIR-mate:main' into main
DongilMin Aug 11, 2025
4be270b
Fix: swagger route
DongilMin Aug 11, 2025
54de74e
Fix: Prisma 타입 불일치 수정
DongilMin Aug 11, 2025
ee2d979
Merge branch 'main' into main
DongilMin Aug 11, 2025
674f043
Refact: ReceiverId를 객체 타입으로 수정
DongilMin Aug 11, 2025
adac8f3
Refact: Formatting
DongilMin Aug 11, 2025
a6962a6
Merge branch 'main' of https://github.com/DongilMin/on-air-mate-backe…
DongilMin Aug 11, 2025
8e50435
refact: 소켓이 덮어쓰기 허용
DongilMin Aug 11, 2025
b95d4e9
Merge branch 'ON-AIR-mate:main' into main
DongilMin Aug 13, 2025
d2082a3
Merge branch 'ON-AIR-mate:main' into main
DongilMin Aug 14, 2025
b077a6c
refact: Remove Token in upload image
DongilMin Aug 14, 2025
1dea919
fix: ai summary && friend request
DongilMin Aug 14, 2025
e390e87
feat: 친구 요청 로직 개선 및 AI 요약 기능 안정화
DongilMin Aug 16, 2025
360e121
feat: ai, friend 수정
DongilMin Aug 16, 2025
8ff63a3
Formatting
DongilMin Aug 16, 2025
25c182f
Merge branch 'main' into main
DongilMin Aug 16, 2025
3cb819c
Merge branch 'ON-AIR-mate:main' into main
DongilMin Aug 18, 2025
5bbc89f
Refact str to list
DongilMin Aug 18, 2025
c73faae
Merge branch 'ON-AIR-mate:main' into main
DongilMin Aug 20, 2025
3348461
Feat: Add Bookmark highlights in ai summary
DongilMin Aug 20, 2025
4af44a5
Merge branch 'ON-AIR-mate:main' into main
DongilMin Aug 22, 2025
17d3fe6
Fix: JSON Parsing err
DongilMin Aug 22, 2025
7b974b2
formatting
DongilMin Aug 22, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion src/services/friendServices.ts
Original file line number Diff line number Diff line change
Expand Up @@ -551,9 +551,24 @@ export const inviteFriendToRoom = async (
let message;
// 4. DM으로 초대 메시지 전송
try {
const contentObj = {
message: `${room.roomName} 방에 초대했습니다.`,
roomId: room.roomId,
roomName: room.roomName,
hostNickname: host?.nickname,
hostProfileImage: host?.profileImage,
hostPopularity: host?.popularity,
currentParticipants: room.currentParticipants,
maxParticipants: room.maxParticipants,
videoTitle: result.video?.videoTitle || '',
videoThumbnail: result.video?.videoThumbnail || '',
duration: result.video?.duration,
isPrivate: result.video?.isPrivate,
};

message = await saveDirectMessage(userId, {
receiverId: friendId,
content: `${room.roomName} 방에 초대했습니다.`,
content: JSON.stringify(contentObj),
type: 'roomInvite',
});
} catch (error) {
Expand Down
Loading