Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop

This commit is contained in:
syuilo 2025-12-17 09:08:25 +09:00
commit 79cbbcfe0f
5 changed files with 17 additions and 13 deletions

View File

@ -10,6 +10,7 @@ v2025.12.0で行われた「configの`trustProxy`のデフォルト値を`false`
### Client ### Client
- Fix: バージョン表記のないPlayが正しく動作しない問題を修正 - Fix: バージョン表記のないPlayが正しく動作しない問題を修正
バージョン表記のないものは v0.x 系として実行されます。v1.x 系で動作させたい場合は必ずバージョン表記を含めてください。
## 2025.12.1 ## 2025.12.1

View File

@ -1,6 +1,6 @@
{ {
"name": "misskey", "name": "misskey",
"version": "2025.12.2-alpha.0", "version": "2025.12.2-beta.1",
"codename": "nasubi", "codename": "nasubi",
"repository": { "repository": {
"type": "git", "type": "git",

View File

@ -27,7 +27,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<SearchMarker :keywords="['signin', 'login', 'history', 'log']"> <SearchMarker :keywords="['signin', 'login', 'history', 'log']">
<FormSection> <FormSection>
<template #label><SearchLabel>{{ i18n.ts.signinHistory }}</SearchLabel></template> <template #label><SearchLabel>{{ i18n.ts.signinHistory }}</SearchLabel></template>
<MkPagination :paginator="paginator" withControl> <MkPagination :paginator="paginator" withControl :forceDisableInfiniteScroll="true">
<template #default="{items}"> <template #default="{items}">
<div> <div>
<div v-for="item in items" :key="item.id" v-panel class="timnmucd"> <div v-for="item in items" :key="item.id" v-panel class="timnmucd">

View File

@ -257,20 +257,23 @@ export class PreferencesManager extends EventEmitter<PreferencesManagerEvents> {
this.rewriteRawState(key, v); this.rewriteRawState(key, v);
this.emit('committed', {
key,
value: v,
oldValue: this.s[key],
});
const record = this.getMatchedRecordOf(key); const record = this.getMatchedRecordOf(key);
const _save = () => {
this.save();
this.emit('committed', {
key,
value: v,
oldValue: this.s[key],
});
};
if (parseScope(record[0]).account == null && isAccountDependentKey(key) && currentAccount != null) { if (parseScope(record[0]).account == null && isAccountDependentKey(key) && currentAccount != null) {
this.profile.preferences[key].push([makeScope({ this.profile.preferences[key].push([makeScope({
server: host, server: host,
account: currentAccount.id, account: currentAccount.id,
}), v, {}]); }), v, {}]);
this.save(); _save();
return; return;
} }
@ -278,12 +281,12 @@ export class PreferencesManager extends EventEmitter<PreferencesManagerEvents> {
this.profile.preferences[key].push([makeScope({ this.profile.preferences[key].push([makeScope({
server: host, server: host,
}), v, {}]); }), v, {}]);
this.save(); _save();
return; return;
} }
record[1] = v; record[1] = v;
this.save(); _save();
if (record[2].sync) { if (record[2].sync) {
// awaitの必要なし // awaitの必要なし

View File

@ -1,7 +1,7 @@
{ {
"type": "module", "type": "module",
"name": "misskey-js", "name": "misskey-js",
"version": "2025.12.2-alpha.0", "version": "2025.12.2-beta.1",
"description": "Misskey SDK for JavaScript", "description": "Misskey SDK for JavaScript",
"license": "MIT", "license": "MIT",
"main": "./built/index.js", "main": "./built/index.js",