doohoyi/chatty-pub
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed 'ection' bug. /s != \s

Browse source
This commit is contained in:
Heerko 2021-07-06 14:51:24 +02:00
parent df72d90f00
commit b06673f27d
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
front/src/store/index.js
View file

@ -18,11 +18,11 @@ let toCSS = (message, currentStream) => {
id = message.id id = message.id
// let regex = /[/s]?(?<selector>.+)\s*\n?{\n?(?<prop>[\s\w.~:>-]+\s*:\s*.+;?\n?)*\n?}/gm // let regex = /[/s]?(?<selector>.+)\s*\n?{\n?(?<prop>[\s\w.~:>-]+\s*:\s*.+;?\n?)*\n?}/gm
let regex = /[/s]?(?<selector>.+)\s*\n?{\n?(?<props>(.*;\n?)+)}/gm let regex = /\s?(?<selector>.+)\s*\n?{\n?(?<props>(.*;\n?)+)}/gm
let content = stripHtml(message.content).result; let content = stripHtml(message.content).result;
let results = content.matchAll(regex); let results = content.matchAll(regex);
results = Array.from(results); results = Array.from(results);
// console.log(results) //console.log(results)
if (results.length > 0) { if (results.length > 0) {
className = emojiConv.replace_colons(results[0]['groups']['selector']); className = emojiConv.replace_colons(results[0]['groups']['selector']);
if (emoji.methods.containsEmoji(className)) { if (emoji.methods.containsEmoji(className)) {
@ -80,19 +80,19 @@ export default createStore({
strict: process.env.NODE_ENV !== 'production', strict: process.env.NODE_ENV !== 'production',
state: { state: {
isMobile : false, isMobile: false,
streams : [], streams: [],
currentStream: '', currentStream: '',
contents : [], contents: [],
rules : [], rules: [],
pubStr : 'pub-', pubStr: 'pub-',
}, },
mutations: { mutations: {
setMobile : (state, mobile) => state.isMobile = mobile, setMobile: (state, mobile) => state.isMobile = mobile,
setStreams : (state, streams) => state.streams = streams, setStreams: (state, streams) => state.streams = streams,
setCurStream : (state, stream) => state.currentStream = stream, setCurStream: (state, stream) => state.currentStream = stream,
setContents: (state, contents) => state.contents = contents, setContents: (state, contents) => state.contents = contents,
addMessage: (state, message) => { addMessage: (state, message) => {
if (message.display_recipient == state.currentStream) { if (message.display_recipient == state.currentStream) {
@ -113,13 +113,13 @@ export default createStore({
state.contents.splice(state.contents.indexOf(message), 1) state.contents.splice(state.contents.indexOf(message), 1)
} }
}, },
addReaction : (state, { mid, reaction }) => { addReaction: (state, { mid, reaction }) => {
const message = state.contents.find(m => m.id == mid) const message = state.contents.find(m => m.id == mid)
if (message) { if (message) {
message.reactions.push(reaction) message.reactions.push(reaction)
} }
}, },
removeReaction : (state, { mid, reaction }) => { removeReaction: (state, { mid, reaction }) => {
const message = state.contents.find(m => m.id == mid) const message = state.contents.find(m => m.id == mid)
if (message) { if (message) {
message.reactions.splice(message.reactions.indexOf(reaction), 1) message.reactions.splice(message.reactions.indexOf(reaction), 1)