Mastodon
/
Sengi-Windows-MacOS-Linux
mirror of https://github.com/NicolasConstant/sengi
1
0
Fork 0
Code Issues Releases Wiki Activity

fix bugs changing CW state

This commit is contained in:
Nicolas Constant 2020-03-28 19:10:15 -04:00
parent e6e75923b0
commit 1272f2303a
No known key found for this signature in database
GPG Key ID: 1E9F677FB01A5688
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/components/floating-column/settings/settings.component.ts
View File

@ -112,25 +112,25 @@ export class SettingsComponent implements OnInit {
let settings = this.toolsService.getSettings();
let cwPolicySettings = new ContentWarningPolicy();
if(id){
if(id !== null){
cwPolicySettings.policy = id;
} else {
cwPolicySettings.policy = settings.contentWarningPolicy.policy;
}
if(addCw){
if(addCw !== null){
cwPolicySettings.addCwOnContent = this.splitCwValues(addCw);
} else {
cwPolicySettings.addCwOnContent = settings.contentWarningPolicy.addCwOnContent;
}
if(removeCw){
if(removeCw !== null){
cwPolicySettings.removeCwOnContent = this.splitCwValues(removeCw);
} else {
cwPolicySettings.removeCwOnContent = settings.contentWarningPolicy.removeCwOnContent;
}
if(hide){
if(hide !== null){
cwPolicySettings.hideCompletlyContent = this.splitCwValues(hide);
} else {
cwPolicySettings.hideCompletlyContent = settings.contentWarningPolicy.hideCompletlyContent;

11
src/app/components/stream/status/status.component.ts
View File

@ -100,7 +100,8 @@ export class StatusComponent implements OnInit {
let cwPolicy = this.toolsService.getSettings().contentWarningPolicy;
let splittedContent = [];
if (cwPolicy.policy === ContentWarningPolicyEnum.HideAll || cwPolicy.policy === ContentWarningPolicyEnum.AddOnAllContent) {
if ((cwPolicy.policy === ContentWarningPolicyEnum.HideAll && cwPolicy.addCwOnContent.length > 0)
|| (cwPolicy.policy === ContentWarningPolicyEnum.AddOnAllContent && cwPolicy.removeCwOnContent.length > 0)) {
let parser = new DOMParser();
let dom = parser.parseFromString((status.content + ' ' + status.spoiler_text).replace("<br/>", " ").replace("<br>", " ").replace(/\n/g, ' '), 'text/html')
let contentToParse = dom.body.textContent;
@ -115,7 +116,10 @@ export class StatusComponent implements OnInit {
console.warn(splittedContent);
console.warn(cwPolicy.addCwOnContent);
console.warn(detected);
if (!detected || detected.length === 0) return;
if (!detected || detected.length === 0) {
this.status.sensitive = false;
return;
}
if (!status.spoiler_text) {
status.spoiler_text = detected.join(' ');
@ -126,11 +130,14 @@ export class StatusComponent implements OnInit {
if (!detected) {
this.setContentWarning(status);
} else {
this.status.sensitive = false;
}
}
}
private setContentWarning(status: Status) {
this.status.sensitive = true;
this.isContentWarned = true;
this.contentWarningText = this.emojiConverter.applyEmojis(this.displayedStatus.emojis, status.spoiler_text, EmojiTypeEnum.medium);
}