mirror/iceshrimp
1
0
Fork 0
mirror of https://iceshrimp.dev/iceshrimp/iceshrimp synced 2024-12-16 15:48:08 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into beta

Browse Source
This commit is contained in:
ThatOneCalculator 2023-03-23 17:50:01 -07:00
commit 67d91d09fc
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/backend/package.json
View File

@ -81,7 +81,7 @@
"koa-send": "5.0.1",
"koa-slow": "2.1.0",
"koa-views": "7.0.2",
"@calckey/megalodon": "5.1.21",
"@calckey/megalodon": "5.1.22",
"mfm-js": "0.23.2",
"mime-types": "2.1.35",
"multer": "1.4.4-lts.1",

1
packages/backend/src/server/api/mastodon/endpoints/account.ts
View File

@ -32,6 +32,7 @@ export function apiAccountMastodon(router: Router): void {
const data = await client.verifyAccountCredentials();
let acct = data.data;
acct.id = convertId(acct.id, IdType.MastodonId);
acct.display_name = acct.display_name || acct.username;
acct.url = `${BASE_URL}/@${acct.url}`;
acct.note = acct.note || "";
acct.avatar_static = acct.avatar;

8
pnpm-lock.yaml
View File

@ -55,7 +55,7 @@ importers:
'@bull-board/api': ^4.6.4
'@bull-board/koa': ^4.6.4
'@bull-board/ui': ^4.6.4
'@calckey/megalodon': 5.1.21
'@calckey/megalodon': 5.1.22
'@discordapp/twemoji': 14.0.2
'@elastic/elasticsearch': 7.17.0
'@koa/cors': 3.4.3
@ -225,7 +225,7 @@ importers:
'@bull-board/api': 4.10.2
'@bull-board/koa': 4.10.2_6tybghmia4wsnt33xeid7y4rby
'@bull-board/ui': 4.10.2
'@calckey/megalodon': 5.1.21
'@calckey/megalodon': 5.1.22
'@discordapp/twemoji': 14.0.2
'@elastic/elasticsearch': 7.17.0
'@koa/cors': 3.4.3
@ -763,8 +763,8 @@ packages:
'@bull-board/api': 4.10.2
dev: false
/@calckey/megalodon/5.1.21:
resolution: {integrity: sha512-wThdyNb/UofklvYzyeFNQwxJNHqaSLD+z0glQLzV1tmAvSB0EZOL0D15dvpdB0LED0Q2rpJlwaonejkTI9JQhA==}
/@calckey/megalodon/5.1.22:
resolution: {integrity: sha512-/wJ4XPyTL2RXGj7Tawy6uT3Imlh78zwpse6xf+m6loZXlpROxdSKJTq87+ffmAJHDoS6gHPTOfYdIxE699oTww==}
engines: {node: '>=15.0.0'}
dependencies:
'@types/oauth': 0.9.1