Eyre_S/Coeur-Morny-Cono
1
0
Fork 0
mirror of https://github.com/Eyre-S/Coeur-Morny-Cono.git synced 2024-11-25 12:37:39 +08:00
Code Issues Actions Packages Releases Wiki Activity

move external API docking code to extra package from data

Browse Source
This commit is contained in:
A.C.Sukazyo Eyre 2023-11-29 00:15:13 +08:00
parent a9767ec1b0
commit 3d1699ea1d
Signed by: Eyre_S
GPG Key ID: C17CE40291207874
29 changed files with 40 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -5,7 +5,7 @@ MORNY_ARCHIVE_NAME = morny-coeur
MORNY_CODE_STORE = https://github.com/Eyre-S/Coeur-Morny-Cono MORNY_CODE_STORE = https://github.com/Eyre-S/Coeur-Morny-Cono
MORNY_COMMIT_PATH = https://github.com/Eyre-S/Coeur-Morny-Cono/commit/%s 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 USE_DELTA = false
VERSION_DELTA = VERSION_DELTA =

7
src/main/scala/cc/sukazyo/cono/morny/bot/command/GetSocial.scala
View File

@ -1,11 +1,12 @@
package cc.sukazyo.cono.morny.bot.command 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.util.tgapi.InputCommand
import cc.sukazyo.cono.morny.MornyCoeur 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.util.tgapi.TelegramExtensions.Bot.exec
import cc.sukazyo.cono.morny.Log.{exceptionLog, logger} 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.Update
import com.pengrad.telegrambot.model.request.{InputMedia, InputMediaPhoto, InputMediaVideo, ParseMode} import com.pengrad.telegrambot.model.request.{InputMedia, InputMediaPhoto, InputMediaVideo, ParseMode}
import com.pengrad.telegrambot.request.{SendMediaGroup, SendMessage, SendSticker} import com.pengrad.telegrambot.request.{SendMediaGroup, SendMessage, SendSticker}

2
src/main/scala/cc/sukazyo/cono/morny/bot/command/IP186Query.scala
View File

@ -1,7 +1,7 @@
package cc.sukazyo.cono.morny.bot.command package cc.sukazyo.cono.morny.bot.command
import cc.sukazyo.cono.morny.MornyCoeur 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.InputCommand
import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Bot.exec import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Bot.exec
import com.pengrad.telegrambot.model.Update import com.pengrad.telegrambot.model.Update

3
src/main/scala/cc/sukazyo/cono/morny/bot/command/Nbnhhsh.scala
View File

@ -1,7 +1,8 @@
package cc.sukazyo.cono.morny.bot.command package cc.sukazyo.cono.morny.bot.command
import cc.sukazyo.cono.morny.MornyCoeur 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.formatting.TelegramParseEscape.escapeHtml as h
import cc.sukazyo.cono.morny.util.tgapi.InputCommand import cc.sukazyo.cono.morny.util.tgapi.InputCommand
import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Bot.exec import cc.sukazyo.cono.morny.util.tgapi.TelegramExtensions.Bot.exec

2
src/main/scala/cc/sukazyo/cono/morny/bot/query/ShareToolBilibili.scala
View File

@ -24,7 +24,7 @@ class ShareToolBilibili (using coeur: MornyCoeur) extends ITelegramQuery {
if (event.inlineQuery.query == null) return null if (event.inlineQuery.query == null) return null
if (event.inlineQuery.query isBlank) 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 = val result: BiliVideoId =
try try
parse_videoUrl(event.inlineQuery.query) parse_videoUrl(event.inlineQuery.query)

4
src/main/scala/cc/sukazyo/cono/morny/bot/query/ShareToolTwitter.scala
View File

@ -1,7 +1,7 @@
package cc.sukazyo.cono.morny.bot.query package cc.sukazyo.cono.morny.bot.query
import cc.sukazyo.cono.morny.data.twitter import cc.sukazyo.cono.morny.extra.twitter
import cc.sukazyo.cono.morny.data.twitter.TweetUrlInformation import cc.sukazyo.cono.morny.extra.twitter.TweetUrlInformation
import cc.sukazyo.cono.morny.util.tgapi.formatting.NamingUtils.inlineQueryId import cc.sukazyo.cono.morny.util.tgapi.formatting.NamingUtils.inlineQueryId
import com.pengrad.telegrambot.model.Update import com.pengrad.telegrambot.model.Update
import com.pengrad.telegrambot.model.request.InlineQueryResultArticle import com.pengrad.telegrambot.model.request.InlineQueryResultArticle

2
src/main/scala/cc/sukazyo/cono/morny/data/BilibiliForms.scala → src/main/scala/cc/sukazyo/cono/morny/extra/BilibiliForms.scala
View File

@ -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.BiliTool
import cc.sukazyo.cono.morny.util.SttpPublic.{mornyBasicRequest, Schemes} import cc.sukazyo.cono.morny.util.SttpPublic.{mornyBasicRequest, Schemes}

2
src/main/scala/cc/sukazyo/cono/morny/data/NbnhhshQuery.scala → src/main/scala/cc/sukazyo/cono/morny/extra/NbnhhshQuery.scala
View File

@ -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 cc.sukazyo.cono.morny.util.SttpPublic.mornyBasicRequest
import com.google.gson.Gson import com.google.gson.Gson

2
src/main/scala/cc/sukazyo/cono/morny/data/ip186/IP186QueryHandler.scala → src/main/scala/cc/sukazyo/cono/morny/extra/ip186/IP186QueryHandler.scala
View File

@ -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 cc.sukazyo.cono.morny.util.SttpPublic.{mornyBasicRequest, Schemes}
import sttp.client3.{asString, HttpError, SttpClientException, UriContext} import sttp.client3.{asString, HttpError, SttpClientException, UriContext}

2
src/main/scala/cc/sukazyo/cono/morny/data/ip186/IP186Response.scala → src/main/scala/cc/sukazyo/cono/morny/extra/ip186/IP186Response.scala
View File

@ -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) case class IP186Response (url: String, body: String)

2
src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXApi.scala → src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXApi.scala
View File

@ -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
import cc.sukazyo.cono.morny.util.SttpPublic.mornyBasicRequest import cc.sukazyo.cono.morny.util.SttpPublic.mornyBasicRequest

2
src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXAuthor.scala → src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXAuthor.scala
View File

@ -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. /** Information about the author of a tweet.
* *

2
src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXExternalMedia.scala → src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXExternalMedia.scala
View File

@ -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. /** Data for external media, currently only video.
* *

4
src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXMosaicPhoto.scala → src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXMosaicPhoto.scala
View File

@ -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 /** Data for the mosaic service, which stitches photos together
* *

2
src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXPhoto.scala → src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXPhoto.scala
View File

@ -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 /** This can help compare items in a pool of media
* *

2
src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXPool.scala → src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXPool.scala
View File

@ -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. /** Data for a poll on a given Tweet.
* *

2
src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXPoolChoice.scala → src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXPoolChoice.scala
View File

@ -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 /** Data for a single choice in a poll
* *

2
src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXTranslate.scala → src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXTranslate.scala
View File

@ -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. /** Information about a requested translation for a Tweet, when asked.
* *

4
src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXTweet.scala → src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXTweet.scala
View File

@ -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 import cc.sukazyo.cono.morny.util.EpochDateTime.EpochSeconds
/** The container of all the information for a Tweet. /** The container of all the information for a Tweet.

2
src/main/scala/cc/sukazyo/cono/morny/data/twitter/FXVideo.scala → src/main/scala/cc/sukazyo/cono/morny/extra/twitter/FXVideo.scala
View File

@ -1,4 +1,4 @@
package cc.sukazyo.cono.morny.data.twitter package cc.sukazyo.cono.morny.extra.twitter
/** Data for a Tweet's video /** Data for a Tweet's video
* *

2
src/main/scala/cc/sukazyo/cono/morny/data/twitter/package.scala → src/main/scala/cc/sukazyo/cono/morny/extra/twitter/package.scala
View File

@ -1,4 +1,4 @@
package cc.sukazyo.cono.morny.data package cc.sukazyo.cono.morny.extra
import scala.util.matching.Regex import scala.util.matching.Regex

2
src/main/scala/cc/sukazyo/cono/morny/data/weibo/MApi.scala → src/main/scala/cc/sukazyo/cono/morny/extra/weibo/MApi.scala
View File

@ -1,4 +1,4 @@
package cc.sukazyo.cono.morny.data.weibo package cc.sukazyo.cono.morny.extra.weibo
case class MApi [D] ( case class MApi [D] (
ok: Int, ok: Int,

2
src/main/scala/cc/sukazyo/cono/morny/data/weibo/MPic.scala → src/main/scala/cc/sukazyo/cono/morny/extra/weibo/MPic.scala
View File

@ -1,4 +1,4 @@
package cc.sukazyo.cono.morny.data.weibo package cc.sukazyo.cono.morny.extra.weibo
case class MPic ( case class MPic (
pid: String, pid: String,

2
src/main/scala/cc/sukazyo/cono/morny/data/weibo/MStatus.scala → src/main/scala/cc/sukazyo/cono/morny/extra/weibo/MStatus.scala
View File

@ -1,4 +1,4 @@
package cc.sukazyo.cono.morny.data.weibo package cc.sukazyo.cono.morny.extra.weibo
case class MStatus ( case class MStatus (

2
src/main/scala/cc/sukazyo/cono/morny/data/weibo/MUser.scala → src/main/scala/cc/sukazyo/cono/morny/extra/weibo/MUser.scala
View File

@ -1,4 +1,4 @@
package cc.sukazyo.cono.morny.data.weibo package cc.sukazyo.cono.morny.extra.weibo
case class MUser ( case class MUser (

2
src/main/scala/cc/sukazyo/cono/morny/data/weibo/package.scala → src/main/scala/cc/sukazyo/cono/morny/extra/weibo/package.scala
View File

@ -1,4 +1,4 @@
package cc.sukazyo.cono.morny.data package cc.sukazyo.cono.morny.extra
package object weibo { package object weibo {

4
src/test/scala/cc/sukazyo/cono/morny/test/data/BilibiliFormsTest.scala → src/test/scala/cc/sukazyo/cono/morny/test/extra/BilibiliFormsTest.scala
View File

@ -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 cc.sukazyo.cono.morny.test.MornyTests
import org.scalatest.prop.TableDrivenPropertyChecks import org.scalatest.prop.TableDrivenPropertyChecks
import org.scalatest.tagobjects.{Network, Slow} import org.scalatest.tagobjects.{Network, Slow}

6
src/test/scala/cc/sukazyo/cono/morny/test/data/twitter/FXApiTest.scala → src/test/scala/cc/sukazyo/cono/morny/test/extra/twitter/FXApiTest.scala
View File

@ -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.extra.twitter.FXApi
import cc.sukazyo.cono.morny.data.twitter.FXApi.Fetch import cc.sukazyo.cono.morny.extra.twitter.FXApi.Fetch
import cc.sukazyo.cono.morny.test.MornyTests import cc.sukazyo.cono.morny.test.MornyTests
import org.scalatest.prop.TableDrivenPropertyChecks import org.scalatest.prop.TableDrivenPropertyChecks
import org.scalatest.tagobjects.{Network, Slow} import org.scalatest.tagobjects.{Network, Slow}

4
src/test/scala/cc/sukazyo/cono/morny/test/data/twitter/PackageTest.scala → src/test/scala/cc/sukazyo/cono/morny/test/extra/twitter/PackageTest.scala
View File

@ -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 import cc.sukazyo.cono.morny.test.MornyTests
class PackageTest extends MornyTests { class PackageTest extends MornyTests {