Compare commits

...

2 Commits

Author SHA1 Message Date
Natty c3e7791b3e
Backend: Fixed emoji context merging 2023-12-22 19:52:38 +01:00
Natty f23aae4ac7
Frontend: Fixed note previews with custom emojis 2023-12-22 19:30:46 +01:00
2 changed files with 2 additions and 2 deletions

View File

@ -8,6 +8,7 @@
<div class="body">
<div class="content">
<Mfm
:customEmojis="$instance.emojis"
:text="preprocess(text).trim()"
:author="$i"
:i="$i"
@ -20,7 +21,6 @@
</template>
<script lang="ts" setup>
import {} from "vue";
import { preprocess } from "@/scripts/preprocess";
const props = defineProps<{

View File

@ -33,7 +33,7 @@ impl EmojiContext {
self.0.extend(
more.iter()
.filter(|&e| existing.contains(&e.emoji.0.shortcode))
.filter(|&e| !existing.contains(&e.emoji.0.shortcode))
.cloned(),
);
}