mirror of
				https://codeberg.org/yeentown/barkey.git
				synced 2025-11-04 15:34:13 +00:00 
			
		
		
		
	real-time update: adjust replyCount up/down
this also fixes the connecting lines in the Sk-style view thanks @ShittyKopper for reporting the bug! NOTE: at this point, the `isDeletedRef` boolean is pretty much useless, because we're directly removing deleted notes from the `replies` array and therefore from the DOM (we were just hiding them, before); I'm intentionally not touching `isDeletedRef` to simplify merges from upstream
This commit is contained in:
		
							parent
							
								
									d06939bd25
								
							
						
					
					
						commit
						576a87118c
					
				
					 5 changed files with 53 additions and 10 deletions
				
			
		| 
						 | 
					@ -170,7 +170,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 | 
				
			||||||
			<div v-if="!repliesLoaded" style="padding: 16px">
 | 
								<div v-if="!repliesLoaded" style="padding: 16px">
 | 
				
			||||||
				<MkButton style="margin: 0 auto;" primary rounded @click="loadReplies">{{ i18n.ts.loadReplies }}</MkButton>
 | 
									<MkButton style="margin: 0 auto;" primary rounded @click="loadReplies">{{ i18n.ts.loadReplies }}</MkButton>
 | 
				
			||||||
			</div>
 | 
								</div>
 | 
				
			||||||
			<MkNoteSub v-for="note in replies" :key="note.id" :note="note" :class="$style.reply" :detail="true" :expandAllCws="props.expandAllCws"/>
 | 
								<MkNoteSub v-for="note in replies" :key="note.id" :note="note" :class="$style.reply" :detail="true" :expandAllCws="props.expandAllCws" :onDeleteCallback="removeReply" />
 | 
				
			||||||
		</div>
 | 
							</div>
 | 
				
			||||||
		<div v-else-if="tab === 'renotes'" :class="$style.tab_renotes">
 | 
							<div v-else-if="tab === 'renotes'" :class="$style.tab_renotes">
 | 
				
			||||||
			<MkPagination :pagination="renotesPagination" :disableAutoLoad="true">
 | 
								<MkPagination :pagination="renotesPagination" :disableAutoLoad="true">
 | 
				
			||||||
| 
						 | 
					@ -372,8 +372,17 @@ const reactionsPagination = computed(() => ({
 | 
				
			||||||
	},
 | 
						},
 | 
				
			||||||
}));
 | 
					}));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
async function addReplyTo(note, replyNote: Misskey.entities.Note) {
 | 
					async function addReplyTo(replyNote: Misskey.entities.Note) {
 | 
				
			||||||
		replies.value.unshift(replyNote);
 | 
							replies.value.unshift(replyNote);
 | 
				
			||||||
 | 
							appearNote.repliesCount += 1;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					async function removeReply(id: Misskey.entities.Note['id']) {
 | 
				
			||||||
 | 
							const replyIdx = replies.value.findIndex(note => note.id === id);
 | 
				
			||||||
 | 
							if (replyIdx >= 0) {
 | 
				
			||||||
 | 
								replies.value.splice(replyIdx, 1);
 | 
				
			||||||
 | 
								appearNote.repliesCount -= 1;
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
useNoteCapture({
 | 
					useNoteCapture({
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -65,7 +65,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 | 
				
			||||||
		</div>
 | 
							</div>
 | 
				
			||||||
	</div>
 | 
						</div>
 | 
				
			||||||
	<template v-if="depth < numberOfReplies">
 | 
						<template v-if="depth < numberOfReplies">
 | 
				
			||||||
		<MkNoteSub v-for="reply in replies" :key="reply.id" :note="reply" :class="$style.reply" :detail="true" :depth="depth + 1" :expandAllCws="props.expandAllCws"/>
 | 
							<MkNoteSub v-for="reply in replies" :key="reply.id" :note="reply" :class="$style.reply" :detail="true" :depth="depth + 1" :expandAllCws="props.expandAllCws" :onDeleteCallback="removeReply"/>
 | 
				
			||||||
	</template>
 | 
						</template>
 | 
				
			||||||
	<div v-else :class="$style.more">
 | 
						<div v-else :class="$style.more">
 | 
				
			||||||
		<MkA class="_link" :to="notePage(note)">{{ i18n.ts.continueThread }} <i class="ph-caret-double-right ph-bold ph-lg"></i></MkA>
 | 
							<MkA class="_link" :to="notePage(note)">{{ i18n.ts.continueThread }} <i class="ph-caret-double-right ph-bold ph-lg"></i></MkA>
 | 
				
			||||||
| 
						 | 
					@ -110,6 +110,7 @@ const props = withDefaults(defineProps<{
 | 
				
			||||||
	note: Misskey.entities.Note;
 | 
						note: Misskey.entities.Note;
 | 
				
			||||||
	detail?: boolean;
 | 
						detail?: boolean;
 | 
				
			||||||
	expandAllCws?: boolean;
 | 
						expandAllCws?: boolean;
 | 
				
			||||||
 | 
						onDeleteCallback?: (id: Misskey.entities.Note['id']) => void;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	// how many notes are in between this one and the note being viewed in detail
 | 
						// how many notes are in between this one and the note being viewed in detail
 | 
				
			||||||
	depth?: number;
 | 
						depth?: number;
 | 
				
			||||||
| 
						 | 
					@ -141,8 +142,17 @@ const isRenote = (
 | 
				
			||||||
	props.note.poll == null
 | 
						props.note.poll == null
 | 
				
			||||||
);
 | 
					);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
async function addReplyTo(note, replyNote: Misskey.entities.Note) {
 | 
					async function addReplyTo(replyNote: Misskey.entities.Note) {
 | 
				
			||||||
		replies.value.unshift(replyNote);
 | 
							replies.value.unshift(replyNote);
 | 
				
			||||||
 | 
							appearNote.repliesCount += 1;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					async function removeReply(id: Misskey.entities.Note['id']) {
 | 
				
			||||||
 | 
							const replyIdx = replies.value.findIndex(note => note.id === id);
 | 
				
			||||||
 | 
							if (replyIdx >= 0) {
 | 
				
			||||||
 | 
								replies.value.splice(replyIdx, 1);
 | 
				
			||||||
 | 
								appearNote.repliesCount -= 1;
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
useNoteCapture({
 | 
					useNoteCapture({
 | 
				
			||||||
| 
						 | 
					@ -151,6 +161,7 @@ useNoteCapture({
 | 
				
			||||||
	isDeletedRef: isDeleted,
 | 
						isDeletedRef: isDeleted,
 | 
				
			||||||
	// only update replies if we are, in fact, showing replies
 | 
						// only update replies if we are, in fact, showing replies
 | 
				
			||||||
	onReplyCallback: props.detail && props.depth < numberOfReplies.value ? addReplyTo : undefined,
 | 
						onReplyCallback: props.detail && props.depth < numberOfReplies.value ? addReplyTo : undefined,
 | 
				
			||||||
 | 
						onDeleteCallback: props.detail && props.depth < numberOfReplies.value ? props.onDeleteCallback : undefined,
 | 
				
			||||||
});
 | 
					});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if ($i) {
 | 
					if ($i) {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -178,7 +178,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 | 
				
			||||||
			<div v-if="!repliesLoaded" style="padding: 16px">
 | 
								<div v-if="!repliesLoaded" style="padding: 16px">
 | 
				
			||||||
				<MkButton style="margin: 0 auto;" primary rounded @click="loadReplies">{{ i18n.ts.loadReplies }}</MkButton>
 | 
									<MkButton style="margin: 0 auto;" primary rounded @click="loadReplies">{{ i18n.ts.loadReplies }}</MkButton>
 | 
				
			||||||
			</div>
 | 
								</div>
 | 
				
			||||||
			<SkNoteSub v-for="note in replies" :key="note.id" :note="note" :class="$style.reply" :detail="true" :expandAllCws="props.expandAllCws"/>
 | 
								<SkNoteSub v-for="note in replies" :key="note.id" :note="note" :class="$style.reply" :detail="true" :expandAllCws="props.expandAllCws" :onDeleteCallback="removeReply" />
 | 
				
			||||||
		</div>
 | 
							</div>
 | 
				
			||||||
		<div v-else-if="tab === 'renotes'" :class="$style.tab_renotes">
 | 
							<div v-else-if="tab === 'renotes'" :class="$style.tab_renotes">
 | 
				
			||||||
			<MkPagination :pagination="renotesPagination" :disableAutoLoad="true">
 | 
								<MkPagination :pagination="renotesPagination" :disableAutoLoad="true">
 | 
				
			||||||
| 
						 | 
					@ -380,8 +380,17 @@ const reactionsPagination = computed(() => ({
 | 
				
			||||||
	},
 | 
						},
 | 
				
			||||||
}));
 | 
					}));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
async function addReplyTo(note, replyNote: Misskey.entities.Note) {
 | 
					async function addReplyTo(replyNote: Misskey.entities.Note) {
 | 
				
			||||||
		replies.value.unshift(replyNote);
 | 
							replies.value.unshift(replyNote);
 | 
				
			||||||
 | 
							appearNote.repliesCount += 1;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					async function removeReply(id: Misskey.entities.Note['id']) {
 | 
				
			||||||
 | 
							const replyIdx = replies.value.findIndex(note => note.id === id);
 | 
				
			||||||
 | 
							if (replyIdx >= 0) {
 | 
				
			||||||
 | 
								replies.value.splice(replyIdx, 1);
 | 
				
			||||||
 | 
								appearNote.repliesCount -= 1;
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
useNoteCapture({
 | 
					useNoteCapture({
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -73,7 +73,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 | 
				
			||||||
		</div>
 | 
							</div>
 | 
				
			||||||
	</div>
 | 
						</div>
 | 
				
			||||||
	<template v-if="depth < numberOfReplies">
 | 
						<template v-if="depth < numberOfReplies">
 | 
				
			||||||
		<SkNoteSub v-for="reply in replies" :key="reply.id" :note="reply" :class="[$style.reply, { [$style.single]: replies.length === 1 }]" :detail="true" :depth="depth + 1" :expandAllCws="props.expandAllCws"/>
 | 
							<SkNoteSub v-for="reply in replies" :key="reply.id" :note="reply" :class="[$style.reply, { [$style.single]: replies.length === 1 }]" :detail="true" :depth="depth + 1" :expandAllCws="props.expandAllCws" :onDeleteCallback="removeReply"/>
 | 
				
			||||||
	</template>
 | 
						</template>
 | 
				
			||||||
	<div v-else :class="$style.more">
 | 
						<div v-else :class="$style.more">
 | 
				
			||||||
		<MkA class="_link" :to="notePage(note)">{{ i18n.ts.continueThread }} <i class="ph-caret-double-right ph-bold ph-lg"></i></MkA>
 | 
							<MkA class="_link" :to="notePage(note)">{{ i18n.ts.continueThread }} <i class="ph-caret-double-right ph-bold ph-lg"></i></MkA>
 | 
				
			||||||
| 
						 | 
					@ -119,6 +119,7 @@ const props = withDefaults(defineProps<{
 | 
				
			||||||
	note: Misskey.entities.Note;
 | 
						note: Misskey.entities.Note;
 | 
				
			||||||
	detail?: boolean;
 | 
						detail?: boolean;
 | 
				
			||||||
	expandAllCws?: boolean;
 | 
						expandAllCws?: boolean;
 | 
				
			||||||
 | 
						onDeleteCallback?: (id: Misskey.entities.Note['id']) => void;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	// how many notes are in between this one and the note being viewed in detail
 | 
						// how many notes are in between this one and the note being viewed in detail
 | 
				
			||||||
	depth?: number;
 | 
						depth?: number;
 | 
				
			||||||
| 
						 | 
					@ -150,8 +151,17 @@ const isRenote = (
 | 
				
			||||||
	props.note.poll == null
 | 
						props.note.poll == null
 | 
				
			||||||
);
 | 
					);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
async function addReplyTo(note, replyNote: Misskey.entities.Note) {
 | 
					async function addReplyTo(replyNote: Misskey.entities.Note) {
 | 
				
			||||||
		replies.value.unshift(replyNote);
 | 
							replies.value.unshift(replyNote);
 | 
				
			||||||
 | 
							appearNote.repliesCount += 1;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					async function removeReply(id: Misskey.entities.Note['id']) {
 | 
				
			||||||
 | 
							const replyIdx = replies.value.findIndex(note => note.id === id);
 | 
				
			||||||
 | 
							if (replyIdx >= 0) {
 | 
				
			||||||
 | 
								replies.value.splice(replyIdx, 1);
 | 
				
			||||||
 | 
								appearNote.repliesCount -= 1;
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
useNoteCapture({
 | 
					useNoteCapture({
 | 
				
			||||||
| 
						 | 
					@ -160,6 +170,7 @@ useNoteCapture({
 | 
				
			||||||
	isDeletedRef: isDeleted,
 | 
						isDeletedRef: isDeleted,
 | 
				
			||||||
	// only update replies if we are, in fact, showing replies
 | 
						// only update replies if we are, in fact, showing replies
 | 
				
			||||||
	onReplyCallback: props.detail && props.depth < numberOfReplies.value ? addReplyTo : undefined,
 | 
						onReplyCallback: props.detail && props.depth < numberOfReplies.value ? addReplyTo : undefined,
 | 
				
			||||||
 | 
						onDeleteCallback: props.detail && props.depth < numberOfReplies.value ? props.onDeleteCallback : undefined,
 | 
				
			||||||
});
 | 
					});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if ($i) {
 | 
					if ($i) {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -14,7 +14,8 @@ export function useNoteCapture(props: {
 | 
				
			||||||
	note: Ref<Misskey.entities.Note>;
 | 
						note: Ref<Misskey.entities.Note>;
 | 
				
			||||||
	pureNote: Ref<Misskey.entities.Note>;
 | 
						pureNote: Ref<Misskey.entities.Note>;
 | 
				
			||||||
	isDeletedRef: Ref<boolean>;
 | 
						isDeletedRef: Ref<boolean>;
 | 
				
			||||||
	onReplyCallback: (note, replyNote: Misskey.entities.Note) => void | undefined;
 | 
						onReplyCallback: (replyNote: Misskey.entities.Note) => void | undefined;
 | 
				
			||||||
 | 
						onDeleteCallback: (id: Misskey.entities.Note['id']) => void | undefined;
 | 
				
			||||||
}) {
 | 
					}) {
 | 
				
			||||||
	const note = props.note;
 | 
						const note = props.note;
 | 
				
			||||||
	const pureNote = props.pureNote !== undefined ? props.pureNote : props.note;
 | 
						const pureNote = props.pureNote !== undefined ? props.pureNote : props.note;
 | 
				
			||||||
| 
						 | 
					@ -33,7 +34,7 @@ export function useNoteCapture(props: {
 | 
				
			||||||
					noteId: body.id,
 | 
										noteId: body.id,
 | 
				
			||||||
				});
 | 
									});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
				await props.onReplyCallback(pureNote, replyNote);
 | 
									await props.onReplyCallback(replyNote);
 | 
				
			||||||
				break;
 | 
									break;
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -88,6 +89,8 @@ export function useNoteCapture(props: {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			case 'deleted': {
 | 
								case 'deleted': {
 | 
				
			||||||
				props.isDeletedRef.value = true;
 | 
									props.isDeletedRef.value = true;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
									if (props.onDeleteCallback) await props.onDeleteCallback(id);
 | 
				
			||||||
				break;
 | 
									break;
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue