From e90e7ce2dbcaa1e585d39028ffcdacc4fa76e817 Mon Sep 17 00:00:00 2001
From: jasper <jasper92341@hotmail.com>
Date: Fri, 8 Feb 2019 08:25:53 -0800
Subject: [PATCH 1/3] Subject copying composition bug
---
package.json | 1 +
src/components/status/status.js | 8 +++++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/package.json b/package.json
index 90bf48cf..1bfee49c 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
"babel-plugin-lodash": "^3.2.11",
"chromatism": "^3.0.0",
"diff": "^3.0.1",
+ "entities": "^1.1.2",
"karma-mocha-reporter": "^2.2.1",
"localforage": "^1.5.0",
"node-sass": "^3.10.1",
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 65ddcb9f..68d02ce3 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -12,6 +12,7 @@ import fileType from 'src/services/file_type/file_type.service'
import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
import { mentionMatchesUrl } from 'src/services/mention_matcher/mention_matcher.js'
import { filter, find } from 'lodash'
+import entities from 'entities'
const Status = {
name: 'Status',
@@ -201,14 +202,15 @@ const Status = {
},
replySubject () {
if (!this.status.summary) return ''
+ const decodedSummary = entities.decodeHTML(this.status.summary)
const behavior = typeof this.$store.state.config.subjectLineBehavior === 'undefined'
? this.$store.state.instance.subjectLineBehavior
: this.$store.state.config.subjectLineBehavior
- const startsWithRe = this.status.summary.match(/^re[: ]/i)
+ const startsWithRe = decodedSummary.match(/^re[: ]/i)
if (behavior !== 'noop' && startsWithRe || behavior === 'masto') {
- return this.status.summary
+ return decodedSummary
} else if (behavior === 'email') {
- return 're: '.concat(this.status.summary)
+ return 're: '.concat(decodedSummary)
} else if (behavior === 'noop') {
return ''
}
From f75ec48a8029a9c142bb09b3f76b14c956863ea3 Mon Sep 17 00:00:00 2001
From: jasper <jasper92341@hotmail.com>
Date: Sat, 9 Feb 2019 04:13:52 -0800
Subject: [PATCH 2/3] Switch into Lodash
---
package.json | 1 -
src/components/status/status.js | 7 +++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/package.json b/package.json
index 1bfee49c..90bf48cf 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,6 @@
"babel-plugin-lodash": "^3.2.11",
"chromatism": "^3.0.0",
"diff": "^3.0.1",
- "entities": "^1.1.2",
"karma-mocha-reporter": "^2.2.1",
"localforage": "^1.5.0",
"node-sass": "^3.10.1",
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 68d02ce3..3e6247df 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -11,8 +11,7 @@ import generateProfileLink from 'src/services/user_profile_link_generator/user_p
import fileType from 'src/services/file_type/file_type.service'
import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
import { mentionMatchesUrl } from 'src/services/mention_matcher/mention_matcher.js'
-import { filter, find } from 'lodash'
-import entities from 'entities'
+import { filter, find, unescape } from 'lodash'
const Status = {
name: 'Status',
@@ -197,12 +196,12 @@ const Status = {
}
if (this.status.summary && this.localCollapseSubjectDefault) {
return false
- }
+ }
return true
},
replySubject () {
if (!this.status.summary) return ''
- const decodedSummary = entities.decodeHTML(this.status.summary)
+ const decodedSummary = unescape(this.status.summary)
const behavior = typeof this.$store.state.config.subjectLineBehavior === 'undefined'
? this.$store.state.instance.subjectLineBehavior
: this.$store.state.config.subjectLineBehavior
From 0a435465641da60ccc656cf5a0b79a50132243ae Mon Sep 17 00:00:00 2001
From: jasper <jasper92341@hotmail.com>
Date: Sat, 9 Feb 2019 04:18:38 -0800
Subject: [PATCH 3/3] Switch into Lodash
---
src/components/status/status.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 3e6247df..d29c0491 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -196,7 +196,7 @@ const Status = {
}
if (this.status.summary && this.localCollapseSubjectDefault) {
return false
- }
+ }
return true
},
replySubject () {