1
0
mirror of https://github.com/NicolasConstant/sengi synced 2025-02-09 08:28:40 +01:00

mention hack removal

This commit is contained in:
Nicolas Constant 2020-04-26 01:14:37 -04:00
parent 4269ca2700
commit af790dc646
No known key found for this signature in database
GPG Key ID: 1E9F677FB01A5688

View File

@ -85,7 +85,9 @@ export class CreateStatusComponent implements OnInit, OnDestroy {
const newLine = String.fromCharCode(13, 10);
let content = value.status.content;
console.warn(content);
content = this.tranformHtmlRepliesToReplies(content);
console.warn(content);
while (content.includes('<p>') || content.includes('</p>') || content.includes('<br>') || content.includes('<br/>') || content.includes('<br />')) {
content = content.replace('<p>', '').replace('</p>', newLine + newLine).replace('<br />', newLine).replace('<br/>', newLine).replace('<br>', newLine);
@ -97,6 +99,8 @@ export class CreateStatusComponent implements OnInit, OnDestroy {
var dom = parser.parseFromString(content, 'text/html')
this.status = dom.body.textContent;
console.warn(this.status);
this.statusStateService.setStatusContent(this.status, this.statusReplyingToWrapper);
this.setVisibilityFromStatus(value.status);
@ -110,15 +114,15 @@ export class CreateStatusComponent implements OnInit, OnDestroy {
let cwResult = this.toolsService.checkContentWarning(status);
this.statusReplyingToWrapper = new StatusWrapper(cwResult.status, value.provider, cwResult.applyCw, cwResult.hide);
const mentions = this.getMentions(this.statusReplyingToWrapper.status, this.statusReplyingToWrapper.provider);
for (const mention of mentions) {
const name = `@${mention.split('@')[0]}`;
if (this.status.includes(name)) {
this.status = this.status.replace(name, `@${mention}`);
} else {
this.status = `@${mention} ` + this.status;
}
}
// const mentions = this.getMentions(this.statusReplyingToWrapper.status, this.statusReplyingToWrapper.provider);
// for (const mention of mentions) {
// const name = `@${mention.split('@')[0]}`;
// if (this.status.includes(name)) {
// this.status = this.status.replace(name, `@${mention}`);
// } else {
// this.status = `@${mention} ` + this.status;
// }
// }
})
.catch(err => {