Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#606 Implement v2 media endpoint #607

Draft
wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft

#606 Implement v2 media endpoint #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a0f56c
Fix #606 Stop using v1 media endpoint
Lastorder-DC Aug 13, 2023
1cc8d1b
Try to avoid rait limit by increasing retryAfter
Lastorder-DC Aug 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 38 additions & 11 deletions src/app/services/mastodon.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,16 +376,43 @@ 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) {
let tryCount = 1;
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 {
const retryAfter = (Math.log2(tryCount) || 1) * 1000;
tryCount += 1;
setTimeout(checkMediaStatus, retryAfter);
}
}, error => {
reject(error);
});
};
checkMediaStatus();
} else {
resolve(response.body);
}
}, error => {
reject(error);
});
});
}

//TODO: add focus support
Expand Down Expand Up @@ -704,4 +731,4 @@ export class FollowingResult {
constructor(
public maxId: string,
public follows: Account[]) { }
}
}
2 changes: 1 addition & 1 deletion src/app/services/models/api.settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down