From 97ea1c52f4766fc344c16c04cd7f1b39249b91d4 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Wed, 25 Jan 2023 02:08:03 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=E3=83=9E=E3=83=AB=E3=83=81=E3=83=97?= =?UTF-8?q?=E3=83=AD=E3=82=B8=E3=82=A7=E3=82=AF=E3=83=88=E6=A7=8B=E6=88=90?= =?UTF-8?q?=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +- build.gradle.kts | 98 +++++++++++-------- core/build.gradle.kts | 0 .../usbharu/multim/api/common/AccountApi.kt | 0 .../usbharu/multim/api/common/ApiClient.kt | 0 .../usbharu/multim/api/common/PlatformApis.kt | 0 .../usbharu/multim/api/common/StatusApi.kt | 0 .../dev/usbharu/multim}/factory/MultiMApis.kt | 4 +- .../multim}/factory/PlatformApiFactory.kt | 4 +- .../usbharu/multim/model/common/Account.kt | 0 .../dev/usbharu/multim/model/common/Avatar.kt | 0 .../dev/usbharu/multim/model/common/Emoji.kt | 0 .../dev/usbharu/multim/model/common/Field.kt | 0 .../model/common/PreviousAndNextPosts.kt | 0 .../usbharu/multim/model/common/Profile.kt | 0 .../multim/model/common/ProfileContent.kt | 0 .../usbharu/multim/model/common/Reaction.kt | 0 .../usbharu/multim/model/common/Relation.kt | 0 .../dev/usbharu/multim/model/common/Status.kt | 0 .../multim/model/common/StatusContent.kt | 0 .../usbharu/multim/model/common/StatusId.kt | 0 .../dev/usbharu/multim/model/common/Tag.kt | 0 .../model/mastodon/v1/StatuesContextGetId.kt | 0 .../model/mastodon/v1/StatuesDeleteId.kt | 0 .../multim/model/mastodon/v1/StatuesGetId.kt | 0 .../mastodon/v1/StatusesBookmarkPostId.kt | 0 .../mastodon/v1/StatusesFavouritePostId.kt | 0 .../mastodon/v1/StatusesFavouritedByGetId.kt | 0 .../model/mastodon/v1/StatusesHistoryGetId.kt | 0 .../model/mastodon/v1/StatusesMutePostId.kt | 0 .../model/mastodon/v1/StatusesPinPostId.kt | 0 .../multim/model/mastodon/v1/StatusesPost.kt | 0 .../multim/model/mastodon/v1/StatusesPutId.kt | 0 .../model/mastodon/v1/StatusesReblogPostId.kt | 0 .../mastodon/v1/StatusesRebloggedByGetId.kt | 0 .../model/mastodon/v1/StatusesSourceGetId.kt | 0 .../mastodon/v1/StatusesUnbookmarkPostId.kt | 0 .../mastodon/v1/StatusesUnfavouritePostId.kt | 0 .../model/mastodon/v1/StatusesUnmutePostId.kt | 0 .../model/mastodon/v1/StatusesUnpinPostId.kt | 0 .../mastodon/v1/StatusesUnreblogPostId.kt | 0 .../model/mastodon/v1/components/Account.kt | 0 .../mastodon/v1/components/Application.kt | 0 .../model/mastodon/v1/components/Context.kt | 0 .../mastodon/v1/components/CustomEmoji.kt | 0 .../model/mastodon/v1/components/Filter.kt | 0 .../mastodon/v1/components/FilterKeyword.kt | 0 .../mastodon/v1/components/FilterResult.kt | 0 .../mastodon/v1/components/FilterStatus.kt | 0 .../mastodon/v1/components/MediaAttachment.kt | 0 .../model/mastodon/v1/components/Poll.kt | 0 .../mastodon/v1/components/PreviewCard.kt | 0 .../model/mastodon/v1/components/Role.kt | 0 .../model/mastodon/v1/components/Status.kt | 0 .../mastodon/v1/components/StatusEdit.kt | 0 .../mastodon/v1/components/StatusSource.kt | 0 .../usbharu/multim/model/nodeinfo/NodeInfo.kt | 0 .../dev/usbharu/multim/api/common/TestUtil.kt | 18 +--- .../impl/DefaultPlatformApiFactoryTest.kt | 0 impl/misskey/build.gradle.kts | 3 + .../factory}/DefaultPlatformApiFactory.kt | 16 +-- .../misskey/factory/MisskeyMultiMApis.kt | 8 ++ .../dev/usbharu/multim/misskey/v12/api/Ap.kt | 11 +++ .../multim/misskey/v12/api}/Following.kt | 7 +- .../usbharu/multim/misskey/v12/api}/Miauth.kt | 7 +- .../multim/misskey/v12/api}/MisskeyApis.kt | 4 +- .../usbharu/multim/misskey/v12/api}/Notes.kt | 5 +- .../multim/misskey/v12/api}/Timeline.kt | 5 +- .../usbharu/multim/misskey/v12/api}/Users.kt | 7 +- .../misskey/v12/common}/MisskeyAccount.kt | 2 +- .../misskey/v12/common}/MisskeyAvatar.kt | 2 +- .../misskey/v12/common}/MisskeyContent.kt | 2 +- .../misskey/v12/common}/MisskeyProfile.kt | 4 +- .../v12/common}/MisskeyProfileContent.kt | 4 +- .../misskey/v12/common}/MisskeyReaction.kt | 2 +- .../misskey/v12/common}/MisskeyRelation.kt | 4 +- .../misskey/v12/common}/MisskeyStatus.kt | 2 +- .../misskey/v12/common}/MisskeyStatusId.kt | 2 +- .../v12/common/api}/MisskeyAccountApi.kt | 23 ++--- .../v12/common/api}/MisskeyApiClient.kt | 6 +- .../v12/common/api}/MisskeyStatusApi.kt | 13 +-- .../converter/misskey/v12/NoteConverter.kt | 8 +- .../misskey/v12/ReactionConverter.kt | 10 +- .../converter/misskey/v12/UsersConverter.kt | 10 +- .../multim/misskey/v12/model}/ApShow.kt | 8 +- .../misskey/v12/model}/FollowingCreate.kt | 4 +- .../misskey/v12/model}/FollowingDelete.kt | 4 +- .../misskey/v12/model/FollowingInvalidate.kt | 10 ++ .../v12/model}/FollowingRequestsAccept.kt | 4 +- .../v12/model}/FollowingRequestsCancel.kt | 4 +- .../v12/model}/FollowingRequestsList.kt | 6 +- .../v12/model}/FollowingRequestsReject.kt | 2 +- .../multim/misskey/v12/model}/MiauthCheck.kt | 4 +- .../misskey/v12/model}/NotesChildren.kt | 4 +- .../misskey/v12/model}/NotesConversation.kt | 4 +- .../multim/misskey/v12/model}/NotesCreate.kt | 6 +- .../multim/misskey/v12/model}/NotesDelete.kt | 4 +- .../v12/model}/NotesFavoritesCreate.kt | 4 +- .../v12/model}/NotesFavoritesDelete.kt | 4 +- .../misskey/v12/model}/NotesFeatured.kt | 4 +- .../misskey/v12/model}/NotesGlobalTimeline.kt | 4 +- .../misskey/v12/model}/NotesHybridTimeline.kt | 15 ++- .../misskey/v12/model}/NotesLocalTimeline.kt | 4 +- .../misskey/v12/model}/NotesMentions.kt | 6 +- .../multim/misskey/v12/model}/NotesNotes.kt | 4 +- .../v12/model}/NotesPollsRecommendation.kt | 4 +- .../misskey/v12/model}/NotesPollsVote.kt | 2 +- .../misskey/v12/model}/NotesReactionCreate.kt | 2 +- .../misskey/v12/model}/NotesReactionDelete.kt | 2 +- .../misskey/v12/model}/NotesReactions.kt | 4 +- .../multim/misskey/v12/model}/NotesRenote.kt | 4 +- .../multim/misskey/v12/model}/NotesReplies.kt | 4 +- .../multim/misskey/v12/model}/NotesSearch.kt | 5 +- .../misskey/v12/model}/NotesSearchByTag.kt | 4 +- .../multim/misskey/v12/model}/NotesShow.kt | 4 +- .../multim/misskey/v12/model}/NotesState.kt | 4 +- .../v12/model}/NotesThreadMutingCreate.kt | 4 +- .../v12/model}/NotesThreadMutingDelete.kt | 4 +- .../misskey/v12/model}/NotesTimeline.kt | 6 +- .../misskey/v12/model}/NotesTranslate.kt | 2 +- .../misskey/v12/model}/NotesUnrenote.kt | 4 +- .../v12/model}/NotesUserListTimeline.kt | 6 +- .../misskey/v12/model}/NotesWatchingCreate.kt | 4 +- .../misskey/v12/model}/NotesWatchingDelete.kt | 4 +- .../multim/misskey/v12/model}/UsersNotes.kt | 6 +- .../misskey/v12/model}/UsersRelation.kt | 4 +- .../multim/misskey/v12/model/UsersShow.kt | 9 ++ .../misskey/v12/model}/components/Antenna.kt | 2 +- .../misskey/v12/model}/components/App.kt | 2 +- .../misskey/v12/model}/components/Blocking.kt | 3 +- .../misskey/v12/model}/components/Channel.kt | 3 +- .../misskey/v12/model}/components/Clip.kt | 2 +- .../v12/model}/components/DriveFile.kt | 2 +- .../v12/model}/components/DriveFolder.kt | 2 +- .../misskey/v12/model}/components/Emoji.kt | 2 +- .../v12/model}/components/EmojiLite.kt | 2 +- .../misskey/v12/model}/components/Error.kt | 2 +- .../model}/components/FederationInstance.kt | 2 +- .../misskey/v12/model}/components/Field.kt | 2 +- .../misskey/v12/model}/components/File.kt | 2 +- .../v12/model}/components/Following.kt | 3 +- .../v12/model}/components/GalleryPost.kt | 3 +- .../misskey/v12/model}/components/Hashtag.kt | 2 +- .../v12/model}/components/MeDetailed.kt | 3 +- .../v12/model}/components/MeDetailedOnly.kt | 2 +- .../v12/model}/components/MessagingMessage.kt | 3 +- .../v12/model}/components/MisskeyNeedAuth.kt | 2 +- .../misskey/v12/model}/components/Muting.kt | 3 +- .../misskey/v12/model}/components/Note.kt | 2 +- .../v12/model}/components/NoteFavorite.kt | 3 +- .../v12/model}/components/NoteReaction.kt | 3 +- .../v12/model}/components/Notification.kt | 3 +- .../misskey/v12/model}/components/Page.kt | 3 +- .../v12/model}/components/QueueCount.kt | 2 +- .../misskey/v12/model}/components/User.kt | 2 +- .../v12/model}/components/UserDetailed.kt | 2 +- .../model}/components/UserDetailedNotMe.kt | 2 +- .../components/UserDetailedNotMeOnly.kt | 2 +- .../v12/model}/components/UserGroup.kt | 3 +- .../misskey/v12/model}/components/UserList.kt | 2 +- .../misskey/v12/model}/components/UserLite.kt | 2 +- .../src/test/kotlin/MisskeyTestUtil.kt | 81 +++++++++++++++ .../dev/usbharu/multim/v12/api}/ApTest.kt | 15 +-- .../dev/usbharu/multim/v12/api}/MiauthTest.kt | 2 +- .../dev/usbharu/multim/v12/api}/NotesTest.kt | 25 ++--- .../v12/common/api}/MisskeyStatusApiTest.kt | 14 +-- settings.gradle.kts | 1 + src/androidMain/AndroidManifest.xml | 6 -- .../usbharu/multim/api/common/ApiClient.kt | 9 -- .../kotlin/dev/usbharu/multim/utils/UUID.kt | 9 -- .../usbharu/multim/api/common/ApiClient.kt | 8 -- .../api/misskey/v12/MisskeyApiClient.kt | 2 - .../kotlin/dev/usbharu/multim/utils/UUID.kt | 22 ----- .../usbharu/multim/api/common/ApiClient.kt | 9 -- .../api/misskey/v12/MisskeyApiClient.kt | 2 - .../kotlin/dev/usbharu/multim/utils/UUID.kt | 9 -- .../usbharu/multim/api/misskey/v12/ApTest.kt | 10 -- .../multim/api/misskey/v12/NotesTest.kt | 8 -- .../api/factory/impl/MisskeyMultiMApis.kt | 8 -- .../dev/usbharu/multim/api/misskey/v12/Ap.kt | 10 -- .../model/misskey/v12/FollowingInvalidate.kt | 10 -- .../multim/model/misskey/v12/UsersShow.kt | 9 -- .../multim/model/misskey/v12/ApShowTest.kt | 55 ----------- 183 files changed, 417 insertions(+), 482 deletions(-) create mode 100644 core/build.gradle.kts rename {src => core/src}/main/kotlin/dev/usbharu/multim/api/common/AccountApi.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/api/common/ApiClient.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/api/common/PlatformApis.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/api/common/StatusApi.kt (100%) rename {src/main/kotlin/dev/usbharu/multim/api => core/src/main/kotlin/dev/usbharu/multim}/factory/MultiMApis.kt (82%) rename {src/main/kotlin/dev/usbharu/multim/api => core/src/main/kotlin/dev/usbharu/multim}/factory/PlatformApiFactory.kt (89%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/common/Account.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/common/Avatar.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/common/Emoji.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/common/Field.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/common/PreviousAndNextPosts.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/common/Profile.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/common/ProfileContent.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/common/Reaction.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/common/Relation.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/common/Status.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/common/StatusContent.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/common/StatusId.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/common/Tag.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatuesContextGetId.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatuesDeleteId.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatuesGetId.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesBookmarkPostId.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesFavouritePostId.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesFavouritedByGetId.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesHistoryGetId.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesMutePostId.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesPinPostId.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesPost.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesPutId.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesReblogPostId.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesRebloggedByGetId.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesSourceGetId.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesUnbookmarkPostId.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesUnfavouritePostId.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesUnmutePostId.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesUnpinPostId.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesUnreblogPostId.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/Account.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/Application.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/Context.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/CustomEmoji.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/Filter.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/FilterKeyword.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/FilterResult.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/FilterStatus.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/MediaAttachment.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/Poll.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/PreviewCard.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/Role.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/Status.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/StatusEdit.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/StatusSource.kt (100%) rename {src => core/src}/main/kotlin/dev/usbharu/multim/model/nodeinfo/NodeInfo.kt (100%) rename {src => core/src}/test/kotlin/dev/usbharu/multim/api/common/TestUtil.kt (76%) rename {src => core/src}/test/kotlin/dev/usbharu/multim/api/factory/impl/DefaultPlatformApiFactoryTest.kt (100%) create mode 100644 impl/misskey/build.gradle.kts rename {src/main/kotlin/dev/usbharu/multim/api/factory/impl => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/factory}/DefaultPlatformApiFactory.kt (75%) create mode 100644 impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/factory/MisskeyMultiMApis.kt create mode 100644 impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api/Ap.kt rename {src/main/kotlin/dev/usbharu/multim/api/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api}/Following.kt (90%) rename {src/main/kotlin/dev/usbharu/multim/api/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api}/Miauth.kt (74%) rename {src/main/kotlin/dev/usbharu/multim/api/common/impl/misskey => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api}/MisskeyApis.kt (78%) rename {src/main/kotlin/dev/usbharu/multim/api/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api}/Notes.kt (97%) rename {src/main/kotlin/dev/usbharu/multim/api/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api}/Timeline.kt (93%) rename {src/main/kotlin/dev/usbharu/multim/api/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api}/Users.kt (75%) rename {src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common}/MisskeyAccount.kt (84%) rename {src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common}/MisskeyAvatar.kt (66%) rename {src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common}/MisskeyContent.kt (77%) rename {src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common}/MisskeyProfile.kt (86%) rename {src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common}/MisskeyProfileContent.kt (69%) rename {src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common}/MisskeyReaction.kt (82%) rename {src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common}/MisskeyRelation.kt (65%) rename {src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common}/MisskeyStatus.kt (92%) rename {src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common}/MisskeyStatusId.kt (85%) rename {src/main/kotlin/dev/usbharu/multim/api/common/impl/misskey => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/api}/MisskeyAccountApi.kt (84%) rename {src/main/kotlin/dev/usbharu/multim/api/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/api}/MisskeyApiClient.kt (89%) rename {src/main/kotlin/dev/usbharu/multim/api/common/impl/misskey => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/api}/MisskeyStatusApi.kt (90%) rename {src/main/kotlin/dev/usbharu/multim => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12}/converter/misskey/v12/NoteConverter.kt (81%) rename {src/main/kotlin/dev/usbharu/multim => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12}/converter/misskey/v12/ReactionConverter.kt (66%) rename {src/main/kotlin/dev/usbharu/multim => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12}/converter/misskey/v12/UsersConverter.kt (50%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/ApShow.kt (68%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/FollowingCreate.kt (56%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/FollowingDelete.kt (56%) create mode 100644 impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/FollowingInvalidate.kt rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/FollowingRequestsAccept.kt (69%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/FollowingRequestsCancel.kt (68%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/FollowingRequestsList.kt (66%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/FollowingRequestsReject.kt (70%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/MiauthCheck.kt (68%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/NotesChildren.kt (70%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/NotesConversation.kt (67%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/NotesCreate.kt (91%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/NotesDelete.kt (56%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/NotesFavoritesCreate.kt (57%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/NotesFavoritesDelete.kt (57%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/NotesFeatured.kt (64%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/NotesGlobalTimeline.kt (76%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/NotesHybridTimeline.kt (81%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/NotesLocalTimeline.kt (80%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/NotesMentions.kt (65%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/NotesNotes.kt (78%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/NotesPollsRecommendation.kt (65%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/NotesPollsVote.kt (75%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/NotesReactionCreate.kt (76%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/NotesReactionDelete.kt (73%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/NotesReactions.kt (74%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/NotesRenote.kt (70%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/NotesReplies.kt (70%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/NotesSearch.kt (77%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/NotesSearchByTag.kt (83%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/NotesShow.kt (58%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/NotesState.kt (71%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/NotesThreadMutingCreate.kt (58%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/NotesThreadMutingDelete.kt (58%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/NotesTimeline.kt (91%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/NotesTranslate.kt (91%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/NotesUnrenote.kt (56%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/NotesUserListTimeline.kt (75%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/NotesWatchingCreate.kt (57%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/NotesWatchingDelete.kt (57%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/UsersNotes.kt (76%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/UsersRelation.kt (89%) create mode 100644 impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/UsersShow.kt rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/components/Antenna.kt (92%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/components/App.kt (81%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/components/Blocking.kt (69%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/components/Channel.kt (79%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/components/Clip.kt (83%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/components/DriveFile.kt (92%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/components/DriveFolder.kt (84%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/components/Emoji.kt (79%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/components/EmojiLite.kt (67%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/components/Error.kt (56%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/components/FederationInstance.kt (93%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/components/Field.kt (66%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/components/File.kt (55%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/components/Following.kt (75%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/components/GalleryPost.kt (82%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/components/Hashtag.kt (85%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/components/MeDetailed.kt (96%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/components/MeDetailedOnly.kt (95%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/components/MessagingMessage.kt (82%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/components/MisskeyNeedAuth.kt (67%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/components/Muting.kt (71%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/components/Note.kt (95%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/components/NoteFavorite.kt (68%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/components/NoteReaction.kt (69%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/components/Notification.kt (90%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/components/Page.kt (81%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/components/QueueCount.kt (77%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/components/User.kt (91%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/components/UserDetailed.kt (92%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/components/UserDetailedNotMe.kt (98%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/components/UserDetailedNotMeOnly.kt (95%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/components/UserGroup.kt (72%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/components/UserList.kt (79%) rename {src/main/kotlin/dev/usbharu/multim/model/misskey/v12 => impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model}/components/UserLite.kt (92%) create mode 100644 impl/misskey/src/test/kotlin/MisskeyTestUtil.kt rename {src/test/kotlin/dev/usbharu/multim/api/misskey/v12 => impl/misskey/src/test/kotlin/dev/usbharu/multim/v12/api}/ApTest.kt (88%) rename {src/test/kotlin/dev/usbharu/multim/api/misskey/v12 => impl/misskey/src/test/kotlin/dev/usbharu/multim/v12/api}/MiauthTest.kt (93%) rename {src/test/kotlin/dev/usbharu/multim/api/misskey/v12 => impl/misskey/src/test/kotlin/dev/usbharu/multim/v12/api}/NotesTest.kt (95%) rename {src/test/kotlin/dev/usbharu/multim/api/common/impl/misskey => impl/misskey/src/test/kotlin/dev/usbharu/multim/v12/common/api}/MisskeyStatusApiTest.kt (68%) delete mode 100644 src/androidMain/AndroidManifest.xml delete mode 100644 src/androidMain/kotlin/dev/usbharu/multim/api/common/ApiClient.kt delete mode 100644 src/androidMain/kotlin/dev/usbharu/multim/utils/UUID.kt delete mode 100644 src/jsMain/kotlin/dev/usbharu/multim/api/common/ApiClient.kt delete mode 100644 src/jsMain/kotlin/dev/usbharu/multim/api/misskey/v12/MisskeyApiClient.kt delete mode 100644 src/jsMain/kotlin/dev/usbharu/multim/utils/UUID.kt delete mode 100644 src/jvmMain/kotlin/dev/usbharu/multim/api/common/ApiClient.kt delete mode 100644 src/jvmMain/kotlin/dev/usbharu/multim/api/misskey/v12/MisskeyApiClient.kt delete mode 100644 src/jvmMain/kotlin/dev/usbharu/multim/utils/UUID.kt delete mode 100644 src/jvmTest/kotlin/dev/usbharu/multim/api/misskey/v12/ApTest.kt delete mode 100644 src/jvmTest/kotlin/dev/usbharu/multim/api/misskey/v12/NotesTest.kt delete mode 100644 src/main/kotlin/dev/usbharu/multim/api/factory/impl/MisskeyMultiMApis.kt delete mode 100644 src/main/kotlin/dev/usbharu/multim/api/misskey/v12/Ap.kt delete mode 100644 src/main/kotlin/dev/usbharu/multim/model/misskey/v12/FollowingInvalidate.kt delete mode 100644 src/main/kotlin/dev/usbharu/multim/model/misskey/v12/UsersShow.kt delete mode 100644 src/test/kotlin/dev/usbharu/multim/model/misskey/v12/ApShowTest.kt diff --git a/.gitignore b/.gitignore index 31c0240..106375c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ /local.properties /build/ /.gradle/ -*.log \ No newline at end of file +*.log +build/ diff --git a/build.gradle.kts b/build.gradle.kts index d75c95a..95b8214 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,60 +1,72 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import java.util.Properties - - plugins { - kotlin("jvm") version "1.8.0" - kotlin("plugin.serialization") version "1.8.0" + kotlin("jvm") version "1.8.0" apply false + kotlin("plugin.serialization") version "1.8.0" apply false } + + group = "org.example" version = "1.0-SNAPSHOT" -repositories { - mavenCentral() +allprojects { + repositories { + mavenCentral() + } } +subprojects { + apply { + plugin("org.jetbrains.kotlin.jvm") + plugin("org.jetbrains.kotlin.plugin.serialization") + } + + group = "org.example" + version = "1.0-SNAPSHOT" -tasks.test { - val props = Properties() + tasks.withType { + kotlinOptions.jvmTarget = "1.8" + } + + tasks.getByName("test",Test::class) { + val props = Properties() // - try { - props.load(file("local.properties").inputStream()) - systemProperties("multim_misskey_token" to props["multim_misskey_token"]) - systemProperties("multim_misskey_instance" to props["multim_misskey_instance"]) - - } catch (e: Exception) { - e.printStackTrace() - systemProperties("multim_misskey_token" to System.getenv("multim_misskey_token")) - systemProperties("multim_misskey_instance" to System.getenv("multim_misskey_instance")) + try { + props.load(file("${project.rootProject.projectDir}/local.properties").inputStream()) + systemProperties("multim_misskey_token" to props["multim_misskey_token"]) + systemProperties("multim_misskey_instance" to props["multim_misskey_instance"]) + + } catch (e: Exception) { + e.printStackTrace() + systemProperties("multim_misskey_token" to System.getenv("multim_misskey_token")) + systemProperties("multim_misskey_instance" to System.getenv("multim_misskey_instance")) + } + + useJUnitPlatform() } - useJUnitPlatform() -} + val ktor_version = "2.2.2" + dependencies { + "implementation"("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1") + "implementation"("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0") + "implementation"("io.ktor:ktor-client-core:$ktor_version") + "implementation"("io.ktor:ktor-client-cio:$ktor_version") + "implementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") + "implementation"("io.ktor:ktor-client-content-negotiation:$ktor_version") + "implementation"("io.ktor:ktor-client-logging:$ktor_version") + "implementation"("io.ktor:ktor-client-websockets:$ktor_version") + "implementation"("io.ktor:ktor-serialization-kotlinx-json:$ktor_version") -tasks.withType { - kotlinOptions.jvmTarget = "1.8" -} -val ktor_version = "2.2.2" -dependencies { - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1") - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0") - implementation("io.ktor:ktor-client-core:$ktor_version") - implementation("io.ktor:ktor-client-cio:$ktor_version") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") - implementation("io.ktor:ktor-client-content-negotiation:$ktor_version") - implementation("io.ktor:ktor-client-logging:$ktor_version") - implementation("io.ktor:ktor-client-websockets:$ktor_version") - implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version") - - - testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.0") - testImplementation("org.junit.jupiter:junit-jupiter-params:5.9.0") - testImplementation("org.assertj:assertj-core:3.2.0") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.0") - testImplementation("io.ktor:ktor-client-mock:$ktor_version") - testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4") - testImplementation("org.slf4j:slf4j-simple:2.0.4") - testImplementation("io.github.artsok:rerunner-jupiter:2.1.6") + "testImplementation"("org.junit.jupiter:junit-jupiter-api:5.9.0") + "testImplementation"("org.junit.jupiter:junit-jupiter-params:5.9.0") + "testImplementation"("org.assertj:assertj-core:3.2.0") + "testRuntimeOnly"("org.junit.jupiter:junit-jupiter-engine:5.9.0") + "testImplementation"("io.ktor:ktor-client-mock:$ktor_version") + "testImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4") + "testImplementation"("org.slf4j:slf4j-simple:2.0.4") + "testImplementation"("io.github.artsok:rerunner-jupiter:2.1.6") + } + } diff --git a/core/build.gradle.kts b/core/build.gradle.kts new file mode 100644 index 0000000..e69de29 diff --git a/src/main/kotlin/dev/usbharu/multim/api/common/AccountApi.kt b/core/src/main/kotlin/dev/usbharu/multim/api/common/AccountApi.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/api/common/AccountApi.kt rename to core/src/main/kotlin/dev/usbharu/multim/api/common/AccountApi.kt diff --git a/src/main/kotlin/dev/usbharu/multim/api/common/ApiClient.kt b/core/src/main/kotlin/dev/usbharu/multim/api/common/ApiClient.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/api/common/ApiClient.kt rename to core/src/main/kotlin/dev/usbharu/multim/api/common/ApiClient.kt diff --git a/src/main/kotlin/dev/usbharu/multim/api/common/PlatformApis.kt b/core/src/main/kotlin/dev/usbharu/multim/api/common/PlatformApis.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/api/common/PlatformApis.kt rename to core/src/main/kotlin/dev/usbharu/multim/api/common/PlatformApis.kt diff --git a/src/main/kotlin/dev/usbharu/multim/api/common/StatusApi.kt b/core/src/main/kotlin/dev/usbharu/multim/api/common/StatusApi.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/api/common/StatusApi.kt rename to core/src/main/kotlin/dev/usbharu/multim/api/common/StatusApi.kt diff --git a/src/main/kotlin/dev/usbharu/multim/api/factory/MultiMApis.kt b/core/src/main/kotlin/dev/usbharu/multim/factory/MultiMApis.kt similarity index 82% rename from src/main/kotlin/dev/usbharu/multim/api/factory/MultiMApis.kt rename to core/src/main/kotlin/dev/usbharu/multim/factory/MultiMApis.kt index 143ec85..35c7481 100644 --- a/src/main/kotlin/dev/usbharu/multim/api/factory/MultiMApis.kt +++ b/core/src/main/kotlin/dev/usbharu/multim/factory/MultiMApis.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.api.factory +package dev.usbharu.multim.factory import dev.usbharu.multim.api.common.AccountApi import dev.usbharu.multim.api.common.StatusApi @@ -6,4 +6,4 @@ import dev.usbharu.multim.api.common.StatusApi abstract class MultiMApis( var statusApi: StatusApi, var accountApi: AccountApi -) \ No newline at end of file +) diff --git a/src/main/kotlin/dev/usbharu/multim/api/factory/PlatformApiFactory.kt b/core/src/main/kotlin/dev/usbharu/multim/factory/PlatformApiFactory.kt similarity index 89% rename from src/main/kotlin/dev/usbharu/multim/api/factory/PlatformApiFactory.kt rename to core/src/main/kotlin/dev/usbharu/multim/factory/PlatformApiFactory.kt index 44dfdd2..6b899b4 100644 --- a/src/main/kotlin/dev/usbharu/multim/api/factory/PlatformApiFactory.kt +++ b/core/src/main/kotlin/dev/usbharu/multim/factory/PlatformApiFactory.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.api.factory +package dev.usbharu.multim.factory import dev.usbharu.multim.api.common.PlatformApis import dev.usbharu.multim.model.nodeinfo.NodeInfo @@ -12,4 +12,4 @@ interface PlatformApiFactory { baseUrl: String, build: MultiMApis.(PlatformApis) -> Unit = {} ): MultiMApis -} \ No newline at end of file +} diff --git a/src/main/kotlin/dev/usbharu/multim/model/common/Account.kt b/core/src/main/kotlin/dev/usbharu/multim/model/common/Account.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/common/Account.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/common/Account.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/common/Avatar.kt b/core/src/main/kotlin/dev/usbharu/multim/model/common/Avatar.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/common/Avatar.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/common/Avatar.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/common/Emoji.kt b/core/src/main/kotlin/dev/usbharu/multim/model/common/Emoji.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/common/Emoji.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/common/Emoji.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/common/Field.kt b/core/src/main/kotlin/dev/usbharu/multim/model/common/Field.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/common/Field.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/common/Field.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/common/PreviousAndNextPosts.kt b/core/src/main/kotlin/dev/usbharu/multim/model/common/PreviousAndNextPosts.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/common/PreviousAndNextPosts.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/common/PreviousAndNextPosts.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/common/Profile.kt b/core/src/main/kotlin/dev/usbharu/multim/model/common/Profile.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/common/Profile.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/common/Profile.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/common/ProfileContent.kt b/core/src/main/kotlin/dev/usbharu/multim/model/common/ProfileContent.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/common/ProfileContent.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/common/ProfileContent.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/common/Reaction.kt b/core/src/main/kotlin/dev/usbharu/multim/model/common/Reaction.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/common/Reaction.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/common/Reaction.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/common/Relation.kt b/core/src/main/kotlin/dev/usbharu/multim/model/common/Relation.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/common/Relation.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/common/Relation.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/common/Status.kt b/core/src/main/kotlin/dev/usbharu/multim/model/common/Status.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/common/Status.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/common/Status.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/common/StatusContent.kt b/core/src/main/kotlin/dev/usbharu/multim/model/common/StatusContent.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/common/StatusContent.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/common/StatusContent.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/common/StatusId.kt b/core/src/main/kotlin/dev/usbharu/multim/model/common/StatusId.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/common/StatusId.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/common/StatusId.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/common/Tag.kt b/core/src/main/kotlin/dev/usbharu/multim/model/common/Tag.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/common/Tag.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/common/Tag.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatuesContextGetId.kt b/core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatuesContextGetId.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatuesContextGetId.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatuesContextGetId.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatuesDeleteId.kt b/core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatuesDeleteId.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatuesDeleteId.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatuesDeleteId.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatuesGetId.kt b/core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatuesGetId.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatuesGetId.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatuesGetId.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesBookmarkPostId.kt b/core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesBookmarkPostId.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesBookmarkPostId.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesBookmarkPostId.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesFavouritePostId.kt b/core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesFavouritePostId.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesFavouritePostId.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesFavouritePostId.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesFavouritedByGetId.kt b/core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesFavouritedByGetId.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesFavouritedByGetId.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesFavouritedByGetId.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesHistoryGetId.kt b/core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesHistoryGetId.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesHistoryGetId.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesHistoryGetId.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesMutePostId.kt b/core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesMutePostId.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesMutePostId.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesMutePostId.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesPinPostId.kt b/core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesPinPostId.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesPinPostId.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesPinPostId.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesPost.kt b/core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesPost.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesPost.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesPost.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesPutId.kt b/core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesPutId.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesPutId.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesPutId.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesReblogPostId.kt b/core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesReblogPostId.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesReblogPostId.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesReblogPostId.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesRebloggedByGetId.kt b/core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesRebloggedByGetId.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesRebloggedByGetId.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesRebloggedByGetId.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesSourceGetId.kt b/core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesSourceGetId.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesSourceGetId.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesSourceGetId.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesUnbookmarkPostId.kt b/core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesUnbookmarkPostId.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesUnbookmarkPostId.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesUnbookmarkPostId.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesUnfavouritePostId.kt b/core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesUnfavouritePostId.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesUnfavouritePostId.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesUnfavouritePostId.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesUnmutePostId.kt b/core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesUnmutePostId.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesUnmutePostId.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesUnmutePostId.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesUnpinPostId.kt b/core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesUnpinPostId.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesUnpinPostId.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesUnpinPostId.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesUnreblogPostId.kt b/core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesUnreblogPostId.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesUnreblogPostId.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/StatusesUnreblogPostId.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/Account.kt b/core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/Account.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/Account.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/Account.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/Application.kt b/core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/Application.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/Application.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/Application.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/Context.kt b/core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/Context.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/Context.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/Context.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/CustomEmoji.kt b/core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/CustomEmoji.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/CustomEmoji.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/CustomEmoji.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/Filter.kt b/core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/Filter.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/Filter.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/Filter.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/FilterKeyword.kt b/core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/FilterKeyword.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/FilterKeyword.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/FilterKeyword.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/FilterResult.kt b/core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/FilterResult.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/FilterResult.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/FilterResult.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/FilterStatus.kt b/core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/FilterStatus.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/FilterStatus.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/FilterStatus.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/MediaAttachment.kt b/core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/MediaAttachment.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/MediaAttachment.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/MediaAttachment.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/Poll.kt b/core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/Poll.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/Poll.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/Poll.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/PreviewCard.kt b/core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/PreviewCard.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/PreviewCard.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/PreviewCard.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/Role.kt b/core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/Role.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/Role.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/Role.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/Status.kt b/core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/Status.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/Status.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/Status.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/StatusEdit.kt b/core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/StatusEdit.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/StatusEdit.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/StatusEdit.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/StatusSource.kt b/core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/StatusSource.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/StatusSource.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/mastodon/v1/components/StatusSource.kt diff --git a/src/main/kotlin/dev/usbharu/multim/model/nodeinfo/NodeInfo.kt b/core/src/main/kotlin/dev/usbharu/multim/model/nodeinfo/NodeInfo.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/multim/model/nodeinfo/NodeInfo.kt rename to core/src/main/kotlin/dev/usbharu/multim/model/nodeinfo/NodeInfo.kt diff --git a/src/test/kotlin/dev/usbharu/multim/api/common/TestUtil.kt b/core/src/test/kotlin/dev/usbharu/multim/api/common/TestUtil.kt similarity index 76% rename from src/test/kotlin/dev/usbharu/multim/api/common/TestUtil.kt rename to core/src/test/kotlin/dev/usbharu/multim/api/common/TestUtil.kt index eca2579..e08bba0 100644 --- a/src/test/kotlin/dev/usbharu/multim/api/common/TestUtil.kt +++ b/core/src/test/kotlin/dev/usbharu/multim/api/common/TestUtil.kt @@ -1,14 +1,11 @@ package dev.usbharu.multim.api.common -import dev.usbharu.multim.model.misskey.v12.components.Note -import dev.usbharu.multim.model.misskey.v12.components.UserLite import io.ktor.client.* import io.ktor.client.engine.mock.* import io.ktor.client.plugins.contentnegotiation.* import io.ktor.client.request.* import io.ktor.http.* import io.ktor.serialization.kotlinx.json.* -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import kotlinx.serialization.json.jsonObject import org.assertj.core.api.Fail.fail @@ -50,20 +47,7 @@ object TestUtil { } } - fun createFakeNote(id: String, userId: String, username: String, text: String?): Note { - return Note( - id = id, - userId = userId, - user = UserLite(id = userId, name = username, username = username), - text = text - ) - } - - fun createFakeNoteToString(id: String, userId: String, username: String, text: String?): String { - return json.encodeToString(createFakeNote(id, userId, username, text)) - } - - fun checkAuth( + fun checkAuth( respond: String, status: HttpStatusCode = HttpStatusCode.OK, headers: Headers = headersOf() diff --git a/src/test/kotlin/dev/usbharu/multim/api/factory/impl/DefaultPlatformApiFactoryTest.kt b/core/src/test/kotlin/dev/usbharu/multim/api/factory/impl/DefaultPlatformApiFactoryTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/multim/api/factory/impl/DefaultPlatformApiFactoryTest.kt rename to core/src/test/kotlin/dev/usbharu/multim/api/factory/impl/DefaultPlatformApiFactoryTest.kt diff --git a/impl/misskey/build.gradle.kts b/impl/misskey/build.gradle.kts new file mode 100644 index 0000000..eca1ab1 --- /dev/null +++ b/impl/misskey/build.gradle.kts @@ -0,0 +1,3 @@ +dependencies { + implementation(project(":core")) +} diff --git a/src/main/kotlin/dev/usbharu/multim/api/factory/impl/DefaultPlatformApiFactory.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/factory/DefaultPlatformApiFactory.kt similarity index 75% rename from src/main/kotlin/dev/usbharu/multim/api/factory/impl/DefaultPlatformApiFactory.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/factory/DefaultPlatformApiFactory.kt index cf289ad..addd97f 100644 --- a/src/main/kotlin/dev/usbharu/multim/api/factory/impl/DefaultPlatformApiFactory.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/factory/DefaultPlatformApiFactory.kt @@ -1,12 +1,12 @@ -package dev.usbharu.multim.api.factory.impl +package dev.usbharu.multim.misskey.factory import dev.usbharu.multim.api.common.PlatformApis -import dev.usbharu.multim.api.common.impl.misskey.MisskeyAccountApi -import dev.usbharu.multim.api.common.impl.misskey.MisskeyApis -import dev.usbharu.multim.api.common.impl.misskey.MisskeyStatusApi -import dev.usbharu.multim.api.factory.MultiMApis -import dev.usbharu.multim.api.factory.PlatformApiFactory -import dev.usbharu.multim.api.misskey.v12.MisskeyApiClient +import dev.usbharu.multim.factory.MultiMApis +import dev.usbharu.multim.factory.PlatformApiFactory +import dev.usbharu.multim.misskey.v12.api.MisskeyApis +import dev.usbharu.multim.misskey.v12.common.api.MisskeyAccountApi +import dev.usbharu.multim.misskey.v12.common.api.MisskeyApiClient +import dev.usbharu.multim.misskey.v12.common.api.MisskeyStatusApi import dev.usbharu.multim.model.nodeinfo.NodeInfo import io.ktor.client.* @@ -42,4 +42,4 @@ open class DefaultPlatformApiFactory : PlatformApiFactory { } TODO() } -} \ No newline at end of file +} diff --git a/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/factory/MisskeyMultiMApis.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/factory/MisskeyMultiMApis.kt new file mode 100644 index 0000000..c3b4abd --- /dev/null +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/factory/MisskeyMultiMApis.kt @@ -0,0 +1,8 @@ +package dev.usbharu.multim.misskey.factory + +import dev.usbharu.multim.factory.MultiMApis +import dev.usbharu.multim.misskey.v12.common.api.MisskeyAccountApi +import dev.usbharu.multim.misskey.v12.common.api.MisskeyStatusApi + +class MisskeyMultiMApis(statusApi: MisskeyStatusApi, accountApi: MisskeyAccountApi) : + MultiMApis(statusApi, accountApi) diff --git a/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api/Ap.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api/Ap.kt new file mode 100644 index 0000000..1c9c542 --- /dev/null +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api/Ap.kt @@ -0,0 +1,11 @@ +package dev.usbharu.multim.misskey.v12.api + +import dev.usbharu.multim.misskey.v12.common.api.MisskeyApiClient +import dev.usbharu.multim.misskey.v12.model.ApShowRequest +import dev.usbharu.multim.misskey.v12.model.ApShowResponse + +class Ap(val client: MisskeyApiClient) { + suspend fun show(apShowRequest: ApShowRequest): ApShowResponse { + return client.post(apShowRequest, "api/ap/show") + } +} diff --git a/src/main/kotlin/dev/usbharu/multim/api/misskey/v12/Following.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api/Following.kt similarity index 90% rename from src/main/kotlin/dev/usbharu/multim/api/misskey/v12/Following.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api/Following.kt index dcd82a7..a35a245 100644 --- a/src/main/kotlin/dev/usbharu/multim/api/misskey/v12/Following.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api/Following.kt @@ -1,6 +1,7 @@ -package dev.usbharu.multim.api.misskey.v12 +package dev.usbharu.multim.misskey.v12.api -import dev.usbharu.multim.model.misskey.v12.* +import dev.usbharu.multim.misskey.v12.common.api.MisskeyApiClient +import dev.usbharu.multim.misskey.v12.model.* class Following(val client: MisskeyApiClient) { suspend fun create(followingCreateRequest: FollowingCreateRequest): FollowingCreateResponse { @@ -41,4 +42,4 @@ class Following(val client: MisskeyApiClient) { ) } } -} \ No newline at end of file +} diff --git a/src/main/kotlin/dev/usbharu/multim/api/misskey/v12/Miauth.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api/Miauth.kt similarity index 74% rename from src/main/kotlin/dev/usbharu/multim/api/misskey/v12/Miauth.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api/Miauth.kt index 50881f3..81c1f7f 100644 --- a/src/main/kotlin/dev/usbharu/multim/api/misskey/v12/Miauth.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api/Miauth.kt @@ -1,7 +1,8 @@ -package dev.usbharu.multim.api.misskey.v12 +package dev.usbharu.multim.misskey.v12.api -import dev.usbharu.multim.model.misskey.v12.MiauthCheckRequest -import dev.usbharu.multim.model.misskey.v12.MiauthCheckResponse +import dev.usbharu.multim.misskey.v12.common.api.MisskeyApiClient +import dev.usbharu.multim.misskey.v12.model.MiauthCheckRequest +import dev.usbharu.multim.misskey.v12.model.MiauthCheckResponse import io.ktor.client.statement.* import java.util.* diff --git a/src/main/kotlin/dev/usbharu/multim/api/common/impl/misskey/MisskeyApis.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api/MisskeyApis.kt similarity index 78% rename from src/main/kotlin/dev/usbharu/multim/api/common/impl/misskey/MisskeyApis.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api/MisskeyApis.kt index f16eb7b..467238a 100644 --- a/src/main/kotlin/dev/usbharu/multim/api/common/impl/misskey/MisskeyApis.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api/MisskeyApis.kt @@ -1,7 +1,7 @@ -package dev.usbharu.multim.api.common.impl.misskey +package dev.usbharu.multim.misskey.v12.api import dev.usbharu.multim.api.common.PlatformApis -import dev.usbharu.multim.api.misskey.v12.* +import dev.usbharu.multim.misskey.v12.common.api.MisskeyApiClient class MisskeyApis(misskeyApiClient: MisskeyApiClient) : PlatformApis(misskeyApiClient) { val notes = Notes(misskeyApiClient) diff --git a/src/main/kotlin/dev/usbharu/multim/api/misskey/v12/Notes.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api/Notes.kt similarity index 97% rename from src/main/kotlin/dev/usbharu/multim/api/misskey/v12/Notes.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api/Notes.kt index a96ed58..5ef6657 100644 --- a/src/main/kotlin/dev/usbharu/multim/api/misskey/v12/Notes.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api/Notes.kt @@ -1,6 +1,7 @@ -package dev.usbharu.multim.api.misskey.v12 +package dev.usbharu.multim.misskey.v12.api -import dev.usbharu.multim.model.misskey.v12.* +import dev.usbharu.multim.misskey.v12.common.api.MisskeyApiClient +import dev.usbharu.multim.misskey.v12.model.* class Notes(val client: MisskeyApiClient) { diff --git a/src/main/kotlin/dev/usbharu/multim/api/misskey/v12/Timeline.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api/Timeline.kt similarity index 93% rename from src/main/kotlin/dev/usbharu/multim/api/misskey/v12/Timeline.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api/Timeline.kt index 8a3028a..97e5701 100644 --- a/src/main/kotlin/dev/usbharu/multim/api/misskey/v12/Timeline.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api/Timeline.kt @@ -1,6 +1,7 @@ -package dev.usbharu.multim.api.misskey.v12 +package dev.usbharu.multim.misskey.v12.api -import dev.usbharu.multim.api.misskey.v12.Miauth.Companion.baseUrl +import dev.usbharu.multim.misskey.v12.api.Miauth.Companion.baseUrl +import dev.usbharu.multim.misskey.v12.common.api.MisskeyApiClient import io.ktor.client.plugins.websocket.* import io.ktor.websocket.* import kotlinx.coroutines.async diff --git a/src/main/kotlin/dev/usbharu/multim/api/misskey/v12/Users.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api/Users.kt similarity index 75% rename from src/main/kotlin/dev/usbharu/multim/api/misskey/v12/Users.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api/Users.kt index ea35751..9f2a34e 100644 --- a/src/main/kotlin/dev/usbharu/multim/api/misskey/v12/Users.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api/Users.kt @@ -1,6 +1,7 @@ -package dev.usbharu.multim.api.misskey.v12 +package dev.usbharu.multim.misskey.v12.api -import dev.usbharu.multim.model.misskey.v12.* +import dev.usbharu.multim.misskey.v12.common.api.MisskeyApiClient +import dev.usbharu.multim.misskey.v12.model.* class Users(val client: MisskeyApiClient) { suspend fun relation(relationRequest: UsersRelationRequest): UsersRelationResponse { @@ -14,4 +15,4 @@ class Users(val client: MisskeyApiClient) { suspend fun show(showRequest: UsersShowRequest): UsersShowResponse { return client.post(showRequest, "api/users/show") } -} \ No newline at end of file +} diff --git a/src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyAccount.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyAccount.kt similarity index 84% rename from src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyAccount.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyAccount.kt index 768d8b9..3bfec52 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyAccount.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyAccount.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.model.common.impl.misskey +package dev.usbharu.multim.misskey.v12.common import dev.usbharu.multim.model.common.Account import dev.usbharu.multim.model.common.Avatar diff --git a/src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyAvatar.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyAvatar.kt similarity index 66% rename from src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyAvatar.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyAvatar.kt index 1944381..f21705b 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyAvatar.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyAvatar.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.model.common.impl.misskey +package dev.usbharu.multim.misskey.v12.common import dev.usbharu.multim.model.common.Avatar diff --git a/src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyContent.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyContent.kt similarity index 77% rename from src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyContent.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyContent.kt index cb306aa..4ca4922 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyContent.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyContent.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.model.common.impl.misskey +package dev.usbharu.multim.misskey.v12.common import dev.usbharu.multim.model.common.StatusContent diff --git a/src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyProfile.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyProfile.kt similarity index 86% rename from src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyProfile.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyProfile.kt index 4a912af..919f6ef 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyProfile.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyProfile.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.model.common.impl.misskey +package dev.usbharu.multim.misskey.v12.common import dev.usbharu.multim.model.common.Account import dev.usbharu.multim.model.common.Field @@ -12,4 +12,4 @@ class MisskeyProfile( followingCount: Int = 0, followersCount: Int = 0, fields: List = emptyList() -) : Profile(account, isBot, profileContent, followingCount, followersCount, fields) \ No newline at end of file +) : Profile(account, isBot, profileContent, followingCount, followersCount, fields) diff --git a/src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyProfileContent.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyProfileContent.kt similarity index 69% rename from src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyProfileContent.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyProfileContent.kt index 7a9740d..59c53fc 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyProfileContent.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyProfileContent.kt @@ -1,5 +1,5 @@ -package dev.usbharu.multim.model.common.impl.misskey +package dev.usbharu.multim.misskey.v12.common import dev.usbharu.multim.model.common.ProfileContent -class MisskeyProfileContent(text: String) : ProfileContent(text) \ No newline at end of file +class MisskeyProfileContent(text: String) : ProfileContent(text) diff --git a/src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyReaction.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyReaction.kt similarity index 82% rename from src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyReaction.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyReaction.kt index a9bd5f7..585b283 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyReaction.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyReaction.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.model.common.impl.misskey +package dev.usbharu.multim.misskey.v12.common import dev.usbharu.multim.model.common.Reaction diff --git a/src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyRelation.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyRelation.kt similarity index 65% rename from src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyRelation.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyRelation.kt index 4ab8354..955c57a 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyRelation.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyRelation.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.model.common.impl.misskey +package dev.usbharu.multim.misskey.v12.common import dev.usbharu.multim.model.common.Relation @@ -9,4 +9,4 @@ class MisskeyRelation( follower: Boolean, mute: Boolean, block: Boolean -) : Relation(myself, other, following, follower, mute, block) \ No newline at end of file +) : Relation(myself, other, following, follower, mute, block) diff --git a/src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyStatus.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyStatus.kt similarity index 92% rename from src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyStatus.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyStatus.kt index 0516845..4a14bf1 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyStatus.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyStatus.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.model.common.impl.misskey +package dev.usbharu.multim.misskey.v12.common import dev.usbharu.multim.model.common.* diff --git a/src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyStatusId.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyStatusId.kt similarity index 85% rename from src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyStatusId.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyStatusId.kt index c630a05..ed844f3 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyStatusId.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyStatusId.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.model.common.impl.misskey +package dev.usbharu.multim.misskey.v12.common import dev.usbharu.multim.model.common.StatusId diff --git a/src/main/kotlin/dev/usbharu/multim/api/common/impl/misskey/MisskeyAccountApi.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/api/MisskeyAccountApi.kt similarity index 84% rename from src/main/kotlin/dev/usbharu/multim/api/common/impl/misskey/MisskeyAccountApi.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/api/MisskeyAccountApi.kt index e99124d..fc697f7 100644 --- a/src/main/kotlin/dev/usbharu/multim/api/common/impl/misskey/MisskeyAccountApi.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/api/MisskeyAccountApi.kt @@ -1,17 +1,18 @@ -package dev.usbharu.multim.api.common.impl.misskey +package dev.usbharu.multim.misskey.v12.common.api import dev.usbharu.multim.api.common.AccountApi -import dev.usbharu.multim.converter.misskey.v12.NoteConverter.toStatus -import dev.usbharu.multim.converter.misskey.v12.UsersConverter.toRelation +import dev.usbharu.multim.misskey.v12.api.MisskeyApis +import dev.usbharu.multim.misskey.v12.common.MisskeyAccount +import dev.usbharu.multim.misskey.v12.common.MisskeyProfile +import dev.usbharu.multim.misskey.v12.common.MisskeyProfileContent +import dev.usbharu.multim.misskey.v12.common.MisskeyStatusId +import dev.usbharu.multim.misskey.v12.converter.misskey.v12.NoteConverter.toStatus +import dev.usbharu.multim.misskey.v12.converter.misskey.v12.UsersConverter.toRelation +import dev.usbharu.multim.misskey.v12.model.* +import dev.usbharu.multim.misskey.v12.model.components.MeDetailed +import dev.usbharu.multim.misskey.v12.model.components.UserDetailedNotMe +import dev.usbharu.multim.misskey.v12.model.components.UserLite import dev.usbharu.multim.model.common.* -import dev.usbharu.multim.model.common.impl.misskey.MisskeyAccount -import dev.usbharu.multim.model.common.impl.misskey.MisskeyProfile -import dev.usbharu.multim.model.common.impl.misskey.MisskeyProfileContent -import dev.usbharu.multim.model.common.impl.misskey.MisskeyStatusId -import dev.usbharu.multim.model.misskey.v12.* -import dev.usbharu.multim.model.misskey.v12.components.MeDetailed -import dev.usbharu.multim.model.misskey.v12.components.UserDetailedNotMe -import dev.usbharu.multim.model.misskey.v12.components.UserLite class MisskeyAccountApi(val misskeyApis: MisskeyApis) : AccountApi { override suspend fun userTimeline( diff --git a/src/main/kotlin/dev/usbharu/multim/api/misskey/v12/MisskeyApiClient.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/api/MisskeyApiClient.kt similarity index 89% rename from src/main/kotlin/dev/usbharu/multim/api/misskey/v12/MisskeyApiClient.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/api/MisskeyApiClient.kt index a19d95b..80694d1 100644 --- a/src/main/kotlin/dev/usbharu/multim/api/misskey/v12/MisskeyApiClient.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/api/MisskeyApiClient.kt @@ -1,7 +1,7 @@ -package dev.usbharu.multim.api.misskey.v12 +package dev.usbharu.multim.misskey.v12.common.api import dev.usbharu.multim.api.common.ApiClient -import dev.usbharu.multim.model.misskey.v12.components.MisskeyNeedAuth +import dev.usbharu.multim.misskey.v12.model.components.MisskeyNeedAuth import io.ktor.client.* import io.ktor.client.plugins.api.* import io.ktor.client.plugins.contentnegotiation.* @@ -9,10 +9,8 @@ import io.ktor.client.plugins.logging.* import io.ktor.client.plugins.websocket.* import io.ktor.http.* import io.ktor.serialization.kotlinx.json.* -import io.ktor.util.* import kotlinx.serialization.json.Json -@OptIn(InternalAPI::class) class MisskeyApiClient(var token: String, baseUrl: String, client: HttpClient) : ApiClient(baseUrl, client.config { expectSuccess = true diff --git a/src/main/kotlin/dev/usbharu/multim/api/common/impl/misskey/MisskeyStatusApi.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/api/MisskeyStatusApi.kt similarity index 90% rename from src/main/kotlin/dev/usbharu/multim/api/common/impl/misskey/MisskeyStatusApi.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/api/MisskeyStatusApi.kt index 266747b..8b9ac1e 100644 --- a/src/main/kotlin/dev/usbharu/multim/api/common/impl/misskey/MisskeyStatusApi.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/api/MisskeyStatusApi.kt @@ -1,12 +1,13 @@ -package dev.usbharu.multim.api.common.impl.misskey +package dev.usbharu.multim.misskey.v12.common.api import dev.usbharu.multim.api.common.StatusApi -import dev.usbharu.multim.converter.misskey.v12.NoteConverter.toStatus -import dev.usbharu.multim.converter.misskey.v12.ReactionConverter.toReactions +import dev.usbharu.multim.misskey.v12.api.MisskeyApis +import dev.usbharu.multim.misskey.v12.common.MisskeyReaction +import dev.usbharu.multim.misskey.v12.common.MisskeyStatusId +import dev.usbharu.multim.misskey.v12.converter.misskey.v12.NoteConverter.toStatus +import dev.usbharu.multim.misskey.v12.converter.misskey.v12.ReactionConverter.toReactions +import dev.usbharu.multim.misskey.v12.model.* import dev.usbharu.multim.model.common.* -import dev.usbharu.multim.model.common.impl.misskey.MisskeyReaction -import dev.usbharu.multim.model.common.impl.misskey.MisskeyStatusId -import dev.usbharu.multim.model.misskey.v12.* /** diff --git a/src/main/kotlin/dev/usbharu/multim/converter/misskey/v12/NoteConverter.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/converter/misskey/v12/NoteConverter.kt similarity index 81% rename from src/main/kotlin/dev/usbharu/multim/converter/misskey/v12/NoteConverter.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/converter/misskey/v12/NoteConverter.kt index 7a6e3e5..079864c 100644 --- a/src/main/kotlin/dev/usbharu/multim/converter/misskey/v12/NoteConverter.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/converter/misskey/v12/NoteConverter.kt @@ -1,9 +1,9 @@ -package dev.usbharu.multim.converter.misskey.v12 +package dev.usbharu.multim.misskey.v12.converter.misskey.v12 +import dev.usbharu.multim.misskey.v12.common.* +import dev.usbharu.multim.misskey.v12.model.components.Note +import dev.usbharu.multim.misskey.v12.model.components.UserLite import dev.usbharu.multim.model.common.Status -import dev.usbharu.multim.model.common.impl.misskey.* -import dev.usbharu.multim.model.misskey.v12.components.Note -import dev.usbharu.multim.model.misskey.v12.components.UserLite object NoteConverter { fun Note.toStatus(): MisskeyStatus { diff --git a/src/main/kotlin/dev/usbharu/multim/converter/misskey/v12/ReactionConverter.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/converter/misskey/v12/ReactionConverter.kt similarity index 66% rename from src/main/kotlin/dev/usbharu/multim/converter/misskey/v12/ReactionConverter.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/converter/misskey/v12/ReactionConverter.kt index 072b391..98fa4b0 100644 --- a/src/main/kotlin/dev/usbharu/multim/converter/misskey/v12/ReactionConverter.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/converter/misskey/v12/ReactionConverter.kt @@ -1,10 +1,10 @@ -package dev.usbharu.multim.converter.misskey.v12 +package dev.usbharu.multim.misskey.v12.converter.misskey.v12 +import dev.usbharu.multim.misskey.v12.common.MisskeyReaction +import dev.usbharu.multim.misskey.v12.model.components.Note +import dev.usbharu.multim.misskey.v12.model.components.NoteReaction +import dev.usbharu.multim.misskey.v12.model.components.Reactions import dev.usbharu.multim.model.common.Reaction -import dev.usbharu.multim.model.common.impl.misskey.MisskeyReaction -import dev.usbharu.multim.model.misskey.v12.components.Note -import dev.usbharu.multim.model.misskey.v12.components.NoteReaction -import dev.usbharu.multim.model.misskey.v12.components.Reactions object ReactionConverter { fun NoteReaction.toReaction(note: Note): Reaction { diff --git a/src/main/kotlin/dev/usbharu/multim/converter/misskey/v12/UsersConverter.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/converter/misskey/v12/UsersConverter.kt similarity index 50% rename from src/main/kotlin/dev/usbharu/multim/converter/misskey/v12/UsersConverter.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/converter/misskey/v12/UsersConverter.kt index f66d896..03d4a46 100644 --- a/src/main/kotlin/dev/usbharu/multim/converter/misskey/v12/UsersConverter.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/converter/misskey/v12/UsersConverter.kt @@ -1,8 +1,8 @@ -package dev.usbharu.multim.converter.misskey.v12 +package dev.usbharu.multim.misskey.v12.converter.misskey.v12 -import dev.usbharu.multim.model.common.impl.misskey.MisskeyAccount -import dev.usbharu.multim.model.common.impl.misskey.MisskeyRelation -import dev.usbharu.multim.model.misskey.v12.UsersRelationResponse +import dev.usbharu.multim.misskey.v12.common.MisskeyAccount +import dev.usbharu.multim.misskey.v12.common.MisskeyRelation +import dev.usbharu.multim.misskey.v12.model.UsersRelationResponse object UsersConverter { fun UsersRelationResponse.toRelation( @@ -12,4 +12,4 @@ object UsersConverter { return MisskeyRelation(myself, other, isFollowing, isFollowed, isMuted, isBlocked) } -} \ No newline at end of file +} diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/ApShow.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/ApShow.kt similarity index 68% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/ApShow.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/ApShow.kt index 12db516..ea33270 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/ApShow.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/ApShow.kt @@ -1,8 +1,8 @@ -package dev.usbharu.multim.model.misskey.v12 +package dev.usbharu.multim.misskey.v12.model -import dev.usbharu.multim.model.misskey.v12.components.MisskeyNeedAuth -import dev.usbharu.multim.model.misskey.v12.components.Note -import dev.usbharu.multim.model.misskey.v12.components.UserDetailedNotMe +import dev.usbharu.multim.misskey.v12.model.components.MisskeyNeedAuth +import dev.usbharu.multim.misskey.v12.model.components.Note +import dev.usbharu.multim.misskey.v12.model.components.UserDetailedNotMe import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/FollowingCreate.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/FollowingCreate.kt similarity index 56% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/FollowingCreate.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/FollowingCreate.kt index 5e7d5bf..1d87932 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/FollowingCreate.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/FollowingCreate.kt @@ -1,6 +1,6 @@ -package dev.usbharu.multim.model.misskey.v12 +package dev.usbharu.multim.misskey.v12.model -import dev.usbharu.multim.model.misskey.v12.components.UserLite +import dev.usbharu.multim.misskey.v12.model.components.UserLite @kotlinx.serialization.Serializable data class FollowingCreateRequest( diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/FollowingDelete.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/FollowingDelete.kt similarity index 56% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/FollowingDelete.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/FollowingDelete.kt index 428b27d..de1684b 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/FollowingDelete.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/FollowingDelete.kt @@ -1,6 +1,6 @@ -package dev.usbharu.multim.model.misskey.v12 +package dev.usbharu.multim.misskey.v12.model -import dev.usbharu.multim.model.misskey.v12.components.UserLite +import dev.usbharu.multim.misskey.v12.model.components.UserLite @kotlinx.serialization.Serializable data class FollowingDeleteRequest( diff --git a/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/FollowingInvalidate.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/FollowingInvalidate.kt new file mode 100644 index 0000000..d6ef6d7 --- /dev/null +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/FollowingInvalidate.kt @@ -0,0 +1,10 @@ +package dev.usbharu.multim.misskey.v12.model + +import dev.usbharu.multim.misskey.v12.model.components.UserLite + +@kotlinx.serialization.Serializable +data class FollowingInvalidateRequest( + val userId: String +) + +typealias FollowingInvalidateResponse = UserLite diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/FollowingRequestsAccept.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/FollowingRequestsAccept.kt similarity index 69% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/FollowingRequestsAccept.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/FollowingRequestsAccept.kt index 02837f6..a6d9252 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/FollowingRequestsAccept.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/FollowingRequestsAccept.kt @@ -1,8 +1,6 @@ -package dev.usbharu.multim.model.misskey.v12 +package dev.usbharu.multim.misskey.v12.model @kotlinx.serialization.Serializable data class FollowingRequestsAcceptRequest( val userId: String ) - - diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/FollowingRequestsCancel.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/FollowingRequestsCancel.kt similarity index 68% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/FollowingRequestsCancel.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/FollowingRequestsCancel.kt index 74cc686..fddbab3 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/FollowingRequestsCancel.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/FollowingRequestsCancel.kt @@ -1,6 +1,6 @@ -package dev.usbharu.multim.model.misskey.v12 +package dev.usbharu.multim.misskey.v12.model @kotlinx.serialization.Serializable data class FollowingRequestsCancelRequest( val userId: String -) \ No newline at end of file +) diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/FollowingRequestsList.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/FollowingRequestsList.kt similarity index 66% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/FollowingRequestsList.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/FollowingRequestsList.kt index 87b18df..cd6435e 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/FollowingRequestsList.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/FollowingRequestsList.kt @@ -1,6 +1,6 @@ -package dev.usbharu.multim.model.misskey.v12 +package dev.usbharu.multim.misskey.v12.model -import dev.usbharu.multim.model.misskey.v12.components.UserLite +import dev.usbharu.multim.misskey.v12.model.components.UserLite typealias FollowingRequestsListResponse = List @@ -9,4 +9,4 @@ data class FollowingRequestsList( val id: String, val follower: UserLite, val followee: UserLite -) \ No newline at end of file +) diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/FollowingRequestsReject.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/FollowingRequestsReject.kt similarity index 70% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/FollowingRequestsReject.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/FollowingRequestsReject.kt index 7d090b1..a9539ce 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/FollowingRequestsReject.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/FollowingRequestsReject.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.model.misskey.v12 +package dev.usbharu.multim.misskey.v12.model @kotlinx.serialization.Serializable data class FollowingRequestsRejectRequest( diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/MiauthCheck.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/MiauthCheck.kt similarity index 68% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/MiauthCheck.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/MiauthCheck.kt index 0ed4458..3cc6025 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/MiauthCheck.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/MiauthCheck.kt @@ -1,6 +1,6 @@ -package dev.usbharu.multim.model.misskey.v12 +package dev.usbharu.multim.misskey.v12.model -import dev.usbharu.multim.model.misskey.v12.components.User +import dev.usbharu.multim.misskey.v12.model.components.User import kotlinx.serialization.Serializable @Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/NotesChildren.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/NotesChildren.kt similarity index 70% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/NotesChildren.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/NotesChildren.kt index 07c320a..a782398 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/NotesChildren.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/NotesChildren.kt @@ -1,6 +1,6 @@ -package dev.usbharu.multim.model.misskey.v12 +package dev.usbharu.multim.misskey.v12.model -import dev.usbharu.multim.model.misskey.v12.components.Note +import dev.usbharu.multim.misskey.v12.model.components.Note import kotlinx.serialization.Serializable @Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/NotesConversation.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/NotesConversation.kt similarity index 67% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/NotesConversation.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/NotesConversation.kt index 60ebf32..4340abf 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/NotesConversation.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/NotesConversation.kt @@ -1,6 +1,6 @@ -package dev.usbharu.multim.model.misskey.v12 +package dev.usbharu.multim.misskey.v12.model -import dev.usbharu.multim.model.misskey.v12.components.Note +import dev.usbharu.multim.misskey.v12.model.components.Note import kotlinx.serialization.Serializable @Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/NotesCreate.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/NotesCreate.kt similarity index 91% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/NotesCreate.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/NotesCreate.kt index 1aaeb2a..e497be6 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/NotesCreate.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/NotesCreate.kt @@ -1,7 +1,7 @@ -package dev.usbharu.multim.model.misskey.v12 +package dev.usbharu.multim.misskey.v12.model -import dev.usbharu.multim.model.misskey.v12.components.MisskeyNeedAuth -import dev.usbharu.multim.model.misskey.v12.components.Note +import dev.usbharu.multim.misskey.v12.model.components.MisskeyNeedAuth +import dev.usbharu.multim.misskey.v12.model.components.Note import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/NotesDelete.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/NotesDelete.kt similarity index 56% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/NotesDelete.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/NotesDelete.kt index 7a31d63..7b9d6f8 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/NotesDelete.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/NotesDelete.kt @@ -1,6 +1,6 @@ -package dev.usbharu.multim.model.misskey.v12 +package dev.usbharu.multim.misskey.v12.model -import dev.usbharu.multim.model.misskey.v12.components.MisskeyNeedAuth +import dev.usbharu.multim.misskey.v12.model.components.MisskeyNeedAuth import kotlinx.serialization.Serializable @Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/NotesFavoritesCreate.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/NotesFavoritesCreate.kt similarity index 57% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/NotesFavoritesCreate.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/NotesFavoritesCreate.kt index acdf8e0..8d2a33e 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/NotesFavoritesCreate.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/NotesFavoritesCreate.kt @@ -1,6 +1,6 @@ -package dev.usbharu.multim.model.misskey.v12 +package dev.usbharu.multim.misskey.v12.model -import dev.usbharu.multim.model.misskey.v12.components.MisskeyNeedAuth +import dev.usbharu.multim.misskey.v12.model.components.MisskeyNeedAuth import kotlinx.serialization.Serializable @Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/NotesFavoritesDelete.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/NotesFavoritesDelete.kt similarity index 57% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/NotesFavoritesDelete.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/NotesFavoritesDelete.kt index 6cafd8e..dbcabc5 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/NotesFavoritesDelete.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/NotesFavoritesDelete.kt @@ -1,6 +1,6 @@ -package dev.usbharu.multim.model.misskey.v12 +package dev.usbharu.multim.misskey.v12.model -import dev.usbharu.multim.model.misskey.v12.components.MisskeyNeedAuth +import dev.usbharu.multim.misskey.v12.model.components.MisskeyNeedAuth import kotlinx.serialization.Serializable @Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/NotesFeatured.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/NotesFeatured.kt similarity index 64% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/NotesFeatured.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/NotesFeatured.kt index 17e9d35..bd2cd5d 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/NotesFeatured.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/NotesFeatured.kt @@ -1,6 +1,6 @@ -package dev.usbharu.multim.model.misskey.v12 +package dev.usbharu.multim.misskey.v12.model -import dev.usbharu.multim.model.misskey.v12.components.Note +import dev.usbharu.multim.misskey.v12.model.components.Note import kotlinx.serialization.Serializable @Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/NotesGlobalTimeline.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/NotesGlobalTimeline.kt similarity index 76% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/NotesGlobalTimeline.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/NotesGlobalTimeline.kt index 9184c40..57bafff 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/NotesGlobalTimeline.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/NotesGlobalTimeline.kt @@ -1,6 +1,6 @@ -package dev.usbharu.multim.model.misskey.v12 +package dev.usbharu.multim.misskey.v12.model -import dev.usbharu.multim.model.misskey.v12.components.Note +import dev.usbharu.multim.misskey.v12.model.components.Note import kotlinx.serialization.Serializable @Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/NotesHybridTimeline.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/NotesHybridTimeline.kt similarity index 81% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/NotesHybridTimeline.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/NotesHybridTimeline.kt index 5acfbd5..c4dbbc2 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/NotesHybridTimeline.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/NotesHybridTimeline.kt @@ -1,7 +1,7 @@ -package dev.usbharu.multim.model.misskey.v12 +package dev.usbharu.multim.misskey.v12.model -import dev.usbharu.multim.model.misskey.v12.components.MisskeyNeedAuth -import dev.usbharu.multim.model.misskey.v12.components.Note +import dev.usbharu.multim.misskey.v12.model.components.MisskeyNeedAuth +import dev.usbharu.multim.misskey.v12.model.components.Note import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializable import kotlinx.serialization.Serializer @@ -40,11 +40,16 @@ object NotesHybridTimelineResponseSerializer : KSerializer \ No newline at end of file +typealias UsersNotesResponse = List diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/UsersRelation.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/UsersRelation.kt similarity index 89% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/UsersRelation.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/UsersRelation.kt index a2db7f5..52c9bbd 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/UsersRelation.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/UsersRelation.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.model.misskey.v12 +package dev.usbharu.multim.misskey.v12.model @kotlinx.serialization.Serializable data class UsersRelationRequest(val userId: String) @@ -13,4 +13,4 @@ data class UsersRelationResponse( val isBlocking: Boolean, val isBlocked: Boolean, val isMuted: Boolean -) \ No newline at end of file +) diff --git a/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/UsersShow.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/UsersShow.kt new file mode 100644 index 0000000..34aac92 --- /dev/null +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/UsersShow.kt @@ -0,0 +1,9 @@ +package dev.usbharu.multim.misskey.v12.model + +import dev.usbharu.multim.misskey.v12.model.components.User + +@kotlinx.serialization.Serializable +data class UsersShowRequest( + val userId: String +) +typealias UsersShowResponse = User diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Antenna.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Antenna.kt similarity index 92% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Antenna.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Antenna.kt index c585ad0..ad02cbb 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Antenna.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Antenna.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.model.misskey.v12.components +package dev.usbharu.multim.misskey.v12.model.components import kotlinx.datetime.Instant import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/App.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/App.kt similarity index 81% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/App.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/App.kt index 0f4026f..926ed53 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/App.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/App.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.model.misskey.v12.components +package dev.usbharu.multim.misskey.v12.model.components import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Blocking.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Blocking.kt similarity index 69% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Blocking.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Blocking.kt index f52d6b0..ad6b279 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Blocking.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Blocking.kt @@ -1,7 +1,6 @@ -package dev.usbharu.multim.model.misskey.v12.components +package dev.usbharu.multim.misskey.v12.model.components import kotlinx.datetime.Instant -import kotlinx.datetime.LocalDateTime import kotlinx.serialization.Serializable @Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Channel.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Channel.kt similarity index 79% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Channel.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Channel.kt index d8224a5..a7b6e5a 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Channel.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Channel.kt @@ -1,7 +1,6 @@ -package dev.usbharu.multim.model.misskey.v12.components +package dev.usbharu.multim.misskey.v12.model.components import kotlinx.datetime.Instant -import kotlinx.datetime.LocalDateTime import kotlinx.serialization.Serializable @Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Clip.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Clip.kt similarity index 83% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Clip.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Clip.kt index 21b77ee..941d134 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Clip.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Clip.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.model.misskey.v12.components +package dev.usbharu.multim.misskey.v12.model.components import kotlinx.datetime.Instant import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/DriveFile.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/DriveFile.kt similarity index 92% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/DriveFile.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/DriveFile.kt index 8b81876..5650219 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/DriveFile.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/DriveFile.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.model.misskey.v12.components +package dev.usbharu.multim.misskey.v12.model.components import kotlinx.datetime.Instant import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/DriveFolder.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/DriveFolder.kt similarity index 84% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/DriveFolder.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/DriveFolder.kt index 3ef646e..233789f 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/DriveFolder.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/DriveFolder.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.model.misskey.v12.components +package dev.usbharu.multim.misskey.v12.model.components import kotlinx.datetime.Instant import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Emoji.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Emoji.kt similarity index 79% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Emoji.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Emoji.kt index f5e954b..62172e6 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Emoji.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Emoji.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.model.misskey.v12.components +package dev.usbharu.multim.misskey.v12.model.components import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/EmojiLite.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/EmojiLite.kt similarity index 67% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/EmojiLite.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/EmojiLite.kt index 2949dee..5df3449 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/EmojiLite.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/EmojiLite.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.model.misskey.v12.components +package dev.usbharu.multim.misskey.v12.model.components import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Error.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Error.kt similarity index 56% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Error.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Error.kt index f262f08..6c26b39 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Error.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Error.kt @@ -1,3 +1,3 @@ -package dev.usbharu.multim.model.misskey.v12.components +package dev.usbharu.multim.misskey.v12.model.components data class Error(val code: String, val message: String, val id: String) diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/FederationInstance.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/FederationInstance.kt similarity index 93% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/FederationInstance.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/FederationInstance.kt index 5c526a6..c5639a8 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/FederationInstance.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/FederationInstance.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.model.misskey.v12.components +package dev.usbharu.multim.misskey.v12.model.components import kotlinx.datetime.Instant import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Field.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Field.kt similarity index 66% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Field.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Field.kt index 2efc96b..ee9f943 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Field.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Field.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.model.misskey.v12.components +package dev.usbharu.multim.misskey.v12.model.components import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/File.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/File.kt similarity index 55% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/File.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/File.kt index 713c4e9..a461a0e 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/File.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/File.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.model.misskey.v12.components +package dev.usbharu.multim.misskey.v12.model.components import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Following.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Following.kt similarity index 75% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Following.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Following.kt index 1a60e51..ef7c925 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Following.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Following.kt @@ -1,7 +1,6 @@ -package dev.usbharu.multim.model.misskey.v12.components +package dev.usbharu.multim.misskey.v12.model.components import kotlinx.datetime.Instant -import kotlinx.datetime.LocalDateTime import kotlinx.serialization.Serializable @Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/GalleryPost.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/GalleryPost.kt similarity index 82% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/GalleryPost.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/GalleryPost.kt index 64970e8..668aa14 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/GalleryPost.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/GalleryPost.kt @@ -1,7 +1,6 @@ -package dev.usbharu.multim.model.misskey.v12.components +package dev.usbharu.multim.misskey.v12.model.components import kotlinx.datetime.Instant -import kotlinx.datetime.LocalDateTime import kotlinx.serialization.Serializable @Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Hashtag.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Hashtag.kt similarity index 85% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Hashtag.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Hashtag.kt index 8940e0d..693b96a 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Hashtag.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Hashtag.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.model.misskey.v12.components +package dev.usbharu.multim.misskey.v12.model.components import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/MeDetailed.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/MeDetailed.kt similarity index 96% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/MeDetailed.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/MeDetailed.kt index f60bba1..9fdf783 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/MeDetailed.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/MeDetailed.kt @@ -1,7 +1,6 @@ -package dev.usbharu.multim.model.misskey.v12.components +package dev.usbharu.multim.misskey.v12.model.components import kotlinx.datetime.Instant -import kotlinx.datetime.LocalDateTime import kotlinx.serialization.Serializable @Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/MeDetailedOnly.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/MeDetailedOnly.kt similarity index 95% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/MeDetailedOnly.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/MeDetailedOnly.kt index 9889edd..dfafb86 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/MeDetailedOnly.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/MeDetailedOnly.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.model.misskey.v12.components +package dev.usbharu.multim.misskey.v12.model.components import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/MessagingMessage.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/MessagingMessage.kt similarity index 82% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/MessagingMessage.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/MessagingMessage.kt index 11e6c5a..59bf604 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/MessagingMessage.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/MessagingMessage.kt @@ -1,7 +1,6 @@ -package dev.usbharu.multim.model.misskey.v12.components +package dev.usbharu.multim.misskey.v12.model.components import kotlinx.datetime.Instant -import kotlinx.datetime.LocalDateTime import kotlinx.serialization.Serializable @Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/MisskeyNeedAuth.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/MisskeyNeedAuth.kt similarity index 67% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/MisskeyNeedAuth.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/MisskeyNeedAuth.kt index be318b2..d9a710b 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/MisskeyNeedAuth.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/MisskeyNeedAuth.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.model.misskey.v12.components +package dev.usbharu.multim.misskey.v12.model.components import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Muting.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Muting.kt similarity index 71% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Muting.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Muting.kt index 995d1ff..a216de9 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Muting.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Muting.kt @@ -1,7 +1,6 @@ -package dev.usbharu.multim.model.misskey.v12.components +package dev.usbharu.multim.misskey.v12.model.components import kotlinx.datetime.Instant -import kotlinx.datetime.LocalDateTime import kotlinx.serialization.Serializable @Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Note.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Note.kt similarity index 95% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Note.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Note.kt index c746a1d..6df7f13 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Note.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Note.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.model.misskey.v12.components +package dev.usbharu.multim.misskey.v12.model.components import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/NoteFavorite.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/NoteFavorite.kt similarity index 68% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/NoteFavorite.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/NoteFavorite.kt index 2607c85..ffe1abc 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/NoteFavorite.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/NoteFavorite.kt @@ -1,7 +1,6 @@ -package dev.usbharu.multim.model.misskey.v12.components +package dev.usbharu.multim.misskey.v12.model.components import kotlinx.datetime.Instant -import kotlinx.datetime.LocalDateTime import kotlinx.serialization.Serializable @Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/NoteReaction.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/NoteReaction.kt similarity index 69% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/NoteReaction.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/NoteReaction.kt index 496b7eb..7b0b395 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/NoteReaction.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/NoteReaction.kt @@ -1,7 +1,6 @@ -package dev.usbharu.multim.model.misskey.v12.components +package dev.usbharu.multim.misskey.v12.model.components import kotlinx.datetime.Instant -import kotlinx.datetime.LocalDateTime import kotlinx.serialization.Serializable @Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Notification.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Notification.kt similarity index 90% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Notification.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Notification.kt index 0d4a738..7d2135c 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Notification.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Notification.kt @@ -1,7 +1,6 @@ -package dev.usbharu.multim.model.misskey.v12.components +package dev.usbharu.multim.misskey.v12.model.components import kotlinx.datetime.Instant -import kotlinx.datetime.LocalDateTime import kotlinx.serialization.Serializable @Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Page.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Page.kt similarity index 81% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Page.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Page.kt index 74f12ab..f98490f 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/Page.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/Page.kt @@ -1,7 +1,6 @@ -package dev.usbharu.multim.model.misskey.v12.components +package dev.usbharu.multim.misskey.v12.model.components import kotlinx.datetime.Instant -import kotlinx.datetime.LocalDateTime import kotlinx.serialization.Serializable @Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/QueueCount.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/QueueCount.kt similarity index 77% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/QueueCount.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/QueueCount.kt index 1f9610a..8a64291 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/QueueCount.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/QueueCount.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.model.misskey.v12.components +package dev.usbharu.multim.misskey.v12.model.components import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/User.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/User.kt similarity index 91% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/User.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/User.kt index cd5350f..a89c586 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/User.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/User.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.model.misskey.v12.components +package dev.usbharu.multim.misskey.v12.model.components import kotlinx.serialization.DeserializationStrategy import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/UserDetailed.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/UserDetailed.kt similarity index 92% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/UserDetailed.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/UserDetailed.kt index da4abe2..6a70a4a 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/UserDetailed.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/UserDetailed.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.model.misskey.v12.components +package dev.usbharu.multim.misskey.v12.model.components import kotlinx.serialization.DeserializationStrategy import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/UserDetailedNotMe.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/UserDetailedNotMe.kt similarity index 98% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/UserDetailedNotMe.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/UserDetailedNotMe.kt index 10b9388..532ff36 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/UserDetailedNotMe.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/UserDetailedNotMe.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.model.misskey.v12.components +package dev.usbharu.multim.misskey.v12.model.components import kotlinx.datetime.Instant import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/UserDetailedNotMeOnly.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/UserDetailedNotMeOnly.kt similarity index 95% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/UserDetailedNotMeOnly.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/UserDetailedNotMeOnly.kt index 88a7711..e35818e 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/UserDetailedNotMeOnly.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/UserDetailedNotMeOnly.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.model.misskey.v12.components +package dev.usbharu.multim.misskey.v12.model.components import kotlinx.datetime.Instant import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/UserGroup.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/UserGroup.kt similarity index 72% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/UserGroup.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/UserGroup.kt index edf0e90..671a795 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/UserGroup.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/UserGroup.kt @@ -1,7 +1,6 @@ -package dev.usbharu.multim.model.misskey.v12.components +package dev.usbharu.multim.misskey.v12.model.components import kotlinx.datetime.Instant -import kotlinx.datetime.LocalDateTime import kotlinx.serialization.Serializable @Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/UserList.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/UserList.kt similarity index 79% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/UserList.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/UserList.kt index 10d2d8b..63c690b 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/UserList.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/UserList.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.model.misskey.v12.components +package dev.usbharu.multim.misskey.v12.model.components import kotlinx.datetime.Instant import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/UserLite.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/UserLite.kt similarity index 92% rename from src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/UserLite.kt rename to impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/UserLite.kt index aefc2ad..f9edc75 100644 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/components/UserLite.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/components/UserLite.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.model.misskey.v12.components +package dev.usbharu.multim.misskey.v12.model.components import kotlinx.serialization.Serializable diff --git a/impl/misskey/src/test/kotlin/MisskeyTestUtil.kt b/impl/misskey/src/test/kotlin/MisskeyTestUtil.kt new file mode 100644 index 0000000..952faf6 --- /dev/null +++ b/impl/misskey/src/test/kotlin/MisskeyTestUtil.kt @@ -0,0 +1,81 @@ +import dev.usbharu.multim.misskey.v12.model.components.Note +import dev.usbharu.multim.misskey.v12.model.components.UserLite +import io.ktor.client.* +import io.ktor.client.engine.mock.* +import io.ktor.client.plugins.contentnegotiation.* +import io.ktor.client.request.* +import io.ktor.http.* +import io.ktor.serialization.kotlinx.json.* +import kotlinx.serialization.encodeToString +import kotlinx.serialization.json.Json +import kotlinx.serialization.json.jsonObject +import org.assertj.core.api.Fail + +object MisskeyTestUtil { + + val json = Json { ignoreUnknownKeys = true;isLenient = true } + + fun createMockHttpClient( + content: String = "", + contentType: String = "application/json", + statusCode: HttpStatusCode = HttpStatusCode.OK, + checkAuth: Boolean = true, + respond: suspend MockRequestHandleScope.(HttpRequestData) -> HttpResponseData = { + if (checkAuth) { + if ("i" in json.parseToJsonElement(it.body.toByteArray().decodeToString()).jsonObject) { + + } else { + Fail.fail("No auth") + } + } + respond( + content = content, + status = statusCode, + headers = headersOf(HttpHeaders.ContentType, contentType) + ) + } + ): HttpClient { + return HttpClient(MockEngine(respond)) { + Json { + ignoreUnknownKeys = true + isLenient = true + } + install(ContentNegotiation) { + json(Json { + ignoreUnknownKeys = true + isLenient = true + }) + } + } + } + + fun checkAuth( + respond: String, + status: HttpStatusCode = HttpStatusCode.OK, + headers: Headers = headersOf() + ): suspend MockRequestHandleScope.(HttpRequestData) -> HttpResponseData { + return { httpRequestData: HttpRequestData -> + val decodeToString = httpRequestData.body.toByteArray().decodeToString() + println(decodeToString) + if ("i" in json.parseToJsonElement(decodeToString).jsonObject) { + respond(respond, status, headers) + } else { + Fail.fail("Not authed") + respondBadRequest() + } + } + } + + fun createFakeNote(id: String, userId: String, username: String, text: String?): Note { + return Note( + id = id, + userId = userId, + user = UserLite(id = userId, name = username, username = username), + text = text + ) + } + + fun createFakeNoteToString(id: String, userId: String, username: String, text: String?): String { + return json.encodeToString(createFakeNote(id, userId, username, text)) + } +} diff --git a/src/test/kotlin/dev/usbharu/multim/api/misskey/v12/ApTest.kt b/impl/misskey/src/test/kotlin/dev/usbharu/multim/v12/api/ApTest.kt similarity index 88% rename from src/test/kotlin/dev/usbharu/multim/api/misskey/v12/ApTest.kt rename to impl/misskey/src/test/kotlin/dev/usbharu/multim/v12/api/ApTest.kt index 14bbcea..05f0a65 100644 --- a/src/test/kotlin/dev/usbharu/multim/api/misskey/v12/ApTest.kt +++ b/impl/misskey/src/test/kotlin/dev/usbharu/multim/v12/api/ApTest.kt @@ -1,14 +1,15 @@ @file:OptIn(ExperimentalCoroutinesApi::class) -package dev.usbharu.multim.api.misskey.v12 +package dev.usbharu.multim.v12.api -import dev.usbharu.multim.api.common.TestUtil.checkAuth -import dev.usbharu.multim.api.common.TestUtil.createFakeNoteToString -import dev.usbharu.multim.api.common.TestUtil.json +import MisskeyTestUtil.checkAuth +import MisskeyTestUtil.createFakeNoteToString +import MisskeyTestUtil.json import dev.usbharu.multim.api.common.createHttpClient -import dev.usbharu.multim.model.misskey.v12.ApShowRequest -import dev.usbharu.multim.model.misskey.v12.ApShowResponse -import dev.usbharu.multim.model.misskey.v12.components.Note +import dev.usbharu.multim.misskey.v12.api.Ap +import dev.usbharu.multim.misskey.v12.common.api.MisskeyApiClient +import dev.usbharu.multim.misskey.v12.model.ApShowRequest +import dev.usbharu.multim.misskey.v12.model.ApShowResponse import io.github.artsok.RepeatedIfExceptionsTest import io.ktor.client.* import io.ktor.client.engine.mock.* diff --git a/src/test/kotlin/dev/usbharu/multim/api/misskey/v12/MiauthTest.kt b/impl/misskey/src/test/kotlin/dev/usbharu/multim/v12/api/MiauthTest.kt similarity index 93% rename from src/test/kotlin/dev/usbharu/multim/api/misskey/v12/MiauthTest.kt rename to impl/misskey/src/test/kotlin/dev/usbharu/multim/v12/api/MiauthTest.kt index 1690fe5..8404e97 100644 --- a/src/test/kotlin/dev/usbharu/multim/api/misskey/v12/MiauthTest.kt +++ b/impl/misskey/src/test/kotlin/dev/usbharu/multim/v12/api/MiauthTest.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.api.misskey.v12 +package dev.usbharu.multim.v12.api import kotlinx.coroutines.* import kotlinx.coroutines.test.runTest diff --git a/src/test/kotlin/dev/usbharu/multim/api/misskey/v12/NotesTest.kt b/impl/misskey/src/test/kotlin/dev/usbharu/multim/v12/api/NotesTest.kt similarity index 95% rename from src/test/kotlin/dev/usbharu/multim/api/misskey/v12/NotesTest.kt rename to impl/misskey/src/test/kotlin/dev/usbharu/multim/v12/api/NotesTest.kt index f52cecb..ff4ad25 100644 --- a/src/test/kotlin/dev/usbharu/multim/api/misskey/v12/NotesTest.kt +++ b/impl/misskey/src/test/kotlin/dev/usbharu/multim/v12/api/NotesTest.kt @@ -1,10 +1,12 @@ -package dev.usbharu.multim.api.misskey.v12 +package dev.usbharu.multim.v12.api -import dev.usbharu.multim.api.common.TestUtil -import dev.usbharu.multim.api.common.TestUtil.createFakeNote -import dev.usbharu.multim.api.common.TestUtil.json +import MisskeyTestUtil.createFakeNote +import MisskeyTestUtil.createMockHttpClient +import MisskeyTestUtil.json import dev.usbharu.multim.api.common.createHttpClient -import dev.usbharu.multim.model.misskey.v12.* +import dev.usbharu.multim.misskey.v12.api.Notes +import dev.usbharu.multim.misskey.v12.common.api.MisskeyApiClient +import dev.usbharu.multim.misskey.v12.model.* import io.github.artsok.RepeatedIfExceptionsTest import io.ktor.client.* import io.ktor.client.engine.mock.* @@ -15,7 +17,6 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest import kotlinx.datetime.Instant import kotlinx.serialization.encodeToString -import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Assertions.* import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows @@ -30,7 +31,7 @@ class NotesTest { MisskeyApiClient( "aaaa", "", - TestUtil.createMockHttpClient( + createMockHttpClient( checkAuth = false, content = json.encodeToString(expectNoteArray) ) @@ -47,7 +48,7 @@ class NotesTest { MisskeyApiClient( "aaaa", "", - TestUtil.createMockHttpClient(content = json.encodeToString(expectNoteArray)) + createMockHttpClient(content = json.encodeToString(expectNoteArray)) ) ) val hybridTimeline = notes.hybridTimeline(NotesHybridTimelineRequest()) @@ -60,7 +61,7 @@ class NotesTest { MisskeyApiClient( "aaa", "", - TestUtil.createMockHttpClient( + createMockHttpClient( checkAuth = false, content = json.encodeToString(expectNoteArray) ) @@ -77,7 +78,7 @@ class NotesTest { MisskeyApiClient( "aaa", "", - TestUtil.createMockHttpClient( + createMockHttpClient( checkAuth = false, content = json.encodeToString(expectedNote) ) @@ -94,7 +95,7 @@ class NotesTest { MisskeyApiClient( "aaa", "", - TestUtil.createMockHttpClient(content = json.encodeToString(NotesCreateResponse(note))) + createMockHttpClient(content = json.encodeToString(NotesCreateResponse(note))) ) ) val create = notes.create(NotesCreateRequest(text = "gold")) @@ -103,7 +104,7 @@ class NotesTest { @Test fun deleteTest() = runTest { - val notes = Notes(MisskeyApiClient("aaa", "", TestUtil.createMockHttpClient(content = ""))) + val notes = Notes(MisskeyApiClient("aaa", "", createMockHttpClient(content = ""))) notes.delete(NotesDeleteRequest("Rw4g2CH")) } diff --git a/src/test/kotlin/dev/usbharu/multim/api/common/impl/misskey/MisskeyStatusApiTest.kt b/impl/misskey/src/test/kotlin/dev/usbharu/multim/v12/common/api/MisskeyStatusApiTest.kt similarity index 68% rename from src/test/kotlin/dev/usbharu/multim/api/common/impl/misskey/MisskeyStatusApiTest.kt rename to impl/misskey/src/test/kotlin/dev/usbharu/multim/v12/common/api/MisskeyStatusApiTest.kt index abf252e..cf1d69b 100644 --- a/src/test/kotlin/dev/usbharu/multim/api/common/impl/misskey/MisskeyStatusApiTest.kt +++ b/impl/misskey/src/test/kotlin/dev/usbharu/multim/v12/common/api/MisskeyStatusApiTest.kt @@ -1,8 +1,10 @@ -package dev.usbharu.multim.api.common.impl.misskey +package dev.usbharu.multim.v12.common.api -import dev.usbharu.multim.api.common.TestUtil -import dev.usbharu.multim.api.misskey.v12.MisskeyApiClient -import dev.usbharu.multim.model.common.impl.misskey.MisskeyStatusId +import MisskeyTestUtil +import dev.usbharu.multim.misskey.v12.api.MisskeyApis +import dev.usbharu.multim.misskey.v12.common.MisskeyStatusId +import dev.usbharu.multim.misskey.v12.common.api.MisskeyApiClient +import dev.usbharu.multim.misskey.v12.common.api.MisskeyStatusApi import kotlinx.coroutines.test.runTest import kotlinx.serialization.Serializable import kotlinx.serialization.decodeFromString @@ -17,9 +19,9 @@ class MisskeyStatusApiTest { MisskeyApiClient( "", "http://localhost/", - TestUtil.createMockHttpClient( + MisskeyTestUtil.createMockHttpClient( checkAuth = false, content = - Json.encodeToString(TestUtil.createFakeNote("Fx0Z", "D93", "brqNq4v", "earn")) + Json.encodeToString(MisskeyTestUtil.createFakeNote("Fx0Z", "D93", "brqNq4v", "earn")) ) ) ) diff --git a/settings.gradle.kts b/settings.gradle.kts index b3408d2..b516aeb 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1 +1,2 @@ rootProject.name = "multim" +include(":core",":impl:misskey") diff --git a/src/androidMain/AndroidManifest.xml b/src/androidMain/AndroidManifest.xml deleted file mode 100644 index 006fd51..0000000 --- a/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - diff --git a/src/androidMain/kotlin/dev/usbharu/multim/api/common/ApiClient.kt b/src/androidMain/kotlin/dev/usbharu/multim/api/common/ApiClient.kt deleted file mode 100644 index 48d727c..0000000 --- a/src/androidMain/kotlin/dev/usbharu/multim/api/common/ApiClient.kt +++ /dev/null @@ -1,9 +0,0 @@ -package dev.usbharu.multim.api.common - -import io.ktor.client.* -import io.ktor.client.engine.okhttp.* - - -actual fun createHttpClient(config: HttpClientConfig<*>.() -> Unit) = HttpClient(OkHttp) { - config(this) -} diff --git a/src/androidMain/kotlin/dev/usbharu/multim/utils/UUID.kt b/src/androidMain/kotlin/dev/usbharu/multim/utils/UUID.kt deleted file mode 100644 index 34b60f5..0000000 --- a/src/androidMain/kotlin/dev/usbharu/multim/utils/UUID.kt +++ /dev/null @@ -1,9 +0,0 @@ -package dev.usbharu.multim.utils - -import java.util.UUID - -actual object UUID { - actual fun generateUUID(): String { - return UUID.randomUUID().toString() - } -} diff --git a/src/jsMain/kotlin/dev/usbharu/multim/api/common/ApiClient.kt b/src/jsMain/kotlin/dev/usbharu/multim/api/common/ApiClient.kt deleted file mode 100644 index 26af136..0000000 --- a/src/jsMain/kotlin/dev/usbharu/multim/api/common/ApiClient.kt +++ /dev/null @@ -1,8 +0,0 @@ -package dev.usbharu.multim.api.common - -import io.ktor.client.* -import io.ktor.client.engine.js.* - -actual fun createHttpClient(config: HttpClientConfig<*>.() -> Unit): HttpClient { - return HttpClient(Js).config(config) -} diff --git a/src/jsMain/kotlin/dev/usbharu/multim/api/misskey/v12/MisskeyApiClient.kt b/src/jsMain/kotlin/dev/usbharu/multim/api/misskey/v12/MisskeyApiClient.kt deleted file mode 100644 index fa1c30f..0000000 --- a/src/jsMain/kotlin/dev/usbharu/multim/api/misskey/v12/MisskeyApiClient.kt +++ /dev/null @@ -1,2 +0,0 @@ -package dev.usbharu.multim.api.misskey.v12 - diff --git a/src/jsMain/kotlin/dev/usbharu/multim/utils/UUID.kt b/src/jsMain/kotlin/dev/usbharu/multim/utils/UUID.kt deleted file mode 100644 index ff07e9e..0000000 --- a/src/jsMain/kotlin/dev/usbharu/multim/utils/UUID.kt +++ /dev/null @@ -1,22 +0,0 @@ -package dev.usbharu.multim.utils - -import kotlin.random.Random - -actual object UUID { - actual fun generateUUID(): String { - val bytes = Random.nextBytes(size = 16) - bytes[6] = 0x10.toByte() - bytes[8] = 0x0100.toByte() - return buildString { - append(bytes.copyOfRange(0, 4).toHex()).append('-') - append(bytes.copyOfRange(4, 6).toHex()).append('-') - append(bytes.copyOfRange(6, 8).toHex()).append('-') - append(bytes.copyOfRange(8, 10).toHex()).append('-') - append(bytes.copyOfRange(10, 16).toHex()) - } - } - - private fun ByteArray.toHex(): String { - return toUByteArray().joinToString("") { it.toString(16).padStart(2, '0') } - } -} diff --git a/src/jvmMain/kotlin/dev/usbharu/multim/api/common/ApiClient.kt b/src/jvmMain/kotlin/dev/usbharu/multim/api/common/ApiClient.kt deleted file mode 100644 index 836352a..0000000 --- a/src/jvmMain/kotlin/dev/usbharu/multim/api/common/ApiClient.kt +++ /dev/null @@ -1,9 +0,0 @@ -package dev.usbharu.multim.api.common - -import io.ktor.client.* -import io.ktor.client.engine.cio.* - - -actual fun createHttpClient(config: HttpClientConfig<*>.() -> Unit) = HttpClient(CIO) { - config(this) -} diff --git a/src/jvmMain/kotlin/dev/usbharu/multim/api/misskey/v12/MisskeyApiClient.kt b/src/jvmMain/kotlin/dev/usbharu/multim/api/misskey/v12/MisskeyApiClient.kt deleted file mode 100644 index fa1c30f..0000000 --- a/src/jvmMain/kotlin/dev/usbharu/multim/api/misskey/v12/MisskeyApiClient.kt +++ /dev/null @@ -1,2 +0,0 @@ -package dev.usbharu.multim.api.misskey.v12 - diff --git a/src/jvmMain/kotlin/dev/usbharu/multim/utils/UUID.kt b/src/jvmMain/kotlin/dev/usbharu/multim/utils/UUID.kt deleted file mode 100644 index 34b60f5..0000000 --- a/src/jvmMain/kotlin/dev/usbharu/multim/utils/UUID.kt +++ /dev/null @@ -1,9 +0,0 @@ -package dev.usbharu.multim.utils - -import java.util.UUID - -actual object UUID { - actual fun generateUUID(): String { - return UUID.randomUUID().toString() - } -} diff --git a/src/jvmTest/kotlin/dev/usbharu/multim/api/misskey/v12/ApTest.kt b/src/jvmTest/kotlin/dev/usbharu/multim/api/misskey/v12/ApTest.kt deleted file mode 100644 index d6350da..0000000 --- a/src/jvmTest/kotlin/dev/usbharu/multim/api/misskey/v12/ApTest.kt +++ /dev/null @@ -1,10 +0,0 @@ -package dev.usbharu.multim.api.misskey.v12 - -import dev.usbharu.multim.api.common.createHttpClient -import dev.usbharu.multim.model.misskey.v12.ApShowRequest -import dev.usbharu.multim.model.misskey.v12.ApShowResponse -import dev.usbharu.multim.secret.BuildKonfig -import kotlinx.coroutines.test.runTest -import org.junit.jupiter.api.Test -import org.junit.jupiter.api.condition.EnabledIfSystemProperty -import kotlin.test.assertIs diff --git a/src/jvmTest/kotlin/dev/usbharu/multim/api/misskey/v12/NotesTest.kt b/src/jvmTest/kotlin/dev/usbharu/multim/api/misskey/v12/NotesTest.kt deleted file mode 100644 index 23c8621..0000000 --- a/src/jvmTest/kotlin/dev/usbharu/multim/api/misskey/v12/NotesTest.kt +++ /dev/null @@ -1,8 +0,0 @@ -package dev.usbharu.multim.api.misskey.v12 - -import dev.usbharu.multim.api.common.createHttpClient -import dev.usbharu.multim.model.misskey.v12.* -import dev.usbharu.multim.secret.BuildKonfig -import kotlinx.coroutines.test.runTest -import org.junit.jupiter.api.Test -import kotlin.test.assertFails diff --git a/src/main/kotlin/dev/usbharu/multim/api/factory/impl/MisskeyMultiMApis.kt b/src/main/kotlin/dev/usbharu/multim/api/factory/impl/MisskeyMultiMApis.kt deleted file mode 100644 index dbed25f..0000000 --- a/src/main/kotlin/dev/usbharu/multim/api/factory/impl/MisskeyMultiMApis.kt +++ /dev/null @@ -1,8 +0,0 @@ -package dev.usbharu.multim.api.factory.impl - -import dev.usbharu.multim.api.common.impl.misskey.MisskeyAccountApi -import dev.usbharu.multim.api.common.impl.misskey.MisskeyStatusApi -import dev.usbharu.multim.api.factory.MultiMApis - -class MisskeyMultiMApis(statusApi: MisskeyStatusApi, accountApi: MisskeyAccountApi) : - MultiMApis(statusApi, accountApi) \ No newline at end of file diff --git a/src/main/kotlin/dev/usbharu/multim/api/misskey/v12/Ap.kt b/src/main/kotlin/dev/usbharu/multim/api/misskey/v12/Ap.kt deleted file mode 100644 index 7b8e7d6..0000000 --- a/src/main/kotlin/dev/usbharu/multim/api/misskey/v12/Ap.kt +++ /dev/null @@ -1,10 +0,0 @@ -package dev.usbharu.multim.api.misskey.v12 - -import dev.usbharu.multim.model.misskey.v12.ApShowRequest -import dev.usbharu.multim.model.misskey.v12.ApShowResponse - -class Ap(val client: MisskeyApiClient) { - suspend fun show(apShowRequest: ApShowRequest): ApShowResponse { - return client.post(apShowRequest, "api/ap/show") - } -} diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/FollowingInvalidate.kt b/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/FollowingInvalidate.kt deleted file mode 100644 index 9d84744..0000000 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/FollowingInvalidate.kt +++ /dev/null @@ -1,10 +0,0 @@ -package dev.usbharu.multim.model.misskey.v12 - -import dev.usbharu.multim.model.misskey.v12.components.UserLite - -@kotlinx.serialization.Serializable -data class FollowingInvalidateRequest( - val userId: String -) - -typealias FollowingInvalidateResponse = UserLite \ No newline at end of file diff --git a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/UsersShow.kt b/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/UsersShow.kt deleted file mode 100644 index ca68181..0000000 --- a/src/main/kotlin/dev/usbharu/multim/model/misskey/v12/UsersShow.kt +++ /dev/null @@ -1,9 +0,0 @@ -package dev.usbharu.multim.model.misskey.v12 - -import dev.usbharu.multim.model.misskey.v12.components.User - -@kotlinx.serialization.Serializable -data class UsersShowRequest( - val userId: String -) -typealias UsersShowResponse = User \ No newline at end of file diff --git a/src/test/kotlin/dev/usbharu/multim/model/misskey/v12/ApShowTest.kt b/src/test/kotlin/dev/usbharu/multim/model/misskey/v12/ApShowTest.kt deleted file mode 100644 index f557698..0000000 --- a/src/test/kotlin/dev/usbharu/multim/model/misskey/v12/ApShowTest.kt +++ /dev/null @@ -1,55 +0,0 @@ -package dev.usbharu.multim.model.misskey.v12 - -import kotlinx.serialization.decodeFromString -import kotlinx.serialization.json.Json -import org.junit.jupiter.api.Test - -class ApShowTest { - - @Test - fun serializeTest() { - //language=JSON - val test = """{ - "type": "Note", - "object": { - "id": "aaaaaaaaa", - "createdAt": "2023-01-19T06:07:12.000Z", - "userId": "aaaaaaaaa", - "user": { - "id": "vvvvvvvv", - "name": "aaa", - "username": "aaa", - "host": "example.com", - "avatarUrl": "https://localhost/fake.webp", - "avatarBlurhash": "afaldjfaslfjdklajf", - "avatarColor": null, - "instance": { - "name": "test", - "softwareName": "testdon", - "softwareVersion": "3.3.3", - "iconUrl": "https://example.com/favicon.ico", - "faviconUrl": "https://example.com/favicon.ico", - "themeColor": "#000000" - }, - "emojis": [], - "onlineStatus": "unknown", - "driveCapacityOverrideMb": null - }, - "text": "Lorem ipsum dolor sit amet clita et lorem invidunt eirmod elitr soluta vel rebum justo consetetur sed. Tempor option takimata ipsum diam doming est gubergren velit accumsan sed sed consectetuer.", - "cw": null, - "visibility": "public", - "renoteCount": 0, - "repliesCount": 0, - "reactions": {}, - "emojis": [], - "fileIds": [], - "files": [], - "replyId": null, - "renoteId": null, - "uri": "https://example.com", - "url": "https://example.com" - }}""" - val response: ApShowResponse = Json { ignoreUnknownKeys = true }.decodeFromString(test) - println(response) - } -}