From 0c1cbd02f85784cd831b0463e91bf9447a6f182f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=A9?= <69432552+unchidev@users.noreply.github.com> Date: Thu, 23 Jun 2022 20:51:51 +0900 Subject: [PATCH 01/37] =?UTF-8?q?=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC?= =?UTF-8?q?=E6=A4=9C=E7=B4=A2=E7=94=A8=E3=81=AEAPI=E9=96=A2=E6=95=B0?= =?UTF-8?q?=E3=82=92=E7=94=A8=E6=84=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/repositories/userRepository.ts | 8 ++++++++ src/types/syncroom.d.ts | 28 ++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/src/repositories/userRepository.ts b/src/repositories/userRepository.ts index 4a88f83b..5fe0823d 100644 --- a/src/repositories/userRepository.ts +++ b/src/repositories/userRepository.ts @@ -16,4 +16,12 @@ export const UserRepository = { }); return res.json(); }, + + // ユーザーをキーワードで検索 + async search(option: SYNCROOM.UserSearchRequestType): Promise { + const res = await srClientWithToken().get('https://webapi.syncroom.appservice.yamaha.com/comm/users', { + searchParams: option, + }); + return res.json(); + }, }; diff --git a/src/types/syncroom.d.ts b/src/types/syncroom.d.ts index 2acc389b..6be32017 100644 --- a/src/types/syncroom.d.ts +++ b/src/types/syncroom.d.ts @@ -157,6 +157,34 @@ export namespace SYNCROOM { [key: UserIdType]: UserBasicInfoType; }[]; + export type UserSearchRequestType = { + keywords: string, + publishStatus: 'open' | 'hidden', + pageSize: number, + page: number + }; + + export type UserSearchType = { + userId: UserIdType, + nickname: string, + profileText: string, + publishStatus: PublishStatusType, + iconInfo: IconInfoType, + socialLinks: SocialLinksType, + favoriteProducts: string[], + favoriteGenres: string[], + }; + + export type UserSearchResponseType = { + users: UserSearchType, + meta: { + pageSize: number, + page: number, + totalUsers: number, + totalPages: number + }, + }[]; + // 未使用 // export type ErrorRessponseType = { // status: "error", From b1d2325ae8297811159682dd787b68696effcda3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=A9?= <69432552+unchidev@users.noreply.github.com> Date: Sat, 2 Jul 2022 18:47:53 +0900 Subject: [PATCH 02/37] =?UTF-8?q?=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC?= =?UTF-8?q?=E6=A4=9C=E7=B4=A2=E3=83=95=E3=82=A9=E3=83=BC=E3=83=A0=E4=BD=9C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/App.tsx | 2 + src/components/ConfigPanel/MemberInfo.tsx | 4 +- src/components/Parts/Header.tsx | 26 ++- src/components/SearchMember/MemberInfo.tsx | 150 ++++++++++++ src/components/SearchMember/index.tsx | 251 +++++++++++++++++++++ src/lib/i18n.json | 12 + src/types/syncroom.d.ts | 76 ++++--- 7 files changed, 470 insertions(+), 51 deletions(-) create mode 100644 src/components/SearchMember/MemberInfo.tsx create mode 100644 src/components/SearchMember/index.tsx diff --git a/src/components/App.tsx b/src/components/App.tsx index 454a020b..348535ea 100755 --- a/src/components/App.tsx +++ b/src/components/App.tsx @@ -14,6 +14,7 @@ import Report from './Report'; import Messages from './Messages'; import { LoginRequiredDialog } from '../components/LoginRequired/Dialog'; import ReturnToTopButton from './ReturnToTopButton'; +import SearchMember from './SearchMember'; interface Props {} @@ -57,6 +58,7 @@ const App: React.FC = ({}: Props) => { + ); diff --git a/src/components/ConfigPanel/MemberInfo.tsx b/src/components/ConfigPanel/MemberInfo.tsx index 1ad55c7d..aaabf841 100644 --- a/src/components/ConfigPanel/MemberInfo.tsx +++ b/src/components/ConfigPanel/MemberInfo.tsx @@ -26,10 +26,10 @@ const ActivityComponent: React.FC = ({ currentState, return {`${t('in_the_room')}: ${entryRoom.roomName}`}; } else { if (publishState === 'hidden') { - return {`${t('profile_is_private')}`}; + return {t('profile_is_private')}; } else { if (currentState.time === 0) { - return t('no_activity_history'); + return {t('no_activity_history')}; } else { return ( diff --git a/src/components/Parts/Header.tsx b/src/components/Parts/Header.tsx index 4a790109..043a4461 100644 --- a/src/components/Parts/Header.tsx +++ b/src/components/Parts/Header.tsx @@ -1,6 +1,6 @@ import React, { Fragment, useState, useEffect } from 'react'; import { Disclosure, Menu, Transition } from '@headlessui/react'; -import { CheckIcon, MenuIcon, ChevronDownIcon, TranslateIcon, QrcodeIcon, XIcon, LoginIcon, LogoutIcon } from '@heroicons/react/outline'; +import { CheckIcon, MenuIcon, ChevronDownIcon, TranslateIcon, QrcodeIcon, XIcon, LoginIcon, UserIcon } from '@heroicons/react/outline'; import { useTranslation, langMap, changeLanguage } from '../../lib/i18n'; @@ -8,6 +8,7 @@ import ShareRoom from '../ShareRoom'; import ConfigPanel from '../ConfigPanel/index'; import { useSession } from '../../hooks/useSession'; import { iconInfoToUrl } from '../../lib/iconInfoToUrl'; +import { useUserSearch } from '../SearchMember'; interface Props {} @@ -21,6 +22,8 @@ const Component: React.FC = ({}: Props) => { const [displayLangState, setDisplayLangState] = useState(langMap(i18n.language)); + const { openUserSearchForm } = useUserSearch(); + useEffect(() => { setDisplayLangState(langMap(i18n.language)); }, [i18n.language]); @@ -54,6 +57,16 @@ const Component: React.FC = ({}: Props) => { {t('share_room')} + + @@ -164,17 +177,6 @@ const Component: React.FC = ({}: Props) => { {t('my_profile')} - - - - {t('user_search')} - -
diff --git a/src/components/SearchMember/MemberInfo.tsx b/src/components/SearchMember/MemberInfo.tsx new file mode 100644 index 00000000..ae02d63f --- /dev/null +++ b/src/components/SearchMember/MemberInfo.tsx @@ -0,0 +1,150 @@ +import { SYNCROOM } from '../../types/syncroom'; +import { UserRepository } from '../../repositories/userRepository'; +import { iconInfoToUrl } from '../../lib/iconInfoToUrl'; +import { useTranslation } from '../../lib/i18n'; + +import { css } from '@emotion/css'; +import React, { memo, useEffect, useState } from 'react'; +import { useRooms } from '../../hooks/useRooms'; +import findRoomByUserId from '../../lib/findRoomByUserId'; +import { DateTime } from 'luxon'; + +interface ActivityComponentPropType { + currentState: SYNCROOM.CurrentStateType; + publishState: SYNCROOM.PublishStatusType; + entryRoom: SYNCROOM.RoomType | undefined; +} +const ActivityComponent: React.FC = ({ currentState, publishState, entryRoom }: ActivityComponentPropType) => { + const { t } = useTranslation(); + + if (currentState.type === 'none') { + if (entryRoom) { + return {`${t('in_the_room')}: ${entryRoom.roomName}`}; + } else { + if (publishState === 'hidden') { + return {t('profile_is_private')}; + } else { + if (currentState.time === 0) { + return {t('no_activity_history')}; + } else { + return ( + + {t('recent_activities')}: {DateTime.fromMillis(currentState.time * 1000).toLocaleString(DateTime.DATETIME_MED)} + + ); + } + } + } + } else if (currentState.type === 'createRoom') { + if (entryRoom) { + return {`${t('in_the_room')}: ${entryRoom.roomName}`}; + } else { + return {`${t('in_the_room')}`}; + } + } else if (currentState.type === 'enterRoom') { + if (entryRoom) { + return {`${t('in_the_room')}: ${entryRoom.roomName}`}; + } else { + return {`${t('in_the_room')}`}; + } + } + return null; +}; + +const StatusIconComponent: React.FC = ({ currentState, publishState, entryRoom }: ActivityComponentPropType) => { + if (currentState.type === 'none') { + if (entryRoom) { + return ( + + + + + ); + } else { + if (publishState === 'hidden') { + return ( + + + + ); + } else { + if (currentState.time === 0) { + return ( + + + + ); + } else { + return ( + + + + ); + } + } + } + } else if (currentState.type === 'createRoom') { + return ( + + + + + ); + } else if (currentState.type === 'enterRoom') { + return ( + + + + + ); + } + return null; +}; + +interface Props { + nickname: string; + iconInfo: SYNCROOM.IconInfoType; + profileText: string; + userId: string; +} + +const Component: React.FC = ({ nickname, iconInfo, profileText, userId }: Props) => { + const { t } = useTranslation(); + const [user, setUser] = useState(); + const [entryRoom, setEntryRoom] = useState(); + const { rooms } = useRooms(); + + useEffect(() => { + UserRepository.show(userId).then((res) => { + setUser(res); + setEntryRoom(findRoomByUserId(rooms, res.userId)); + }); + }, []); + + return ( +
+
+
+ +
+
+ +

{nickname}

+ +

+ + {user && } + + + {user && } + +

+
+
+
+

{profileText}

+
+
+ ); +}; +export default memo(Component); diff --git a/src/components/SearchMember/index.tsx b/src/components/SearchMember/index.tsx new file mode 100644 index 00000000..3657013b --- /dev/null +++ b/src/components/SearchMember/index.tsx @@ -0,0 +1,251 @@ +import { Dialog, Transition } from '@headlessui/react'; +import { ExclamationIcon, SearchIcon, XIcon } from '@heroicons/react/outline'; +import { SYNCROOM } from '../../types/syncroom'; +import { UserRepository } from '../../repositories/userRepository'; +import { useTranslation } from '../../lib/i18n'; + +import { css } from '@emotion/css'; +import React, { Fragment, memo, useEffect, useState } from 'react'; +import MemberInfo from './MemberInfo'; +import { InformationCircleIcon } from '@heroicons/react/solid'; +import ReactLoading from 'react-loading'; + +// focus:shadow-none が効かないのでこのやり方をとる +const SearchInputStyle = css` + &:focus { + box-shadow: none !important; + } +`; + +interface PaginationProps extends SYNCROOM.UserSearchMetaType { + onPrev: Function; + onNext: Function; +} + +const PaginationComponent: React.FC = ({ page, totalPages, onPrev, onNext }: PaginationProps) => { + const { t } = useTranslation(); + + return ( + + ); +}; + +import { atom, useRecoilState } from 'recoil'; + +const userSearchModalState = atom({ + key: 'UserSearchModalState', + default: false, +}); + +export const useUserSearch = () => { + const [isOpen, setIsOpen] = useRecoilState(userSearchModalState); + + const openUserSearchForm = () => { + setIsOpen(true); + }; + + const closeUserSearchForm = () => { + setIsOpen(false); + }; + + return { + isOpen, + openUserSearchForm, + closeUserSearchForm, + }; +}; + +interface Props {} + +const Component: React.FC = ({}: Props) => { + const { t } = useTranslation(); + + const { isOpen, closeUserSearchForm } = useUserSearch(); + + const [keywordState, setKeywords] = useState(''); + const [pageState, setPageState] = useState(1); + const [searchRes, setSearchRes] = useState(); + const [isLoading, setIsLoading] = useState(false); + + useEffect(() => { + if (keywordState === '') { + setSearchRes(undefined); + } else { + setIsLoading(true); + UserRepository.search({ + keywords: keywordState, + publishStatus: 'open', + pageSize: 20, + page: pageState, + }).then((res) => { + if (setSearchRes) setSearchRes(res); + if (setIsLoading) setIsLoading(false); + }); + } + }, [keywordState, pageState]); + + return ( + + { + closeUserSearchForm(); + }} + > +
+ + + + + +
+
+ +
+
+
+

{t('user_search')}

+
+ +
+
+ {isLoading ? ( +
+ +

{t('loading')}

+
+ ) : keywordState === '' ? ( +
+
+
+
+
+

{t('type_keywords')}

+
+
+
+ ) : searchRes?.users.length === 0 ? ( +
+
+
+
+
+
+

{t('user_not_found')}

+
+
+
+
+ ) : ( + searchRes && ( + <> + { + setPageState(pageState - 1); + }} + onNext={() => { + setPageState(pageState + 1); + }} + /> +
+
+ {searchRes.users.map((user) => ( + + ))} +
+
+ + { + setPageState(pageState - 1); + }} + onNext={() => { + setPageState(pageState + 1); + }} + /> + + ) + )} +
+
+
+
+ +
+ + + ); +}; +export default memo(Component); diff --git a/src/lib/i18n.json b/src/lib/i18n.json index dfad0925..bd3e9e8e 100644 --- a/src/lib/i18n.json +++ b/src/lib/i18n.json @@ -9,6 +9,10 @@ "account_page": "Account Page", "my_profile": "My Profile", "user_search": "User Search", + "user_not_found": "User not found.", + "pages": "pages.", + "next": "Next", + "prev": "Previous", "loading": "Loading...", "menu": "Menu", "basic_settings": "Basic Settings", @@ -89,6 +93,10 @@ "account_page": "マイページ", "my_profile": "プロフィール確認", "user_search": "ユーザー検索", + "user_not_found": "ユーザーが見つかりませんでした", + "pages": "ページ", + "next": "次へ", + "prev": "前へ", "loading": "読込中...", "menu": "メニュー", "basic_settings": "基本設定", @@ -169,6 +177,10 @@ "account_page": "계정 페이지", "my_profile": "내 프로필", "user_search": "사용자 검색", + "user_not_found": "사용자를 찾을 수 없음.", + "pages": "페이지.", + "next": "다음", + "prev": "이전의", "loading": "로딩...", "menu": "메뉴", "basic_settings": "기본 설정", diff --git a/src/types/syncroom.d.ts b/src/types/syncroom.d.ts index 6be32017..a4dbf8b5 100644 --- a/src/types/syncroom.d.ts +++ b/src/types/syncroom.d.ts @@ -23,25 +23,25 @@ export namespace SYNCROOM { // TODO: 非公開ルームに入室しているときの状態を確認 export type CurrentStateType = | { - type: 'none'; - // 最終活動日時 - // プロフィール非公開ユーザーは 0 になる - // 活動履歴がないと 0 になる - time: number; - roomName: ''; - } + type: 'none'; + // 最終活動日時 + // プロフィール非公開ユーザーは 0 になる + // 活動履歴がないと 0 になる + time: number; + roomName: ''; + } | { - type: 'createRoom'; - time: number; - roomName: string; - needPasswd: boolean; - } + type: 'createRoom'; + time: number; + roomName: string; + needPasswd: boolean; + } | { - // 入室中は部屋名も鍵部屋かどうかもわからない - type: 'enterRoom'; - time: number; - roomName: ''; - }; + // 入室中は部屋名も鍵部屋かどうかもわからない + type: 'enterRoom'; + time: number; + roomName: ''; + }; export type MyProfileType = { userId: string; @@ -158,32 +158,34 @@ export namespace SYNCROOM { }[]; export type UserSearchRequestType = { - keywords: string, - publishStatus: 'open' | 'hidden', - pageSize: number, - page: number + keywords: string; + publishStatus: 'open' | 'hidden'; + pageSize: number; + page: number; }; export type UserSearchType = { - userId: UserIdType, - nickname: string, - profileText: string, - publishStatus: PublishStatusType, - iconInfo: IconInfoType, - socialLinks: SocialLinksType, - favoriteProducts: string[], - favoriteGenres: string[], + userId: UserIdType; + nickname: string; + profileText: string; + publishStatus: PublishStatusType; + iconInfo: IconInfoType; + socialLinks: SocialLinksType; + favoriteProducts: string[]; + favoriteGenres: string[]; + }; + + export type UserSearchMetaType = { + pageSize: number; + page: number; + totalUsers: number; + totalPages: number; }; export type UserSearchResponseType = { - users: UserSearchType, - meta: { - pageSize: number, - page: number, - totalUsers: number, - totalPages: number - }, - }[]; + users: UserSearchType[]; + meta: UserSearchMetaType; + }; // 未使用 // export type ErrorRessponseType = { From cdde321327d2b997c812bf4d42e6f6fea0e48027 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=A9?= <69432552+unchidev@users.noreply.github.com> Date: Sat, 2 Jul 2022 18:48:02 +0900 Subject: [PATCH 03/37] =?UTF-8?q?devcontainer=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devcontainer/devcontainer.json | 36 ++++++++++++++++++++++++++++++ .devcontainer/docker-compose.yml | 38 ++++++++++++++++++++++++++++++++ .gitignore | 2 +- 3 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 .devcontainer/devcontainer.json create mode 100644 .devcontainer/docker-compose.yml diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 00000000..0a42c608 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,36 @@ +// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at: +// https://github.com/microsoft/vscode-dev-containers/tree/v0.238.0/containers/docker-existing-docker-compose +// If you want to run as a non-root user in the container, see .devcontainer/docker-compose.yml. +{ + "name": "Existing Docker Compose (Extend)", + + // Update the 'dockerComposeFile' list if you have more compose files or use different names. + // The .devcontainer/docker-compose.yml file contains any overrides you need/want to make. + "dockerComposeFile": [ + "../docker-compose.yml", + "docker-compose.yml" + ], + + // The 'service' property is the name of the service for the container that VS Code should + // use. Update this value and .devcontainer/docker-compose.yml to the real service name. + "service": "app", + + // The optional 'workspaceFolder' property is the path VS Code should open by default when + // connected. This is typically a file mount in .devcontainer/docker-compose.yml + "workspaceFolder": "/workspace" + + // Use 'forwardPorts' to make a list of ports inside the container available locally. + // "forwardPorts": [], + + // Uncomment the next line if you want start specific services in your Docker Compose config. + // "runServices": [], + + // Uncomment the next line if you want to keep your containers running after VS Code shuts down. + // "shutdownAction": "none", + + // Uncomment the next line to run commands after the container is created - for example installing curl. + // "postCreateCommand": "apt-get update && apt-get install -y curl", + + // Uncomment to connect as a non-root user if you've added one. See https://aka.ms/vscode-remote/containers/non-root. + // "remoteUser": "vscode" +} diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml new file mode 100644 index 00000000..378e4e85 --- /dev/null +++ b/.devcontainer/docker-compose.yml @@ -0,0 +1,38 @@ +version: '3.3' +services: + # Update this to the name of the service you want to work with in your docker-compose.yml file + app: + # If you want add a non-root user to your Dockerfile, you can use the "remoteUser" + # property in devcontainer.json to cause VS Code its sub-processes (terminals, tasks, + # debugging) to execute as the user. Uncomment the next line if you want the entire + # container to run as this user instead. Note that, on Linux, you may need to + # ensure the UID and GID of the container user you create matches your local user. + # See https://aka.ms/vscode-remote/containers/non-root for details. + # + # user: vscode + + # Uncomment if you want to override the service's Dockerfile to one in the .devcontainer + # folder. Note that the path of the Dockerfile and context is relative to the *primary* + # docker-compose.yml file (the first in the devcontainer.json "dockerComposeFile" + # array). The sample below assumes your primary file is in the root of your project. + # + # build: + # context: . + # dockerfile: .devcontainer/Dockerfile + + volumes: + # Update this to wherever you want VS Code to mount the folder of your project + - .:/workspace:cached + + # Uncomment the next line to use Docker from inside the container. See https://aka.ms/vscode-remote/samples/docker-from-docker-compose for details. + # - /var/run/docker.sock:/var/run/docker.sock + + # Uncomment the next four lines if you will use a ptrace-based debugger like C++, Go, and Rust. + # cap_add: + # - SYS_PTRACE + # security_opt: + # - seccomp:unconfined + + # Overrides default command so things don't shut down after the process ends. + command: /bin/sh -c "while sleep 1000; do :; done" + diff --git a/.gitignore b/.gitignore index 8fee16c4..6789b8ed 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,4 @@ /dist-zip /coverage report.json -.devcontainer + From 8feb7d657a68d558a1eeadb72244eddebf0ed063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=A9?= <69432552+unchidev@users.noreply.github.com> Date: Sat, 2 Jul 2022 18:49:43 +0900 Subject: [PATCH 04/37] =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=89=E3=82=B9?= =?UTF-8?q?=E3=82=BF=E3=82=A4=E3=83=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/types/syncroom.d.ts | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/types/syncroom.d.ts b/src/types/syncroom.d.ts index a4dbf8b5..c3e7c0cb 100644 --- a/src/types/syncroom.d.ts +++ b/src/types/syncroom.d.ts @@ -23,25 +23,25 @@ export namespace SYNCROOM { // TODO: 非公開ルームに入室しているときの状態を確認 export type CurrentStateType = | { - type: 'none'; - // 最終活動日時 - // プロフィール非公開ユーザーは 0 になる - // 活動履歴がないと 0 になる - time: number; - roomName: ''; - } + type: 'none'; + // 最終活動日時 + // プロフィール非公開ユーザーは 0 になる + // 活動履歴がないと 0 になる + time: number; + roomName: ''; + } | { - type: 'createRoom'; - time: number; - roomName: string; - needPasswd: boolean; - } + type: 'createRoom'; + time: number; + roomName: string; + needPasswd: boolean; + } | { - // 入室中は部屋名も鍵部屋かどうかもわからない - type: 'enterRoom'; - time: number; - roomName: ''; - }; + // 入室中は部屋名も鍵部屋かどうかもわからない + type: 'enterRoom'; + time: number; + roomName: ''; + }; export type MyProfileType = { userId: string; From 5ed7b4e0b57b64955b98026e9cbc733e27cc87b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=A9?= <69432552+unchidev@users.noreply.github.com> Date: Sat, 2 Jul 2022 19:00:26 +0900 Subject: [PATCH 05/37] =?UTF-8?q?CodeQL=E3=81=AE=E8=A8=AD=E5=AE=9A?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/codeql-analysis.yml | 79 +++++++++++++++++---------- 1 file changed, 50 insertions(+), 29 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index e91482c7..12d9b5e9 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -9,14 +9,14 @@ # the `language` matrix defined below to confirm you have the correct set of # supported CodeQL languages. # -name: "CodeQL" +name: 'CodeQL' on: push: - branches: [ "develop" ] + branches: ['develop'] pull_request: # The branches below must be a subset of the branches above - branches: [ "develop" ] + branches: ['develop'] schedule: - cron: '24 0 * * 2' @@ -35,41 +35,62 @@ jobs: matrix: # TypeScript をしていしなくても大丈夫らしい # 参考: https://github.com/github/codeql-action/issues/365 - language: [ 'javascript' ] + language: ['javascript'] # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support steps: - - name: Checkout repository - uses: actions/checkout@v3 + - name: Checkout repository + uses: actions/checkout@v3 - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v2 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. + - uses: actions/setup-node@v3 + id: setup_node_id + with: + node-version: 18 + cache: yarn - # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs - # queries: security-extended,security-and-quality + - uses: actions/cache@v3 + id: node_modules_cache_id + env: + cache-name: cache-node-modules + with: + path: 'node_modules' + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('yarn.lock') }}-v6 + - run: echo '${{ toJSON(steps.node_modules_cache_id.outputs) }}' + - run: echo '${{ steps.node_modules_cache_id.outputs.cache-hit != 'true' }}' - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v2 + - if: steps.node_modules_cache_id.outputs.cache-hit != 'true' + run: yarn install --frozen-lockfile - # ℹ️ Command-line programs to run using the OS shell. - # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v2 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. - # If the Autobuild fails above, remove it and uncomment the following three lines. - # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. + # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs + # queries: security-extended,security-and-quality - # - run: | - # echo "Run, Build Application using script" - # ./location_of_script_within_repo/buildscript.sh + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v2 - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + # ℹ️ Command-line programs to run using the OS shell. + # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun + + # If the Autobuild fails above, remove it and uncomment the following three lines. + # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. + + # - run: | + # echo "Run, Build Application using script" + # ./location_of_script_within_repo/buildscript.sh + + - run: yarn build + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v2 From 963880629c95950ed197579046a5a94b4c1a6bd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=A9?= <69432552+unchidev@users.noreply.github.com> Date: Sat, 2 Jul 2022 19:26:09 +0900 Subject: [PATCH 06/37] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E3=82=A8?= =?UTF-8?q?=E3=82=B9=E3=82=B1=E3=83=BC=E3=83=97=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lib/optimizeSearchKeyword.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/optimizeSearchKeyword.ts b/src/lib/optimizeSearchKeyword.ts index e4710eb2..bf7d7144 100644 --- a/src/lib/optimizeSearchKeyword.ts +++ b/src/lib/optimizeSearchKeyword.ts @@ -6,7 +6,7 @@ const optimizeSearchKeyword = (keyword: string): string => { let result: string = keyword; // 記号を削除 - result = result.replace(/[\~\!\@\#\$\%\^\&\*\(\)\_\+\`\-\=\[\]\\\{\}\|\;\'\:\"\,\.\/\<\>\?\']/g, ''); + result = result.replace(/[~!@#$%^&*()_+`\-=[\]\\{}|;':",./<>?']/g, ''); // 英数字をすべて半角に統一 result = result.replace(/[Ａ-Ｚａ-ｚ０-９]/g, (s) => { From b07a4297d9b7d79d99a43c5e692f95bc56628709 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=A9?= <69432552+unchidev@users.noreply.github.com> Date: Sat, 2 Jul 2022 19:34:50 +0900 Subject: [PATCH 07/37] =?UTF-8?q?=E4=BD=BF=E3=81=A3=E3=81=A6=E3=81=84?= =?UTF-8?q?=E3=81=AA=E3=81=84=E3=81=AE=E3=81=A7Option=E3=83=9A=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack.config.js b/webpack.config.js index c6d62c42..44b2fe3f 100755 --- a/webpack.config.js +++ b/webpack.config.js @@ -37,7 +37,7 @@ var options = { mode: process.env.NODE_ENV || 'development', entry: { // newtab: path.join(__dirname, 'src', 'pages', 'Newtab', 'index.jsx'), - options: path.join(__dirname, 'src', 'pages', 'Options', 'index.tsx'), + // options: path.join(__dirname, 'src', 'pages', 'Options', 'index.tsx'), // popup: path.join(__dirname, 'src', 'pages', 'Popup', 'index.jsx'), background: path.join(__dirname, 'src', 'pages', 'Background', 'index.ts'), contentScript: path.join(__dirname, 'src', 'pages', 'Content', 'index.tsx'), From acd4b0b278980b334a0f09c3dbc303c3d31deae8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=A9?= <69432552+unchidev@users.noreply.github.com> Date: Sat, 2 Jul 2022 19:43:36 +0900 Subject: [PATCH 08/37] =?UTF-8?q?=E7=94=BB=E5=83=8F=E3=82=92=E5=9C=A7?= =?UTF-8?q?=E7=B8=AE=E3=81=97=E3=81=A6=E8=BB=BD=E9=87=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/logo.png | Bin 9081 -> 3592 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png index 3adf325e9f5188ef1e9162bac86d9a07b4b6d4cf..83fc8cf282c18e7fcb53bfca89f216fce6cc20bb 100644 GIT binary patch literal 3592 zcmZWsc|4SB8=kR*8YV?!9b_4XP^jp&rJ9IFgJdU(DEl&&?9;R{DN%+-}l#fe(&#o?)!SL`?|09pZE7XcWlpNM0d;VhCm>qmS<1l zAP_!)mnRDI^WyO{79`%bVry-Gnzy6TXcS5lh2llDnwq+r8ZU0=>e~ygs;aS5ZWGkh zG*wm6ii(OTl-5qE!HYXgEgnZzRTYKO;Pvp-c3OC#hN7bG4)TwtCNJlKJi?ChKNGk0 z6%~11Je&5lm9ofP215?Q&;CD|0{Web`-XIc}~>Tw;le2>~PQ; z8a!9LXPf_Qx6&5x%W>hj^LCKKi@(2kK|ygaq~QFQ!JhOs>-2mm z1Of}PJY{Z=ht72zgF+M`5XFYA{mpyU_?38r|Gm00^Ktxfe#Th$zrR9~rBeCSCr^4# z6#v#9+hV``l`ax5K9ZoSAv-KD{w8#@OsL?OjnTd&^6+D-SxPr4BqJ zXXNkN*O)Ibq zU-E9VdTQ~JXxGW;8erk)X7uC1$2EavhH!3Inl=n8wOjyI!f0L$n3SL&cytisq|vPX z$t9-s_dUx`CH&RtltP6c3D{B?(Qq+t#D@^Na3X!5=72wZWhCjeD5$d_OkV0uE*W}# z_t@a8hgZ>q45I_8>)+d>YnP@fvnIaO7kn3B)Z|=d1R9~hb;8Korkot-8jJ2<9yDR~!J`C7 zx2tkWU+?4lpnP=}d0&Y6)F141{BCqBTSrHj{PX&zv#<24U4DsmeU@yJ#vYZDpV_LU=nX{5wl1M zF#DxiC>^c+d7(};1KCndCh8*~_yWeyQFlpl#ZpgUP9oz7Q0p^7$;!PO*KQ^9=s6$u z1y$K&P@y5+_yB}-?e9LjRPz_p*0Q-9gT1v^g*bARL}uT$w97Z~i5DQhLQ&v-s5oUN zv%=Ry51C9mU<6?FZTPMi+7oFlQf4bEIn(4uu4Vild;HfQRC_v#? zt?93Zua`>}r4XJl%AHa=)@xkfo>hjsB{Zefs8rao|9Wv(XB1-b; zXJr}MifkyzRKt+@fZ#6T(X7SN{$0WQ67Z7j!?mkDYd8!4`#mY(_$L_Lo_5m3xp^*` zEjD=CgnyFt%zfX5H|lXQf@F0;D=O=7b&hJ>0N87l7Tl_sU*3%GPhYyP<}mB*P$C7V zdc!60Rm&=bgiA#B*(;G;gmOe}D17R)bOm?m3IAJ&Oebso{9`kaa?UoFFrLw~rT4h- zhSq^g*d~2!wG9HW6GT2SUV31dA0$9m!n$Tg#x>>SJx|X~zSSxyh7f>n(xMeWi5WHQ zsu5{e(DYLgWe?t#%uL#Zvb$Y|AV>YP_z23~-i`A2@L~}YIG$%hNMt)Weozj1l{n1` zQrXD8gsoewN~-h&Rbcec?geSL-22gal~^TdI4A5CWkM7DM)q1GMYu4c<`Q-H z;QG2ET;KzG04^+1sAoV4?0uJT$zXTx%(Z?Fel(CjTtoz(NMvpu6+qt3lY#gJI_fu_ z+0+g61dITOey~?L+i5R=xwvW&z)9H`d;8IXgB9PwUMFEd7XiR-vD3$ihEZ?wd*}T| z?e@sbH>Xw7_<@2?FjB=IF1ekL>hnbUx6pDTl(1KPB$WsI?HSSm)p z>hHLSduXeVmS<)%+-)nR;GN3fotZUC;Gpb#G;R&1hJlcROX5_?F9H~rb-&JqcBQcz zCFWqKA_$$zGwcJ_>dO{X&Xq{LIAqO|E@1710J@z){jBclEK%@!L87l!yo><-BmtEy zk|RcHGk^Hyc!pq{>;fQ?y6ozt^8FCU04x(15hWM7c2<16*EQuKNKqE-sdd4J>UjS- z6HWeBw+lp3SxSfmiT12xm7#S$s_|~KOAzdSQdkK3=dI6T0DWSG1$Fapy}0J}(klU^ zTYucHDShmyF{L7xZH*3Dhsm)-+Ncp= zNe5kZFfN83QmrZe~iM_|hq z92P(_nnVJzT=s=4EnYPrd#<22_zVqagvc`o4O%;>99OTE?^kkApm-a#m>O2qpn zOMRqbNno3LIc~XZA$^CbRWb2@#RR_ZGKljh-aphrJg@S#DE>( zX3=77>10DFgifFCSG_l(8SbYt#i$~?7>};%;Zlj8L%gblv6Ah>MN+XB%)P+dF6XT2 zN+wFPZooiLw&!vO2!o z5GU4$hoauc5;6VQGvP~FBFv;Tyw(K!W{3CfSt(nx|1<1fWIYmjP;zEoq;se|J3`Tp zaX0z2?Qe5@5e~ZdDAL&Nw=5o@7Q$i*{tSX5yJIM4U)VPaMEv0@Sd`n_a(La)!-h^A zs9r=OGdJo2m;I$EMg}e{P}p6B?A`KJkVFcF!Cm0(VGUavfGP8(+Uk6do-e-WW*_u@ zL^D4gCx~Qw40P;YTLVZ9m3zD<<7q$+w~J3}Lh>U~)iM!NM~f#H9dyTlyM>$2TGOU%EUPH^g^Q7=DQqyypeG!F<5x zTeZKtzfI6`w^lM+`S`PXWBfN9+ifm<&$>;#nvGZDP z;7WLMHAD`Z?JmC}2*-|juRVP6T#TdvLN!}fkJ&Cn{rK3PI(7qsG&vMdF9Zj=wVz6K zt0ehmxA0+2l9%>PvoZuK5FOsQ(my2Y5H_L-^e6*wL#9=ffhO*R_km!0nD@1!Lk`TO_kA}y`KLtC z<5}Eu2{BEOreORU%6seJUIp#T`0!bC6wA9@cM_MkoB8~>UhNHh6Maw;CjD1=(>VW6 z<9T@`9n>|RI{||`VKe{3ftkVIhmU89>g7tULQZ1-oNu~j-Z~O+`G=9_HRfk0ymS6dP z#XIfK<))8M6Q{D?m5{I%zqlA5)#N*^k*$DCz!VpDH#?yoIM-ag%M-vUj9xCgvHm^Z zuu~yT0$|&o?%m2PWK+K$E WCY6uV-XGt7XLVCn8!Iv?Nn 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 From 580e382da1c9f6dd9aba9b07d284a2056a6221b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=A9?= <69432552+unchidev@users.noreply.github.com> Date: Sat, 2 Jul 2022 19:50:26 +0900 Subject: [PATCH 09/37] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=83=AB?= =?UTF-8?q?=E3=83=BC=E3=83=A0=E3=81=B8=E3=81=AE=E5=85=A5=E5=AE=A4=E3=81=AF?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E3=81=97=E3=81=AA=E3=81=84=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB=E8=A8=AD=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Background/index.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/pages/Background/index.ts b/src/pages/Background/index.ts index cf97199e..5c280a5e 100755 --- a/src/pages/Background/index.ts +++ b/src/pages/Background/index.ts @@ -73,6 +73,10 @@ browser.alarms.onAlarm.addListener(async () => { const onlineMembers = []; for (const room of roomlist.rooms) { + // テストルームの通知は意味がないので無視 + if (room.roomName === '接続テストルーム') { + continue; + } for (const member of room.members) { onlineMembers.push(member); From 44cb82afaa00b3f9f93277425a5c39301accc1fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=A9?= <69432552+unchidev@users.noreply.github.com> Date: Sat, 2 Jul 2022 20:01:18 +0900 Subject: [PATCH 10/37] =?UTF-8?q?=E3=82=A2=E3=83=97=E3=83=AA=E3=81=AE?= =?UTF-8?q?=E3=83=9E=E3=82=A6=E3=83=B3=E3=83=88=E5=87=A6=E7=90=86=E3=82=92?= =?UTF-8?q?=E6=9C=80=E9=81=A9=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lib/mountApp.tsx | 2 +- src/pages/Content/index.tsx | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/lib/mountApp.tsx b/src/lib/mountApp.tsx index 1826dfb2..061689f1 100644 --- a/src/lib/mountApp.tsx +++ b/src/lib/mountApp.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { render } from 'react-dom'; import App from '../components/App'; -const mountApp = async () => { +const mountApp = () => { const AppContainer = document.createElement('div'); AppContainer.id = 'app-container'; document.body.appendChild(AppContainer); diff --git a/src/pages/Content/index.tsx b/src/pages/Content/index.tsx index bc10bdf2..40654d8c 100755 --- a/src/pages/Content/index.tsx +++ b/src/pages/Content/index.tsx @@ -3,15 +3,10 @@ import clearAssets from '../../lib/clearAssets'; import addFavicon from '../../lib/addFavicon'; import mountApp from '../../lib/mountApp'; -const run = async () => { - // 既存のassetsが邪魔になるので、必ず mountApp() より先に実行しておく - await clearAssets(); - +// 既存のassetsが邪魔になるので、必ず clearAssets() を実行し終わったあとに mountApp() を実行する +clearAssets().then((res) => { mountApp(); - addFavicon(); -}; - -run(); +}); if (module.hot) module.hot.accept(); From b73335b8bc1ae0bba0eab6e18cb8030b6ec2b2dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=A9?= <69432552+unchidev@users.noreply.github.com> Date: Sat, 2 Jul 2022 20:04:09 +0900 Subject: [PATCH 11/37] =?UTF-8?q?devcontainer=E7=92=B0=E5=A2=83=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devcontainer/devcontainer.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 0a42c608..0026dc6a 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -17,7 +17,15 @@ // The optional 'workspaceFolder' property is the path VS Code should open by default when // connected. This is typically a file mount in .devcontainer/docker-compose.yml - "workspaceFolder": "/workspace" + "workspaceFolder": "/workspace", + "customizations": { + "vscode": { + "extensions": [ + "esbenp.prettier-vscode", + "remimarsal.prettier-now" + ] + } + } // Use 'forwardPorts' to make a list of ports inside the container available locally. // "forwardPorts": [], From 72727b1b114bdcc1922babb2522240cc946678c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=A9?= <69432552+unchidev@users.noreply.github.com> Date: Sat, 2 Jul 2022 23:38:48 +0900 Subject: [PATCH 12/37] =?UTF-8?q?=E3=83=AB=E3=83=BC=E3=83=A0=E5=85=A5?= =?UTF-8?q?=E5=AE=A4=E7=8A=B6=E6=B3=81=E3=82=92=E8=A9=B3=E7=B4=B0=E3=81=AB?= =?UTF-8?q?=E8=A1=A8=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ConfigPanel/MemberInfo.tsx | 6 +++--- src/components/SearchMember/MemberInfo.tsx | 6 +++--- src/lib/i18n.json | 9 +++++++++ src/types/syncroom.d.ts | 15 ++++++++++++--- 4 files changed, 27 insertions(+), 9 deletions(-) diff --git a/src/components/ConfigPanel/MemberInfo.tsx b/src/components/ConfigPanel/MemberInfo.tsx index aaabf841..52fd2946 100644 --- a/src/components/ConfigPanel/MemberInfo.tsx +++ b/src/components/ConfigPanel/MemberInfo.tsx @@ -41,15 +41,15 @@ const ActivityComponent: React.FC = ({ currentState, } } else if (currentState.type === 'createRoom') { if (entryRoom) { - return {`${t('in_the_room')}: ${entryRoom.roomName}`}; + return {`${t('creating_the_room')}: ${entryRoom.roomName}`}; } else { - return {`${t('in_the_room')}`}; + return ${t('creating_the_private_room')}; } } else if (currentState.type === 'enterRoom') { if (entryRoom) { return {`${t('in_the_room')}: ${entryRoom.roomName}`}; } else { - return {`${t('in_the_room')}`}; + return {t('in_the_private_room')}; } } return null; diff --git a/src/components/SearchMember/MemberInfo.tsx b/src/components/SearchMember/MemberInfo.tsx index ae02d63f..aba40840 100644 --- a/src/components/SearchMember/MemberInfo.tsx +++ b/src/components/SearchMember/MemberInfo.tsx @@ -37,15 +37,15 @@ const ActivityComponent: React.FC = ({ currentState, } } else if (currentState.type === 'createRoom') { if (entryRoom) { - return {`${t('in_the_room')}: ${entryRoom.roomName}`}; + return {`${t('creating_the_room')}: ${entryRoom.roomName}`}; } else { - return {`${t('in_the_room')}`}; + return ${t('creating_the_private_room')}; } } else if (currentState.type === 'enterRoom') { if (entryRoom) { return {`${t('in_the_room')}: ${entryRoom.roomName}`}; } else { - return {`${t('in_the_room')}`}; + return {t('in_the_private_room')}; } } return null; diff --git a/src/lib/i18n.json b/src/lib/i18n.json index bd3e9e8e..e2862660 100644 --- a/src/lib/i18n.json +++ b/src/lib/i18n.json @@ -3,6 +3,9 @@ "return_to_top": "Return to top of page", "old_user": "This user is using an older version of SYNCROOM.", "in_the_room": "In the room", + "in_the_private_room": "In the private room", + "creating_the_room": "Creating the room", + "creating_the_private_room": "Creating the private room", "recent_activities": "Recent Activities", "no_activity_history": "No activity history.", "profile_is_private": "Profile is private.", @@ -87,6 +90,9 @@ "return_to_top": "ページ上部へ戻る", "old_user": "このユーザーは古いバージョンのSYNCROOMを使用しています", "in_the_room": "ルーム入室中", + "in_the_private_room": "非公開ルーム入室中", + "creating_the_room": "ルーム作成中", + "creating_the_private_room": "非公開ルーム作成中", "recent_activities": "最近の活動", "no_activity_history": "活動履歴がありません", "profile_is_private": "プロフィール非公開", @@ -171,6 +177,9 @@ "return_to_top": "페이지 맨 위로 돌아가기", "old_user": "이 사용자는 이전 버전의 SYNCROOM을 사용하고 있습니다.", "in_the_room": "방에서", + "in_the_private_room": "개인실에서", + "creating_the_room": "방 만들기", + "creating_the_private_room": "개인실 만들기", "recent_activities": "최근 활동", "no_activity_history": "활동 기록 없음", "profile_is_private": "프로필은 비공개입니다.", diff --git a/src/types/syncroom.d.ts b/src/types/syncroom.d.ts index c3e7c0cb..276a954f 100644 --- a/src/types/syncroom.d.ts +++ b/src/types/syncroom.d.ts @@ -20,7 +20,6 @@ export namespace SYNCROOM { linkImage?: string; }; - // TODO: 非公開ルームに入室しているときの状態を確認 export type CurrentStateType = | { type: 'none'; @@ -29,18 +28,28 @@ export namespace SYNCROOM { // 活動履歴がないと 0 になる time: number; roomName: ''; + needPasswd?: boolean; } | { + // 公開部屋を作っている時 type: 'createRoom'; time: number; roomName: string; - needPasswd: boolean; + needPasswd?: boolean; } | { - // 入室中は部屋名も鍵部屋かどうかもわからない + // 非公開部屋を作っている時 + type: 'createRoom'; + time: number; + roomName: ''; + needPasswd?: boolean; + } + | { + // 入室中は部屋名も鍵部屋かどうかもわからないので非公開入室も同じになる type: 'enterRoom'; time: number; roomName: ''; + needPasswd?: boolean; }; export type MyProfileType = { From 910de5f9fa884f60e6d7d6005daa570a78fb9310 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=A9?= <69432552+unchidev@users.noreply.github.com> Date: Sat, 2 Jul 2022 23:52:34 +0900 Subject: [PATCH 13/37] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E3=82=B3?= =?UTF-8?q?=E3=83=BC=E3=83=89=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/SearchMember/MemberInfo.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/SearchMember/MemberInfo.tsx b/src/components/SearchMember/MemberInfo.tsx index aba40840..2babba50 100644 --- a/src/components/SearchMember/MemberInfo.tsx +++ b/src/components/SearchMember/MemberInfo.tsx @@ -3,7 +3,6 @@ import { UserRepository } from '../../repositories/userRepository'; import { iconInfoToUrl } from '../../lib/iconInfoToUrl'; import { useTranslation } from '../../lib/i18n'; -import { css } from '@emotion/css'; import React, { memo, useEffect, useState } from 'react'; import { useRooms } from '../../hooks/useRooms'; import findRoomByUserId from '../../lib/findRoomByUserId'; From 6d6653678785d2a5583792f975d49e1a5c7b8e3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=A9?= <69432552+unchidev@users.noreply.github.com> Date: Sun, 3 Jul 2022 00:14:30 +0900 Subject: [PATCH 14/37] =?UTF-8?q?=E3=83=97=E3=83=AD=E3=83=95=E3=82=A3?= =?UTF-8?q?=E3=83=BC=E3=83=AB=E9=9D=9E=E5=85=AC=E9=96=8B=E3=83=A6=E3=83=BC?= =?UTF-8?q?=E3=82=B6=E3=83=BC=E3=82=92=E6=A4=9C=E7=B4=A2=E3=81=A7=E3=81=8D?= =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/SearchMember/index.tsx | 42 ++++++++++++++++++++++++--- src/lib/i18n.json | 5 +++- 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/src/components/SearchMember/index.tsx b/src/components/SearchMember/index.tsx index 3657013b..d83650ec 100644 --- a/src/components/SearchMember/index.tsx +++ b/src/components/SearchMember/index.tsx @@ -94,6 +94,7 @@ const Component: React.FC = ({}: Props) => { const [pageState, setPageState] = useState(1); const [searchRes, setSearchRes] = useState(); const [isLoading, setIsLoading] = useState(false); + const [publishStatusState, setPublishStatusState] = useState('open'); useEffect(() => { if (keywordState === '') { @@ -102,7 +103,7 @@ const Component: React.FC = ({}: Props) => { setIsLoading(true); UserRepository.search({ keywords: keywordState, - publishStatus: 'open', + publishStatus: publishStatusState, pageSize: 20, page: pageState, }).then((res) => { @@ -110,7 +111,7 @@ const Component: React.FC = ({}: Props) => { if (setIsLoading) setIsLoading(false); }); } - }, [keywordState, pageState]); + }, [keywordState, pageState, publishStatusState]); return ( @@ -156,8 +157,8 @@ const Component: React.FC = ({}: Props) => {

{t('user_search')}

-
-
From 8bcc3902295ac7a7651d742c516e229df4e368cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=A9?= <69432552+unchidev@users.noreply.github.com> Date: Sun, 3 Jul 2022 18:46:56 +0900 Subject: [PATCH 29/37] =?UTF-8?q?=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC?= =?UTF-8?q?=E6=A4=9C=E7=B4=A2=E5=87=A6=E7=90=86=E3=81=AE=E9=A0=BB=E5=BA=A6?= =?UTF-8?q?=E3=82=92=E5=88=B6=E5=BE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/SearchMember/index.tsx | 31 ++++++++++++++++----------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/src/components/SearchMember/index.tsx b/src/components/SearchMember/index.tsx index 613ad73e..f97bc1a2 100644 --- a/src/components/SearchMember/index.tsx +++ b/src/components/SearchMember/index.tsx @@ -96,20 +96,27 @@ const Component: React.FC = ({}: Props) => { const [isLoading, setIsLoading] = useState(false); const [publishStatusState, setPublishStatusState] = useState('open'); + let timer: any = null; useEffect(() => { - if (keywordState === '') { - setSearchRes(undefined); + if (timer) { + return; } else { - setIsLoading(true); - UserRepository.search({ - keywords: keywordState, - publishStatus: publishStatusState, - pageSize: 20, - page: pageState, - }).then((res) => { - if (setSearchRes) setSearchRes(res); - if (setIsLoading) setIsLoading(false); - }); + timer = setTimeout(() => { + if (keywordState === '') { + setSearchRes(undefined); + } else { + setIsLoading(true); + UserRepository.search({ + keywords: keywordState, + publishStatus: publishStatusState, + pageSize: 20, + page: pageState, + }).then((res) => { + if (setSearchRes) setSearchRes(res); + if (setIsLoading) setIsLoading(false); + }); + } + }, 500); } }, [keywordState, pageState, publishStatusState]); From a098b8740f685aab12389e4a9d796cef54455427 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=A9?= <69432552+unchidev@users.noreply.github.com> Date: Sun, 3 Jul 2022 18:55:39 +0900 Subject: [PATCH 30/37] =?UTF-8?q?CodeQL=E3=81=A7=E3=83=93=E3=83=AB?= =?UTF-8?q?=E3=83=89=E7=B5=90=E6=9E=9C=E3=82=92=E8=A6=8B=E3=81=AA=E3=81=84?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/codeql-analysis.yml | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 12d9b5e9..d1ef846c 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -33,7 +33,7 @@ jobs: strategy: fail-fast: false matrix: - # TypeScript をしていしなくても大丈夫らしい + # TypeScript を指定しなくても大丈夫らしい # 参考: https://github.com/github/codeql-action/issues/365 language: ['javascript'] # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] @@ -43,26 +43,6 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - id: setup_node_id - with: - node-version: 18 - cache: yarn - - - uses: actions/cache@v3 - id: node_modules_cache_id - env: - cache-name: cache-node-modules - with: - path: 'node_modules' - key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('yarn.lock') }}-v6 - - - run: echo '${{ toJSON(steps.node_modules_cache_id.outputs) }}' - - run: echo '${{ steps.node_modules_cache_id.outputs.cache-hit != 'true' }}' - - - if: steps.node_modules_cache_id.outputs.cache-hit != 'true' - run: yarn install --frozen-lockfile - # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v2 @@ -90,7 +70,8 @@ jobs: # echo "Run, Build Application using script" # ./location_of_script_within_repo/buildscript.sh - - run: yarn build + # 実際にビルドを行ってその内容を確認してもらうのが安全そうだが、誤検出されたものを毎回承認する作業が大変なのでビルド結果は一旦無視 + # - run: yarn build - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v2 From d9d73c9e302c46dd2ed4677fc3ebe5f85ee66064 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Jul 2022 12:14:10 +0000 Subject: [PATCH 31/37] Bump @types/node from 18.0.0 to 18.0.1 Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 18.0.0 to 18.0.1. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 0457d58e..335bfe8d 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "@types/chrome": "^0.0.191", "@types/jest": "^28.1.4", "@types/luxon": "^2.3.2", - "@types/node": "^18.0.0", + "@types/node": "^18.0.1", "@types/react": "^17.0.33", "@types/react-dom": "^17.0.10", "@types/recoil": "^0.0.9", diff --git a/yarn.lock b/yarn.lock index 138aa5dc..bda4c160 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1278,7 +1278,7 @@ dependencies: "@jest/types" "^27.5.1" -"@jest/environment@^28.1.1", "@jest/environment@^28.1.2": +"@jest/environment@^28.1.2": version "28.1.2" resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-28.1.2.tgz#94a052c0c5f9f8c8e6d13ea6da78dbc5d7d9b85b" integrity sha512-I0CR1RUMmOzd0tRpz10oUfaChBWs+/Hrvn5xYhMEF/ZqrDaaeHwS8yDBqEWCrEnkH2g+WE/6g90oBv3nKpcm8Q== @@ -1303,7 +1303,7 @@ expect "^28.1.1" jest-snapshot "^28.1.2" -"@jest/fake-timers@^28.1.1", "@jest/fake-timers@^28.1.2": +"@jest/fake-timers@^28.1.2": version "28.1.2" resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-28.1.2.tgz#d49e8ee4e02ba85a6e844a52a5e7c59c23e3b76f" integrity sha512-xSYEI7Y0D5FbZN2LsCUj/EKRR1zfQYmGuAUVh6xTqhx7V5JhjgMcK5Pa0iR6WIk0GXiHDe0Ke4A+yERKE9saqg== @@ -1931,10 +1931,10 @@ resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c" integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== -"@types/node@*", "@types/node@^18.0.0": - version "18.0.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.0.0.tgz#67c7b724e1bcdd7a8821ce0d5ee184d3b4dd525a" - integrity sha512-cHlGmko4gWLVI27cGJntjs/Sj8th9aYwplmZFwmmgYQQvL5NUsgVJG7OddLvNfLqYS31KFN0s3qlaD9qCaxACA== +"@types/node@*", "@types/node@^18.0.1": + version "18.0.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.0.1.tgz#e91bd73239b338557a84d1f67f7b9e0f25643870" + integrity sha512-CmR8+Tsy95hhwtZBKJBs0/FFq4XX7sDZHlGGf+0q+BRZfMbOTkzkj0AFAuTyXbObDIoanaBBW0+KEW+m3N16Wg== "@types/normalize-package-data@^2.4.0": version "2.4.1" From f38d0bc3a29a4708613164f537cc6aa16d9fdedf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Jul 2022 12:14:45 +0000 Subject: [PATCH 32/37] Bump ts-node from 10.8.1 to 10.8.2 Bumps [ts-node](https://github.com/TypeStrong/ts-node) from 10.8.1 to 10.8.2. - [Release notes](https://github.com/TypeStrong/ts-node/releases) - [Commits](https://github.com/TypeStrong/ts-node/compare/v10.8.1...v10.8.2) --- updated-dependencies: - dependency-name: ts-node dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 0457d58e..6667e7e6 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "terser-webpack-plugin": "^5.2.4", "ts-jest": "^28.0.5", "ts-loader": "^9.3.1", - "ts-node": "^10.8.1", + "ts-node": "^10.8.2", "typescript": "^4.7.4", "webextension-polyfill": "^0.9.0", "webpack": "^5.60.0", diff --git a/yarn.lock b/yarn.lock index 138aa5dc..f92b5629 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1278,7 +1278,7 @@ dependencies: "@jest/types" "^27.5.1" -"@jest/environment@^28.1.1", "@jest/environment@^28.1.2": +"@jest/environment@^28.1.2": version "28.1.2" resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-28.1.2.tgz#94a052c0c5f9f8c8e6d13ea6da78dbc5d7d9b85b" integrity sha512-I0CR1RUMmOzd0tRpz10oUfaChBWs+/Hrvn5xYhMEF/ZqrDaaeHwS8yDBqEWCrEnkH2g+WE/6g90oBv3nKpcm8Q== @@ -1303,7 +1303,7 @@ expect "^28.1.1" jest-snapshot "^28.1.2" -"@jest/fake-timers@^28.1.1", "@jest/fake-timers@^28.1.2": +"@jest/fake-timers@^28.1.2": version "28.1.2" resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-28.1.2.tgz#d49e8ee4e02ba85a6e844a52a5e7c59c23e3b76f" integrity sha512-xSYEI7Y0D5FbZN2LsCUj/EKRR1zfQYmGuAUVh6xTqhx7V5JhjgMcK5Pa0iR6WIk0GXiHDe0Ke4A+yERKE9saqg== @@ -7279,10 +7279,10 @@ ts-loader@^9.3.1: micromatch "^4.0.0" semver "^7.3.4" -ts-node@^10.8.1: - version "10.8.1" - resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.8.1.tgz#ea2bd3459011b52699d7e88daa55a45a1af4f066" - integrity sha512-Wwsnao4DQoJsN034wePSg5nZiw4YKXf56mPIAeD6wVmiv+RytNSWqc2f3fKvcUoV+Yn2+yocD71VOfQHbmVX4g== +ts-node@^10.8.2: + version "10.8.2" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.8.2.tgz#3185b75228cef116bf82ffe8762594f54b2a23f2" + integrity sha512-LYdGnoGddf1D6v8REPtIH+5iq/gTDuZqv2/UJUU7tKjuEU8xVZorBM+buCGNjj+pGEud+sOoM4CX3/YzINpENA== dependencies: "@cspotcode/source-map-support" "^0.8.0" "@tsconfig/node10" "^1.0.7" From 5172aa796a618ae24a1aeca72d8384d08bd9c46e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Jul 2022 12:15:25 +0000 Subject: [PATCH 33/37] Bump @swc/core from 1.2.207 to 1.2.208 Bumps [@swc/core](https://github.com/swc-project/swc) from 1.2.207 to 1.2.208. - [Release notes](https://github.com/swc-project/swc/releases) - [Changelog](https://github.com/swc-project/swc/blob/main/CHANGELOG.md) - [Commits](https://github.com/swc-project/swc/compare/v1.2.207...v1.2.208) --- updated-dependencies: - dependency-name: "@swc/core" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 168 +++++++++++++++++++++++++-------------------------- 2 files changed, 85 insertions(+), 85 deletions(-) diff --git a/package.json b/package.json index 0457d58e..99db6ba4 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "@hot-loader/react-dom": "^17.0.2", "@jest/expect-utils": "^28.1.1", "@jest/globals": "^28.1.2", - "@swc/core": "^1.2.207", + "@swc/core": "^1.2.208", "@swc/jest": "^0.2.21", "@tailwindcss/aspect-ratio": "^0.4.0", "@tailwindcss/forms": "^0.5.2", diff --git a/yarn.lock b/yarn.lock index 138aa5dc..dd75ed49 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1278,7 +1278,7 @@ dependencies: "@jest/types" "^27.5.1" -"@jest/environment@^28.1.1", "@jest/environment@^28.1.2": +"@jest/environment@^28.1.2": version "28.1.2" resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-28.1.2.tgz#94a052c0c5f9f8c8e6d13ea6da78dbc5d7d9b85b" integrity sha512-I0CR1RUMmOzd0tRpz10oUfaChBWs+/Hrvn5xYhMEF/ZqrDaaeHwS8yDBqEWCrEnkH2g+WE/6g90oBv3nKpcm8Q== @@ -1303,7 +1303,7 @@ expect "^28.1.1" jest-snapshot "^28.1.2" -"@jest/fake-timers@^28.1.1", "@jest/fake-timers@^28.1.2": +"@jest/fake-timers@^28.1.2": version "28.1.2" resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-28.1.2.tgz#d49e8ee4e02ba85a6e844a52a5e7c59c23e3b76f" integrity sha512-xSYEI7Y0D5FbZN2LsCUj/EKRR1zfQYmGuAUVh6xTqhx7V5JhjgMcK5Pa0iR6WIk0GXiHDe0Ke4A+yERKE9saqg== @@ -1560,89 +1560,89 @@ dependencies: "@sinonjs/commons" "^1.7.0" -"@swc/core-android-arm-eabi@1.2.207": - version "1.2.207" - resolved "https://registry.yarnpkg.com/@swc/core-android-arm-eabi/-/core-android-arm-eabi-1.2.207.tgz#c70746aaba3f5bd6064dd9e8442a0edf477960e9" - integrity sha512-hmMw4EaDMh8qH3DYbNPmBvrxzRPbOlF5+wMGm0NmmWQjKSCblRZUEkM4GJFtejO/DX75HHOfvh/Op+/+1UOyRQ== - -"@swc/core-android-arm64@1.2.207": - version "1.2.207" - resolved "https://registry.yarnpkg.com/@swc/core-android-arm64/-/core-android-arm64-1.2.207.tgz#cba450d11e5d37b7b2a116291da683700af1818b" - integrity sha512-jCDGX+yIb9RRQ1BOLz2o7fcJuiGz8+8l/xgKTanx+c7cNg43hm5EzlNzIxQs6oklKE/dlVw75H1Y90QJoH5a2Q== - -"@swc/core-darwin-arm64@1.2.207": - version "1.2.207" - resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.2.207.tgz#ec7ceac5e55b757bee527a305327dba8fbbbfeda" - integrity sha512-Xp4LcmVBemLLZpB8d/XR6TnlVvtXKdFSxGmbwC7uiTl26Cji2HRjBXaQnQQfSnlKGcSB+W1sH8q9K2jDJO+hIA== - -"@swc/core-darwin-x64@1.2.207": - version "1.2.207" - resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.2.207.tgz#bbda0f7698438951472da2ebe076a2192cc79db7" - integrity sha512-4TG7KW5FB/4Uli3ef9Hdx4igQYDv0DK0ZnGWmvteUyYPjhoR6YhIkr04CrqfHeYNOhK6oWG58K6t3ydGfnIJSw== - -"@swc/core-freebsd-x64@1.2.207": - version "1.2.207" - resolved "https://registry.yarnpkg.com/@swc/core-freebsd-x64/-/core-freebsd-x64-1.2.207.tgz#13e1eb5232752f4ff0380499bd02cc5f9368350a" - integrity sha512-rOj1TRbeY1ysG2cPaFdFUlup/0EJ3c1S+jWJkPK5HYt3mlvbdDu68wa8HIR6oTdbGiyMVogVIZn+je+d92Xjrg== - -"@swc/core-linux-arm-gnueabihf@1.2.207": - version "1.2.207" - resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.2.207.tgz#0f539b1e0e81fa7ae41e571732e3910e9201e61d" - integrity sha512-hQRgp2LLr0a0aBkch7qvTAoNx3wTQYMLiPvAzlwFLwOWlv122BmfdMvxobLvwligduFZ9XBEHTdhLc/V8hsWog== - -"@swc/core-linux-arm64-gnu@1.2.207": - version "1.2.207" - resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.2.207.tgz#aba04c22c1ef2ce668c39585359f6d9240767fe2" - integrity sha512-WF/plJ2chQXaNvcfM9OOaJbYPryr1ljhB5I0Iaz0AChoyOQfnaQ6Iq09ed1lwoHGBFS3SdrucPxu1z0vkfNIzg== - -"@swc/core-linux-arm64-musl@1.2.207": - version "1.2.207" - resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.2.207.tgz#f7ebcac390eb23c368455431cc08cc0055edb2e7" - integrity sha512-9h2HVHrxj7bB5DB6l04jvVVQCirfwIHWIctd5BqAyAI4HnYzirFaDqFntZHpZ0PfaJIa/l04hmhj1t/9f3GYww== - -"@swc/core-linux-x64-gnu@1.2.207": - version "1.2.207" - resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.2.207.tgz#40774055f71df85253413fe9ce607a14d3e5948a" - integrity sha512-BjmpgEkT9OibBWC/ulnT2MxZpUbMZrfEWgdThCv2KiL0wYZ6ZAzkgjjArktmw6vjLLrB+1qnTysUN3RAuTrzxg== - -"@swc/core-linux-x64-musl@1.2.207": - version "1.2.207" - resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.2.207.tgz#ae151ab250c9ed6059b361537db48d17ca72479e" - integrity sha512-jzBjXdjpw1+eR/GVhENreIpqS8zVezKObutiJLSSayNG3YT9MwyEz58qEHdALPhOJBjctaExr0nYCAPq9U8k2A== - -"@swc/core-win32-arm64-msvc@1.2.207": - version "1.2.207" - resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.2.207.tgz#c0542e66a31f2333341cbb32b41f78b94c4bfcc4" - integrity sha512-zF2rID7fzgDxa0Aev92+NcSy4j1Ct87KaDhOiL/BofAOrmf274UHn6yl8HUOjbejD/WEoGG62Dv7EFlzbtVOBw== - -"@swc/core-win32-ia32-msvc@1.2.207": - version "1.2.207" - resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.2.207.tgz#aa5ad44d587db3968dc7f6cc52e76af5ba50edc8" - integrity sha512-AUI349ky8Xh4KqmySx7Yd+HdmaEU9Q67Cr5VO1ZJYEu/XRI9aiHlwLFkIb24Jio0LLddN/0GIwnDm+5Evr3deg== - -"@swc/core-win32-x64-msvc@1.2.207": - version "1.2.207" - resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.2.207.tgz#36ffb9bc08b1a27415009f601fb22f13ffd076d8" - integrity sha512-clRP+rfNcGrgu2AXb/H02iKm2tTNHPd5cgqTP2bFe9PalKh2mBFR52+g44b3ca7vwdwIYie39ZoIu7jNkKEVMA== - -"@swc/core@^1.2.207": - version "1.2.207" - resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.2.207.tgz#cbe5f6c971ba17df83ab4934d46a1e53580634a7" - integrity sha512-4LgdAwZv+dLQsIBaWpK4eEOpeeJlcuOM6LRkUXJLZ0CUIkZHm2zQ4N6jksm/YJYgF++mYwjM6JWwCvLpW3ZTuA== +"@swc/core-android-arm-eabi@1.2.208": + version "1.2.208" + resolved "https://registry.yarnpkg.com/@swc/core-android-arm-eabi/-/core-android-arm-eabi-1.2.208.tgz#df7d0fb531830186287733c633416cb166dc2e8d" + integrity sha512-Cspm5VrwblJSwvcug0yEtNGQ6qG+LsuzTxJM+VHa8raNisyObPjA8J+SuiKv3sRb85rdjC7n1wSIQW0Sz2g3Dg== + +"@swc/core-android-arm64@1.2.208": + version "1.2.208" + resolved "https://registry.yarnpkg.com/@swc/core-android-arm64/-/core-android-arm64-1.2.208.tgz#3c4343bc9209904f2f9ca88c97a987d6eecf991c" + integrity sha512-gUQv1xSzHaaQ2/9+R8rcmVLWl7K0iM+r7Fbcs0z/BY8FzllXAEIC+AR/DyyYpEdsbUS3ZRWQmdMyC9Aj0xjRgA== + +"@swc/core-darwin-arm64@1.2.208": + version "1.2.208" + resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.2.208.tgz#b08145528abaccc280f3024f154e12a568e43f05" + integrity sha512-xqILWXEQMvhoC/jH7/wnXAhLqTaH1oTDP/E3DVNLRzbLgACmUIo724Y3LKmBDzATVXupOHve8nNdNicAD9Q70Q== + +"@swc/core-darwin-x64@1.2.208": + version "1.2.208" + resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.2.208.tgz#1f2364e815856b16fc793882f279f9a647b66f9a" + integrity sha512-o5FIXAFyeFKKCCk1o209DPRxUFUYAw1qSCN4jnY2o35iDL0gZosDrAnx71y1h4krPNUcOdcSHucwACH44+s18g== + +"@swc/core-freebsd-x64@1.2.208": + version "1.2.208" + resolved "https://registry.yarnpkg.com/@swc/core-freebsd-x64/-/core-freebsd-x64-1.2.208.tgz#1c8e0e7e252b6e57d01a85f17727924f42e2995a" + integrity sha512-j0IbNUZClbQy/SoKE3Tc+iLLwKSqogdp58wGNJjTccecug9EMmeG3fMqWdNbH8sDdmf63ZjT/zfQMnEmAr0dAw== + +"@swc/core-linux-arm-gnueabihf@1.2.208": + version "1.2.208" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.2.208.tgz#d66672614c7dc142011d457a66cdc68aeea8c804" + integrity sha512-oqesiqB1lw9S50REMirVuhfLUL0Ub0TzJHMooNvPtrcwnXa0CDDdA60KfaaA8Mxiybly32TiXekW4fLxsNi04A== + +"@swc/core-linux-arm64-gnu@1.2.208": + version "1.2.208" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.2.208.tgz#e725a6b016de48c144163764fcb0055fefa49a8c" + integrity sha512-Es0POIkuk7ite0syUUvO/xmh7E9zEKwdK1NhGiGu1nR4LwRTbUr7x0aaC+u3djZUJvZUa+4MK0NoayUbO7V+zQ== + +"@swc/core-linux-arm64-musl@1.2.208": + version "1.2.208" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.2.208.tgz#3397e39df1cd7dec2bb63145c002c7109d2a11da" + integrity sha512-5Mel0Hw+95tVBC5Zx9A2FU8eBfcbbjOAQ3FsrdMbOeuhQYzV9CqNNQkktoEUfjnHlHF3HPShN8PBE20+ycf4HA== + +"@swc/core-linux-x64-gnu@1.2.208": + version "1.2.208" + resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.2.208.tgz#858336a49d130185469e370e0aa11d6923ffa90b" + integrity sha512-j5GvAUf8hwHWKdmkF80HGSSzBzENmuWFG/OBle+0fwqO9NStUGWAoGYwBPiTlJ8aCBjbVGXlCVstHx8OHx+1pw== + +"@swc/core-linux-x64-musl@1.2.208": + version "1.2.208" + resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.2.208.tgz#ea8faceff0a14875f644fb66eaa1ccbff897bf50" + integrity sha512-A+kGJDB3qQ1jaME7YiIH3yWOOx2Pjo8g+63TYsuaDJhA1MzQzg1KBCk5/gGEw5YFGgMqQbU0dp2emORu9UwRHw== + +"@swc/core-win32-arm64-msvc@1.2.208": + version "1.2.208" + resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.2.208.tgz#50dcb29511b9716ee7a2334e3e86110aaf2eac5c" + integrity sha512-yTUC9QIAHecyBlT7HcoISM+L4vFkP+Y6+LpW4kW1VJmJWm2EEsaFXJdaH2LF6HVbPp+dgvsWK2+EqYephfUT1Q== + +"@swc/core-win32-ia32-msvc@1.2.208": + version "1.2.208" + resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.2.208.tgz#59ce0c20ecd0a96e6d09710756695b53c616e402" + integrity sha512-A1h9ZLSCI7ixBxkvEf8Brxg5WdnBKPFsolacGnulGsqWHRez7UVtI2Q2NhgYMZdoPUIqEMVGE5d0M+MPCo5RRg== + +"@swc/core-win32-x64-msvc@1.2.208": + version "1.2.208" + resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.2.208.tgz#8b50d477ec1c7cfda15ad822540787c1f9fd17bc" + integrity sha512-CkESi36HJSkqicrDQzgSWLOx9oTaVDrD8FnplP8PgpySUgoesyGg3uZt+2moaBTyUjxG6L4OuMTkwa0vsbiFrw== + +"@swc/core@^1.2.208": + version "1.2.208" + resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.2.208.tgz#7796cd6ffdab43567ae9460aae6e2f606265e205" + integrity sha512-DzGQmQsWsmVlFppH2Xtu9ispT+b0W5YaXD1sqr4694zIjRMe5suAIMXRT0BiHlLXgWTSNDMUceOM/i4YXlWEhQ== optionalDependencies: - "@swc/core-android-arm-eabi" "1.2.207" - "@swc/core-android-arm64" "1.2.207" - "@swc/core-darwin-arm64" "1.2.207" - "@swc/core-darwin-x64" "1.2.207" - "@swc/core-freebsd-x64" "1.2.207" - "@swc/core-linux-arm-gnueabihf" "1.2.207" - "@swc/core-linux-arm64-gnu" "1.2.207" - "@swc/core-linux-arm64-musl" "1.2.207" - "@swc/core-linux-x64-gnu" "1.2.207" - "@swc/core-linux-x64-musl" "1.2.207" - "@swc/core-win32-arm64-msvc" "1.2.207" - "@swc/core-win32-ia32-msvc" "1.2.207" - "@swc/core-win32-x64-msvc" "1.2.207" + "@swc/core-android-arm-eabi" "1.2.208" + "@swc/core-android-arm64" "1.2.208" + "@swc/core-darwin-arm64" "1.2.208" + "@swc/core-darwin-x64" "1.2.208" + "@swc/core-freebsd-x64" "1.2.208" + "@swc/core-linux-arm-gnueabihf" "1.2.208" + "@swc/core-linux-arm64-gnu" "1.2.208" + "@swc/core-linux-arm64-musl" "1.2.208" + "@swc/core-linux-x64-gnu" "1.2.208" + "@swc/core-linux-x64-musl" "1.2.208" + "@swc/core-win32-arm64-msvc" "1.2.208" + "@swc/core-win32-ia32-msvc" "1.2.208" + "@swc/core-win32-x64-msvc" "1.2.208" "@swc/jest@^0.2.21": version "0.2.21" From 9fccdca73a91211efe6db8191d73c916e28dd198 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=A9?= <69432552+unchidev@users.noreply.github.com> Date: Tue, 5 Jul 2022 20:09:06 +0900 Subject: [PATCH 34/37] =?UTF-8?q?=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88?= =?UTF-8?q?=E3=81=AE=E8=89=B2=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/RoomList.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/RoomList.tsx b/src/components/RoomList.tsx index 497fbb1a..4660c66e 100644 --- a/src/components/RoomList.tsx +++ b/src/components/RoomList.tsx @@ -276,7 +276,7 @@ const Component: React.FC = ({}: Props) => { > {selectTagState === tag.name && } {tag.name} - {tag.count} + {tag.count} ); })} From e6659fdec0bde055230e8dfcb1b7fc6355baee3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=A9?= <69432552+unchidev@users.noreply.github.com> Date: Tue, 5 Jul 2022 20:14:57 +0900 Subject: [PATCH 35/37] =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 59a3784f..61b270cd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "syncroom-plus", - "version": "2.0.4", + "version": "2.0.5", "description": "syncroom-plus", "license": "MIT", "private": true, From 9efa4049ef16e917f9c402f409f9f943d3454bbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=A9?= <69432552+unchidev@users.noreply.github.com> Date: Tue, 5 Jul 2022 20:19:35 +0900 Subject: [PATCH 36/37] =?UTF-8?q?CHANGELOGS=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOGS.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/CHANGELOGS.md b/CHANGELOGS.md index 50c68db8..005c8078 100644 --- a/CHANGELOGS.md +++ b/CHANGELOGS.md @@ -1,5 +1,23 @@ # CHANGELOGS +## v2.0.5 + +### 変更 + +- 「最近の活動」を相対時間に変更 +- テストルームへの入室はオンライン通知しないように変更 +- ユーザー検索機能追加 +- ルーム入室状況を詳細に表示 +- 一部テキストの色を変更 +- 使用していないOptionページを削除 +- 画像を圧縮して軽量化 + +### 依存パッケージ + +- @swc/core from 1.2.207 to 1.2.208 +- @types/node from 18.0.0 to 18.0.1 +- ts-node from 10.8.1 to 10.8.2 + ## v2.0.4 ### 変更 From 91664dd07cf7ce9b666850fa623ac6343cb0a70b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=A9?= <69432552+unchidev@users.noreply.github.com> Date: Tue, 5 Jul 2022 20:19:42 +0900 Subject: [PATCH 37/37] =?UTF-8?q?README=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4b93fb19..6f838c48 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ - 🚫 メンバーブロック管理機能 - 🔔 メンバーオンライン通知機能 - ⏳ ルームの残り時間表示 -- 🔍 高度な検索 +- 🔍 高度なルーム検索 - 🚫 満室表示切り替え - 🔔 満室空き通知登録 - 🍎 ファビコン表示 @@ -20,6 +20,7 @@ - 🌏 多言語対応 - 📌 お知らせ表示 - 🔐 パスワード保存機能 +- 🔍 メンバー検索機能 ## 対応ブラウザ