versia-pub/server
2
0
Fork 0
mirror of https://github.com/versia-pub/server.git synced 2026-04-27 20:59:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(database): Remove unused columns and rename baseUrl to domain

Browse source
This commit is contained in:
Jesse Wierzbinski 2026-04-03 12:47:37 +02:00
parent 35d285bb2a
commit df2a5ce260
No known key found for this signature in database
16 changed files with 2448 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

20
packages/kit/db/user.ts
View file

@ -229,13 +229,13 @@ export class User extends BaseInterface<typeof Users, UserWithRelations> {
return new VersiaEntities.Reference(
this.data.remoteId as string,
(this.data.instance as typeof Instance.$type).baseUrl,
(this.data.instance as typeof Instance.$type).domain,
);
}
public get uri(): URL {
const domain = this.data.instance?.baseUrl
? new URL(`https://${this.data.instance.baseUrl}`)
const domain = this.data.instance?.domain
? new URL(`https://${this.data.instance.domain}`)
: config.http.base_url;
return new URL(
@ -335,7 +335,7 @@ export class User extends BaseInterface<typeof Users, UserWithRelations> {
author: this.id,
created_at: new Date().toISOString(),
followee: followee.data.instance
? `${followee.data.instance.baseUrl}:${followee.id}`
? `${followee.data.instance.domain}:${followee.id}`
: followee.id,
});
}
@ -357,7 +357,7 @@ export class User extends BaseInterface<typeof Users, UserWithRelations> {
author: this.id,
created_at: new Date().toISOString(),
follower: follower.data.instance
? `${follower.data.instance.baseUrl}:${follower.id}`
? `${follower.data.instance.domain}:${follower.id}`
: follower.id,
});
@ -382,7 +382,7 @@ export class User extends BaseInterface<typeof Users, UserWithRelations> {
author: this.id,
created_at: new Date().toISOString(),
follower: follower.data.instance
? `${follower.data.instance.baseUrl}:${follower.id}`
? `${follower.data.instance.domain}:${follower.id}`
: follower.id,
});
@ -840,7 +840,7 @@ export class User extends BaseInterface<typeof Users, UserWithRelations> {
? reference
: new VersiaEntities.Reference(
reference.id,
instance.data.baseUrl,
instance.data.domain,
),
);
}
@ -910,7 +910,7 @@ export class User extends BaseInterface<typeof Users, UserWithRelations> {
public getAcct(): string {
return this.local
? this.data.username
: `${this.data.username}@${this.data.instance?.baseUrl}`;
: `${this.data.username}@${this.data.instance?.domain}`;
}
public static getAcct(
@ -1008,7 +1008,7 @@ export class User extends BaseInterface<typeof Users, UserWithRelations> {
try {
await Instance.federationRequester.postEntity(
user.data.instance.baseUrl,
user.data.instance.domain,
entity,
);
} catch (e) {
@ -1034,7 +1034,7 @@ export class User extends BaseInterface<typeof Users, UserWithRelations> {
uri: this.uri.href,
url: new URL(
`/@${user.username}${
user.instanceId ? `@${user.instance?.baseUrl}` : ""
user.instanceId ? `@${user.instance?.domain}` : ""
}`,
config.http.base_url,
).href,