diff --git a/.github/workflows/check-misskey-js-version.yml b/.github/workflows/check-misskey-js-version.yml new file mode 100644 index 0000000000..0102dbc815 --- /dev/null +++ b/.github/workflows/check-misskey-js-version.yml @@ -0,0 +1,27 @@ +name: Check Misskey JS version + +on: + push: + branches: [ io ] + paths: + - packages/misskey-js/package.json + - package.json + pull_request: + paths: + - packages/misskey-js/package.json + - package.json + +jobs: + check-version: + # ルートの package.json と packages/misskey-js/package.json のバージョンが一致しているかを確認する + name: Check version + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4.1.1 + - name: Check version + run: | + if [ "$(jq -r '.version' package.json)" != "$(jq -r '.version' packages/misskey-js/package.json)" ]; then + echo "Version mismatch!" + exit 1 + fi diff --git a/.github/workflows/test-misskey-js.yml b/.github/workflows/test-misskey-js.yml index fae467e52f..d2e8dcc461 100644 --- a/.github/workflows/test-misskey-js.yml +++ b/.github/workflows/test-misskey-js.yml @@ -53,17 +53,3 @@ jobs: with: token: ${{ secrets.CODECOV_TOKEN }} files: ./packages/misskey-js/coverage/coverage-final.json - - check-version: - # ルートの package.json と packages/misskey-js/package.json のバージョンが一致しているかを確認する - name: Check version - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4.1.1 - - name: Check version - run: | - if [ "$(jq -r '.version' package.json)" != "$(jq -r '.version' packages/misskey-js/package.json)" ]; then - echo "Version mismatch!" - exit 1 - fi diff --git a/packages/frontend/src/components/MkUserSelectDialog.vue b/packages/frontend/src/components/MkUserSelectDialog.vue index 4ca2ba4e21..3b10d6bd71 100644 --- a/packages/frontend/src/components/MkUserSelectDialog.vue +++ b/packages/frontend/src/components/MkUserSelectDialog.vue @@ -101,7 +101,13 @@ function search() { limit: 10, detail: false, }).then(_users => { - users.value = _users; + users.value = _users.filter((u) => { + if (!props.includeSelf) { + return u.id !== $i?.id; + } else { + return true; + } + }); }); } @@ -131,13 +137,22 @@ onMounted(() => { misskeyApi('users/show', { userIds: defaultStore.state.recentlyUsedUsers, }).then(foundUsers => { - const _users = foundUsers.filter((u) => { - if (props.localOnly) { - return u.host == null; - } else { - return true; - } - }); + const _users = foundUsers + .filter((u) => { + if (props.localOnly) { + return u.host == null; + } else { + return true; + } + }) + .filter((u) => { + if (!props.includeSelf) { + return u.id !== $i?.id; + } else { + return true; + } + }); + if (props.includeSelf && $i && !_users.find(x => $i ? x.id === $i.id : true)) { recentUsers.value = [$i, ..._users]; } else { diff --git a/packages/frontend/src/pages/reversi/index.vue b/packages/frontend/src/pages/reversi/index.vue index fca9f9e643..f342c986fc 100644 --- a/packages/frontend/src/pages/reversi/index.vue +++ b/packages/frontend/src/pages/reversi/index.vue @@ -196,7 +196,7 @@ async function matchHeatbeat() { async function matchUser() { pleaseLogin(); - const user = await os.selectUser({ localOnly: true }); + const user = await os.selectUser({ includeSelf: false, localOnly: true }); if (user == null) return; matchingUser.value = user;