matty/peertube-plugin-livechat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #449: Remove the constraint for custom emojis shortnames to have ":" at the beginning and at the end.

Browse Source
This commit is contained in:
John Livingston
2024-06-25 17:12:46 +02:00
parent bd211d777e
commit 934c07e34e
6 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/common/configuration/elements/channel-emojis.ts
View File

@ -193,9 +193,7 @@ export class ChannelEmojisElement extends LivechatElement {
}
const url = await this._convertImageToDataUrl(entry.url)
let sn = entry.sn as string
if (!sn.startsWith(':')) { sn = ':' + sn }
if (!sn.endsWith(':')) { sn += ':' }
const sn = entry.sn as string
const item: ChannelEmojisConfiguration['emojis']['customEmojis'][0] = {
sn,

6
client/common/configuration/elements/templates/channel-emojis.ts
View File

@ -91,12 +91,6 @@ export function tplChannelEmojis (el: ChannelEmojisElement): TemplateResult {
el.resetValidation(e)
if (el.channelEmojisConfiguration) {
el.channelEmojisConfiguration.emojis.customEmojis = e.detail
// Fixing missing ':' for shortnames:
for (const desc of el.channelEmojisConfiguration.emojis.customEmojis) {
if (desc.sn === '') { continue }
if (!desc.sn.startsWith(':')) { desc.sn = ':' + desc.sn }
if (!desc.sn.endsWith(':')) { desc.sn += ':' }
}
el.requestUpdate('channelEmojisConfiguration')
}
}

2
client/common/configuration/services/channel-details.ts
View File

@ -201,7 +201,7 @@ export class ChannelDetailsService {
propertiesError[`emojis.${i}.sn`] = []
if (e.sn === '') {
propertiesError[`emojis.${i}.sn`].push(ValidationErrorType.Missing)
} else if (!/^:[\w-]+:$/.test(e.sn)) {
} else if (!/^:?[\w-]+:?$/.test(e.sn)) { // optional ':' at the beggining and at the end
propertiesError[`emojis.${i}.sn`].push(ValidationErrorType.WrongFormat)
} else if (seen.has(e.sn)) {
propertiesError[`emojis.${i}.sn`].push(ValidationErrorType.Duplicate)