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

Fix #606 Stop using v1 media endpoint

This commit is contained in:
Lastorder 2023-08-13 11:02:39 +09:00 committed by GitHub
parent 14287b476c
commit 9a0f56c36e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/app/services/mastodon.service.ts
View File

@ -376,16 +376,40 @@ export class MastodonService {
}
uploadMediaAttachment(account: AccountInfo, file: File, description: string): Promise<Attachment> {
let input = new FormData();
input.append('file', file);
if (description !== null && description !== undefined) {
input.append('description', description);
} else {
input.append('description', '');
}
const route = `https://${account.instance}${this.apiRoutes.uploadMediaAttachment}`;
const headers = new HttpHeaders({ 'Authorization': `Bearer ${account.token.access_token}` });
return this.httpClient.post<Attachment>(route, input, { headers: headers }).toPromise();
return new Promise((resolve, reject) => {
let input = new FormData();
input.append('file', file);
if (description !== null && description !== undefined) {
input.append('description', description);
} else {
input.append('description', '');
}
const route = `https://${account.instance}${this.apiRoutes.uploadMediaAttachment}`;
const headers = new HttpHeaders({ 'Authorization': `Bearer ${account.token.access_token}` });
this.httpClient.post<Attachment>(route, input, { headers: headers, observe: 'response' })
.subscribe(response => {
if (response.status === 202) {
const checkMediaStatus = () => {
this.httpClient.get<Attachment>(`https://${account.instance}${this.apiRoutes.updateMediaAttachment.replace('{0}', response.body.id)}`, { headers: headers })
.subscribe(mediaStatus => {
if (mediaStatus.url) {
resolve(mediaStatus);
} else {
setTimeout(checkMediaStatus, 1000);
}
}, error => {
reject(error);
});
};
checkMediaStatus();
} else {
resolve(response.body);
}
}, error => {
reject(error);
});
});
}
//TODO: add focus support

2
src/app/services/models/api.settings.ts
View File

@ -26,7 +26,7 @@ export class ApiRoutes {
followRemote = '/api/v1/follows';
getInstance = '/api/v1/instance';
getInstancev2 = '/api/v2/instance';
uploadMediaAttachment = '/api/v1/media';
uploadMediaAttachment = '/api/v2/media';
updateMediaAttachment = '/api/v1/media/{0}';
getMutes = '/api/v1/mutes';
getNotifications = '/api/v1/notifications';