summaryrefslogtreecommitdiff
path: root/packages/backend/src/remote
diff options
context:
space:
mode:
authortamaina <tamaina@hotmail.co.jp>2022-02-27 13:59:10 +0900
committerGitHub <noreply@github.com>2022-02-27 13:59:10 +0900
commite314be5b59dc5b518f114c82a67a8546decb5a80 (patch)
tree269c4befe67f7e6c845ae975695ab4ceb0ba39ff /packages/backend/src/remote
parentrefactor: Use ESM (#8358) (diff)
downloadsharkey-e314be5b59dc5b518f114c82a67a8546decb5a80.tar.gz
sharkey-e314be5b59dc5b518f114c82a67a8546decb5a80.tar.bz2
sharkey-e314be5b59dc5b518f114c82a67a8546decb5a80.zip
Fix avatar/banner proxy (#8346)
* Fix avatar/banner proxy Co-authored-by: mei23 <m@m544.net> * use getAvatarUrl * fix * join avatar and banner to improve performance * join * Update hybrid-timeline.ts * fix Co-authored-by: mei23 <m@m544.net> Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Diffstat (limited to 'packages/backend/src/remote')
-rw-r--r--packages/backend/src/remote/activitypub/models/person.ts16
1 files changed, 0 insertions, 16 deletions
diff --git a/packages/backend/src/remote/activitypub/models/person.ts b/packages/backend/src/remote/activitypub/models/person.ts
index 1c03bddccc..bfc613523b 100644
--- a/packages/backend/src/remote/activitypub/models/person.ts
+++ b/packages/backend/src/remote/activitypub/models/person.ts
@@ -228,26 +228,14 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise<Us
const avatarId = avatar ? avatar.id : null;
const bannerId = banner ? banner.id : null;
- const avatarUrl = avatar ? DriveFiles.getPublicUrl(avatar, true) : null;
- const bannerUrl = banner ? DriveFiles.getPublicUrl(banner) : null;
- const avatarBlurhash = avatar ? avatar.blurhash : null;
- const bannerBlurhash = banner ? banner.blurhash : null;
await Users.update(user!.id, {
avatarId,
bannerId,
- avatarUrl,
- bannerUrl,
- avatarBlurhash,
- bannerBlurhash,
});
user!.avatarId = avatarId;
user!.bannerId = bannerId;
- user!.avatarUrl = avatarUrl;
- user!.bannerUrl = bannerUrl;
- user!.avatarBlurhash = avatarBlurhash;
- user!.bannerBlurhash = bannerBlurhash;
//#endregion
//#region カスタム絵文字取得
@@ -340,14 +328,10 @@ export async function updatePerson(uri: string, resolver?: Resolver | null, hint
if (avatar) {
updates.avatarId = avatar.id;
- updates.avatarUrl = DriveFiles.getPublicUrl(avatar, true);
- updates.avatarBlurhash = avatar.blurhash;
}
if (banner) {
updates.bannerId = banner.id;
- updates.bannerUrl = DriveFiles.getPublicUrl(banner);
- updates.bannerBlurhash = banner.blurhash;
}
// Update user