e2net/iceshrimp-legacy
2
0
Fork 0
forked from mirrors/firefish
Code Issues Pull requests Packages Projects Releases Activity

Merge pull request 'Fix polls & own reactions not showing in replies' (#10199) from Freeplay/calckey:notes into develop

Browse source 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10199
This commit is contained in:
Kainoa Kanter 2023-05-25 20:50:57 +00:00
parent a4f089670d c683ee304e
commit 6383babe04
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
packages/backend/src/models/repositories/note.ts
View file

@ -236,6 +236,12 @@ export const NoteRepository = db.getRepository(Note).extend({
uri: note.uri || undefined,
url: note.url || undefined,
updatedAt: note.updatedAt?.toISOString() || undefined,
poll: note.hasPoll ? populatePoll(note, meId) : undefined,
...(meId
? {
myReaction: populateMyReaction(note, meId, options?._hint_),
}
: {}),
...(opts.detail
? {
@ -252,14 +258,6 @@ export const NoteRepository = db.getRepository(Note).extend({
_hint_: options?._hint_,
})
: undefined,
poll: note.hasPoll ? populatePoll(note, meId) : undefined,
...(meId
? {
myReaction: populateMyReaction(note, meId, options?._hint_),
}
: {}),
}
: {}),
});

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

@ -59,7 +59,7 @@ defineExpose({
<style lang="scss" scoped>
._button {
font-weight: 700;
z-index: 2;
z-index: 5;
> span {
background: var(--cwBg) !important;
color: var(--cwFg);

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

@ -569,7 +569,7 @@ onUnmounted(() => {
background: var(--panelHighlight);
border-radius: var(--radius);
opacity: 0;
transition: opacity 0.2s;
transition: opacity 0.2s, background 0.2s;
z-index: -1;
}
&.reply-to {
@ -604,6 +604,7 @@ onUnmounted(() => {
--panel: var(--panelHighlight);
&::before {
opacity: 1;
background: var(--panelHighlight) !important;
}
}
// @media (pointer: coarse) {
@ -623,6 +624,7 @@ onUnmounted(() => {
&::before {
outline: auto;
opacity: 1;
background: none;
}
}

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

@ -41,7 +41,7 @@ defineExpose({
bottom: 0;
left: 0;
width: 100%;
z-index: 2;
z-index: 5;
> span {
display: inline-block;
background: var(--panel);