amechama/sharkey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: use this.baseUrl instead of BASE_URL

Browse Source
This commit is contained in:
Mar0xy 2023-09-25 12:46:47 +02:00
parent aaa3a34d60
commit 0547940523
No known key found for this signature in database
GPG Key ID: 56569BBE47D2C828
5 changed files with 31 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/backend/src/server/api/mastodon/endpoints/search.ts
View File

@ -49,7 +49,7 @@ async function getFeaturedUser( BASE_URL: string, host: string, accessTokens: st
return data.map((u) => { return data.map((u) => {
return { return {
source: 'past_interactions', source: 'past_interactions',
account: Converter.userDetail(u, host), account: Converter.userDetail(u),
}; };
}); });
} catch (e: any) { } catch (e: any) {

6
packages/backend/src/server/api/mastodon/endpoints/status.ts
View File

@ -24,7 +24,7 @@ export class ApiStatusMastodon {
const accessTokens = _request.headers.authorization; const accessTokens = _request.headers.authorization;
const client = getClient(BASE_URL, accessTokens); const client = getClient(BASE_URL, accessTokens);
try { try {
const data = await client.getStatus(convertId(_request.params.id, IdType.SharkeyId), BASE_URL); const data = await client.getStatus(convertId(_request.params.id, IdType.SharkeyId));
reply.send(convertStatus(data.data)); reply.send(convertStatus(data.data));
} catch (e: any) { } catch (e: any) {
console.error(e); console.error(e);
@ -71,7 +71,7 @@ export class ApiStatusMastodon {
const accessTokens = _request.headers.authorization; const accessTokens = _request.headers.authorization;
const client = getClient(BASE_URL, accessTokens); const client = getClient(BASE_URL, accessTokens);
try { try {
const data = await client.getStatusRebloggedBy(convertId(_request.params.id, IdType.SharkeyId), BASE_URL); const data = await client.getStatusRebloggedBy(convertId(_request.params.id, IdType.SharkeyId));
reply.send(data.data.map((account: Entity.Account) => convertAccount(account))); reply.send(data.data.map((account: Entity.Account) => convertAccount(account)));
} catch (e: any) { } catch (e: any) {
console.error(e); console.error(e);
@ -86,7 +86,7 @@ export class ApiStatusMastodon {
const accessTokens = _request.headers.authorization; const accessTokens = _request.headers.authorization;
const client = getClient(BASE_URL, accessTokens); const client = getClient(BASE_URL, accessTokens);
try { try {
const data = await client.getStatusFavouritedBy(convertId(_request.params.id, IdType.SharkeyId), BASE_URL); const data = await client.getStatusFavouritedBy(convertId(_request.params.id, IdType.SharkeyId));
reply.send(data.data.map((account: Entity.Account) => convertAccount(account))); reply.send(data.data.map((account: Entity.Account) => convertAccount(account)));
} catch (e: any) { } catch (e: any) {
console.error(e); console.error(e);

8
packages/backend/src/server/api/mastodon/endpoints/timeline.ts
View File

@ -51,8 +51,8 @@ export class ApiTimelineMastodon {
try { try {
const query: any = _request.query; const query: any = _request.query;
const data = query.local === 'true' const data = query.local === 'true'
? await client.getLocalTimeline(convertTimelinesArgsId(argsToBools(limitToInt(query))), BASE_URL) ? await client.getLocalTimeline(convertTimelinesArgsId(argsToBools(limitToInt(query))))
: await client.getPublicTimeline(convertTimelinesArgsId(argsToBools(limitToInt(query))), BASE_URL); : await client.getPublicTimeline(convertTimelinesArgsId(argsToBools(limitToInt(query))));
reply.send(data.data.map((status: Entity.Status) => convertStatus(status))); reply.send(data.data.map((status: Entity.Status) => convertStatus(status)));
} catch (e: any) { } catch (e: any) {
console.error(e); console.error(e);
@ -69,7 +69,7 @@ export class ApiTimelineMastodon {
const client = getClient(BASE_URL, accessTokens); const client = getClient(BASE_URL, accessTokens);
try { try {
const query: any = _request.query; const query: any = _request.query;
const data = await client.getHomeTimeline(convertTimelinesArgsId(limitToInt(query)), BASE_URL); const data = await client.getHomeTimeline(convertTimelinesArgsId(limitToInt(query)));
reply.send(data.data.map((status: Entity.Status) => convertStatus(status))); reply.send(data.data.map((status: Entity.Status) => convertStatus(status)));
} catch (e: any) { } catch (e: any) {
console.error(e); console.error(e);
@ -87,7 +87,7 @@ export class ApiTimelineMastodon {
try { try {
const query: any = _request.query; const query: any = _request.query;
const params: any = _request.params; const params: any = _request.params;
const data = await client.getTagTimeline(params.hashtag, convertTimelinesArgsId(limitToInt(query)), BASE_URL); const data = await client.getTagTimeline(params.hashtag, convertTimelinesArgsId(limitToInt(query)));
reply.send(data.data.map((status: Entity.Status) => convertStatus(status))); reply.send(data.data.map((status: Entity.Status) => convertStatus(status)));
} catch (e: any) { } catch (e: any) {
console.error(e); console.error(e);

20
packages/megalodon/src/megalodon.ts
View File

@ -156,7 +156,7 @@ export interface MegalodonInterface {
* @param id The account ID. * @param id The account ID.
* @return An account. * @return An account.
*/ */
getAccount(id: string, host?: string): Promise<Response<Entity.Account>> getAccount(id: string): Promise<Response<Entity.Account>>
/** /**
* Statuses posted to the given account. * Statuses posted to the given account.
* *
@ -182,8 +182,7 @@ export interface MegalodonInterface {
exclude_replies?: boolean exclude_replies?: boolean
exclude_reblogs?: boolean exclude_reblogs?: boolean
only_media?: boolean only_media?: boolean
}, }
host?: string
): Promise<Response<Array<Entity.Status>>> ): Promise<Response<Array<Entity.Status>>>
/** /**
* Favourites timeline of any user. * Favourites timeline of any user.
@ -683,7 +682,7 @@ export interface MegalodonInterface {
* @param id The target status id. * @param id The target status id.
* @return Status * @return Status
*/ */
getStatus(id: string, host?: string): Promise<Response<Entity.Status>> getStatus(id: string): Promise<Response<Entity.Status>>
/** /**
* Edit a given status to change its text, sensitivity, media attachments, or poll. Note that editing a poll’s options will reset the votes. * Edit a given status to change its text, sensitivity, media attachments, or poll. Note that editing a poll’s options will reset the votes.
* *
@ -734,14 +733,14 @@ export interface MegalodonInterface {
* @param id The target status id. * @param id The target status id.
* @return Array of accounts. * @return Array of accounts.
*/ */
getStatusRebloggedBy(id: string, host?: string): Promise<Response<Array<Entity.Account>>> getStatusRebloggedBy(id: string): Promise<Response<Array<Entity.Account>>>
/** /**
* See who favourited a status * See who favourited a status
* *
* @param id The target status id. * @param id The target status id.
* @return Array of accounts. * @return Array of accounts.
*/ */
getStatusFavouritedBy(id: string, host?: string): Promise<Response<Array<Entity.Account>>> getStatusFavouritedBy(id: string): Promise<Response<Array<Entity.Account>>>
/** /**
* Favourite a status. * Favourite a status.
* *
@ -926,7 +925,7 @@ export interface MegalodonInterface {
max_id?: string max_id?: string
since_id?: string since_id?: string
min_id?: string min_id?: string
}, host?: string): Promise<Response<Array<Entity.Status>>> }): Promise<Response<Array<Entity.Status>>>
/** /**
* View local timeline. * View local timeline.
* *
@ -943,7 +942,7 @@ export interface MegalodonInterface {
max_id?: string max_id?: string
since_id?: string since_id?: string
min_id?: string min_id?: string
}, host?: string): Promise<Response<Array<Entity.Status>>> }): Promise<Response<Array<Entity.Status>>>
/** /**
* View hashtag timeline. * View hashtag timeline.
* *
@ -965,8 +964,7 @@ export interface MegalodonInterface {
max_id?: string max_id?: string
since_id?: string since_id?: string
min_id?: string min_id?: string
}, }
host?: string
): Promise<Response<Array<Entity.Status>>> ): Promise<Response<Array<Entity.Status>>>
/** /**
* View home timeline. * View home timeline.
@ -984,7 +982,7 @@ export interface MegalodonInterface {
max_id?: string max_id?: string
since_id?: string since_id?: string
min_id?: string min_id?: string
}, host?: string): Promise<Response<Array<Entity.Status>>> }): Promise<Response<Array<Entity.Status>>>
/** /**
* View list timeline. * View list timeline.
* *

30
packages/megalodon/src/misskey.ts
View File

@ -291,8 +291,7 @@ export default class Misskey implements MegalodonInterface {
exclude_replies: boolean exclude_replies: boolean
exclude_reblogs: boolean exclude_reblogs: boolean
only_media?: boolean only_media?: boolean
}, }
host?: string
): Promise<Response<Array<Entity.Status>>> { ): Promise<Response<Array<Entity.Status>>> {
if (options && options.pinned) { if (options && options.pinned) {
return this.client return this.client
@ -343,7 +342,7 @@ export default class Misskey implements MegalodonInterface {
} }
} }
return this.client.post<Array<MisskeyAPI.Entity.Note>>('/api/users/notes', params).then(res => { return this.client.post<Array<MisskeyAPI.Entity.Note>>('/api/users/notes', params).then(res => {
const statuses: Array<Entity.Status> = res.data.map(note => MisskeyAPI.Converter.note(note, host)) const statuses: Array<Entity.Status> = res.data.map(note => MisskeyAPI.Converter.note(note, this.baseUrl))
return Object.assign(res, { return Object.assign(res, {
data: statuses data: statuses
}) })
@ -1132,12 +1131,12 @@ export default class Misskey implements MegalodonInterface {
/** /**
* POST /api/notes/show * POST /api/notes/show
*/ */
public async getStatus(id: string, host: string): Promise<Response<Entity.Status>> { public async getStatus(id: string): Promise<Response<Entity.Status>> {
return this.client return this.client
.post<MisskeyAPI.Entity.Note>('/api/notes/show', { .post<MisskeyAPI.Entity.Note>('/api/notes/show', {
noteId: id noteId: id
}) })
.then(res => ({ ...res, data: MisskeyAPI.Converter.note(res.data, host) })) .then(res => ({ ...res, data: MisskeyAPI.Converter.note(res.data, this.baseUrl) }))
} }
public async editStatus( public async editStatus(
@ -1214,14 +1213,14 @@ export default class Misskey implements MegalodonInterface {
/** /**
* POST /api/notes/renotes * POST /api/notes/renotes
*/ */
public async getStatusRebloggedBy(id: string, host?: string): Promise<Response<Array<Entity.Account>>> { public async getStatusRebloggedBy(id: string): Promise<Response<Array<Entity.Account>>> {
return this.client return this.client
.post<Array<MisskeyAPI.Entity.Note>>('/api/notes/renotes', { .post<Array<MisskeyAPI.Entity.Note>>('/api/notes/renotes', {
noteId: id noteId: id
}) })
.then(res => ({ .then(res => ({
...res, ...res,
data: res.data.map(n => MisskeyAPI.Converter.user(n.user, host)) data: res.data.map(n => MisskeyAPI.Converter.user(n.user, this.baseUrl))
})) }))
} }
@ -1492,7 +1491,7 @@ export default class Misskey implements MegalodonInterface {
max_id?: string max_id?: string
since_id?: string since_id?: string
min_id?: string min_id?: string
}, host?: string): Promise<Response<Array<Entity.Status>>> { }): Promise<Response<Array<Entity.Status>>> {
let params = {} let params = {}
if (options) { if (options) {
if (options.only_media !== undefined) { if (options.only_media !== undefined) {
@ -1523,7 +1522,7 @@ export default class Misskey implements MegalodonInterface {
} }
return this.client return this.client
.post<Array<MisskeyAPI.Entity.Note>>('/api/notes/global-timeline', params) .post<Array<MisskeyAPI.Entity.Note>>('/api/notes/global-timeline', params)
.then(res => ({ ...res, data: res.data.map(n => MisskeyAPI.Converter.note(n, host)) })) .then(res => ({ ...res, data: res.data.map(n => MisskeyAPI.Converter.note(n, this.baseUrl)) }))
} }
/** /**
@ -1535,7 +1534,7 @@ export default class Misskey implements MegalodonInterface {
max_id?: string max_id?: string
since_id?: string since_id?: string
min_id?: string min_id?: string
}, host?: string): Promise<Response<Array<Entity.Status>>> { }): Promise<Response<Array<Entity.Status>>> {
let params = {} let params = {}
if (options) { if (options) {
if (options.only_media !== undefined) { if (options.only_media !== undefined) {
@ -1566,7 +1565,7 @@ export default class Misskey implements MegalodonInterface {
} }
return this.client return this.client
.post<Array<MisskeyAPI.Entity.Note>>('/api/notes/local-timeline', params) .post<Array<MisskeyAPI.Entity.Note>>('/api/notes/local-timeline', params)
.then(res => ({ ...res, data: res.data.map(n => MisskeyAPI.Converter.note(n, host)) })) .then(res => ({ ...res, data: res.data.map(n => MisskeyAPI.Converter.note(n, this.baseUrl)) }))
} }
/** /**
@ -1581,8 +1580,7 @@ export default class Misskey implements MegalodonInterface {
max_id?: string max_id?: string
since_id?: string since_id?: string
min_id?: string min_id?: string
}, }
host?: string
): Promise<Response<Array<Entity.Status>>> { ): Promise<Response<Array<Entity.Status>>> {
let params = { let params = {
tag: hashtag tag: hashtag
@ -1616,7 +1614,7 @@ export default class Misskey implements MegalodonInterface {
} }
return this.client return this.client
.post<Array<MisskeyAPI.Entity.Note>>('/api/notes/search-by-tag', params) .post<Array<MisskeyAPI.Entity.Note>>('/api/notes/search-by-tag', params)
.then(res => ({ ...res, data: res.data.map(n => MisskeyAPI.Converter.note(n, host)) })) .then(res => ({ ...res, data: res.data.map(n => MisskeyAPI.Converter.note(n, this.baseUrl)) }))
} }
/** /**
@ -1628,7 +1626,7 @@ export default class Misskey implements MegalodonInterface {
max_id?: string max_id?: string
since_id?: string since_id?: string
min_id?: string min_id?: string
}, host?: string): Promise<Response<Array<Entity.Status>>> { }): Promise<Response<Array<Entity.Status>>> {
let params = { let params = {
withFiles: false withFiles: false
} }
@ -1656,7 +1654,7 @@ export default class Misskey implements MegalodonInterface {
} }
return this.client return this.client
.post<Array<MisskeyAPI.Entity.Note>>('/api/notes/timeline', params) .post<Array<MisskeyAPI.Entity.Note>>('/api/notes/timeline', params)
.then(res => ({ ...res, data: res.data.map(n => MisskeyAPI.Converter.note(n, host)) })) .then(res => ({ ...res, data: res.data.map(n => MisskeyAPI.Converter.note(n, this.baseUrl)) }))
} }
/** /**