therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix non-notifying mentions and original mention display

Browse source
This commit is contained in:
Henry Jameson 2021-06-22 20:16:26 +03:00
parent c6831a3810
commit a258182522
4 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/components/rich_content/rich_content.jsx
View file

@ -36,6 +36,10 @@ export default Vue.component('RichContent', {
required: true,
type: String
},
attentions: {
required: false,
default: () => []
},
// Emoji object, as in status.emojis, note the "s" at the end...
emoji: {
required: true,
@ -91,8 +95,12 @@ export default Vue.component('RichContent', {
</a>
}
const renderMention = (attrs, children, encounteredText) => {
const renderMention = (attrs, children) => {
const linkData = getLinkData(attrs, children, mentionIndex++)
linkData.notifying = this.attentions.some(a => a.statusnet_profile_url === linkData.url)
if (!linkData.notifying) {
encounteredText = true
}
writtenMentions.push(linkData)
if (!encounteredText) {
firstMentions.push(linkData)
@ -148,7 +156,7 @@ export default Vue.component('RichContent', {
const Tag = getTagName(opener)
const attrs = getAttrs(opener)
switch (Tag) {
case 'span': // replace images with StillImage
case 'span': // Replace last mentions class with mentionsline
if (attrs['class'] && attrs['class'].includes('lastMentions')) {
if (firstMentions.length > 1 && lastMentions.length > 1) {
break