limepotato/jormungandr-bite
1
0
Fork 0
mirror of https://iceshrimp.dev/limepotato/jormungandr-bite.git synced 2024-11-15 06:27:34 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of codeberg.org:calckey/calckey into develop

Browse source
This commit is contained in:
ThatOneCalculator 2023-03-15 18:29:22 -07:00
commit d182e90fc5
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packages/backend/src/server/api/mastodon/endpoints/timeline.ts
View file

@ -92,8 +92,8 @@ export function apiTimelineMastodon(router: Router): void {
try { try {
const query: any = ctx.query; const query: any = ctx.query;
const data = query.local const data = query.local
? await client.getLocalTimeline(limitToInt(query)) ? await client.getLocalTimeline(argsToBools(limitToInt(query)))
: await client.getPublicTimeline(limitToInt(query)); : await client.getPublicTimeline(argsToBools(limitToInt(query)));
ctx.body = toTextWithReaction(data.data, ctx.hostname); ctx.body = toTextWithReaction(data.data, ctx.hostname);
} catch (e: any) { } catch (e: any) {
console.error(e); console.error(e);
@ -111,7 +111,7 @@ export function apiTimelineMastodon(router: Router): void {
try { try {
const data = await client.getTagTimeline( const data = await client.getTagTimeline(
ctx.params.hashtag, ctx.params.hashtag,
limitToInt(ctx.query), argsToBools(limitToInt(ctx.query)),
); );
ctx.body = toTextWithReaction(data.data, ctx.hostname); ctx.body = toTextWithReaction(data.data, ctx.hostname);
} catch (e: any) { } catch (e: any) {