Skip to content

Commit

Permalink
Merge pull request #270 from boostcampwm-2024/dev-be
Browse files Browse the repository at this point in the history
[CICD]
  • Loading branch information
i3kae authored Dec 2, 2024
2 parents 7c57f12 + 583db30 commit ec61d2d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion backend/mainServer/src/common/constants.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export const DEFAULT_VALUE = {
THUMBNAIL_IMG_URL : 'https://kr.object.ncloudstorage.com/web22/static/liboo_default_thumbnail.png',
NOTICE : '쾌적한 컨퍼런스 환경을 위해 상대방을 존중하는 언어를 사용해 주시길 바랍니다. 모두가 배움과 소통을 즐길 수 있는 문화를 함께 만들기에 동참해주세요.',
NOTICE : '쾌적한 컨퍼런스 환경을 위해 상대방을 존중하는 언어를 사용해 주시길 바랍니다.\n모두가 배움과 소통을 즐길 수 있는 문화를 함께 만들기에 동참해주세요.',
HOST_NAME : '방송 진행자',
};
6 changes: 5 additions & 1 deletion backend/mainServer/src/streams/streams.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export class StreamsController {
if (!sessionInfo) {
throw new HttpException('Bad Request', HttpStatus.BAD_REQUEST);
}
res.status(HttpStatus.OK).json({notice: sessionInfo.notice});
res.status(HttpStatus.OK).json({notice: sessionInfo.notice, channelName: sessionInfo.channel.channelName});
} catch (error) {
if ((error as { status: number }).status === 400) {
res.status(HttpStatus.BAD_REQUEST).json({
Expand All @@ -104,6 +104,10 @@ export class StreamsController {
@ApiOperation({summary: 'Get Session exited', description: '방송 세션에 대한 존재 여부를 반환 받습니다.'})
async getExistence(@Query('sessionKey') sessionKey: string, @Res() res: Response) {
try {
if (this.memoryDBService.chzzkSwitch && sessionKey in this.memoryDBService.chzzkDb) {
res.status(HttpStatus.OK).json({existed: true});
return;
}
const liveSessions = this.memoryDBService.findAll().filter((info) => info.state);
if (liveSessions.some((info) => info.sessionKey === sessionKey)) {
res.status(HttpStatus.OK).json({existed: true});
Expand Down

0 comments on commit ec61d2d

Please sign in to comment.