build.gradle.kts

@@ -182,7 +182,6 @@ dependencies {
     implementation("org.apache.tika:tika-core:2.9.1")
     implementation("net.coobird:thumbnailator:0.4.20")
     implementation("org.bytedeco:javacv-platform:1.5.9")
-    implementation("org.flywaydb:flyway-core")
 
     implementation("io.ktor:ktor-client-logging-jvm:$ktor_version")
 

src/intTest/resources/sql/note/httpSignature認証でフォロワーがfollowers投稿を取得できる.sql

@@ -1,5 +1,5 @@
 insert into "USERS" (ID, NAME, DOMAIN, SCREEN_NAME, DESCRIPTION, PASSWORD, INBOX, OUTBOX, URL, PUBLIC_KEY, PRIVATE_KEY,
-                     CREATED_AT, KEY_ID, FOLLOWING, FOLLOWERS, INSTANCE)
+                     CREATED_AT, KEY_ID, FOLLOWING, FOLLOWERS)
 VALUES (8, 'test-user8', 'example.com', 'Im test-user8.', 'THis account is test-user8.',
         '5e884898da28047151d0e56f8dc6292773603d0d6aabbdd62a11ef721d1542d8',
         'https://example.com/users/test-user8/inbox',
@@ -7,10 +7,10 @@ VALUES (8, 'test-user8', 'example.com', 'Im test-user8.', 'THis account is test-
         '-----BEGIN PUBLIC KEY-----...-----END PUBLIC KEY-----',
         '-----BEGIN PRIVATE KEY-----...-----END PRIVATE KEY-----', 12345678,
         'https://example.com/users/test-user8#pubkey', 'https://example.com/users/test-user8/following',
-        'https://example.com/users/test-user8/followers', null);
+        'https://example.com/users/test-user8/followers');
 
 insert into "USERS" (ID, NAME, DOMAIN, SCREEN_NAME, DESCRIPTION, PASSWORD, INBOX, OUTBOX, URL, PUBLIC_KEY, PRIVATE_KEY,
-                     CREATED_AT, KEY_ID, FOLLOWING, FOLLOWERS, INSTANCE)
+                     CREATED_AT, KEY_ID, FOLLOWING, FOLLOWERS)
 VALUES (9, 'test-user9', 'follower.example.com', 'Im test-user9.', 'THis account is test-user9.',
         null,
         'https://follower.example.com/users/test-user9/inbox',
@@ -19,11 +19,11 @@ VALUES (9, 'test-user9', 'follower.example.com', 'Im test-user9.', 'THis account
         null, 12345678,
         'https://follower.example.com/users/test-user9#pubkey',
         'https://follower.example.com/users/test-user9/following',
-        'https://follower.example.com/users/test-user9/followers', null);
+        'https://follower.example.com/users/test-user9/followers');
 
 insert into USERS_FOLLOWERS (USER_ID, FOLLOWER_ID)
 VALUES (8, 9);
 
-insert into POSTS (ID, USER_ID, OVERVIEW, TEXT, CREATED_AT, VISIBILITY, URL, REPLY_ID, REPOST_ID, SENSITIVE, AP_ID)
+insert into POSTS (ID, "userId", OVERVIEW, TEXT, "createdAt", VISIBILITY, URL, "repostId", "replyId", SENSITIVE, AP_ID)
 VALUES (1239, 8, null, 'test post', 12345680, 2, 'https://example.com/users/test-user8/posts/1239', null, null, false,
         'https://example.com/users/test-user8/posts/1239');

src/intTest/resources/sql/note/httpSignature認証でフォロワーがpublic投稿を取得できる.sql

@@ -1,5 +1,5 @@
 insert into "USERS" (ID, NAME, DOMAIN, SCREEN_NAME, DESCRIPTION, PASSWORD, INBOX, OUTBOX, URL, PUBLIC_KEY, PRIVATE_KEY,
-                     CREATED_AT, KEY_ID, FOLLOWING, FOLLOWERS, INSTANCE)
+                     CREATED_AT, KEY_ID, FOLLOWING, FOLLOWERS)
 VALUES (4, 'test-user4', 'example.com', 'Im test user4.', 'THis account is test user4.',
         '5e884898da28047151d0e56f8dc6292773603d0d6aabbdd62a11ef721d1542d8',
         'https://example.com/users/test-user4/inbox',
@@ -7,10 +7,10 @@ VALUES (4, 'test-user4', 'example.com', 'Im test user4.', 'THis account is test
         '-----BEGIN PUBLIC KEY-----...-----END PUBLIC KEY-----',
         '-----BEGIN PRIVATE KEY-----...-----END PRIVATE KEY-----', 12345678,
         'https://example.com/users/test-user4#pubkey', 'https://example.com/users/test-user4/following',
-        'https://example.com/users/test-user4/followers', null);
+        'https://example.com/users/test-user4/followers');
 
 insert into "USERS" (ID, NAME, DOMAIN, SCREEN_NAME, DESCRIPTION, PASSWORD, INBOX, OUTBOX, URL, PUBLIC_KEY, PRIVATE_KEY,
-                     CREATED_AT, KEY_ID, FOLLOWING, FOLLOWERS, INSTANCE)
+                     CREATED_AT, KEY_ID, FOLLOWING, FOLLOWERS)
 VALUES (5, 'test-user5', 'follower.example.com', 'Im test user5.', 'THis account is test user5.',
         null,
         'https://follower.example.com/users/test-user5/inbox',
@@ -19,12 +19,11 @@ VALUES (5, 'test-user5', 'follower.example.com', 'Im test user5.', 'THis account
         null, 12345678,
         'https://follower.example.com/users/test-user5#pubkey',
         'https://follower.example.com/users/test-user5/following',
-        'https://follower.example.com/users/test-user5/followers', null);
+        'https://follower.example.com/users/test-user5/followers');
 
 insert into USERS_FOLLOWERS (USER_ID, FOLLOWER_ID)
 VALUES (4, 5);
 
-insert into POSTS (ID, "USER_ID", OVERVIEW, TEXT, "CREATED_AT", VISIBILITY, URL, "REPOST_ID", "REPLY_ID", SENSITIVE,
-                   AP_ID)
+insert into POSTS (ID, "userId", OVERVIEW, TEXT, "createdAt", VISIBILITY, URL, "repostId", "replyId", SENSITIVE, AP_ID)
 VALUES (1237, 4, null, 'test post', 12345680, 0, 'https://example.com/users/test-user4/posts/1237', null, null, false,
         'https://example.com/users/test-user4/posts/1237');

src/intTest/resources/sql/note/httpSignature認証でフォロワーがunlisted投稿を取得できる.sql

@@ -1,5 +1,5 @@
 insert into "USERS" (ID, NAME, DOMAIN, SCREEN_NAME, DESCRIPTION, PASSWORD, INBOX, OUTBOX, URL, PUBLIC_KEY, PRIVATE_KEY,
-                     CREATED_AT, KEY_ID, FOLLOWING, FOLLOWERS, INSTANCE)
+                     CREATED_AT, KEY_ID, FOLLOWING, FOLLOWERS)
 VALUES (6, 'test-user6', 'example.com', 'Im test-user6.', 'THis account is test-user6.',
         '5e884898da28047151d0e56f8dc6292773603d0d6aabbdd62a11ef721d1542d8',
         'https://example.com/users/test-user6/inbox',
@@ -7,10 +7,10 @@ VALUES (6, 'test-user6', 'example.com', 'Im test-user6.', 'THis account is test-
         '-----BEGIN PUBLIC KEY-----...-----END PUBLIC KEY-----',
         '-----BEGIN PRIVATE KEY-----...-----END PRIVATE KEY-----', 12345678,
         'https://example.com/users/test-user6#pubkey', 'https://example.com/users/test-user6/following',
-        'https://example.com/users/test-user6/followers', null);
+        'https://example.com/users/test-user6/followers');
 
 insert into "USERS" (ID, NAME, DOMAIN, SCREEN_NAME, DESCRIPTION, PASSWORD, INBOX, OUTBOX, URL, PUBLIC_KEY, PRIVATE_KEY,
-                     CREATED_AT, KEY_ID, FOLLOWING, FOLLOWERS, INSTANCE)
+                     CREATED_AT, KEY_ID, FOLLOWING, FOLLOWERS)
 VALUES (7, 'test-user7', 'follower.example.com', 'Im test-user7.', 'THis account is test-user7.',
         null,
         'https://follower.example.com/users/test-user7/inbox',
@@ -19,12 +19,11 @@ VALUES (7, 'test-user7', 'follower.example.com', 'Im test-user7.', 'THis account
         null, 12345678,
         'https://follower.example.com/users/test-user7#pubkey',
         'https://follower.example.com/users/test-user7/following',
-        'https://follower.example.com/users/test-user7/followers', null);
+        'https://follower.example.com/users/test-user7/followers');
 
 insert into USERS_FOLLOWERS (USER_ID, FOLLOWER_ID)
 VALUES (6, 7);
 
-insert into POSTS (ID, "USER_ID", OVERVIEW, TEXT, "CREATED_AT", VISIBILITY, URL, "REPOST_ID", "REPLY_ID", SENSITIVE,
-                   AP_ID)
+insert into POSTS (ID, "userId", OVERVIEW, TEXT, "createdAt", VISIBILITY, URL, "repostId", "replyId", SENSITIVE, AP_ID)
 VALUES (1238, 6, null, 'test post', 12345680, 1, 'https://example.com/users/test-user6/posts/1238', null, null, false,
         'https://example.com/users/test-user6/posts/1238');

src/intTest/resources/sql/note/メディア付き投稿はattachmentにDocumentとして画像が存在する.sql

@@ -1,5 +1,5 @@
 insert into "USERS" (ID, NAME, DOMAIN, SCREEN_NAME, DESCRIPTION, PASSWORD, INBOX, OUTBOX, URL, PUBLIC_KEY, PRIVATE_KEY,
-                     CREATED_AT, KEY_ID, FOLLOWING, FOLLOWERS, INSTANCE)
+                     CREATED_AT, KEY_ID, FOLLOWING, FOLLOWERS)
 VALUES (11, 'test-user11', 'example.com', 'Im test-user11.', 'THis account is test-user11.',
         '5e884898da28047151d0e56f8dc6292773603d0d6aabbdd62a11ef721d1542d8',
         'https://example.com/users/test-user11/inbox',
@@ -7,10 +7,9 @@ VALUES (11, 'test-user11', 'example.com', 'Im test-user11.', 'THis account is te
         '-----BEGIN PUBLIC KEY-----...-----END PUBLIC KEY-----',
         '-----BEGIN PRIVATE KEY-----...-----END PRIVATE KEY-----', 12345678,
         'https://example.com/users/test-user11#pubkey', 'https://example.com/users/test-user11/following',
-        'https://example.com/users/test-user11/followers', null);
+        'https://example.com/users/test-user11/followers');
 
-insert into POSTS (ID, "USER_ID", OVERVIEW, TEXT, "CREATED_AT", VISIBILITY, URL, "REPOST_ID", "REPLY_ID", SENSITIVE,
-                   AP_ID)
+insert into POSTS (ID, "userId", OVERVIEW, TEXT, "createdAt", VISIBILITY, URL, "repostId", "replyId", SENSITIVE, AP_ID)
 VALUES (1242, 11, null, 'test post', 12345680, 0, 'https://example.com/users/test-user11/posts/1242', null, null, false,
         'https://example.com/users/test-user11/posts/1242');
 
@@ -18,6 +17,6 @@ insert into MEDIA (ID, NAME, URL, REMOTE_URL, THUMBNAIL_URL, TYPE, BLURHASH, MIM
 VALUES (1, 'test-media', 'https://example.com/media/test-media.png', null, null, 0, null, 'image/png', null),
        (2, 'test-media2', 'https://example.com/media/test-media2.png', null, null, 0, null, 'image/png', null);
 
-insert into POSTS_MEDIA(POST_ID, MEDIA_ID)
+insert into POSTSMEDIA(POST_ID, MEDIA_ID)
 VALUES (1242, 1),
        (1242, 2);

src/intTest/resources/sql/note/リプライになっている投稿はinReplyToが存在する.sql

@@ -1,5 +1,5 @@
 insert into "USERS" (ID, NAME, DOMAIN, SCREEN_NAME, DESCRIPTION, PASSWORD, INBOX, OUTBOX, URL, PUBLIC_KEY, PRIVATE_KEY,
-                     CREATED_AT, KEY_ID, FOLLOWING, FOLLOWERS, INSTANCE)
+                     CREATED_AT, KEY_ID, FOLLOWING, FOLLOWERS)
 VALUES (10, 'test-user10', 'example.com', 'Im test-user10.', 'THis account is test-user10.',
         '5e884898da28047151d0e56f8dc6292773603d0d6aabbdd62a11ef721d1542d8',
         'https://example.com/users/test-user10/inbox',
@@ -7,10 +7,9 @@ VALUES (10, 'test-user10', 'example.com', 'Im test-user10.', 'THis account is te
         '-----BEGIN PUBLIC KEY-----...-----END PUBLIC KEY-----',
         '-----BEGIN PRIVATE KEY-----...-----END PRIVATE KEY-----', 12345678,
         'https://example.com/users/test-user10#pubkey', 'https://example.com/users/test-user10/following',
-        'https://example.com/users/test-user10/followers', null);
+        'https://example.com/users/test-user10/followers');
 
-insert into POSTS (ID, "USER_ID", OVERVIEW, TEXT, "CREATED_AT", VISIBILITY, URL, "REPOST_ID", "REPLY_ID", SENSITIVE,
-                   AP_ID)
+insert into POSTS (ID, "userId", OVERVIEW, TEXT, "createdAt", VISIBILITY, URL, "repostId", "replyId", SENSITIVE, AP_ID)
 VALUES (1240, 10, null, 'test post', 12345680, 0, 'https://example.com/users/test-user10/posts/1240', null, null, false,
         'https://example.com/users/test-user10/posts/1240'),
        (1241, 10, null, 'test post', 12345680, 0, 'https://example.com/users/test-user10/posts/1241', null, 1240, false,

src/intTest/resources/sql/note/匿名でfollowers投稿を取得しようとすると404.sql

@@ -1,5 +1,5 @@
 insert into "USERS" (ID, NAME, DOMAIN, SCREEN_NAME, DESCRIPTION, PASSWORD, INBOX, OUTBOX, URL, PUBLIC_KEY, PRIVATE_KEY,
-                     CREATED_AT, KEY_ID, FOLLOWING, FOLLOWERS, INSTANCE)
+                     CREATED_AT, KEY_ID, FOLLOWING, FOLLOWERS)
 VALUES (3, 'test-user3', 'example.com', 'Im test user3.', 'THis account is test user3.',
         '5e884898da28047151d0e56f8dc6292773603d0d6aabbdd62a11ef721d1542d8',
         'https://example.com/users/test-user3/inbox',
@@ -7,9 +7,8 @@ VALUES (3, 'test-user3', 'example.com', 'Im test user3.', 'THis account is test
         '-----BEGIN PUBLIC KEY-----...-----END PUBLIC KEY-----',
         '-----BEGIN PRIVATE KEY-----...-----END PRIVATE KEY-----', 12345678,
         'https://example.com/users/test-user3#pubkey', 'https://example.com/users/test-user3/following',
-        'https://example.com/users/test-user3/followers', null);
+        'https://example.com/users/test-user3/followers');
 
-insert into POSTS (ID, "USER_ID", OVERVIEW, TEXT, "CREATED_AT", VISIBILITY, URL, "REPOST_ID", "REPLY_ID", SENSITIVE,
-                   AP_ID)
+insert into POSTS (ID, "userId", OVERVIEW, TEXT, "createdAt", VISIBILITY, URL, "repostId", "replyId", SENSITIVE, AP_ID)
 VALUES (1236, 3, null, 'test post', 12345680, 2, 'https://example.com/users/test-user3/posts/1236', null, null, false,
         'https://example.com/users/test-user3/posts/1236')

src/intTest/resources/sql/note/匿名でpublic投稿を取得できる.sql

@@ -1,14 +1,13 @@
 insert into "USERS" (ID, NAME, DOMAIN, SCREEN_NAME, DESCRIPTION, PASSWORD, INBOX, OUTBOX, URL, PUBLIC_KEY, PRIVATE_KEY,
-                     CREATED_AT, KEY_ID, FOLLOWING, FOLLOWERS, INSTANCE)
+                     CREATED_AT, KEY_ID, FOLLOWING, FOLLOWERS)
 VALUES (1, 'test-user', 'example.com', 'Im test user.', 'THis account is test user.',
         '5e884898da28047151d0e56f8dc6292773603d0d6aabbdd62a11ef721d1542d8', 'https://example.com/users/test-user/inbox',
         'https://example.com/users/test-user/outbox', 'https://example.com/users/test-user',
         '-----BEGIN PUBLIC KEY-----...-----END PUBLIC KEY-----',
         '-----BEGIN PRIVATE KEY-----...-----END PRIVATE KEY-----', 12345678,
         'https://example.com/users/test-user#pubkey', 'https://example.com/users/test-user/following',
-        'https://example.com/users/test-users/followers', null);
+        'https://example.com/users/test-users/followers');
 
-insert into POSTS (ID, "USER_ID", OVERVIEW, TEXT, "CREATED_AT", VISIBILITY, URL, "REPOST_ID", "REPLY_ID", SENSITIVE,
-                   AP_ID)
+insert into POSTS (ID, "userId", OVERVIEW, TEXT, "createdAt", VISIBILITY, URL, "repostId", "replyId", SENSITIVE, AP_ID)
 VALUES (1234, 1, null, 'test post', 12345680, 0, 'https://example.com/users/test-user/posts/1234', null, null, false,
         'https://example.com/users/test-user/posts/1234')

src/intTest/resources/sql/note/匿名でunlisted投稿を取得できる.sql

@@ -1,5 +1,5 @@
 insert into "USERS" (ID, NAME, DOMAIN, SCREEN_NAME, DESCRIPTION, PASSWORD, INBOX, OUTBOX, URL, PUBLIC_KEY, PRIVATE_KEY,
-                     CREATED_AT, KEY_ID, FOLLOWING, FOLLOWERS, INSTANCE)
+                     CREATED_AT, KEY_ID, FOLLOWING, FOLLOWERS)
 VALUES (2, 'test-user2', 'example.com', 'Im test user2.', 'THis account is test user2.',
         '5e884898da28047151d0e56f8dc6292773603d0d6aabbdd62a11ef721d1542d8',
         'https://example.com/users/test-user2/inbox',
@@ -7,9 +7,8 @@ VALUES (2, 'test-user2', 'example.com', 'Im test user2.', 'THis account is test
         '-----BEGIN PUBLIC KEY-----...-----END PUBLIC KEY-----',
         '-----BEGIN PRIVATE KEY-----...-----END PRIVATE KEY-----', 12345678,
         'https://example.com/users/test-user2#pubkey', 'https://example.com/users/test-user2/following',
-        'https://example.com/users/test-user2/followers', null);
+        'https://example.com/users/test-user2/followers');
 
-insert into POSTS (ID, "USER_ID", OVERVIEW, TEXT, "CREATED_AT", VISIBILITY, URL, "REPOST_ID", "REPLY_ID", SENSITIVE,
-                   AP_ID)
+insert into POSTS (ID, "userId", OVERVIEW, TEXT, "createdAt", VISIBILITY, URL, "repostId", "replyId", SENSITIVE, AP_ID)
 VALUES (1235, 2, null, 'test post', 12345680, 1, 'https://example.com/users/test-user2/posts/1235', null, null, false,
         'https://example.com/users/test-user2/posts/1235')

src/intTest/resources/sql/test-user.sql

@@ -1,9 +1,9 @@
 insert into "USERS" (ID, NAME, DOMAIN, SCREEN_NAME, DESCRIPTION, PASSWORD, INBOX, OUTBOX, URL, PUBLIC_KEY, PRIVATE_KEY,
-                     CREATED_AT, KEY_ID, FOLLOWING, FOLLOWERS, INSTANCE)
+                     CREATED_AT, KEY_ID, FOLLOWING, FOLLOWERS)
 VALUES (1, 'test-user', 'example.com', 'Im test user.', 'THis account is test user.',
         '5e884898da28047151d0e56f8dc6292773603d0d6aabbdd62a11ef721d1542d8', 'https://example.com/users/test-user/inbox',
         'https://example.com/users/test-user/outbox', 'https://example.com/users/test-user',
         '-----BEGIN PUBLIC KEY-----...-----END PUBLIC KEY-----',
         '-----BEGIN PRIVATE KEY-----...-----END PRIVATE KEY-----', 12345678,
         'https://example.com/users/test-user#pubkey', 'https://example.com/users/test-user/following',
-        'https://example.com/users/test-users/followers', null);
+        'https://example.com/users/test-users/followers');

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/ObjectValue.kt

@@ -1,6 +1,5 @@
 package dev.usbharu.hideout.activitypub.domain.model.objects
 
-@Suppress("VariableNaming")
 open class ObjectValue : Object {
 
     var `object`: String? = null

src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveServiceImpl.kt

@@ -3,10 +3,7 @@ package dev.usbharu.hideout.activitypub.service.common
 import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 import dev.usbharu.hideout.core.domain.model.user.User
 import dev.usbharu.hideout.core.domain.model.user.UserRepository
-import dev.usbharu.hideout.core.service.resource.CacheManager
-import dev.usbharu.hideout.core.service.resource.ResolveResponse
 import org.springframework.stereotype.Service
-import java.io.InputStream
 
 @Service
 class APResourceResolveServiceImpl(
@@ -28,7 +25,7 @@ class APResourceResolveServiceImpl(
         cacheManager.putCache(key) {
             runResolve(url, singerId?.let { userRepository.findById(it) }, clazz)
         }
-        return (cacheManager.getOrWait(key) as APResolveResponse<T>).objects
+        return cacheManager.getOrWait(key) as T
     }
 
     private suspend fun <T : Object> internalResolve(url: String, singer: User?, clazz: Class<T>): T {
@@ -36,12 +33,11 @@ class APResourceResolveServiceImpl(
         cacheManager.putCache(key) {
             runResolve(url, singer, clazz)
         }
-        return (cacheManager.getOrWait(key) as APResolveResponse<T>).objects
+        return cacheManager.getOrWait(key) as T
     }
 
-    private suspend fun <T : Object> runResolve(url: String, singer: User?, clazz: Class<T>): ResolveResponse {
-        return APResolveResponse(apRequestService.apGet(url, singer, clazz))
-    }
+    private suspend fun <T : Object> runResolve(url: String, singer: User?, clazz: Class<T>): Object =
+        apRequestService.apGet(url, singer, clazz)
 
     private fun genCacheKey(url: String, singerId: Long?): String {
         if (singerId != null) {
@@ -49,30 +45,4 @@ class APResourceResolveServiceImpl(
         }
         return url
     }
-
-    private class APResolveResponse<T : Object>(val objects: T) : ResolveResponse {
-        override suspend fun body(): InputStream {
-            TODO("Not yet implemented")
-        }
-
-        override suspend fun bodyAsText(): String {
-            TODO("Not yet implemented")
-        }
-
-        override suspend fun bodyAsBytes(): ByteArray {
-            TODO("Not yet implemented")
-        }
-
-        override suspend fun header(): Map<String, List<String>> {
-            TODO("Not yet implemented")
-        }
-
-        override suspend fun status(): Int {
-            TODO("Not yet implemented")
-        }
-
-        override suspend fun statusMessage(): String {
-            TODO("Not yet implemented")
-        }
-    }
 }

src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/CacheManager.kt

@@ -0,0 +1,9 @@
+package dev.usbharu.hideout.activitypub.service.common
+
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
+
+interface CacheManager {
+
+    suspend fun putCache(key: String, block: suspend () -> Object)
+    suspend fun getOrWait(key: String): Object
+}

src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/InMemoryCacheManager.kt

@@ -1,5 +1,6 @@
-package dev.usbharu.hideout.core.service.resource
+package dev.usbharu.hideout.activitypub.service.common
 
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 import dev.usbharu.hideout.util.LruCache
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.sync.Mutex
@@ -10,10 +11,10 @@ import java.time.Instant
 @Service
 class InMemoryCacheManager : CacheManager {
     private val cacheKey = LruCache<String, Long>(15)
-    private val valueStore = mutableMapOf<String, ResolveResponse>()
+    private val valueStore = mutableMapOf<String, Object>()
     private val keyMutex = Mutex()
 
-    override suspend fun putCache(key: String, block: suspend () -> ResolveResponse) {
+    override suspend fun putCache(key: String, block: suspend () -> Object) {
         val needRunBlock: Boolean
         keyMutex.withLock {
             cacheKey.filter { Instant.ofEpochMilli(it.value).plusSeconds(300) <= Instant.now() }
@@ -37,7 +38,7 @@ class InMemoryCacheManager : CacheManager {
         }
     }
 
-    override suspend fun getOrWait(key: String): ResolveResponse {
+    override suspend fun getOrWait(key: String): Object {
         while (valueStore.contains(key).not()) {
             if (cacheKey.containsKey(key).not()) {
                 throw IllegalStateException("Invalid cache key.")

src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/user/APUserService.kt

@@ -124,8 +124,7 @@ class APUserServiceImpl(
                         ?: throw IllegalActivityPubObjectException("publicKey is null"),
                     keyId = person.publicKey?.id ?: throw IllegalActivityPubObjectException("publicKey keyId is null"),
                     following = person.following,
-                    followers = person.followers,
-                    sharedInbox = person.endpoints["sharedInbox"]
+                    followers = person.followers
                 )
             )
         }

src/main/kotlin/dev/usbharu/hideout/core/domain/model/instance/Instance.kt

@@ -1,18 +0,0 @@
-package dev.usbharu.hideout.core.domain.model.instance
-
-import java.time.Instant
-
-data class Instance(
-    val id: Long,
-    val name: String,
-    val description: String,
-    val url: String,
-    val iconUrl: String,
-    val sharedInbox: String?,
-    val software: String,
-    val version: String,
-    val isBlocked: Boolean,
-    val isMuted: Boolean,
-    val moderationNote: String,
-    val createdAt: Instant
-)

src/main/kotlin/dev/usbharu/hideout/core/domain/model/instance/InstanceRepository.kt

@@ -1,8 +0,0 @@
-package dev.usbharu.hideout.core.domain.model.instance
-
-interface InstanceRepository {
-    suspend fun generateId(): Long
-    suspend fun save(instance: Instance): Instance
-    suspend fun findById(id: Long): Instance
-    suspend fun delete(instance: Instance)
-}

src/main/kotlin/dev/usbharu/hideout/core/domain/model/instance/Nodeinfo.kt

@@ -1,15 +0,0 @@
-package dev.usbharu.hideout.core.domain.model.instance
-
-class Nodeinfo {
-
-    var links: List<Links> = emptyList()
-
-    private constructor()
-}
-
-class Links {
-    var rel: String? = null
-    var href: String? = null
-
-    private constructor()
-}

src/main/kotlin/dev/usbharu/hideout/core/domain/model/instance/Nodeinfo2_0.kt

@@ -1,23 +0,0 @@
-package dev.usbharu.hideout.core.domain.model.instance
-
-@Suppress("ClassNaming")
-class Nodeinfo2_0 {
-    var metadata: Metadata? = null
-    var software: Software? = null
-
-    constructor()
-}
-
-class Metadata {
-    var nodeName: String? = null
-    var nodeDescription: String? = null
-
-    constructor()
-}
-
-class Software {
-    var name: String? = null
-    var version: String? = null
-
-    constructor()
-}

src/main/kotlin/dev/usbharu/hideout/core/domain/model/user/User.kt

@@ -21,18 +21,16 @@ data class User private constructor(
     val createdAt: Instant,
     val keyId: String,
     val followers: String? = null,
-    val following: String? = null,
-    val instance: Long? = null
+    val following: String? = null
 ) {
     override fun toString(): String =
         "User(id=$id, name='$name', domain='$domain', screenName='$screenName', description='$description'," +
-            " password=$password, inbox='$inbox', outbox='$outbox', url='$url', publicKey='$publicKey', " +
-            "privateKey=$privateKey, createdAt=$createdAt, keyId='$keyId', followers=$followers," +
-            " following=$following, instance=$instance)"
+                " password=$password, inbox='$inbox', outbox='$outbox', url='$url', publicKey='$publicKey'," +
+                " privateKey=$privateKey, createdAt=$createdAt, keyId='$keyId', followers=$followers," +
+                " following=$following)"
 
     @Component
     class UserBuilder(private val characterLimit: CharacterLimit, private val applicationConfig: ApplicationConfig) {
-
         private val logger = LoggerFactory.getLogger(UserBuilder::class.java)
 
         @Suppress("LongParameterList", "FunctionMinLength", "LongMethod")
@@ -51,8 +49,7 @@ data class User private constructor(
             createdAt: Instant,
             keyId: String,
             following: String? = null,
-            followers: String? = null,
-            instance: Long? = null
+            followers: String? = null
         ): User {
             // idは0未満ではいけない
             require(id >= 0) { "id must be greater than or equal to 0." }
@@ -144,8 +141,7 @@ data class User private constructor(
                 createdAt = createdAt,
                 keyId = keyId,
                 followers = followers,
-                following = following,
-                instance = instance
+                following = following
             )
         }
     }

src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposed/UserResultRowMapper.kt

@@ -25,8 +25,7 @@ class UserResultRowMapper(private val userBuilder: User.UserBuilder) : ResultRow
             createdAt = Instant.ofEpochMilli((resultRow[Users.createdAt])),
             keyId = resultRow[Users.keyId],
             followers = resultRow[Users.followers],
-            following = resultRow[Users.following],
-            instance = resultRow[Users.instance]
+            following = resultRow[Users.following]
         )
     }
 }

src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedquery/FollowerQueryServiceImpl.kt

@@ -38,8 +38,7 @@ class FollowerQueryServiceImpl(private val userBuilder: User.UserBuilder) : Foll
                 followers[Users.createdAt],
                 followers[Users.keyId],
                 followers[Users.following],
-                followers[Users.followers],
-                followers[Users.instance]
+                followers[Users.followers]
             )
             .select { Users.id eq id }
             .map {
@@ -58,8 +57,7 @@ class FollowerQueryServiceImpl(private val userBuilder: User.UserBuilder) : Foll
                     createdAt = Instant.ofEpochMilli(it[followers[Users.createdAt]]),
                     keyId = it[followers[Users.keyId]],
                     followers = it[followers[Users.followers]],
-                    following = it[followers[Users.following]],
-                    instance = it[followers[Users.instance]]
+                    following = it[followers[Users.following]]
                 )
             }
     }
@@ -91,8 +89,7 @@ class FollowerQueryServiceImpl(private val userBuilder: User.UserBuilder) : Foll
                 followers[Users.createdAt],
                 followers[Users.keyId],
                 followers[Users.following],
-                followers[Users.followers],
-                followers[Users.instance]
+                followers[Users.followers]
             )
             .select { Users.name eq name and (Users.domain eq domain) }
             .map {
@@ -111,8 +108,7 @@ class FollowerQueryServiceImpl(private val userBuilder: User.UserBuilder) : Foll
                     createdAt = Instant.ofEpochMilli(it[followers[Users.createdAt]]),
                     keyId = it[followers[Users.keyId]],
                     followers = it[followers[Users.followers]],
-                    following = it[followers[Users.following]],
-                    instance = it[followers[Users.instance]]
+                    following = it[followers[Users.following]]
                 )
             }
     }
@@ -144,8 +140,7 @@ class FollowerQueryServiceImpl(private val userBuilder: User.UserBuilder) : Foll
                 followers[Users.createdAt],
                 followers[Users.keyId],
                 followers[Users.following],
-                followers[Users.followers],
-                followers[Users.instance]
+                followers[Users.followers]
             )
             .select { followers[Users.id] eq id }
             .map {
@@ -164,8 +159,7 @@ class FollowerQueryServiceImpl(private val userBuilder: User.UserBuilder) : Foll
                     createdAt = Instant.ofEpochMilli(it[followers[Users.createdAt]]),
                     keyId = it[followers[Users.keyId]],
                     followers = it[followers[Users.followers]],
-                    following = it[followers[Users.following]],
-                    instance = it[followers[Users.instance]]
+                    following = it[followers[Users.following]]
                 )
             }
     }
@@ -197,8 +191,7 @@ class FollowerQueryServiceImpl(private val userBuilder: User.UserBuilder) : Foll
                 followers[Users.createdAt],
                 followers[Users.keyId],
                 followers[Users.following],
-                followers[Users.followers],
-                followers[Users.instance]
+                followers[Users.followers]
             )
             .select { followers[Users.name] eq name and (followers[Users.domain] eq domain) }
             .map {
@@ -217,8 +210,7 @@ class FollowerQueryServiceImpl(private val userBuilder: User.UserBuilder) : Foll
                     createdAt = Instant.ofEpochMilli(it[followers[Users.createdAt]]),
                     keyId = it[followers[Users.keyId]],
                     followers = it[followers[Users.followers]],
-                    following = it[followers[Users.following]],
-                    instance = it[followers[Users.instance]]
+                    following = it[followers[Users.following]]
                 )
             }
     }

src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedquery/InstanceQueryServiceImpl.kt

@@ -1,16 +0,0 @@
-package dev.usbharu.hideout.core.infrastructure.exposedquery
-
-import dev.usbharu.hideout.core.domain.exception.FailedToGetResourcesException
-import dev.usbharu.hideout.core.infrastructure.exposedrepository.Instance
-import dev.usbharu.hideout.core.infrastructure.exposedrepository.toInstance
-import dev.usbharu.hideout.core.query.InstanceQueryService
-import dev.usbharu.hideout.util.singleOr
-import org.jetbrains.exposed.sql.select
-import org.springframework.stereotype.Repository
-import dev.usbharu.hideout.core.domain.model.instance.Instance as InstanceEntity
-
-@Repository
-class InstanceQueryServiceImpl : InstanceQueryService {
-    override suspend fun findByUrl(url: String): InstanceEntity = Instance.select { Instance.url eq url }
-        .singleOr { FailedToGetResourcesException("url is doesn't exist") }.toInstance()
-}

src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/InstanceRepositoryImpl.kt

@@ -1,93 +0,0 @@
-package dev.usbharu.hideout.core.infrastructure.exposedrepository
-
-import dev.usbharu.hideout.application.service.id.IdGenerateService
-import dev.usbharu.hideout.core.domain.exception.FailedToGetResourcesException
-import dev.usbharu.hideout.core.domain.model.instance.InstanceRepository
-import dev.usbharu.hideout.util.singleOr
-import org.jetbrains.exposed.sql.*
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
-import org.jetbrains.exposed.sql.javatime.timestamp
-import org.springframework.stereotype.Repository
-import dev.usbharu.hideout.core.domain.model.instance.Instance as InstanceEntity
-
-@Repository
-class InstanceRepositoryImpl(private val idGenerateService: IdGenerateService) : InstanceRepository {
-    override suspend fun generateId(): Long = idGenerateService.generateId()
-
-    override suspend fun save(instance: InstanceEntity): InstanceEntity {
-        if (Instance.select { Instance.id.eq(instance.id) }.empty()) {
-            Instance.insert {
-                it[id] = instance.id
-                it[name] = instance.name
-                it[description] = instance.description
-                it[url] = instance.url
-                it[iconUrl] = instance.iconUrl
-                it[sharedInbox] = instance.sharedInbox
-                it[software] = instance.software
-                it[version] = instance.version
-                it[isBlocked] = instance.isBlocked
-                it[isMuted] = instance.isMuted
-                it[moderationNote] = instance.moderationNote
-                it[createdAt] = instance.createdAt
-            }
-        } else {
-            Instance.update({ Instance.id eq instance.id }) {
-                it[name] = instance.name
-                it[description] = instance.description
-                it[url] = instance.url
-                it[iconUrl] = instance.iconUrl
-                it[sharedInbox] = instance.sharedInbox
-                it[software] = instance.software
-                it[version] = instance.version
-                it[isBlocked] = instance.isBlocked
-                it[isMuted] = instance.isMuted
-                it[moderationNote] = instance.moderationNote
-                it[createdAt] = instance.createdAt
-            }
-        }
-        return instance
-    }
-
-    override suspend fun findById(id: Long): InstanceEntity {
-        return Instance.select { Instance.id eq id }
-            .singleOr { FailedToGetResourcesException("id: $id doesn't exist.") }.toInstance()
-    }
-
-    override suspend fun delete(instance: InstanceEntity) {
-        Instance.deleteWhere { Instance.id eq instance.id }
-    }
-}
-
-fun ResultRow.toInstance(): InstanceEntity {
-    return InstanceEntity(
-        id = this[Instance.id],
-        name = this[Instance.name],
-        description = this[Instance.description],
-        url = this[Instance.url],
-        iconUrl = this[Instance.iconUrl],
-        sharedInbox = this[Instance.sharedInbox],
-        software = this[Instance.software],
-        version = this[Instance.version],
-        isBlocked = this[Instance.isBlocked],
-        isMuted = this[Instance.isMuted],
-        moderationNote = this[Instance.moderationNote],
-        createdAt = this[Instance.createdAt]
-    )
-}
-
-object Instance : Table("instance") {
-    val id = long("id")
-    val name = varchar("name", 1000)
-    val description = varchar("description", 5000)
-    val url = varchar("url", 255)
-    val iconUrl = varchar("icon_url", 255)
-    val sharedInbox = varchar("shared_inbox", 255).nullable()
-    val software = varchar("software", 255)
-    val version = varchar("version", 255)
-    val isBlocked = bool("is_blocked")
-    val isMuted = bool("is_muted")
-    val moderationNote = varchar("moderation_note", 10000)
-    val createdAt = timestamp("created_at")
-
-    override val primaryKey: PrimaryKey = PrimaryKey(id)
-}

src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/PostRepositoryImpl.kt

@@ -75,20 +75,20 @@ class PostRepositoryImpl(
 
 object Posts : Table() {
     val id: Column<Long> = long("id")
-    val userId: Column<Long> = long("user_id").references(Users.id)
+    val userId: Column<Long> = long("userId").references(Users.id)
     val overview: Column<String?> = varchar("overview", 100).nullable()
     val text: Column<String> = varchar("text", 3000)
-    val createdAt: Column<Long> = long("created_at")
+    val createdAt: Column<Long> = long("createdAt")
     val visibility: Column<Int> = integer("visibility").default(0)
     val url: Column<String> = varchar("url", 500)
-    val repostId: Column<Long?> = long("repost_id").references(id).nullable()
-    val replyId: Column<Long?> = long("reply_id").references(id).nullable()
+    val repostId: Column<Long?> = long("repostId").references(id).nullable()
+    val replyId: Column<Long?> = long("replyId").references(id).nullable()
     val sensitive: Column<Boolean> = bool("sensitive").default(false)
     val apId: Column<String> = varchar("ap_id", 100).uniqueIndex()
     override val primaryKey: PrimaryKey = PrimaryKey(id)
 }
 
-object PostsMedia : Table("posts_media") {
+object PostsMedia : Table() {
     val postId = long("post_id").references(Posts.id, ReferenceOption.CASCADE, ReferenceOption.CASCADE)
     val mediaId = long("media_id").references(Media.id, ReferenceOption.CASCADE, ReferenceOption.CASCADE)
     override val primaryKey = PrimaryKey(postId, mediaId)

src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/UserRepositoryImpl.kt

@@ -35,7 +35,6 @@ class UserRepositoryImpl(
                 it[keyId] = user.keyId
                 it[following] = user.following
                 it[followers] = user.followers
-                it[instance] = user.instance
             }
         } else {
             Users.update({ Users.id eq user.id }) {
@@ -53,7 +52,6 @@ class UserRepositoryImpl(
                 it[keyId] = user.keyId
                 it[following] = user.following
                 it[followers] = user.followers
-                it[instance] = user.instance
             }
         }
         return user
@@ -100,7 +98,6 @@ object Users : Table("users") {
     val keyId = varchar("key_id", length = 1000)
     val following = varchar("following", length = 1000).nullable()
     val followers = varchar("followers", length = 1000).nullable()
-    val instance = long("instance").references(Instance.id).nullable()
 
     override val primaryKey: PrimaryKey = PrimaryKey(id)
 

src/main/kotlin/dev/usbharu/hideout/core/query/InstanceQueryService.kt

@@ -1,7 +0,0 @@
-package dev.usbharu.hideout.core.query
-
-import dev.usbharu.hideout.core.domain.model.instance.Instance
-
-interface InstanceQueryService {
-    suspend fun findByUrl(url: String): Instance
-}

src/main/kotlin/dev/usbharu/hideout/core/service/instance/InstanceCreateDto.kt

@@ -1,11 +0,0 @@
-package dev.usbharu.hideout.core.service.instance
-
-data class InstanceCreateDto(
-    val name: String?,
-    val description: String?,
-    val url: String,
-    val iconUrl: String,
-    val sharedInbox: String?,
-    val software: String?,
-    val version: String?,
-)

src/main/kotlin/dev/usbharu/hideout/core/service/instance/InstanceService.kt

@@ -1,114 +0,0 @@
-package dev.usbharu.hideout.core.service.instance
-
-import com.fasterxml.jackson.databind.ObjectMapper
-import dev.usbharu.hideout.core.domain.exception.FailedToGetResourcesException
-import dev.usbharu.hideout.core.domain.model.instance.Instance
-import dev.usbharu.hideout.core.domain.model.instance.InstanceRepository
-import dev.usbharu.hideout.core.domain.model.instance.Nodeinfo
-import dev.usbharu.hideout.core.domain.model.instance.Nodeinfo2_0
-import dev.usbharu.hideout.core.query.InstanceQueryService
-import dev.usbharu.hideout.core.service.resource.ResourceResolveService
-import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.annotation.Qualifier
-import org.springframework.stereotype.Service
-import java.net.URL
-import java.time.Instant
-
-interface InstanceService {
-    suspend fun fetchInstance(url: String, sharedInbox: String? = null): Instance
-    suspend fun createNewInstance(instanceCreateDto: InstanceCreateDto): Instance
-}
-
-@Service
-class InstanceServiceImpl(
-    private val instanceRepository: InstanceRepository,
-    private val resourceResolveService: ResourceResolveService,
-    @Qualifier("activitypub") private val objectMapper: ObjectMapper,
-    private val instanceQueryService: InstanceQueryService
-) : InstanceService {
-    override suspend fun fetchInstance(url: String, sharedInbox: String?): Instance {
-        val u = URL(url)
-        val resolveInstanceUrl = u.protocol + "://" + u.host
-
-        try {
-            return instanceQueryService.findByUrl(url)
-        } catch (e: FailedToGetResourcesException) {
-            logger.info("Instance not found. try fetch instance info. url: {}", resolveInstanceUrl)
-            logger.debug("Failed to get resources. url: {}", resolveInstanceUrl, e)
-        }
-
-        val nodeinfoJson = resourceResolveService.resolve("$resolveInstanceUrl/.well-known/nodeinfo").bodyAsText()
-        val nodeinfo = objectMapper.readValue(nodeinfoJson, Nodeinfo::class.java)
-        val nodeinfoPathMap = nodeinfo.links.associate { it.rel to it.href }
-
-        for ((key, value) in nodeinfoPathMap) {
-            when (key) {
-                "http://nodeinfo.diaspora.software/ns/schema/2.0" -> {
-                    val nodeinfo20 = objectMapper.readValue(
-                        resourceResolveService.resolve(value!!).bodyAsText(),
-                        Nodeinfo2_0::class.java
-                    )
-
-                    val instanceCreateDto = InstanceCreateDto(
-                        name = nodeinfo20.metadata?.nodeName,
-                        description = nodeinfo20.metadata?.nodeDescription,
-                        url = resolveInstanceUrl,
-                        iconUrl = resolveInstanceUrl + "/favicon.ico",
-                        sharedInbox = sharedInbox,
-                        software = nodeinfo20.software?.name,
-                        version = nodeinfo20.software?.version
-                    )
-                    return createNewInstance(instanceCreateDto)
-                }
-
-                // TODO: 多分2.0と2.1で互換性有るのでそのまま使うけどなおす
-                "http://nodeinfo.diaspora.software/ns/schema/2.1" -> {
-                    val nodeinfo20 = objectMapper.readValue(
-                        resourceResolveService.resolve(value!!).bodyAsText(),
-                        Nodeinfo2_0::class.java
-                    )
-
-                    val instanceCreateDto = InstanceCreateDto(
-                        name = nodeinfo20.metadata?.nodeName,
-                        description = nodeinfo20.metadata?.nodeDescription,
-                        url = resolveInstanceUrl,
-                        iconUrl = resolveInstanceUrl + "/favicon.ico",
-                        sharedInbox = sharedInbox,
-                        software = nodeinfo20.software?.name,
-                        version = nodeinfo20.software?.version
-                    )
-                    return createNewInstance(instanceCreateDto)
-                }
-
-                else -> {
-                    TODO()
-                }
-            }
-        }
-
-        throw IllegalStateException("Nodeinfo aren't found.")
-    }
-
-    override suspend fun createNewInstance(instanceCreateDto: InstanceCreateDto): Instance {
-        val instance = Instance(
-            id = instanceRepository.generateId(),
-            name = instanceCreateDto.name ?: instanceCreateDto.url,
-            description = instanceCreateDto.description.orEmpty(),
-            url = instanceCreateDto.url,
-            iconUrl = instanceCreateDto.iconUrl,
-            sharedInbox = instanceCreateDto.sharedInbox,
-            software = instanceCreateDto.software ?: "unknown",
-            version = instanceCreateDto.version ?: "unknown",
-            isBlocked = false,
-            isMuted = false,
-            moderationNote = "",
-            createdAt = Instant.now()
-        )
-        instanceRepository.save(instance)
-        return instance
-    }
-
-    companion object {
-        private val logger = LoggerFactory.getLogger(InstanceServiceImpl::class.java)
-    }
-}

src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaServiceImpl.kt

@@ -24,7 +24,7 @@ open class MediaServiceImpl(
     private val remoteMediaDownloadService: RemoteMediaDownloadService,
     private val renameService: MediaFileRenameService
 ) : MediaService {
-    @Suppress("LongMethod", "NestedBlockDepth")
+    @Suppress("LongMethod")
     override suspend fun uploadLocalMedia(mediaRequest: MediaRequest): EntityMedia {
         val fileName = mediaRequest.file.name
         logger.info(
@@ -95,7 +95,6 @@ open class MediaServiceImpl(
     }
 
     // TODO: 仮の処理として保存したように動かす
-    @Suppress("LongMethod", "NestedBlockDepth")
     override suspend fun uploadRemoteMedia(remoteMedia: RemoteMedia): Media {
         logger.info("MEDIA Remote media. filename:${remoteMedia.name} url:${remoteMedia.url}")
 

src/main/kotlin/dev/usbharu/hideout/core/service/resource/CacheManager.kt

@@ -1,6 +0,0 @@
-package dev.usbharu.hideout.core.service.resource
-
-interface CacheManager {
-    suspend fun putCache(key: String, block: suspend () -> ResolveResponse)
-    suspend fun getOrWait(key: String): ResolveResponse
-}

src/main/kotlin/dev/usbharu/hideout/core/service/resource/KtorResolveResponse.kt

@@ -1,31 +0,0 @@
-package dev.usbharu.hideout.core.service.resource
-
-import io.ktor.client.statement.*
-import io.ktor.util.*
-import io.ktor.utils.io.jvm.javaio.*
-import java.io.InputStream
-
-class KtorResolveResponse(val ktorHttpResponse: HttpResponse) : ResolveResponse {
-
-    private lateinit var _bodyAsText: String
-    private lateinit var _bodyAsBytes: ByteArray
-
-    override suspend fun body(): InputStream = ktorHttpResponse.bodyAsChannel().toInputStream()
-    override suspend fun bodyAsText(): String {
-        if (!this::_bodyAsText.isInitialized) {
-            _bodyAsText = ktorHttpResponse.bodyAsText()
-        }
-        return _bodyAsText
-    }
-
-    override suspend fun bodyAsBytes(): ByteArray {
-        if (!this::_bodyAsBytes.isInitialized) {
-            _bodyAsBytes = ktorHttpResponse.readBytes()
-        }
-        return _bodyAsBytes
-    }
-
-    override suspend fun header(): Map<String, List<String>> = ktorHttpResponse.headers.toMap()
-    override suspend fun status(): Int = ktorHttpResponse.status.value
-    override suspend fun statusMessage(): String = ktorHttpResponse.status.description
-}

src/main/kotlin/dev/usbharu/hideout/core/service/resource/KtorResourceResolveService.kt

@@ -1,24 +0,0 @@
-package dev.usbharu.hideout.core.service.resource
-
-import io.ktor.client.*
-import io.ktor.client.request.*
-import org.springframework.stereotype.Service
-
-@Service
-open class KtorResourceResolveService(private val httpClient: HttpClient, private val cacheManager: CacheManager) :
-    ResourceResolveService {
-    override suspend fun resolve(url: String): ResolveResponse {
-        cacheManager.putCache(getCacheKey(url)) {
-            runResolve(url)
-        }
-        return cacheManager.getOrWait(getCacheKey(url))
-    }
-
-    protected suspend fun runResolve(url: String): ResolveResponse {
-        val httpResponse = httpClient.get(url)
-
-        return KtorResolveResponse(httpResponse)
-    }
-
-    protected suspend fun getCacheKey(url: String) = url
-}

src/main/kotlin/dev/usbharu/hideout/core/service/resource/ResolveResponse.kt

@@ -1,12 +0,0 @@
-package dev.usbharu.hideout.core.service.resource
-
-import java.io.InputStream
-
-interface ResolveResponse {
-    suspend fun body(): InputStream
-    suspend fun bodyAsText(): String
-    suspend fun bodyAsBytes(): ByteArray
-    suspend fun header(): Map<String, List<String>>
-    suspend fun status(): Int
-    suspend fun statusMessage(): String
-}

src/main/kotlin/dev/usbharu/hideout/core/service/resource/ResourceResolveService.kt

@@ -1,5 +0,0 @@
-package dev.usbharu.hideout.core.service.resource
-
-interface ResourceResolveService {
-    suspend fun resolve(url: String): ResolveResponse
-}

src/main/kotlin/dev/usbharu/hideout/core/service/user/RemoteUserCreateDto.kt

@@ -11,6 +11,5 @@ data class RemoteUserCreateDto(
     val publicKey: String,
     val keyId: String,
     val followers: String?,
-    val following: String?,
-    val sharedInbox: String?
+    val following: String?
 )

src/main/kotlin/dev/usbharu/hideout/core/service/user/UserServiceImpl.kt

@@ -8,9 +8,7 @@ import dev.usbharu.hideout.core.domain.model.user.UserRepository
 import dev.usbharu.hideout.core.query.FollowerQueryService
 import dev.usbharu.hideout.core.query.UserQueryService
 import dev.usbharu.hideout.core.service.follow.SendFollowDto
-import dev.usbharu.hideout.core.service.instance.InstanceService
 import org.jetbrains.exposed.exceptions.ExposedSQLException
-import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
 import java.time.Instant
 
@@ -22,8 +20,7 @@ class UserServiceImpl(
     private val userQueryService: UserQueryService,
     private val followerQueryService: FollowerQueryService,
     private val userBuilder: User.UserBuilder,
-    private val applicationConfig: ApplicationConfig,
-    private val instanceService: InstanceService
+    private val applicationConfig: ApplicationConfig
 ) :
     UserService {
 
@@ -52,20 +49,12 @@ class UserServiceImpl(
             createdAt = Instant.now(),
             following = "$userUrl/following",
             followers = "$userUrl/followers",
-            keyId = "$userUrl#pubkey",
-            instance = null
+            keyId = "$userUrl#pubkey"
         )
         return userRepository.save(userEntity)
     }
 
     override suspend fun createRemoteUser(user: RemoteUserCreateDto): User {
-        val instance = try {
-            instanceService.fetchInstance(user.url, user.sharedInbox)
-        } catch (e: Exception) {
-            logger.warn("FAILED to fetch instance. url: {}", user.url, e)
-            null
-        }
-
         val nextId = userRepository.nextId()
         val userEntity = userBuilder.of(
             id = nextId,
@@ -80,8 +69,7 @@ class UserServiceImpl(
             createdAt = Instant.now(),
             followers = user.followers,
             following = user.following,
-            keyId = user.keyId,
-            instance = instance?.id
+            keyId = user.keyId
         )
         return try {
             userRepository.save(userEntity)
@@ -118,8 +106,4 @@ class UserServiceImpl(
         followerQueryService.removeFollower(id, followerId)
         return false
     }
-
-    companion object {
-        private val logger = LoggerFactory.getLogger(UserServiceImpl::class.java)
-    }
 }

src/main/resources/application.yml

@@ -19,7 +19,7 @@ spring:
     default-property-inclusion: always
   datasource:
     driver-class-name: org.h2.Driver
-    url: "jdbc:h2:./test-dev4;MODE=POSTGRESQL;TRACE_LEVEL_FILE=4"
+    url: "jdbc:h2:./test-dev3;MODE=POSTGRESQL;TRACE_LEVEL_FILE=4"
     username: ""
     password: ""
   #  data:
@@ -37,6 +37,9 @@ spring:
   h2:
     console:
       enabled: true
+  exposed:
+    generate-ddl: true
+    excluded-packages: dev.usbharu.hideout.core.infrastructure.kjobexposed
 server:
   tomcat:
     basedir: tomcat

src/main/resources/db/migration/V1__Init_DB.sql

@@ -1,188 +0,0 @@
-CREATE TABLE IF NOT EXISTS "INSTANCE"
-(
-    ID              BIGINT PRIMARY KEY,
-    "NAME"          VARCHAR(1000)  NOT NULL,
-    DESCRIPTION     VARCHAR(5000)  NOT NULL,
-    URL             VARCHAR(255)   NOT NULL,
-    ICON_URL        VARCHAR(255)   NOT NULL,
-    SHARED_INBOX    VARCHAR(255)   NULL,
-    SOFTWARE        VARCHAR(255)   NOT NULL,
-    VERSION         VARCHAR(255)   NOT NULL,
-    IS_BLOCKED      BOOLEAN        NOT NULL,
-    IS_MUTED        BOOLEAN        NOT NULL,
-    MODERATION_NOTE VARCHAR(10000) NOT NULL,
-    CREATED_AT      TIMESTAMP      NOT NULL
-);
-CREATE TABLE IF NOT EXISTS USERS
-(
-    ID          BIGINT PRIMARY KEY,
-    "NAME"      VARCHAR(300)   NOT NULL,
-    "DOMAIN"    VARCHAR(1000)  NOT NULL,
-    SCREEN_NAME VARCHAR(300)   NOT NULL,
-    DESCRIPTION VARCHAR(10000) NOT NULL,
-    PASSWORD    VARCHAR(255)   NULL,
-    INBOX       VARCHAR(1000)  NOT NULL,
-    OUTBOX      VARCHAR(1000)  NOT NULL,
-    URL         VARCHAR(1000)  NOT NULL,
-    PUBLIC_KEY  VARCHAR(10000) NOT NULL,
-    PRIVATE_KEY VARCHAR(10000) NULL,
-    CREATED_AT  BIGINT         NOT NULL,
-    KEY_ID      VARCHAR(1000)  NOT NULL,
-    "FOLLOWING" VARCHAR(1000)  NULL,
-    FOLLOWERS   VARCHAR(1000)  NULL,
-    "INSTANCE"  BIGINT         NULL,
-    CONSTRAINT FK_USERS_INSTANCE__ID FOREIGN KEY ("INSTANCE") REFERENCES "INSTANCE" (ID) ON DELETE RESTRICT ON UPDATE RESTRICT
-);
-CREATE TABLE IF NOT EXISTS FOLLOW_REQUESTS
-(
-    ID          BIGSERIAL PRIMARY KEY,
-    USER_ID     BIGINT NOT NULL,
-    FOLLOWER_ID BIGINT NOT NULL,
-    CONSTRAINT FK_FOLLOW_REQUESTS_USER_ID__ID FOREIGN KEY (USER_ID) REFERENCES USERS (ID) ON DELETE RESTRICT ON UPDATE RESTRICT,
-    CONSTRAINT FK_FOLLOW_REQUESTS_FOLLOWER_ID__ID FOREIGN KEY (FOLLOWER_ID) REFERENCES USERS (ID) ON DELETE RESTRICT ON UPDATE RESTRICT
-);
-CREATE TABLE IF NOT EXISTS MEDIA
-(
-    ID            BIGINT PRIMARY KEY,
-    "NAME"        VARCHAR(255)  NOT NULL,
-    URL           VARCHAR(255)  NOT NULL,
-    REMOTE_URL    VARCHAR(255)  NULL,
-    THUMBNAIL_URL VARCHAR(255)  NULL,
-    "TYPE"        INT           NOT NULL,
-    BLURHASH      VARCHAR(255)  NULL,
-    MIME_TYPE     VARCHAR(255)  NOT NULL,
-    DESCRIPTION   VARCHAR(4000) NULL
-);
-CREATE TABLE IF NOT EXISTS META_INFO
-(
-    ID              BIGINT PRIMARY KEY,
-    VERSION         VARCHAR(1000)   NOT NULL,
-    KID             VARCHAR(1000)   NOT NULL,
-    JWT_PRIVATE_KEY VARCHAR(100000) NOT NULL,
-    JWT_PUBLIC_KEY  VARCHAR(100000) NOT NULL
-);
-CREATE TABLE IF NOT EXISTS POSTS
-(
-    ID          BIGINT PRIMARY KEY,
-    USER_ID     BIGINT                NOT NULL,
-    OVERVIEW    VARCHAR(100)          NULL,
-    TEXT        VARCHAR(3000)         NOT NULL,
-    CREATED_AT  BIGINT                NOT NULL,
-    VISIBILITY  INT     DEFAULT 0     NOT NULL,
-    URL         VARCHAR(500)          NOT NULL,
-    REPOST_ID   BIGINT                NULL,
-    REPLY_ID    BIGINT                NULL,
-    "SENSITIVE" BOOLEAN DEFAULT FALSE NOT NULL,
-    AP_ID       VARCHAR(100)          NOT NULL
-);
-ALTER TABLE POSTS
-    ADD CONSTRAINT FK_POSTS_USERID__ID FOREIGN KEY (USER_ID) REFERENCES USERS (ID) ON DELETE RESTRICT ON UPDATE RESTRICT;
-ALTER TABLE POSTS
-    ADD CONSTRAINT FK_POSTS_REPOSTID__ID FOREIGN KEY (REPOST_ID) REFERENCES POSTS (ID) ON DELETE RESTRICT ON UPDATE RESTRICT;
-ALTER TABLE POSTS
-    ADD CONSTRAINT FK_POSTS_REPLYID__ID FOREIGN KEY (REPLY_ID) REFERENCES POSTS (ID) ON DELETE RESTRICT ON UPDATE RESTRICT;
-CREATE TABLE IF NOT EXISTS POSTS_MEDIA
-(
-    POST_ID  BIGINT,
-    MEDIA_ID BIGINT,
-    CONSTRAINT pk_PostsMedia PRIMARY KEY (POST_ID, MEDIA_ID)
-);
-ALTER TABLE POSTS_MEDIA
-    ADD CONSTRAINT FK_POSTS_MEDIA_POST_ID__ID FOREIGN KEY (POST_ID) REFERENCES POSTS (ID) ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE POSTS_MEDIA
-    ADD CONSTRAINT FK_POSTS_MEDIA_MEDIA_ID__ID FOREIGN KEY (MEDIA_ID) REFERENCES MEDIA (ID) ON DELETE CASCADE ON UPDATE CASCADE;
-CREATE TABLE IF NOT EXISTS REACTIONS
-(
-    ID       BIGSERIAL PRIMARY KEY,
-    EMOJI_ID BIGINT NOT NULL,
-    POST_ID  BIGINT NOT NULL,
-    USER_ID  BIGINT NOT NULL
-);
-ALTER TABLE REACTIONS
-    ADD CONSTRAINT FK_REACTIONS_POST_ID__ID FOREIGN KEY (POST_ID) REFERENCES POSTS (ID) ON DELETE RESTRICT ON UPDATE RESTRICT;
-ALTER TABLE REACTIONS
-    ADD CONSTRAINT FK_REACTIONS_USER_ID__ID FOREIGN KEY (USER_ID) REFERENCES USERS (ID) ON DELETE RESTRICT ON UPDATE RESTRICT;
-CREATE TABLE IF NOT EXISTS TIMELINES
-(
-    ID             BIGINT PRIMARY KEY,
-    USER_ID        BIGINT       NOT NULL,
-    TIMELINE_ID    BIGINT       NOT NULL,
-    POST_ID        BIGINT       NOT NULL,
-    POST_USER_ID   BIGINT       NOT NULL,
-    CREATED_AT     BIGINT       NOT NULL,
-    REPLY_ID       BIGINT       NULL,
-    REPOST_ID      BIGINT       NULL,
-    VISIBILITY     INT          NOT NULL,
-    "SENSITIVE"    BOOLEAN      NOT NULL,
-    IS_LOCAL       BOOLEAN      NOT NULL,
-    IS_PURE_REPOST BOOLEAN      NOT NULL,
-    MEDIA_IDS      VARCHAR(255) NOT NULL
-);
-CREATE TABLE IF NOT EXISTS USERS_FOLLOWERS
-(
-    ID          BIGSERIAL PRIMARY KEY,
-    USER_ID     BIGINT NOT NULL,
-    FOLLOWER_ID BIGINT NOT NULL,
-    CONSTRAINT FK_USERS_FOLLOWERS_USER_ID__ID FOREIGN KEY (USER_ID) REFERENCES USERS (ID) ON DELETE RESTRICT ON UPDATE RESTRICT,
-    CONSTRAINT FK_USERS_FOLLOWERS_FOLLOWER_ID__ID FOREIGN KEY (FOLLOWER_ID) REFERENCES USERS (ID) ON DELETE RESTRICT ON UPDATE RESTRICT
-);
-CREATE TABLE IF NOT EXISTS APPLICATION_AUTHORIZATION
-(
-    ID                            VARCHAR(255) PRIMARY KEY,
-    REGISTERED_CLIENT_ID          VARCHAR(255)               NOT NULL,
-    PRINCIPAL_NAME                VARCHAR(255)               NOT NULL,
-    AUTHORIZATION_GRANT_TYPE      VARCHAR(255)               NOT NULL,
-    AUTHORIZED_SCOPES             VARCHAR(1000) DEFAULT NULL NULL,
-    "ATTRIBUTES"                  VARCHAR(4000) DEFAULT NULL NULL,
-    "STATE"                       VARCHAR(500)  DEFAULT NULL NULL,
-    AUTHORIZATION_CODE_VALUE      VARCHAR(4000) DEFAULT NULL NULL,
-    AUTHORIZATION_CODE_ISSUED_AT  TIMESTAMP     DEFAULT NULL NULL,
-    AUTHORIZATION_CODE_EXPIRES_AT TIMESTAMP     DEFAULT NULL NULL,
-    AUTHORIZATION_CODE_METADATA   VARCHAR(2000) DEFAULT NULL NULL,
-    ACCESS_TOKEN_VALUE            VARCHAR(4000) DEFAULT NULL NULL,
-    ACCESS_TOKEN_ISSUED_AT        TIMESTAMP     DEFAULT NULL NULL,
-    ACCESS_TOKEN_EXPIRES_AT       TIMESTAMP     DEFAULT NULL NULL,
-    ACCESS_TOKEN_METADATA         VARCHAR(2000) DEFAULT NULL NULL,
-    ACCESS_TOKEN_TYPE             VARCHAR(255)  DEFAULT NULL NULL,
-    ACCESS_TOKEN_SCOPES           VARCHAR(1000) DEFAULT NULL NULL,
-    REFRESH_TOKEN_VALUE           VARCHAR(4000) DEFAULT NULL NULL,
-    REFRESH_TOKEN_ISSUED_AT       TIMESTAMP     DEFAULT NULL NULL,
-    REFRESH_TOKEN_EXPIRES_AT      TIMESTAMP     DEFAULT NULL NULL,
-    REFRESH_TOKEN_METADATA        VARCHAR(2000) DEFAULT NULL NULL,
-    OIDC_ID_TOKEN_VALUE           VARCHAR(4000) DEFAULT NULL NULL,
-    OIDC_ID_TOKEN_ISSUED_AT       TIMESTAMP     DEFAULT NULL NULL,
-    OIDC_ID_TOKEN_EXPIRES_AT      TIMESTAMP     DEFAULT NULL NULL,
-    OIDC_ID_TOKEN_METADATA        VARCHAR(2000) DEFAULT NULL NULL,
-    OIDC_ID_TOKEN_CLAIMS          VARCHAR(2000) DEFAULT NULL NULL,
-    USER_CODE_VALUE               VARCHAR(4000) DEFAULT NULL NULL,
-    USER_CODE_ISSUED_AT           TIMESTAMP     DEFAULT NULL NULL,
-    USER_CODE_EXPIRES_AT          TIMESTAMP     DEFAULT NULL NULL,
-    USER_CODE_METADATA            VARCHAR(2000) DEFAULT NULL NULL,
-    DEVICE_CODE_VALUE             VARCHAR(4000) DEFAULT NULL NULL,
-    DEVICE_CODE_ISSUED_AT         TIMESTAMP     DEFAULT NULL NULL,
-    DEVICE_CODE_EXPIRES_AT        TIMESTAMP     DEFAULT NULL NULL,
-    DEVICE_CODE_METADATA          VARCHAR(2000) DEFAULT NULL NULL
-);
-CREATE TABLE IF NOT EXISTS OAUTH2_AUTHORIZATION_CONSENT
-(
-    REGISTERED_CLIENT_ID VARCHAR(100),
-    PRINCIPAL_NAME       VARCHAR(200),
-    AUTHORITIES          VARCHAR(1000) NOT NULL,
-    CONSTRAINT pk_oauth2_authorization_consent PRIMARY KEY (REGISTERED_CLIENT_ID, PRINCIPAL_NAME)
-);
-CREATE TABLE IF NOT EXISTS REGISTERED_CLIENT
-(
-    ID                            VARCHAR(100) PRIMARY KEY,
-    CLIENT_ID                     VARCHAR(100)                            NOT NULL,
-    CLIENT_ID_ISSUED_AT           TIMESTAMP     DEFAULT CURRENT_TIMESTAMP NOT NULL,
-    CLIENT_SECRET                 VARCHAR(200)  DEFAULT NULL              NULL,
-    CLIENT_SECRET_EXPIRES_AT      TIMESTAMP     DEFAULT NULL              NULL,
-    CLIENT_NAME                   VARCHAR(200)                            NOT NULL,
-    CLIENT_AUTHENTICATION_METHODS VARCHAR(1000)                           NOT NULL,
-    AUTHORIZATION_GRANT_TYPES     VARCHAR(1000)                           NOT NULL,
-    REDIRECT_URIS                 VARCHAR(1000) DEFAULT NULL              NULL,
-    POST_LOGOUT_REDIRECT_URIS     VARCHAR(1000) DEFAULT NULL              NULL,
-    SCOPES                        VARCHAR(1000)                           NOT NULL,
-    CLIENT_SETTINGS               VARCHAR(2000)                           NOT NULL,
-    TOKEN_SETTINGS                VARCHAR(2000)                           NOT NULL
-)

src/test/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveServiceImplTest.kt

@@ -1,7 +1,6 @@
 package dev.usbharu.hideout.activitypub.service.common
 
 import dev.usbharu.hideout.core.domain.model.user.UserRepository
-import dev.usbharu.hideout.core.service.resource.InMemoryCacheManager
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.test.runTest

src/test/kotlin/dev/usbharu/hideout/core/service/user/UserServiceTest.kt

@@ -41,7 +41,6 @@ class UserServiceTest {
                 mock(),
                 userBuilder,
                 testApplicationConfig,
-                mock()
             )
         userService.createLocalUser(UserCreateDto("test", "testUser", "XXXXXXXXXXXXX", "test"))
         verify(userRepository, times(1)).save(any())
@@ -68,7 +67,7 @@ class UserServiceTest {
             onBlocking { nextId() } doReturn 113345L
         }
         val userService =
-            UserServiceImpl(userRepository, mock(), mock(), mock(), mock(), userBuilder, testApplicationConfig, mock())
+            UserServiceImpl(userRepository, mock(), mock(), mock(), mock(), userBuilder, testApplicationConfig)
         val user = RemoteUserCreateDto(
             name = "test",
             domain = "remote.example.com",
@@ -80,8 +79,7 @@ class UserServiceTest {
             publicKey = "-----BEGIN PUBLIC KEY-----...-----END PUBLIC KEY-----",
             keyId = "a",
             following = "",
-            followers = "",
-            sharedInbox = null
+            followers = ""
         )
         userService.createRemoteUser(user)
         verify(userRepository, times(1)).save(any())