Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'misskey-original/develop' into develop

Browse source 
# Conflicts:
#	packages/backend/src/server/api/stream/channels/home-timeline.ts
#	packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
#	pnpm-lock.yaml
This commit is contained in:
mattyatea 2023-10-20 09:55:24 +09:00
commit d421670b54
43 changed files with 580 additions and 558 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
View file

@ -90,7 +90,7 @@ export default function(props: {
switch (token.type) {
case 'text': {
let text = token.props.text.replace(/(\r\n|\n|\r)/g, '\n');
if (!disableNyaize && props.author.isCat) {
if (!disableNyaize && props.author?.isCat) {
text = nyaize(text);
}