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

refactoring

This commit is contained in:
Nicolas Constant 2022-12-10 19:19:02 -05:00
parent 65c147bc6f
commit ce71965b5c
No known key found for this signature in database
GPG Key ID: 1E9F677FB01A5688
1 changed files with 29 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/app/components/create-status/create-status.component.ts
View File

@ -87,7 +87,7 @@ export class CreateStatusComponent implements OnInit, OnDestroy {
set statusToEdit(value: StatusWrapper) { set statusToEdit(value: StatusWrapper) {
if (value) { if (value) {
this.isEditing = true; this.isEditing = true;
this.editingId = value.status.id; this.editingStatusId = value.status.id;
this.redraftedStatus = value; this.redraftedStatus = value;
} }
} }
@ -97,6 +97,7 @@ export class CreateStatusComponent implements OnInit, OnDestroy {
if (value) { if (value) {
this.isRedrafting = true; this.isRedrafting = true;
this.statusLoaded = false; this.statusLoaded = false;
this.isEditing = false;
if (value.status && value.status.media_attachments) { if (value.status && value.status.media_attachments) {
for (const m of value.status.media_attachments) { for (const m of value.status.media_attachments) {
@ -151,7 +152,7 @@ export class CreateStatusComponent implements OnInit, OnDestroy {
instanceSupportsPoll = true; instanceSupportsPoll = true;
instanceSupportsScheduling = true; instanceSupportsScheduling = true;
isEditing: boolean; isEditing: boolean;
editingId: string; editingStatusId: string;
private statusLoaded: boolean; private statusLoaded: boolean;
private hasSuggestions: boolean; private hasSuggestions: boolean;
@ -448,7 +449,7 @@ export class CreateStatusComponent implements OnInit, OnDestroy {
} }
private setVisibility(defaultPrivacy: VisibilityEnum) { private setVisibility(defaultPrivacy: VisibilityEnum) {
if(this.selectedPrivacySetByRedraft) return; if (this.selectedPrivacySetByRedraft) return;
switch (defaultPrivacy) { switch (defaultPrivacy) {
case VisibilityEnum.Public: case VisibilityEnum.Public:
@ -506,14 +507,14 @@ export class CreateStatusComponent implements OnInit, OnDestroy {
private getMentions(status: Status): string[] { private getMentions(status: Status): string[] {
let acct = status.account.acct; let acct = status.account.acct;
if(!acct.includes('@')) { if (!acct.includes('@')) {
acct += `@${status.account.url.replace('https://', '').split('/')[0]}` acct += `@${status.account.url.replace('https://', '').split('/')[0]}`
} }
const mentions = [acct]; const mentions = [acct];
status.mentions.forEach(m => { status.mentions.forEach(m => {
let mentionAcct = m.acct; let mentionAcct = m.acct;
if(!mentionAcct.includes('@')){ if (!mentionAcct.includes('@')) {
mentionAcct += `@${m.url.replace('https://', '').split('/')[0]}`; mentionAcct += `@${m.url.replace('https://', '').split('/')[0]}`;
} }
mentions.push(mentionAcct); mentions.push(mentionAcct);
@ -584,11 +585,7 @@ export class CreateStatusComponent implements OnInit, OnDestroy {
usableStatus usableStatus
.then((status: Status) => { .then((status: Status) => {
if (this.isEditing) { return this.sendStatus(acc, this.status, visibility, this.title, status, mediaAttachments, poll, scheduledTime, this.editingStatusId);
return this.editStatus(acc, this.editingId, this.status, visibility, this.title, status, mediaAttachments, poll, scheduledTime);
} else {
return this.sendStatus(acc, this.status, visibility, this.title, status, mediaAttachments, poll, scheduledTime);
}
}) })
.then((res: Status) => { .then((res: Status) => {
this.title = ''; this.title = '';
@ -615,7 +612,7 @@ export class CreateStatusComponent implements OnInit, OnDestroy {
return false; return false;
} }
private sendStatus(account: AccountInfo, status: string, visibility: VisibilityEnum, title: string, previousStatus: Status, attachments: Attachment[], poll: PollParameters, scheduledAt: string): Promise<Status> { private sendStatus(account: AccountInfo, status: string, visibility: VisibilityEnum, title: string, previousStatus: Status, attachments: Attachment[], poll: PollParameters, scheduledAt: string, editingStatusId: string): Promise<Status> {
let parsedStatus = this.parseStatus(status); let parsedStatus = this.parseStatus(status);
let resultPromise = Promise.resolve(previousStatus); let resultPromise = Promise.resolve(previousStatus);
@ -629,13 +626,25 @@ export class CreateStatusComponent implements OnInit, OnDestroy {
} }
if (i === 0) { if (i === 0) {
return this.mastodonService.postNewStatus(account, s, visibility, title, inReplyToId, attachments.map(x => x.id), poll, scheduledAt) let postPromise: Promise<Status>;
if (this.isEditing) {
postPromise = this.mastodonService.editStatus(account, editingStatusId, s, visibility, title, inReplyToId, attachments.map(x => x.id), poll, scheduledAt);
} else {
postPromise = this.mastodonService.postNewStatus(account, s, visibility, title, inReplyToId, attachments.map(x => x.id), poll, scheduledAt);
}
return postPromise
.then((status: Status) => { .then((status: Status) => {
this.mediaService.clearMedia(); this.mediaService.clearMedia();
return status; return status;
}); });
} else { } else {
return this.mastodonService.postNewStatus(account, s, visibility, title, inReplyToId, [], null, scheduledAt); if (this.isEditing) {
return this.mastodonService.editStatus(account, editingStatusId, s, visibility, title, inReplyToId, [], null, scheduledAt);
} else {
return this.mastodonService.postNewStatus(account, s, visibility, title, inReplyToId, [], null, scheduledAt);
}
} }
}) })
.then((status: Status) => { .then((status: Status) => {
@ -645,48 +654,14 @@ export class CreateStatusComponent implements OnInit, OnDestroy {
} }
return status; return status;
});
}
return resultPromise;
}
private editStatus(account: AccountInfo, statusId: string, status: string, visibility: VisibilityEnum, title: string, previousStatus: Status, attachments: Attachment[], poll: PollParameters, scheduledAt: string): Promise<Status> {
let parsedStatus = this.parseStatus(status);
let resultPromise = Promise.resolve(previousStatus);
for (let i = 0; i < parsedStatus.length; i++) {
let s = parsedStatus[i];
resultPromise = resultPromise
.then((pStatus: Status) => {
let inReplyToId = null;
if (pStatus) {
inReplyToId = pStatus.id;
}
if (i === 0) {
return this.mastodonService.editStatus(account, statusId, s, visibility, title, inReplyToId, attachments.map(x => x.id), poll, scheduledAt)
.then((status: Status) => {
this.mediaService.clearMedia();
return status;
});
} else {
return this.mastodonService.editStatus(account, statusId, s, visibility, title, inReplyToId, [], null, scheduledAt);
}
}) })
.then((status: Status) => { .then((status: Status) => {
if (this.statusReplyingToWrapper) { if (this.isEditing) {
let cwPolicy = this.toolsService.checkContentWarning(status); let cwPolicy = this.toolsService.checkContentWarning(status);
this.notificationService.newStatusPosted(this.statusReplyingToWrapper.status.id, new StatusWrapper(cwPolicy.status, account, cwPolicy.applyCw, cwPolicy.hide)); let statusWrapper = new StatusWrapper(status, account, cwPolicy.applyCw, cwPolicy.hide);
}
return status; this.statusesStateService.statusEditedStatusChanged(status.url, account.id, statusWrapper);
}) }
.then((status: Status) => {
let cwPolicy = this.toolsService.checkContentWarning(status);
let statusWrapper = new StatusWrapper(status, account, cwPolicy.applyCw, cwPolicy.hide);
this.statusesStateService.statusEditedStatusChanged(status.url, account.id, statusWrapper);
return status; return status;
}); });
@ -696,8 +671,6 @@ export class CreateStatusComponent implements OnInit, OnDestroy {
} }
private parseStatus(status: string): string[] { private parseStatus(status: string): string[] {
//console.error(status.toString());
let mentionExtraChars = this.getMentionExtraChars(status); let mentionExtraChars = this.getMentionExtraChars(status);
let urlExtraChar = this.getLinksExtraChars(status); let urlExtraChar = this.getLinksExtraChars(status);
let trucatedStatus = `${status}`; let trucatedStatus = `${status}`;
@ -715,7 +688,7 @@ export class CreateStatusComponent implements OnInit, OnDestroy {
while (trucatedStatus.length > currentMaxCharLength) { while (trucatedStatus.length > currentMaxCharLength) {
const nextIndex = trucatedStatus.lastIndexOf(' ', maxChars); const nextIndex = trucatedStatus.lastIndexOf(' ', maxChars);
if(nextIndex === -1){ if (nextIndex === -1) {
break; break;
} }
@ -816,7 +789,7 @@ export class CreateStatusComponent implements OnInit, OnDestroy {
w++; w++;
result += `${word}`; result += `${word}`;
if(w < wordCount || i === nberLines){ if (w < wordCount || i === nberLines) {
result += ' '; result += ' ';
} }
}); });
@ -828,7 +801,7 @@ export class CreateStatusComponent implements OnInit, OnDestroy {
result = result.replace(' ', ' '); result = result.replace(' ', ' ');
let endRegex = new RegExp(`${autosuggest} $`, 'i'); let endRegex = new RegExp(`${autosuggest} $`, 'i');
if(!result.match(endRegex)){ if (!result.match(endRegex)) {
result = result.substring(0, result.length - 1); result = result.substring(0, result.length - 1);
} }