diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2023-10-12 09:21:04 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-12 09:21:04 +0900 |
| commit | 7e7138c0eb980d7cb9cb0a68e4f07eb2f0d0daeb (patch) | |
| tree | 4b8e58dcd39d113313866c6b66ecb82c65bb7880 /packages/frontend/src/components | |
| parent | Merge pull request #11963 from misskey-dev/develop (diff) | |
| parent | Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop (diff) | |
| download | misskey-7e7138c0eb980d7cb9cb0a68e4f07eb2f0d0daeb.tar.gz misskey-7e7138c0eb980d7cb9cb0a68e4f07eb2f0d0daeb.tar.bz2 misskey-7e7138c0eb980d7cb9cb0a68e4f07eb2f0d0daeb.zip | |
Merge pull request #12011 from misskey-dev/develop
Release: 2023.10.1
Diffstat (limited to 'packages/frontend/src/components')
| -rw-r--r-- | packages/frontend/src/components/MkEmojiPicker.vue | 2 | ||||
| -rw-r--r-- | packages/frontend/src/components/MkTimeline.vue | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/packages/frontend/src/components/MkEmojiPicker.vue b/packages/frontend/src/components/MkEmojiPicker.vue index 32f440ae5d..7eff637482 100644 --- a/packages/frontend/src/components/MkEmojiPicker.vue +++ b/packages/frontend/src/components/MkEmojiPicker.vue @@ -615,6 +615,8 @@ defineExpose({ height: 1.25em; vertical-align: -.25em; pointer-events: none; + width: 100%; + object-fit: contain; } } } diff --git a/packages/frontend/src/components/MkTimeline.vue b/packages/frontend/src/components/MkTimeline.vue index 45dedd5042..cdd72febd1 100644 --- a/packages/frontend/src/components/MkTimeline.vue +++ b/packages/frontend/src/components/MkTimeline.vue @@ -24,9 +24,11 @@ const props = withDefaults(defineProps<{ role?: string; sound?: boolean; withRenotes?: boolean; + withReplies?: boolean; onlyFiles?: boolean; }>(), { withRenotes: true, + withReplies: false, onlyFiles: false, }); @@ -90,10 +92,12 @@ if (props.src === 'antenna') { endpoint = 'notes/local-timeline'; query = { withRenotes: props.withRenotes, + withReplies: props.withReplies, withFiles: props.onlyFiles ? true : undefined, }; connection = stream.useChannel('localTimeline', { withRenotes: props.withRenotes, + withReplies: props.withReplies, withFiles: props.onlyFiles ? true : undefined, }); connection.on('note', prepend); @@ -101,10 +105,12 @@ if (props.src === 'antenna') { endpoint = 'notes/hybrid-timeline'; query = { withRenotes: props.withRenotes, + withReplies: props.withReplies, withFiles: props.onlyFiles ? true : undefined, }; connection = stream.useChannel('hybridTimeline', { withRenotes: props.withRenotes, + withReplies: props.withReplies, withFiles: props.onlyFiles ? true : undefined, }); connection.on('note', prepend); |