mirror of
https://github.com/kokonect-link/cherrypick
synced 2025-01-09 03:13:57 +09:00
Merge branch 'develop' into feat-13070
This commit is contained in:
commit
7512173171
28
.github/workflows/check-misskey-js-version.yml
vendored
Normal file
28
.github/workflows/check-misskey-js-version.yml
vendored
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
name: Check Misskey JS version
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [ develop ]
|
||||||
|
paths:
|
||||||
|
- packages/misskey-js/package.json
|
||||||
|
- package.json
|
||||||
|
pull_request:
|
||||||
|
branches: [ develop ]
|
||||||
|
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
|
14
.github/workflows/test-misskey-js.yml
vendored
14
.github/workflows/test-misskey-js.yml
vendored
@ -54,17 +54,3 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
token: ${{ secrets.CODECOV_TOKEN }}
|
token: ${{ secrets.CODECOV_TOKEN }}
|
||||||
files: ./packages/misskey-js/coverage/coverage-final.json
|
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
|
|
||||||
|
@ -81,13 +81,18 @@ export async function mainBoot() {
|
|||||||
// ▼南半球
|
// ▼南半球
|
||||||
if (month === 7 || month === 8) {
|
if (month === 7 || month === 8) {
|
||||||
const SnowfallEffect = (await import('@/scripts/snowfall-effect.js')).SnowfallEffect;
|
const SnowfallEffect = (await import('@/scripts/snowfall-effect.js')).SnowfallEffect;
|
||||||
new SnowfallEffect().render();
|
new SnowfallEffect({}).render();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// ▼北半球
|
// ▼北半球
|
||||||
if (month === 12 || month === 1) {
|
if (month === 12 || month === 1) {
|
||||||
const SnowfallEffect = (await import('@/scripts/snowfall-effect.js')).SnowfallEffect;
|
const SnowfallEffect = (await import('@/scripts/snowfall-effect.js')).SnowfallEffect;
|
||||||
new SnowfallEffect().render();
|
new SnowfallEffect({}).render();
|
||||||
|
} else if (month === 3 || month === 4) {
|
||||||
|
const SakuraEffect = (await import('@/scripts/snowfall-effect.js')).SnowfallEffect;
|
||||||
|
new SakuraEffect({
|
||||||
|
sakura: true,
|
||||||
|
}).render();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -101,7 +101,13 @@ function search() {
|
|||||||
limit: 10,
|
limit: 10,
|
||||||
detail: false,
|
detail: false,
|
||||||
}).then(_users => {
|
}).then(_users => {
|
||||||
users.value = _users;
|
users.value = _users.filter((u) => {
|
||||||
|
if (props.includeSelf === false) {
|
||||||
|
return u.id !== $i?.id;
|
||||||
|
} else {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -131,18 +137,22 @@ onMounted(() => {
|
|||||||
misskeyApi('users/show', {
|
misskeyApi('users/show', {
|
||||||
userIds: defaultStore.state.recentlyUsedUsers,
|
userIds: defaultStore.state.recentlyUsedUsers,
|
||||||
}).then(foundUsers => {
|
}).then(foundUsers => {
|
||||||
const _users = foundUsers.filter((u) => {
|
let _users = foundUsers;
|
||||||
|
_users = _users.filter((u) => {
|
||||||
if (props.localOnly) {
|
if (props.localOnly) {
|
||||||
return u.host == null;
|
return u.host == null;
|
||||||
} else {
|
} else {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
if (props.includeSelf && _users.find(x => $i ? x.id === $i.id : true) == null) {
|
_users = _users.filter((u) => {
|
||||||
recentUsers.value = [$i!, ..._users];
|
if (props.includeSelf === false) {
|
||||||
} else {
|
return u.id !== $i?.id;
|
||||||
recentUsers.value = _users;
|
} else {
|
||||||
}
|
return true;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
recentUsers.value = _users;
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
@ -196,7 +196,7 @@ async function matchHeatbeat() {
|
|||||||
async function matchUser() {
|
async function matchUser() {
|
||||||
pleaseLogin();
|
pleaseLogin();
|
||||||
|
|
||||||
const user = await os.selectUser({ localOnly: true });
|
const user = await os.selectUser({ includeSelf: false, localOnly: true });
|
||||||
if (user == null) return;
|
if (user == null) return;
|
||||||
|
|
||||||
matchingUser.value = user;
|
matchingUser.value = user;
|
||||||
|
File diff suppressed because one or more lines are too long
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"name": "misskey-js",
|
"name": "misskey-js",
|
||||||
"version": "2024.2.0-beta.7",
|
"version": "2024.2.0-beta.8",
|
||||||
"description": "Misskey SDK for JavaScript",
|
"description": "Misskey SDK for JavaScript",
|
||||||
"types": "./built/dts/index.d.ts",
|
"types": "./built/dts/index.d.ts",
|
||||||
"exports": {
|
"exports": {
|
||||||
|
Loading…
Reference in New Issue
Block a user