From 3d1699ea1dd9a3ac9406edd4974dd719a2a0df8d Mon Sep 17 00:00:00 2001 From: Eyre_S Date: Wed, 29 Nov 2023 00:15:13 +0800 Subject: [PATCH] move external API docking code to `extra` package from `data` --- gradle.properties | 2 +- .../cc/sukazyo/cono/morny/bot/command/GetSocial.scala | 7 ++++--- .../cc/sukazyo/cono/morny/bot/command/IP186Query.scala | 2 +- .../scala/cc/sukazyo/cono/morny/bot/command/Nbnhhsh.scala | 3 ++- .../sukazyo/cono/morny/bot/query/ShareToolBilibili.scala | 2 +- .../cc/sukazyo/cono/morny/bot/query/ShareToolTwitter.scala | 4 ++-- .../sukazyo/cono/morny/{data => extra}/BilibiliForms.scala | 2 +- .../sukazyo/cono/morny/{data => extra}/NbnhhshQuery.scala | 2 +- .../morny/{data => extra}/ip186/IP186QueryHandler.scala | 2 +- .../cono/morny/{data => extra}/ip186/IP186Response.scala | 2 +- .../sukazyo/cono/morny/{data => extra}/twitter/FXApi.scala | 2 +- .../cono/morny/{data => extra}/twitter/FXAuthor.scala | 2 +- .../morny/{data => extra}/twitter/FXExternalMedia.scala | 2 +- .../cono/morny/{data => extra}/twitter/FXMosaicPhoto.scala | 4 ++-- .../cono/morny/{data => extra}/twitter/FXPhoto.scala | 2 +- .../cono/morny/{data => extra}/twitter/FXPool.scala | 2 +- .../cono/morny/{data => extra}/twitter/FXPoolChoice.scala | 2 +- .../cono/morny/{data => extra}/twitter/FXTranslate.scala | 2 +- .../cono/morny/{data => extra}/twitter/FXTweet.scala | 4 ++-- .../cono/morny/{data => extra}/twitter/FXVideo.scala | 2 +- .../cono/morny/{data => extra}/twitter/package.scala | 2 +- .../cc/sukazyo/cono/morny/{data => extra}/weibo/MApi.scala | 2 +- .../cc/sukazyo/cono/morny/{data => extra}/weibo/MPic.scala | 2 +- .../sukazyo/cono/morny/{data => extra}/weibo/MStatus.scala | 2 +- .../sukazyo/cono/morny/{data => extra}/weibo/MUser.scala | 2 +- .../sukazyo/cono/morny/{data => extra}/weibo/package.scala | 2 +- .../morny/test/{data => extra}/BilibiliFormsTest.scala | 4 ++-- .../morny/test/{data => extra}/twitter/FXApiTest.scala | 6 +++--- .../morny/test/{data => extra}/twitter/PackageTest.scala | 4 ++-- 29 files changed, 40 insertions(+), 38 deletions(-) rename src/main/scala/cc/sukazyo/cono/morny/{data => extra}/BilibiliForms.scala (99%) rename src/main/scala/cc/sukazyo/cono/morny/{data => extra}/NbnhhshQuery.scala (96%) rename src/main/scala/cc/sukazyo/cono/morny/{data => extra}/ip186/IP186QueryHandler.scala (97%) rename src/main/scala/cc/sukazyo/cono/morny/{data => extra}/ip186/IP186Response.scala (56%) rename src/main/scala/cc/sukazyo/cono/morny/{data => extra}/twitter/FXApi.scala (99%) rename src/main/scala/cc/sukazyo/cono/morny/{data => extra}/twitter/FXAuthor.scala (95%) rename src/main/scala/cc/sukazyo/cono/morny/{data => extra}/twitter/FXExternalMedia.scala (89%) rename src/main/scala/cc/sukazyo/cono/morny/{data => extra}/twitter/FXMosaicPhoto.scala (82%) rename src/main/scala/cc/sukazyo/cono/morny/{data => extra}/twitter/FXPhoto.scala (89%) rename src/main/scala/cc/sukazyo/cono/morny/{data => extra}/twitter/FXPool.scala (89%) rename src/main/scala/cc/sukazyo/cono/morny/{data => extra}/twitter/FXPoolChoice.scala (88%) rename src/main/scala/cc/sukazyo/cono/morny/{data => extra}/twitter/FXTranslate.scala (88%) rename src/main/scala/cc/sukazyo/cono/morny/{data => extra}/twitter/FXTweet.scala (96%) rename src/main/scala/cc/sukazyo/cono/morny/{data => extra}/twitter/FXVideo.scala (92%) rename src/main/scala/cc/sukazyo/cono/morny/{data => extra}/twitter/package.scala (98%) rename src/main/scala/cc/sukazyo/cono/morny/{data => extra}/weibo/MApi.scala (97%) rename src/main/scala/cc/sukazyo/cono/morny/{data => extra}/weibo/MPic.scala (90%) rename src/main/scala/cc/sukazyo/cono/morny/{data => extra}/weibo/MStatus.scala (97%) rename src/main/scala/cc/sukazyo/cono/morny/{data => extra}/weibo/MUser.scala (83%) rename src/main/scala/cc/sukazyo/cono/morny/{data => extra}/weibo/package.scala (96%) rename src/test/scala/cc/sukazyo/cono/morny/test/{data => extra}/BilibiliFormsTest.scala (98%) rename src/test/scala/cc/sukazyo/cono/morny/test/{data => extra}/twitter/FXApiTest.scala (95%) rename src/test/scala/cc/sukazyo/cono/morny/test/{data => extra}/twitter/PackageTest.scala (97%) diff --git a/gradle.properties b/gradle.properties index 51fff15..a0939eb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ MORNY_ARCHIVE_NAME = morny-coeur MORNY_CODE_STORE = https://github.com/Eyre-S/Coeur-Morny-Cono MORNY_COMMIT_PATH = https://github.com/Eyre-S/Coeur-Morny-Cono/commit/%s -VERSION = 1.3.0-dev11 +VERSION = 1.3.0-dev11.1 USE_DELTA = false VERSION_DELTA = diff --git a/src/main/scala/cc/sukazyo/cono/morny/bot/command/GetSocial.scala b/src/main/scala/cc/sukazyo/cono/morny/bot/command/GetSocial.scala index 3b96200..fb2a0c3 100644 --- a/src/main/scala/cc/sukazyo/cono/morny/bot/command/GetSocial.scala +++ b/src/main/scala/cc/sukazyo/cono/morny/bot/command/GetSocial.scala @@ -1,11 +1,12 @@ package cc.sukazyo.cono.morny.bot.command -import cc.sukazyo.cono.morny.data.{twitter, weibo, TelegramStickers} +import cc.sukazyo.cono.morny.data.TelegramStickers import cc.sukazyo.cono.morny.util.tgapi.InputCommand import cc.sukazyo.cono.morny.MornyCoeur -import cc.sukazyo.cono.morny.data.twitter.{FXApi, TweetUrlInformation} +import cc.sukazyo.cono.morny.extra.{twitter, weibo} +import cc.sukazyo.cono.morny.extra.twitter.{FXApi, TweetUrlInformation} import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Bot.exec import cc.sukazyo.cono.morny.Log.{exceptionLog, logger} -import cc.sukazyo.cono.morny.data.weibo.StatusUrlInfo +import cc.sukazyo.cono.morny.extra.weibo.StatusUrlInfo import com.pengrad.telegrambot.model.Update import com.pengrad.telegrambot.model.request.{InputMedia, InputMediaPhoto, InputMediaVideo, ParseMode} import com.pengrad.telegrambot.request.{SendMediaGroup, SendMessage, SendSticker} diff --git a/src/main/scala/cc/sukazyo/cono/morny/bot/command/IP186Query.scala b/src/main/scala/cc/sukazyo/cono/morny/bot/command/IP186Query.scala index 60d53a7..2b5795d 100644 --- a/src/main/scala/cc/sukazyo/cono/morny/bot/command/IP186Query.scala +++ b/src/main/scala/cc/sukazyo/cono/morny/bot/command/IP186Query.scala @@ -1,7 +1,7 @@ package cc.sukazyo.cono.morny.bot.command import cc.sukazyo.cono.morny.MornyCoeur -import cc.sukazyo.cono.morny.data.ip186.IP186QueryHandler +import cc.sukazyo.cono.morny.extra.ip186.IP186QueryHandler import cc.sukazyo.cono.morny.util.tgapi.InputCommand import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Bot.exec import com.pengrad.telegrambot.model.Update diff --git a/src/main/scala/cc/sukazyo/cono/morny/bot/command/Nbnhhsh.scala b/src/main/scala/cc/sukazyo/cono/morny/bot/command/Nbnhhsh.scala index ea95cbe..c05714b 100644 --- a/src/main/scala/cc/sukazyo/cono/morny/bot/command/Nbnhhsh.scala +++ b/src/main/scala/cc/sukazyo/cono/morny/bot/command/Nbnhhsh.scala @@ -1,7 +1,8 @@ package cc.sukazyo.cono.morny.bot.command import cc.sukazyo.cono.morny.MornyCoeur -import cc.sukazyo.cono.morny.data.{NbnhhshQuery, TelegramStickers} +import cc.sukazyo.cono.morny.data.TelegramStickers +import cc.sukazyo.cono.morny.extra.NbnhhshQuery import cc.sukazyo.cono.morny.util.tgapi.formatting.TelegramParseEscape.escapeHtml as h import cc.sukazyo.cono.morny.util.tgapi.InputCommand import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Bot.exec diff --git a/src/main/scala/cc/sukazyo/cono/morny/bot/query/ShareToolBilibili.scala b/src/main/scala/cc/sukazyo/cono/morny/bot/query/ShareToolBilibili.scala index 85128db..f7b6872 100644 --- a/src/main/scala/cc/sukazyo/cono/morny/bot/query/ShareToolBilibili.scala +++ b/src/main/scala/cc/sukazyo/cono/morny/bot/query/ShareToolBilibili.scala @@ -24,7 +24,7 @@ class ShareToolBilibili (using coeur: MornyCoeur) extends ITelegramQuery { if (event.inlineQuery.query == null) return null if (event.inlineQuery.query isBlank) return null - import cc.sukazyo.cono.morny.data.BilibiliForms.* + import cc.sukazyo.cono.morny.extra.BilibiliForms.* val result: BiliVideoId = try parse_videoUrl(event.inlineQuery.query) diff --git a/src/main/scala/cc/sukazyo/cono/morny/bot/query/ShareToolTwitter.scala b/src/main/scala/cc/sukazyo/cono/morny/bot/query/ShareToolTwitter.scala index 4f49d9f..3105b05 100644 --- a/src/main/scala/cc/sukazyo/cono/morny/bot/query/ShareToolTwitter.scala +++ b/src/main/scala/cc/sukazyo/cono/morny/bot/query/ShareToolTwitter.scala @@ -1,7 +1,7 @@ package cc.sukazyo.cono.morny.bot.query -import cc.sukazyo.cono.morny.data.twitter -import cc.sukazyo.cono.morny.data.twitter.TweetUrlInformation +import cc.sukazyo.cono.morny.extra.twitter +import cc.sukazyo.cono.morny.extra.twitter.TweetUrlInformation import cc.sukazyo.cono.morny.util.tgapi.formatting.NamingUtils.inlineQueryId import com.pengrad.telegrambot.model.Update import com.pengrad.telegrambot.model.request.InlineQueryResultArticle diff --git a/src/main/scala/cc/sukazyo/cono/morny/data/BilibiliForms.scala b/src/main/scala/cc/sukazyo/cono/morny/extra/BilibiliForms.scala similarity index 99% rename from src/main/scala/cc/sukazyo/cono/morny/data/BilibiliForms.scala rename to src/main/scala/cc/sukazyo/cono/morny/extra/BilibiliForms.scala index d018119..3dc55f3 100644 --- a/src/main/scala/cc/sukazyo/cono/morny/data/BilibiliForms.scala +++ b/src/main/scala/cc/sukazyo/cono/morny/extra/BilibiliForms.scala @@ -1,4 +1,4 @@ -package cc.sukazyo.cono.morny.data +package cc.sukazyo.cono.morny.extra import cc.sukazyo.cono.morny.util.BiliTool import cc.sukazyo.cono.morny.util.SttpPublic.{mornyBasicRequest, Schemes} diff --git a/src/main/scala/cc/sukazyo/cono/morny/data/NbnhhshQuery.scala b/src/main/scala/cc/sukazyo/cono/morny/extra/NbnhhshQuery.scala similarity index 96% rename from src/main/scala/cc/sukazyo/cono/morny/data/NbnhhshQuery.scala rename to src/main/scala/cc/sukazyo/cono/morny/extra/NbnhhshQuery.scala index 1fd00fb..99a8170 100644 --- a/src/main/scala/cc/sukazyo/cono/morny/data/NbnhhshQuery.scala +++ b/src/main/scala/cc/sukazyo/cono/morny/extra/NbnhhshQuery.scala @@ -1,4 +1,4 @@ -package cc.sukazyo.cono.morny.data +package cc.sukazyo.cono.morny.extra import cc.sukazyo.cono.morny.util.SttpPublic.mornyBasicRequest import com.google.gson.Gson diff --git a/src/main/scala/cc/sukazyo/cono/morny/data/ip186/IP186QueryHandler.scala b/src/main/scala/cc/sukazyo/cono/morny/extra/ip186/IP186QueryHandler.scala similarity index 97% rename from src/main/scala/cc/sukazyo/cono/morny/data/ip186/IP186QueryHandler.scala rename to src/main/scala/cc/sukazyo/cono/morny/extra/ip186/IP186QueryHandler.scala index 3bc351c..630bf29 100644 --- a/src/main/scala/cc/sukazyo/cono/morny/data/ip186/IP186QueryHandler.scala +++ b/src/main/scala/cc/sukazyo/cono/morny/extra/ip186/IP186QueryHandler.scala @@ -1,4 +1,4 @@ -package cc.sukazyo.cono.morny.data.ip186 +package cc.sukazyo.cono.morny.extra.ip186 import cc.sukazyo.cono.morny.util.SttpPublic.{mornyBasicRequest, Schemes} import sttp.client3.{asString, HttpError, SttpClientException, UriContext} diff --git a/src/main/scala/cc/sukazyo/cono/morny/data/ip186/IP186Response.scala b/src/main/scala/cc/sukazyo/cono/morny/extra/ip186/IP186Response.scala similarity index 56% rename from src/main/scala/cc/sukazyo/cono/morny/data/ip186/IP186Response.scala rename to src/main/scala/cc/sukazyo/cono/morny/extra/ip186/IP186Response.scala index 6fcad79..6673044 100644 --- a/src/main/scala/cc/sukazyo/cono/morny/data/ip186/IP186Response.scala +++ b/src/main/scala/cc/sukazyo/cono/morny/extra/ip186/IP186Response.scala @@ -1,3 +1,3 @@ -package cc.sukazyo.cono.morny.data.ip186 +package cc.sukazyo.cono.morny.extra.ip186 case class IP186Response (url: String, body: String) diff --git a/src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXApi.scala b/src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXApi.scala similarity index 99% rename from src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXApi.scala rename to src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXApi.scala index 7f5ce51..11a4af8 100644 --- a/src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXApi.scala +++ b/src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXApi.scala @@ -1,4 +1,4 @@ -package cc.sukazyo.cono.morny.data.twitter +package cc.sukazyo.cono.morny.extra.twitter import cc.sukazyo.cono.morny.util.SttpPublic import cc.sukazyo.cono.morny.util.SttpPublic.mornyBasicRequest diff --git a/src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXAuthor.scala b/src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXAuthor.scala similarity index 95% rename from src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXAuthor.scala rename to src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXAuthor.scala index cc4c834..1aacb81 100644 --- a/src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXAuthor.scala +++ b/src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXAuthor.scala @@ -1,4 +1,4 @@ -package cc.sukazyo.cono.morny.data.twitter +package cc.sukazyo.cono.morny.extra.twitter /** Information about the author of a tweet. * diff --git a/src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXExternalMedia.scala b/src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXExternalMedia.scala similarity index 89% rename from src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXExternalMedia.scala rename to src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXExternalMedia.scala index a5ef915..202c55e 100644 --- a/src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXExternalMedia.scala +++ b/src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXExternalMedia.scala @@ -1,4 +1,4 @@ -package cc.sukazyo.cono.morny.data.twitter +package cc.sukazyo.cono.morny.extra.twitter /** Data for external media, currently only video. * diff --git a/src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXMosaicPhoto.scala b/src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXMosaicPhoto.scala similarity index 82% rename from src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXMosaicPhoto.scala rename to src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXMosaicPhoto.scala index 23f7990..4fd6453 100644 --- a/src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXMosaicPhoto.scala +++ b/src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXMosaicPhoto.scala @@ -1,6 +1,6 @@ -package cc.sukazyo.cono.morny.data.twitter +package cc.sukazyo.cono.morny.extra.twitter -import cc.sukazyo.cono.morny.data.twitter.FXMosaicPhoto.formatsType +import cc.sukazyo.cono.morny.extra.twitter.FXMosaicPhoto.formatsType /** Data for the mosaic service, which stitches photos together * diff --git a/src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXPhoto.scala b/src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXPhoto.scala similarity index 89% rename from src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXPhoto.scala rename to src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXPhoto.scala index 336c576..d759110 100644 --- a/src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXPhoto.scala +++ b/src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXPhoto.scala @@ -1,4 +1,4 @@ -package cc.sukazyo.cono.morny.data.twitter +package cc.sukazyo.cono.morny.extra.twitter /** This can help compare items in a pool of media * diff --git a/src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXPool.scala b/src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXPool.scala similarity index 89% rename from src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXPool.scala rename to src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXPool.scala index 6148160..bfc7f80 100644 --- a/src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXPool.scala +++ b/src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXPool.scala @@ -1,4 +1,4 @@ -package cc.sukazyo.cono.morny.data.twitter +package cc.sukazyo.cono.morny.extra.twitter /** Data for a poll on a given Tweet. * diff --git a/src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXPoolChoice.scala b/src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXPoolChoice.scala similarity index 88% rename from src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXPoolChoice.scala rename to src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXPoolChoice.scala index 0ded892..1dfe0bd 100644 --- a/src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXPoolChoice.scala +++ b/src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXPoolChoice.scala @@ -1,4 +1,4 @@ -package cc.sukazyo.cono.morny.data.twitter +package cc.sukazyo.cono.morny.extra.twitter /** Data for a single choice in a poll * diff --git a/src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXTranslate.scala b/src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXTranslate.scala similarity index 88% rename from src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXTranslate.scala rename to src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXTranslate.scala index a49b4e3..0f6a08b 100644 --- a/src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXTranslate.scala +++ b/src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXTranslate.scala @@ -1,4 +1,4 @@ -package cc.sukazyo.cono.morny.data.twitter +package cc.sukazyo.cono.morny.extra.twitter /** Information about a requested translation for a Tweet, when asked. * diff --git a/src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXTweet.scala b/src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXTweet.scala similarity index 96% rename from src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXTweet.scala rename to src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXTweet.scala index 2bc75e3..b4b2b57 100644 --- a/src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXTweet.scala +++ b/src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXTweet.scala @@ -1,6 +1,6 @@ -package cc.sukazyo.cono.morny.data.twitter +package cc.sukazyo.cono.morny.extra.twitter -import cc.sukazyo.cono.morny.data.twitter.FXTweet.mediaType +import cc.sukazyo.cono.morny.extra.twitter.FXTweet.mediaType import cc.sukazyo.cono.morny.util.EpochDateTime.EpochSeconds /** The container of all the information for a Tweet. diff --git a/src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXVideo.scala b/src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXVideo.scala similarity index 92% rename from src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXVideo.scala rename to src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXVideo.scala index 0884500..b58f133 100644 --- a/src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXVideo.scala +++ b/src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXVideo.scala @@ -1,4 +1,4 @@ -package cc.sukazyo.cono.morny.data.twitter +package cc.sukazyo.cono.morny.extra.twitter /** Data for a Tweet's video * diff --git a/src/main/scala/cc/sukazyo/cono/morny/data/twitter/package.scala b/src/main/scala/cc/sukazyo/cono/morny/extra/twitter/package.scala similarity index 98% rename from src/main/scala/cc/sukazyo/cono/morny/data/twitter/package.scala rename to src/main/scala/cc/sukazyo/cono/morny/extra/twitter/package.scala index 73e6259..05c9b03 100644 --- a/src/main/scala/cc/sukazyo/cono/morny/data/twitter/package.scala +++ b/src/main/scala/cc/sukazyo/cono/morny/extra/twitter/package.scala @@ -1,4 +1,4 @@ -package cc.sukazyo.cono.morny.data +package cc.sukazyo.cono.morny.extra import scala.util.matching.Regex diff --git a/src/main/scala/cc/sukazyo/cono/morny/data/weibo/MApi.scala b/src/main/scala/cc/sukazyo/cono/morny/extra/weibo/MApi.scala similarity index 97% rename from src/main/scala/cc/sukazyo/cono/morny/data/weibo/MApi.scala rename to src/main/scala/cc/sukazyo/cono/morny/extra/weibo/MApi.scala index a576db5..c87236f 100644 --- a/src/main/scala/cc/sukazyo/cono/morny/data/weibo/MApi.scala +++ b/src/main/scala/cc/sukazyo/cono/morny/extra/weibo/MApi.scala @@ -1,4 +1,4 @@ -package cc.sukazyo.cono.morny.data.weibo +package cc.sukazyo.cono.morny.extra.weibo case class MApi [D] ( ok: Int, diff --git a/src/main/scala/cc/sukazyo/cono/morny/data/weibo/MPic.scala b/src/main/scala/cc/sukazyo/cono/morny/extra/weibo/MPic.scala similarity index 90% rename from src/main/scala/cc/sukazyo/cono/morny/data/weibo/MPic.scala rename to src/main/scala/cc/sukazyo/cono/morny/extra/weibo/MPic.scala index 9701728..d9d2167 100644 --- a/src/main/scala/cc/sukazyo/cono/morny/data/weibo/MPic.scala +++ b/src/main/scala/cc/sukazyo/cono/morny/extra/weibo/MPic.scala @@ -1,4 +1,4 @@ -package cc.sukazyo.cono.morny.data.weibo +package cc.sukazyo.cono.morny.extra.weibo case class MPic ( pid: String, diff --git a/src/main/scala/cc/sukazyo/cono/morny/data/weibo/MStatus.scala b/src/main/scala/cc/sukazyo/cono/morny/extra/weibo/MStatus.scala similarity index 97% rename from src/main/scala/cc/sukazyo/cono/morny/data/weibo/MStatus.scala rename to src/main/scala/cc/sukazyo/cono/morny/extra/weibo/MStatus.scala index b7571ab..8d52be6 100644 --- a/src/main/scala/cc/sukazyo/cono/morny/data/weibo/MStatus.scala +++ b/src/main/scala/cc/sukazyo/cono/morny/extra/weibo/MStatus.scala @@ -1,4 +1,4 @@ -package cc.sukazyo.cono.morny.data.weibo +package cc.sukazyo.cono.morny.extra.weibo case class MStatus ( diff --git a/src/main/scala/cc/sukazyo/cono/morny/data/weibo/MUser.scala b/src/main/scala/cc/sukazyo/cono/morny/extra/weibo/MUser.scala similarity index 83% rename from src/main/scala/cc/sukazyo/cono/morny/data/weibo/MUser.scala rename to src/main/scala/cc/sukazyo/cono/morny/extra/weibo/MUser.scala index 8a8d8d7..f01fff5 100644 --- a/src/main/scala/cc/sukazyo/cono/morny/data/weibo/MUser.scala +++ b/src/main/scala/cc/sukazyo/cono/morny/extra/weibo/MUser.scala @@ -1,4 +1,4 @@ -package cc.sukazyo.cono.morny.data.weibo +package cc.sukazyo.cono.morny.extra.weibo case class MUser ( diff --git a/src/main/scala/cc/sukazyo/cono/morny/data/weibo/package.scala b/src/main/scala/cc/sukazyo/cono/morny/extra/weibo/package.scala similarity index 96% rename from src/main/scala/cc/sukazyo/cono/morny/data/weibo/package.scala rename to src/main/scala/cc/sukazyo/cono/morny/extra/weibo/package.scala index 19b9dcb..80bfb5e 100644 --- a/src/main/scala/cc/sukazyo/cono/morny/data/weibo/package.scala +++ b/src/main/scala/cc/sukazyo/cono/morny/extra/weibo/package.scala @@ -1,4 +1,4 @@ -package cc.sukazyo.cono.morny.data +package cc.sukazyo.cono.morny.extra package object weibo { diff --git a/src/test/scala/cc/sukazyo/cono/morny/test/data/BilibiliFormsTest.scala b/src/test/scala/cc/sukazyo/cono/morny/test/extra/BilibiliFormsTest.scala similarity index 98% rename from src/test/scala/cc/sukazyo/cono/morny/test/data/BilibiliFormsTest.scala rename to src/test/scala/cc/sukazyo/cono/morny/test/extra/BilibiliFormsTest.scala index 6461e37..6ad92ac 100644 --- a/src/test/scala/cc/sukazyo/cono/morny/test/data/BilibiliFormsTest.scala +++ b/src/test/scala/cc/sukazyo/cono/morny/test/extra/BilibiliFormsTest.scala @@ -1,6 +1,6 @@ -package cc.sukazyo.cono.morny.test.data +package cc.sukazyo.cono.morny.test.extra -import cc.sukazyo.cono.morny.data.BilibiliForms.* +import cc.sukazyo.cono.morny.extra.BilibiliForms.* import cc.sukazyo.cono.morny.test.MornyTests import org.scalatest.prop.TableDrivenPropertyChecks import org.scalatest.tagobjects.{Network, Slow} diff --git a/src/test/scala/cc/sukazyo/cono/morny/test/data/twitter/FXApiTest.scala b/src/test/scala/cc/sukazyo/cono/morny/test/extra/twitter/FXApiTest.scala similarity index 95% rename from src/test/scala/cc/sukazyo/cono/morny/test/data/twitter/FXApiTest.scala rename to src/test/scala/cc/sukazyo/cono/morny/test/extra/twitter/FXApiTest.scala index b687f86..7a84054 100644 --- a/src/test/scala/cc/sukazyo/cono/morny/test/data/twitter/FXApiTest.scala +++ b/src/test/scala/cc/sukazyo/cono/morny/test/extra/twitter/FXApiTest.scala @@ -1,7 +1,7 @@ -package cc.sukazyo.cono.morny.test.data.twitter +package cc.sukazyo.cono.morny.test.extra.twitter -import cc.sukazyo.cono.morny.data.twitter.FXApi -import cc.sukazyo.cono.morny.data.twitter.FXApi.Fetch +import cc.sukazyo.cono.morny.extra.twitter.FXApi +import cc.sukazyo.cono.morny.extra.twitter.FXApi.Fetch import cc.sukazyo.cono.morny.test.MornyTests import org.scalatest.prop.TableDrivenPropertyChecks import org.scalatest.tagobjects.{Network, Slow} diff --git a/src/test/scala/cc/sukazyo/cono/morny/test/data/twitter/PackageTest.scala b/src/test/scala/cc/sukazyo/cono/morny/test/extra/twitter/PackageTest.scala similarity index 97% rename from src/test/scala/cc/sukazyo/cono/morny/test/data/twitter/PackageTest.scala rename to src/test/scala/cc/sukazyo/cono/morny/test/extra/twitter/PackageTest.scala index 1510dc4..e65189e 100644 --- a/src/test/scala/cc/sukazyo/cono/morny/test/data/twitter/PackageTest.scala +++ b/src/test/scala/cc/sukazyo/cono/morny/test/extra/twitter/PackageTest.scala @@ -1,6 +1,6 @@ -package cc.sukazyo.cono.morny.test.data.twitter +package cc.sukazyo.cono.morny.test.extra.twitter -import cc.sukazyo.cono.morny.data.twitter.{parseTweetUrl, TweetUrlInformation} +import cc.sukazyo.cono.morny.extra.twitter.{parseTweetUrl, TweetUrlInformation} import cc.sukazyo.cono.morny.test.MornyTests class PackageTest extends MornyTests {