v12.23Q4.2

v12.23Q4.2

CHANGELOG.md

@@ -1,3 +1,11 @@
+## 12.23Q4.2
+ - 独自のPull-To-Refreshをやめる
+   * ブラウザのやつのほうが確実なので
+ - リモートユーザーのページで不正確なチャートやステータスを表示しないようにする
+ - アンテナのページの右上のアイコンがおかしいのを修正
+ - gulp-cssnanoやめる
+ - photoswipeの背景のぼかしがおかしいのを修正
+
 ## 12.23Q4.1
  - BREAKING: nodeinfoでのソフトウェア名をnexkeyに変更
  - BREAKING: Node16のサポートを終了

gulpfile.js

@@ -6,7 +6,8 @@ const fs = require('fs');
 const gulp = require('gulp');
 const replace = require('gulp-replace');
 const terser = require('gulp-terser');
-const cssnano = require('gulp-cssnano');
+const postcss = require('gulp-postcss');
+const cssnano = require('cssnano');
 
 const locales = require('./locales');
 const meta = require('./package.json');
@@ -45,10 +46,14 @@ gulp.task('build:backend:script', () => {
 });
 
 gulp.task('build:backend:style', () => {
-	return gulp.src(['./packages/backend/src/server/web/style.css', './packages/backend/src/server/web/bios.css', './packages/backend/src/server/web/cli.css'])
-		.pipe(cssnano({
+	const plugins = [
+		cssnano({
 			zindex: false
-		}))
+		})
+	];
+
+	return gulp.src(['./packages/backend/src/server/web/style.css', './packages/backend/src/server/web/bios.css', './packages/backend/src/server/web/cli.css'])
+		.pipe(postcss(plugins))
 		.pipe(gulp.dest('./packages/backend/built/server/web/'));
 });
 

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "nexkey",
-	"version": "12.23Q4.1",
+	"version": "12.23Q4.2",
 	"codename": "chirigiku",
 	"repository": {
 		"type": "git",
@@ -33,19 +33,21 @@
 		"cleanall": "npm run clean-all"
 	},
 	"dependencies": {
+		"cssnano": "6.0.2",
 		"execa": "5.1.1",
 		"gulp": "4.0.2",
-		"gulp-cssnano": "2.1.3",
+		"gulp-postcss": "^9.0.1",
 		"gulp-rename": "2.0.0",
 		"gulp-replace": "1.1.4",
 		"gulp-terser": "2.1.0",
 		"js-yaml": "4.1.0",
+		"postcss": "^8.4.31",
 		"sonic-channel": "1.3.1"
 	},
 	"devDependencies": {
 		"@types/gulp": "4.0.17",
 		"@types/gulp-rename": "2.0.6",
-		"@typescript-eslint/parser": "6.14.0",
+		"@typescript-eslint/parser": "6.15.0",
 		"cross-env": "7.0.3",
 		"cypress": "13.6.1",
 		"start-server-and-test": "2.0.3",

packages/backend/package.json

@@ -16,7 +16,7 @@
 	},
 	"dependencies": {
 		"@bull-board/koa": "5.9.1",
-		"@discordapp/twemoji": "14.0.2",
+		"@discordapp/twemoji": "15.0.2",
 		"@elastic/elasticsearch": "8.10.0",
 		"@koa/cors": "5.0.0",
 		"@koa/multer": "3.0.2",
@@ -131,17 +131,17 @@
 		"@types/fluent-ffmpeg": "2.1.24",
 		"@types/js-yaml": "4.0.9",
 		"@types/jsdom": "20.0.0",
-		"@types/jsonld": "1.5.11",
+		"@types/jsonld": "1.5.13",
 		"@types/jsrsasign": "10.5.12",
 		"@types/koa": "2.13.11",
 		"@types/koa-bodyparser": "4.3.12",
 		"@types/koa-cors": "0.0.3",
-		"@types/koa-favicon": "2.1.2",
+		"@types/koa-favicon": "2.1.3",
 		"@types/koa-logger": "3.1.4",
 		"@types/koa-mount": "4.0.4",
 		"@types/koa-send": "4.1.5",
 		"@types/koa-views": "7.0.0",
-		"@types/koa__cors": "4.0.2",
+		"@types/koa__cors": "4.0.3",
 		"@types/koa__multer": "2.0.7",
 		"@types/koa__router": "8.0.11",
 		"@types/mocha": "10.0.3",

packages/backend/yarn.lock

@@ -338,14 +338,14 @@
     ky-universal "^0.11.0"
     undici "^5.21.2"
 
-"@discordapp/twemoji@14.0.2":
-  version "14.0.2"
-  resolved "https://registry.yarnpkg.com/@discordapp/twemoji/-/twemoji-14.0.2.tgz#50cc19f6f3769dc6b36eb251421b5f5d4629e837"
-  integrity sha512-eYJpFsjViDTYwq3f6v+tRu8iRc+yLAeGrlh6kmNRvvC6rroUE2bMlBfEQ/WNh+2Q1FtSEFXpxzuQPOHzRzbAyA==
+"@discordapp/twemoji@15.0.2":
+  version "15.0.2"
+  resolved "https://registry.yarnpkg.com/@discordapp/twemoji/-/twemoji-15.0.2.tgz#8422df8a86e071b16ebc03268200cbd161895e54"
+  integrity sha512-SrWKcv3SrGfrLQ/vfUnA+bAG73Q6Yjys01UuoY5SzUlc9iS03amQ6DxLhzVsjW/aTdgiMQdUatLidD+YPfYMCw==
   dependencies:
+    "@twemoji/parser" "15.0.0"
     fs-extra "^8.0.1"
     jsonfile "^5.0.0"
-    twemoji-parser "14.0.0"
     universalify "^0.1.2"
 
 "@elastic/elasticsearch@8.10.0":
@@ -740,6 +740,11 @@
   resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9"
   integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==
 
+"@twemoji/parser@15.0.0":
+  version "15.0.0"
+  resolved "https://registry.yarnpkg.com/@twemoji/parser/-/parser-15.0.0.tgz#8ae9749659ef524b5f0e6ee1412d0e48865e77bf"
+  integrity sha512-lh9515BNsvKSNvyUqbj5yFu83iIDQ77SwVcsN/SnEGawczhsKU6qWuogewN1GweTi5Imo5ToQ9s+nNTf97IXvg==
+
 "@types/accepts@*":
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/@types/accepts/-/accepts-1.3.5.tgz#c34bec115cfc746e04fe5a059df4ce7e7b391575"
@@ -880,10 +885,10 @@
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
-"@types/jsonld@1.5.11":
-  version "1.5.11"
-  resolved "https://registry.yarnpkg.com/@types/jsonld/-/jsonld-1.5.11.tgz#71b4122f307ecc35bc8e4fa21405cbd6ebc972c8"
-  integrity sha512-/B5yjthc6MEJMR4+TUtaj5LgE3bByVSNIXvPcUxiecj5F7GZKQJS5oery5rbOni7T9QBpjDF0RufCcVVlCe4hw==
+"@types/jsonld@1.5.13":
+  version "1.5.13"
+  resolved "https://registry.yarnpkg.com/@types/jsonld/-/jsonld-1.5.13.tgz#32cb7bf8893ff811036b5025edaf626593a6f36f"
+  integrity sha512-n7fUU6W4kSYK8VQlf/LsE9kddBHPKhODoVOjsZswmve+2qLwBy6naWxs/EiuSZN9NU0N06Ra01FR+j87C62T0A==
 
 "@types/jsrsasign@10.5.12":
   version "10.5.12"
@@ -916,10 +921,10 @@
   dependencies:
     "@types/koa" "*"
 
-"@types/koa-favicon@2.1.2":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/@types/koa-favicon/-/koa-favicon-2.1.2.tgz#a64ebf9f22dc3e4fd7c825b9d3f3146583ba5cdc"
-  integrity sha512-YXGc7+1F0jMlBereDjHCYSHlrxT3aBGhlPNWOodyLabZpsJvTlDrvpKRf5i6WvHpRUXoOlG9zc093U0RJ/Ggkw==
+"@types/koa-favicon@2.1.3":
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/@types/koa-favicon/-/koa-favicon-2.1.3.tgz#4abf8b157b5902e546974e51622adf28c3989591"
+  integrity sha512-L1XAF8k1iOuh3hA/ZjEqWURm9/62a8A1x7BZR9ZCMw8nbnUBt6oZksz2rfKRCEwESqI2e6WVGlF03fs9DbQQXQ==
   dependencies:
     "@types/koa" "*"
 
@@ -965,10 +970,10 @@
     "@types/koa-compose" "*"
     "@types/node" "*"
 
-"@types/koa__cors@4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@types/koa__cors/-/koa__cors-4.0.2.tgz#9a866628aa57653e130e731d6c19c6372779ca1c"
-  integrity sha512-EV1S9t1PbauzUlKyI4KKrw1E/JWHI15OtdVXkaBm6sI+vXvvSW6JoKcsmAiIqY0PYvt94fycvdrWMTtM15uZmw==
+"@types/koa__cors@4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@types/koa__cors/-/koa__cors-4.0.3.tgz#048fa1d523a27ff448c071416e774fac1bf43aab"
+  integrity sha512-zj+1sQO/6GGRGINRXlMmoiFwHibKVcjNGdh+p2SpqHDMLyvC+ce0LMHX6UBi1rdpnPZ/+osUwWdGKF945ffrzA==
   dependencies:
     "@types/koa" "*"
 

packages/client/package.json

@@ -11,14 +11,14 @@
 		"lodash": "^4.17.21"
 	},
 	"dependencies": {
-		"@discordapp/twemoji": "14.1.2",
+		"@discordapp/twemoji": "15.0.2",
 		"@rollup/plugin-alias": "5.1.0",
 		"@rollup/plugin-json": "6.0.1",
 		"@rollup/pluginutils": "5.0.5",
 		"@syuilo/aiscript": "0.11.1",
 		"@tabler/icons": "^1.117.0",
 		"@vitejs/plugin-vue": "4.5.2",
-		"@vue/compiler-sfc": "3.3.11",
+		"@vue/compiler-sfc": "3.3.13",
 		"autobind-decorator": "2.4.0",
 		"autosize": "6.0.1",
 		"blurhash": "2.0.5",
@@ -61,7 +61,7 @@
 		"typescript": "5.3.2",
 		"uuid": "9.0.1",
 		"vanilla-tilt": "1.8.1",
-		"vite": "5.0.4",
+		"vite": "5.0.5",
 		"vue": "3.3.8",
 		"vue-prism-editor": "2.0.0-alpha.2",
 		"vuedraggable": "4.1.0"
@@ -78,14 +78,14 @@
 		"@types/throttle-debounce": "5.0.2",
 		"@types/tinycolor2": "1.4.6",
 		"@types/uuid": "9.0.7",
-		"@typescript-eslint/eslint-plugin": "6.12.0",
+		"@typescript-eslint/eslint-plugin": "6.15.0",
 		"@typescript-eslint/parser": "6.13.2",
 		"cross-env": "7.0.3",
 		"cypress": "13.6.1",
-		"eslint": "8.55.0",
+		"eslint": "8.56.0",
 		"eslint-plugin-import": "2.29.0",
 		"eslint-plugin-vue": "9.19.2",
-		"rollup": "4.9.0",
+		"rollup": "4.9.1",
 		"start-server-and-test": "2.0.3"
 	}
 }

packages/client/src/components/MkMediaList.vue

@@ -181,13 +181,8 @@ const previewable = (file: misskey.entities.DriveFile): boolean => {
 </style>
 
 <style lang="scss">
-.pswp__container {
-	backdrop-filter: blur(5px);
-}
-
 .pswp {
-	// なぜか機能しない
-  //z-index: v-bind(pswpZIndex);
 	z-index: 2000000;
+	backdrop-filter: blur(5px);
 }
 </style>

packages/client/src/components/MkPullToRefresh.vue

@@ -187,6 +187,8 @@ defineExpose({
 
 <style lang="scss" module>
 .frame {
+	overscroll-behavior-y: none;
+
 	position: relative;
 	overflow: clip;
 
@@ -198,6 +200,7 @@ defineExpose({
 }
 
 .frameContent {
+	overscroll-behavior-y: none;
 	position: absolute;
 	bottom: 0;
 	width: 100%;

packages/client/src/components/MkTimeline.vue

@@ -1,14 +1,11 @@
 <template>
-<MkPullToRefresh ref="prComponent" @refresh="() => reloadTimeline(true)">
-    <XNotes ref="tlComponent" :no-gap="!$store.state.showGapBetweenNotesInTimeline" :pagination="pagination" @queue="emit('queue', $event)"/>
-</MkPullToRefresh>
+	   <XNotes ref="tlComponent" :no-gap="!$store.state.showGapBetweenNotesInTimeline" :pagination="pagination" @queue="emit('queue', $event)"/>
 </template>
 
 <script lang="ts" setup>
 import { computed, provide, onUnmounted } from "vue";
-import MkPullToRefresh from "@/components/MkPullToRefresh.vue";
 import XNotes from "@/components/MkNotes.vue";
-import { stream, reloadStream } from "@/stream";
+import { stream } from "@/stream";
 import * as sound from "@/scripts/sound";
 import { $i } from "@/account";
 
@@ -27,7 +24,6 @@ const emit = defineEmits<{
 
 provide("inChannel", computed(() => props.src === "channel"));
 
-const prComponent: InstanceType<typeof MkPullToRefresh> = $ref();
 const tlComponent: InstanceType<typeof XNotes> = $ref();
 
 const prepend = note => {
@@ -136,18 +132,4 @@ onUnmounted(() => {
     connection.dispose();
     if (connection2) connection2.dispose();
 });
-
-const reloadTimeline = (fromPR = false) => {
-    if (fromPR) prComponent.refreshFinished();
-    tlComponent.pagingComponent?.reload().then(() => {
-        reloadStream();
-    });
-};
-
-/* TODO
-const timetravel = (date?: Date) => {
-	this.date = date;
-	this.$refs.tl.reload();
-};
-*/
 </script>

packages/client/src/components/MkUserInfo.vue

@@ -17,10 +17,10 @@
         <div>
             <p>{{ i18n.ts.notes }}</p><span>{{ user.notesCount }}</span>
         </div>
-        <div>
+        <div v-if="user.host == null">
             <p>{{ i18n.ts.following }}</p><span>{{ user.followingCount }}</span>
         </div>
-        <div>
+        <div v-if="user.host == null">
             <p>{{ i18n.ts.followers }}</p><span>{{ user.followersCount }}</span>
         </div>
     </div>

packages/client/src/components/MkUserPreview.vue

@@ -13,17 +13,6 @@
             <div class="description">
                 <Mfm v-if="user.description" :text="user.description" :author="user" :i="$i" :custom-emojis="user.emojis"/>
             </div>
-            <div class="status">
-                <div>
-                    <p>{{ $ts.notes }}</p><span>{{ user.notesCount }}</span>
-                </div>
-                <div>
-                    <p>{{ $ts.following }}</p><span>{{ user.followingCount }}</span>
-                </div>
-                <div>
-                    <p>{{ $ts.followers }}</p><span>{{ user.followersCount }}</span>
-                </div>
-            </div>
             <MkFollowButton v-if="$i && user.id != $i.id" class="koudoku-button" :user="user" mini/>
         </div>
         <div v-else>
@@ -149,7 +138,7 @@ onMounted(() => {
 		}
 
 		> .description {
-			padding: 0 16px;
+			padding: 8px 16px;
 			font-size: 0.8em;
 			color: var(--fg);
 		}

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

@@ -41,6 +41,7 @@ import { scrollToTop } from "@/scripts/scroll";
 import { globalEvents } from "@/events";
 import { injectPageMetadata } from "@/scripts/page-metadata";
 import { $i, openAccountMenu as openAccountMenu_ } from "@/account";
+import {defaultStore} from "@/store";
 
 const props = withDefaults(defineProps<{
 	tabs?: Tab[];
@@ -74,6 +75,7 @@ const hasActions = $computed(() => props.actions && props.actions.length > 0);
 const show = $computed(() => {
     return !hideTitle || hasTabs || hasActions;
 });
+const enableBlur = ref(defaultStore.state.useBlurEffect);
 
 const preventDrag = (ev: TouchEvent) => {
     ev.stopPropagation();
@@ -98,7 +100,9 @@ function onTabClick(): void {
 const calcBg = () => {
     const rawBg = "var(--bg)";
     const tinyBg = tinycolor(rawBg.startsWith("var(") ? getComputedStyle(document.documentElement).getPropertyValue(rawBg.slice(4, -1)) : rawBg);
-    tinyBg.setAlpha(0.85);
+    if (enableBlur.value) {
+        tinyBg.setAlpha(0.85);
+		}
     bg.value = tinyBg.toRgbString();
 };
 

packages/client/src/pages/antenna-timeline.vue

@@ -18,7 +18,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, inject, watch } from "vue";
+import { computed, watch } from "vue";
 import XTimeline from "@/components/MkTimeline.vue";
 import { scroll } from "@/scripts/scroll";
 import * as os from "@/os";
@@ -63,7 +63,7 @@ watch(() => props.antennaId, async () => {
 }, { immediate: true });
 
 const headerActions = $computed(() => antenna ? [{
-    icon: "ti ti-calendar-time",
+    icon: "ti ti-settings",
     text: i18n.ts.settings,
     handler: settings,
 }] : []);

packages/client/src/pages/user-info.vue

@@ -197,7 +197,6 @@ import FormSuspense from "@/components/form/suspense.vue";
 import MkFileListForAdmin from "@/components/MkFileListForAdmin.vue";
 import MkInfo from "@/components/MkInfo.vue";
 import * as os from "@/os";
-import number from "@/filters/number";
 import bytes from "@/filters/bytes";
 import { url } from "@/config";
 import { userPage, acct } from "@/filters/user";