Merge branch 'develop' of https://github.com/gabek/owncast into develop

This commit is contained in:
Ginger Wong 2021-07-25 23:04:12 -07:00
commit f8c06b3da6

View file

@ -48,9 +48,9 @@ export default class ChatMessageView extends Component {
return null;
}
const formattedTimestamp = `Sent at ${formatTimestamp(timestamp)}`;
const userMetadata = `${displayName} first joined ${formatTimestamp(
createdAt
)}`;
const userMetadata = createdAt
? `${displayName} first joined ${formatTimestamp(createdAt)}`
: null;
const isSystemMessage = message.type === SOCKET_MESSAGE_TYPES.SYSTEM;