From 9bac307ba8c67645de9adc0caf085b42c1b49c41 Mon Sep 17 00:00:00 2001 From: s1idewhist1e Date: Mon, 8 May 2023 10:30:21 -0700 Subject: [PATCH 1/2] Make config syntax more consistant --- .config/example.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.config/example.yml b/.config/example.yml index 9d20e44a0..e37d53504 100644 --- a/.config/example.yml +++ b/.config/example.yml @@ -110,12 +110,13 @@ id: 'aid' #maxCaptionLength: 1500 # Reserved usernames that only the administrator can register with -reservedUsernames: - - root - - admin - - administrator - - me - - system +reservedUsernames: [ + 'root', + 'admin', + 'administrator', + 'me', + 'system' +] # Whether disable HSTS #disableHsts: true From 09610b89cb8b2b51f8c41d3ffbfdf8176c09ce98 Mon Sep 17 00:00:00 2001 From: Freeplay Date: Mon, 8 May 2023 15:39:20 -0400 Subject: [PATCH 2/2] fix click.stop --- packages/client/src/components/MkMediaList.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/client/src/components/MkMediaList.vue b/packages/client/src/components/MkMediaList.vue index fb3dab324..cd38196c1 100644 --- a/packages/client/src/components/MkMediaList.vue +++ b/packages/client/src/components/MkMediaList.vue @@ -16,6 +16,7 @@ :data-count=" mediaList.filter((media) => previewable(media)).length " + @click.stop > @@ -190,6 +189,7 @@ const previewable = (file: misskey.entities.DriveFile): boolean => { margin-top: 4px; border-radius: var(--radius); overflow: hidden; + pointer-events: none; &:before { content: ""; @@ -209,6 +209,7 @@ const previewable = (file: misskey.entities.DriveFile): boolean => { > * { overflow: hidden; border-radius: 6px; + pointer-events: all; } &[data-count="1"] {