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

fixed messaage reply not regexing properlly if contenttype == hmll

Browse source
This commit is contained in:
كارل مبارك 2021-07-02 17:25:44 +02:00
parent 505fbc8a7e
commit 400b2bde87
3 changed files with 42 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
front/src/api/zulip/index.js
View file

@ -33,7 +33,7 @@ const
anchor: "newest",
num_before: 100,
num_after: 0,
apply_markdown: false,
// apply_markdown: false,
narrow: [
{ operator: "stream", operand: stream },
{ operator: "topic", operand: topic },

4
front/src/components/Content/Message.vue
View file

@ -47,8 +47,4 @@ export default {
</script>
<style>
header {
box-sizing: border-box;
margin: 1em;
}
</style>

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

@ -35,6 +35,41 @@ let validateRule = (rule) => {
return rule.match(/.+:.+;/gm);
}
// parsing replies, there are two scenarios:
// we are either getting the message as plain markdown
// or we are getting the message pre-rendered as HTML (default Zulip behaviour)
// see /src/api/zulip/index.js line 36
const handleMDReply = message => {
message.responseTo = {
id: message.content
.replace(/.*\/near\//gm, '')
.replace(/\):.*[^]+/gm, ''),
sender_id: message.content
.replace(/@_\*\*.*\|/gm, '')
.replace(/\*\*.\[said\].*[^]+/gm, ''),
quote: message.content
.replace(/[^]+.*```quote\n/gm, '')
.replace(/ \n```/gm, '')
}
// console.log(message.responseTo)
}
const handleHTMLReply = message => {
message.responseTo = {
id: message.content
.replace(/.*\/near\//gm, '')
.replace(/".*[^]+/gm, ''),
sender_id: message.content
.replace(/[^]+data-user-id="/gm, '')
.replace(/">[^]+/gm, ''),
quote: message.content
.replace(/.*[^]+<\/p>\n<blockquote>\n<p>/gm, '')
.replace(/ <\/p>\n<\/blockquote>/gm, '')
}
// console.log(message.responseTo)
}
export default createStore({
strict: process.env.NODE_ENV !== 'production',
@ -55,17 +90,12 @@ export default createStore({
addMessage: (state, message) => {
if (message.content.startsWith('@_**')) {
message.responseTo = {
id: message.content
.replace(/.*\/near\//gm, '')
.replace(/\):.*[^]+/gm, ''),
sender_id: message.content
.replace(/@_\*\*.*\|/gm, '')
.replace(/\*\*.\[said\].*[^]+/gm, ''),
quote: message.content
.replace(/[^]+.*```quote\n/gm, '')
.replace(/ \n```/gm, '')
}
handleMDReply(message)
} else if (
message.content.includes('user-mention') &&
message.content.includes('blockquote')
) {
handleHTMLReply(message)
}
state.contents.push(message)
},