Merge a4e4799613 into f1eb17f66c

chore: little type trick in pizzax.ts (#14891 )
Make `makeGetterSetter` take the correct type associated with getter and setter
2024-11-07 13:51:58 +09:00 · 2024-11-06 22:01:58 +09:00 · 2024-11-06 22:01:21 +09:00 · 2024-11-06 15:15:28 +09:00
4 changed files with 16 additions and 8 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -22,6 +22,8 @@
 - Fix: デッキのタイムラインカラムで「センシティブなファイルを含むノートを表示」設定が使用できなかった問題を修正
 - Fix: Encode RSS urls with escape sequences before fetching allowing query parameters to be used
 - Fix: リンク切れを修正
+= Fix: ノート投稿ボタンにホバー時のスタイルが適用されていないのを修正  
+  (Cherry-picked from https://github.com/taiyme/misskey/pull/305)

 ### Server
 - Enhance: 起動前の疎通チェックで、DBとメイン以外のRedisの疎通確認も行うように  
@ -33,6 +35,8 @@
  (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/706)
 - Fix: 連合への配信時に、acctの大小文字が区別されてしまい正しくメンションが処理されないことがある問題を修正  
  (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/711)
+- Fix: FTT無効時にユーザーリストタイムラインが使用できない問題を修正  
+  (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/709)

 ### Misskey.js
 - Enhance: `/miauth/{sessionId}/check` の型を追加
--- a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
@ -112,7 +112,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-

 				this.activeUsersChart.read(me);

-				await this.noteEntityService.packMany(timeline, me);
+				return await this.noteEntityService.packMany(timeline, me);
 			}

 			const timeline = await this.fanoutTimelineEndpointService.timeline({
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@ -1108,7 +1108,7 @@ defineExpose({
 	&:focus-visible {
 		outline: none;

-		.submitInner {
+		> .submitInner {
 			outline: 2px solid var(--MI_THEME-fgOnAccent);
 			outline-offset: -4px;
 		}
@ -1123,13 +1123,13 @@ defineExpose({
 	}

 	&:not(:disabled):hover {
-		> .inner {
+		> .submitInner {
 			background: linear-gradient(90deg, hsl(from var(--MI_THEME-accent) h s calc(l + 5)), hsl(from var(--MI_THEME-accent) h s calc(l + 5)));
 		}
 	}

 	&:not(:disabled):active {
-		> .inner {
+		> .submitInner {
 			background: linear-gradient(90deg, hsl(from var(--MI_THEME-accent) h s calc(l + 5)), hsl(from var(--MI_THEME-accent) h s calc(l + 5)));
 		}
 	}
--- a/packages/frontend/src/pizzax.ts
+++ b/packages/frontend/src/pizzax.ts
@ -241,9 +241,13 @@ export class Storage<T extends StateDef> {
 	 * 特定のキーの、簡易的なgetter/setterを作ります
 	 * 主にvue上で設定コントロールのmodelとして使う用
 	 */
-	public makeGetterSetter<K extends keyof T>(key: K, getter?: (v: T[K]) => unknown, setter?: (v: unknown) => T[K]): {
-		get: () => T[K]['default'];
-		set: (value: T[K]['default']) => void;
+	public makeGetterSetter<K extends keyof T, R = T[K]['default']>(
+		key: K,
+		getter?: (v: T[K]['default']) => R,
+		setter?: (v: R) => T[K]['default'],
+	): {
+		get: () => R;
+		set: (value: R) => void;
 	} {
 		const valueRef = ref(this.state[key]);

@ -265,7 +269,7 @@ export class Storage<T extends StateDef> {
 					return valueRef.value;
 				}
 			},
-			set: (value: unknown) => {
+			set: (value) => {
 				const val = setter ? setter(value) : value;
 				this.set(key, val);
 				valueRef.value = val;
Author	SHA1	Message	Date
かっこかり	b07f14ea50	Merge `a4e4799613` into `f1eb17f66c`	2024-11-07 13:51:58 +09:00
Linca	f1eb17f66c	chore: little type trick in pizzax.ts (#14891 ) Make `makeGetterSetter` take the correct type associated with getter and setter	2024-11-06 22:01:58 +09:00
かっこかり	b1c82213a3	fix(backend): FTT無効時にユーザーリストタイムラインが使用できない問題を修正 (#14878 ) * fix: return getfromdb when FanoutTimeline is not enabled * Update Changelog * fix --------- Co-authored-by: Lhc_fl <lhcfl@outlook.com>	2024-11-06 22:01:21 +09:00
かっこかり	a896c39dbf	fix(frontend): ノート投稿ボタンにホバー時のスタイルが適用されていない (#14887 ) * fix(frontend): ノート投稿ボタンにホバー時のスタイルが適用されていない (#305) (cherry picked from commit 711ab846a967feeddbe0c908bee4b91646cec321) * Update Changelog --------- Co-authored-by: taiy <53635909+taiyme@users.noreply.github.com>	2024-11-06 15:15:28 +09:00