Merge branch 'develop' of codeberg.org:calckey/calckey into develop

packages/backend/src/server/api/mastodon/endpoints/account.ts

@@ -304,17 +304,19 @@ export function apiAccountMastodon(router: Router): void {
 		const client = getClient(BASE_URL, accessTokens);
 		let users;
 		try {
-			const idsRaw = ctx.query["id[]"];
+			const idsRaw = ctx.request.body?["id[]"] : null;
 			const ids = typeof idsRaw === "string" ? [idsRaw] : idsRaw;
 			users = ids;
 			relationshopModel.id = idsRaw?.toString() || "1";
-			if (!idsRaw) return [relationshopModel];
-			const data = (await client.getRelationships(ids ? ids : [])) as any;
+			if (!(idsRaw && ids)) {
+				ctx.body = [relationshopModel];
+				return;
+			}
+			const data = await client.getRelationships(ids);
 			ctx.body = data.data;
 		} catch (e: any) {
 			console.error(e);
 			console.error(e.response.data);
-			e.response.data.user = users ? users : "null";
 			ctx.status = 401;
 			ctx.body = e.response.data;
 		}

packages/client/src/components/global/MkPageHeader.vue

@@ -144,21 +144,20 @@ onMounted(() => {
 	calcBg();
 	globalEvents.on('themeChanged', calcBg);
 	
-	
 	watch(() => [props.tab, props.tabs], () => {
 		nextTick(() => {
 			const tabEl = tabRefs[props.tab];
 			if (tabEl && tabHighlightEl) {
 				// offsetWidth や offsetLeft は少数を丸めてしまうため getBoundingClientRect を使う必要がある
 				// https://developer.mozilla.org/ja/docs/Web/API/HTMLElement/offsetWidth#%E5%80%A4
+				const tabSizeX = tabEl.scrollWidth + 20; // + the tab's padding
+				tabEl.style = `--width: ${tabSizeX}px`;
 				setTimeout(() => {
 					const parentRect = tabsEl.getBoundingClientRect();
 					const rect = tabEl.getBoundingClientRect();
-					const tabSizeX = tabEl.scrollWidth;
 					const left = (rect.left - parentRect.left + tabsEl?.scrollLeft);
-					tabEl.style = "--width: " + tabSizeX + "px";
 					tabHighlightEl.style.width = tabSizeX + 'px';
-					tabHighlightEl.style.transform = 'translateX(' + left + 'px)';
+					tabHighlightEl.style.transform = `translateX(${left}px)`;
 					window.requestAnimationFrame(() => {
 						tabsEl?.scrollTo({left: left - 60, behavior: "smooth"});
 					})
@@ -358,11 +357,12 @@ onUnmounted(() => {
 			display: inline-flex;
 			align-items: center;
 			position: relative;
-			padding: 0 10px;
+			border-inline: 10px solid transparent;
 			height: 100%;
 			font-weight: normal;
 			opacity: 0.7;
 			width: 38px;
+			--width: 38px;
 			overflow: hidden;
 			transition: color .2s, opacity .2s, width .2s;
 
@@ -384,7 +384,7 @@ onUnmounted(() => {
 				margin-left: 8px;
 			}
 			> .title {
-				transition: font-size .2s, opacity .2s;
+				transition: opacity .2s;
 			}
 		}