-async function loadActorUrlOrGetFromWebfinger (name: string, host: string) {
- const actor = await ActorModel.loadByNameAndHost(name, host)
+async function loadActorUrlOrGetFromWebfinger (uri: string) {
+ const [ name, host ] = uri.split('@')
+ let actor: ActorModel
+
+ if (host === CONFIG.WEBSERVER.HOST) {
+ actor = await ActorModel.loadLocalByName(name)
+ } else {
+ actor = await ActorModel.loadByNameAndHost(name, host)
+ }
+