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

Merge pull request #227 from NicolasConstant/develop 

0.20.1 PR
This commit is contained in:
Nicolas Constant 2020-02-25 21:17:27 -05:00 committed by GitHub
parent 88b32f5b5a 8df8eb7de8
commit c804fbce68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "sengi", "name": "sengi",
"version": "0.20.0", "version": "0.20.1",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"main": "main-electron.js", "main": "main-electron.js",
"description": "A multi-account desktop client for Mastodon and Pleroma", "description": "A multi-account desktop client for Mastodon and Pleroma",

2
src/app/components/floating-column/add-new-account/add-new-account.component.ts
View File

@ -22,7 +22,7 @@ export class AddNewAccountComponent implements OnInit {
private instance: string; private instance: string;
@Input() @Input()
set setInstance(value: string) { set setInstance(value: string) {
this.instance = value; this.instance = value.trim();
this.checkComrad(); this.checkComrad();
} }
get setInstance(): string { get setInstance(): string {

2
src/app/components/stream/status/status.component.html
View File

@ -92,7 +92,7 @@
<a href class="status__content-warning" *ngIf="isContentWarned" title="show content" <a href class="status__content-warning" *ngIf="isContentWarned" title="show content"
(click)="removeContentWarning()"> (click)="removeContentWarning()">
<span class="status__content-warning--title">sensitive content</span> <span class="status__content-warning--title">sensitive content</span>
{{ contentWarningText }} <span innerHTML="{{ contentWarningText }}"></span>
</a> </a>
<app-databinded-text class="status__content" *ngIf="!isContentWarned" [text]="statusContent" <app-databinded-text class="status__content" *ngIf="!isContentWarned" [text]="statusContent"
(accountSelected)="accountSelected($event)" (hashtagSelected)="hashtagSelected($event)" (accountSelected)="accountSelected($event)" (hashtagSelected)="hashtagSelected($event)"

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

@ -97,7 +97,7 @@ export class StatusComponent implements OnInit {
private checkContentWarning(status: Status) { private checkContentWarning(status: Status) {
if (status.sensitive || status.spoiler_text) { if (status.sensitive || status.spoiler_text) {
this.isContentWarned = true; this.isContentWarned = true;
this.contentWarningText = status.spoiler_text; this.contentWarningText = this.emojiConverter.applyEmojis(this.displayedStatus.emojis, status.spoiler_text, EmojiTypeEnum.medium);
} }
} }

14
src/app/components/stream/user-profile/user-profile.component.ts
View File

@ -157,7 +157,7 @@ export class UserProfileComponent implements OnInit {
this.isLoading = false; this.isLoading = false;
this.statusLoading = true; this.statusLoading = true;
this.displayedAccount = account; this.displayedAccount = this.fixPleromaFieldsUrl(account);
this.hasNote = account && account.note && account.note !== '<p></p>'; this.hasNote = account && account.note && account.note !== '<p></p>';
if (this.hasNote) { if (this.hasNote) {
this.note = this.emojiConverter.applyEmojis(account.emojis, account.note, EmojiTypeEnum.medium); this.note = this.emojiConverter.applyEmojis(account.emojis, account.note, EmojiTypeEnum.medium);
@ -178,6 +178,18 @@ export class UserProfileComponent implements OnInit {
}); });
} }
private fixPleromaFieldsUrl(acc: Account): Account {
if(acc.fields){
acc.fields.forEach(f => {
if(f.value.includes('<a href="') && !f.value.includes('target="_blank"')){
f.value = f.value.replace('<a href="', '<a target="_blank" href="');
}
});
}
return acc;
}
private getPinnedStatuses(userAccount: AccountInfo, account: Account): Promise<void> { private getPinnedStatuses(userAccount: AccountInfo, account: Account): Promise<void> {
return this.mastodonService.getAccountStatuses(userAccount, account.id, false, true, false, null, null, 20) return this.mastodonService.getAccountStatuses(userAccount, account.id, false, true, false, null, null, 20)
.then((statuses: Status[]) => { .then((statuses: Status[]) => {