HoovesSocial/hippofish
2
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Fix reply and quote icons

Browse source 
past me was really dumb wth
This commit is contained in:
Freeplay 2023-05-25 22:51:14 -04:00
parent 911704d6a8
commit d373e7be25
3 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/client/src/components/MkNoteDetailed.vue
View file

@ -71,6 +71,7 @@
class="reply" class="reply"
:conversation="replies" :conversation="replies"
:detailedView="true" :detailedView="true"
:parentId="appearNote.id"
/> />
<MkLoading <MkLoading
v-else-if="tab === 'replies' && appearNote.repliesCount > 0" v-else-if="tab === 'replies' && appearNote.repliesCount > 0"
@ -84,6 +85,7 @@
class="reply" class="reply"
:conversation="replies" :conversation="replies"
:detailedView="true" :detailedView="true"
:parentId="appearNote.id"
/> />
<MkLoading v-else-if="tab === 'quotes' && directQuotes.length > 0" /> <MkLoading v-else-if="tab === 'quotes' && directQuotes.length > 0" />

4
packages/client/src/components/MkNoteSub.vue
View file

@ -28,7 +28,7 @@
<MkSubNoteContent <MkSubNoteContent
class="text" class="text"
:note="note" :note="note"
:parentId="appearNote.parentId" :parentId="parentId"
:conversation="conversation" :conversation="conversation"
@focusfooter="footerEl.focus()" @focusfooter="footerEl.focus()"
/> />
@ -140,7 +140,7 @@
:conversation="conversation" :conversation="conversation"
:depth="replies.length == 1 ? depth : depth + 1" :depth="replies.length == 1 ? depth : depth + 1"
:replyLevel="replyLevel + 1" :replyLevel="replyLevel + 1"
:parentId="appearNote.replyId" :parentId="appearNote.id"
:detailedView="detailedView" :detailedView="detailedView"
/> />
<div v-else-if="replies.length > 0" class="more"> <div v-else-if="replies.length > 0" class="more">

48
packages/client/src/components/MkSubNoteContent.vue
View file

@ -1,27 +1,26 @@
<template> <template>
<p v-if="note.cw != null" class="cw"> <p v-if="note.cw != null" class="cw">
<MkA <MkA
v-if="!detailed && note.replyId" v-if="
:to="`#${note.replyId}`" conversation &&
note.renoteId == parentId
"
:to="`#${parentId}`"
behavior="browser" behavior="browser"
class="reply-icon" class="reply-icon"
@click.stop @click.stop
> >
<i class="ph-arrow-bend-left-up ph-bold ph-lg"></i> <i class="ph-quotes ph-bold ph-lg"></i>
</MkA> </MkA>
<MkA <MkA
v-if=" v-else-if="!detailed && note.replyId"
conversation && :to="`#${note.replyId}`"
note.renoteId && behavior="browser"
note.renoteId != parentId &&
!note.replyId
"
:to="`/notes/${note.renoteId}`"
v-tooltip="i18n.ts.jumpToPrevious" v-tooltip="i18n.ts.jumpToPrevious"
class="reply-icon" class="reply-icon"
@click.stop @click.stop
> >
<i class="ph-quotes ph-bold ph-lg"></i> <i class="ph-arrow-bend-left-up ph-bold ph-lg"></i>
</MkA> </MkA>
<Mfm <Mfm
v-if="note.cw != ''" v-if="note.cw != ''"
@ -68,7 +67,19 @@
> >
<template v-if="!note.cw"> <template v-if="!note.cw">
<MkA <MkA
v-if="!detailed && note.replyId" v-if="
conversation &&
note.renoteId == parentId
"
:to="`#${parentId}`"
behavior="browser"
class="reply-icon"
@click.stop
>
<i class="ph-quotes ph-bold ph-lg"></i>
</MkA>
<MkA
v-else-if="!detailed && note.replyId"
:to="`#${note.replyId}`" :to="`#${note.replyId}`"
behavior="browser" behavior="browser"
v-tooltip="i18n.ts.jumpToPrevious" v-tooltip="i18n.ts.jumpToPrevious"
@ -77,19 +88,6 @@
> >
<i class="ph-arrow-bend-left-up ph-bold ph-lg"></i> <i class="ph-arrow-bend-left-up ph-bold ph-lg"></i>
</MkA> </MkA>
<MkA
v-if="
conversation &&
note.renoteId &&
note.renoteId != parentId &&
!note.replyId
"
:to="`/notes/${note.renoteId}`"
class="reply-icon"
@click.stop
>
<i class="ph-quotes ph-bold ph-lg"></i>
</MkA>
</template> </template>
<Mfm <Mfm
v-if="note.text" v-if="note.text"