mirror of
https://github.com/dalbodeule/chibot-chzzk-bot.git
synced 2025-08-07 12:51:13 +00:00
Compare commits
5 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
779604d21e | ||
|
83791fe59b | ||
|
fe63a4af15 | ||
|
7522ec6f9e | ||
|
c35b3082cc |
14
.idea/dataSources.xml
generated
14
.idea/dataSources.xml
generated
@@ -9,6 +9,20 @@
|
|||||||
<jdbc-additional-properties>
|
<jdbc-additional-properties>
|
||||||
<property name="com.intellij.clouds.kubernetes.db.host.port" />
|
<property name="com.intellij.clouds.kubernetes.db.host.port" />
|
||||||
<property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
|
<property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
|
||||||
|
<property name="com.intellij.clouds.kubernetes.db.resource.type" value="Deployment" />
|
||||||
|
<property name="com.intellij.clouds.kubernetes.db.container.port" />
|
||||||
|
</jdbc-additional-properties>
|
||||||
|
<working-dir>$ProjectFileDir$</working-dir>
|
||||||
|
</data-source>
|
||||||
|
<data-source source="LOCAL" name="@prod" uuid="ea495604-156c-4d96-9100-9074495ce007">
|
||||||
|
<driver-ref>mysql.8</driver-ref>
|
||||||
|
<synchronize>true</synchronize>
|
||||||
|
<jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
|
||||||
|
<jdbc-url>jdbc:mysql://localhost:3306/chzzk</jdbc-url>
|
||||||
|
<jdbc-additional-properties>
|
||||||
|
<property name="com.intellij.clouds.kubernetes.db.host.port" />
|
||||||
|
<property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
|
||||||
|
<property name="com.intellij.clouds.kubernetes.db.resource.type" value="Deployment" />
|
||||||
<property name="com.intellij.clouds.kubernetes.db.container.port" />
|
<property name="com.intellij.clouds.kubernetes.db.container.port" />
|
||||||
</jdbc-additional-properties>
|
</jdbc-additional-properties>
|
||||||
<working-dir>$ProjectFileDir$</working-dir>
|
<working-dir>$ProjectFileDir$</working-dir>
|
||||||
|
@@ -1,3 +1,3 @@
|
|||||||
# maybe_chzzk_bot_kotlin
|
# maybe_chzzk_bot_kotlin
|
||||||
|
|
||||||
[discord](https://discord.gg/up8ANZegmy)
|
[](https://discord.gg/up8ANZegmy) [](https://teamcity.mori.space/project/NabotChzzkBot)
|
@@ -21,12 +21,17 @@ data class IFollowContent(
|
|||||||
val badge: Badge? = null,
|
val badge: Badge? = null,
|
||||||
val title: Title? = null,
|
val title: Title? = null,
|
||||||
val verifiedMark: Boolean = false,
|
val verifiedMark: Boolean = false,
|
||||||
val activityBadges: List<String> = emptyList(),
|
val activityBadges: List<Badge> = emptyList(),
|
||||||
val streamingProperty: StreamingProperty = StreamingProperty()
|
val streamingProperty: StreamingProperty = StreamingProperty()
|
||||||
)
|
)
|
||||||
|
|
||||||
data class Badge(
|
data class Badge(
|
||||||
val imageUrl: String = ""
|
val badgeNo: Int?,
|
||||||
|
val badgeId: String?,
|
||||||
|
val imageUrl: String?,
|
||||||
|
val title: String?,
|
||||||
|
val description: String?,
|
||||||
|
val activated: Boolean?
|
||||||
)
|
)
|
||||||
|
|
||||||
data class Title(
|
data class Title(
|
||||||
@@ -117,6 +122,7 @@ fun getFollowDate(chatID: String, userId: String) : IData<IFollowContent> {
|
|||||||
|
|
||||||
return follow
|
return follow
|
||||||
} catch(e: Exception) {
|
} catch(e: Exception) {
|
||||||
|
println(e.stackTrace)
|
||||||
throw e
|
throw e
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -8,11 +8,9 @@ import space.mori.chzzk_bot.services.UserService
|
|||||||
import xyz.r2turntrue.chzzk4j.chat.ChatMessage
|
import xyz.r2turntrue.chzzk4j.chat.ChatMessage
|
||||||
import xyz.r2turntrue.chzzk4j.chat.ChzzkChat
|
import xyz.r2turntrue.chzzk4j.chat.ChzzkChat
|
||||||
import xyz.r2turntrue.chzzk4j.types.channel.ChzzkChannel
|
import xyz.r2turntrue.chzzk4j.types.channel.ChzzkChannel
|
||||||
import java.text.SimpleDateFormat
|
import java.time.LocalDateTime
|
||||||
import java.time.LocalDate
|
|
||||||
import java.time.Period
|
|
||||||
import java.time.format.DateTimeFormatter
|
import java.time.format.DateTimeFormatter
|
||||||
import java.util.*
|
import java.time.temporal.ChronoUnit
|
||||||
|
|
||||||
|
|
||||||
class MessageHandler(
|
class MessageHandler(
|
||||||
@@ -143,18 +141,25 @@ class MessageHandler(
|
|||||||
}
|
}
|
||||||
|
|
||||||
result = followPattern.replace(result) {
|
result = followPattern.replace(result) {
|
||||||
val following = getFollowDate(listener.chatId, msg.userId)
|
try {
|
||||||
val dateString: String = following.content.streamingProperty.following?.followDate ?: SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(
|
val followingDate = getFollowDate(listener.chatId, msg.userId)
|
||||||
Date()
|
.content.streamingProperty.following?.followDate
|
||||||
)
|
|
||||||
val today = LocalDate.now()
|
|
||||||
|
|
||||||
val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
|
return@replace when (followingDate) {
|
||||||
// 문자열을 LocalDate 객체로 변환
|
null -> "0"
|
||||||
val pastDate = LocalDate.parse(dateString, formatter)
|
else -> {
|
||||||
|
val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
|
||||||
|
val pastDate = LocalDateTime.parse(followingDate, formatter)
|
||||||
|
val today = LocalDateTime.now()
|
||||||
|
val period = ChronoUnit.DAYS.between(pastDate, today)
|
||||||
|
|
||||||
val period = Period.between(pastDate, today)
|
"$period"
|
||||||
period.days.toString()
|
}
|
||||||
|
}
|
||||||
|
} catch (e: Exception) {
|
||||||
|
logger.error(e.message)
|
||||||
|
"0"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
result = counterPattern.replace(result) {
|
result = counterPattern.replace(result) {
|
||||||
|
@@ -81,8 +81,6 @@ object CounterService {
|
|||||||
(DailyCounters.name eq name) and (DailyCounters.userId eq userId) and (DailyCounters.user eq user.id)
|
(DailyCounters.name eq name) and (DailyCounters.userId eq userId) and (DailyCounters.user eq user.id)
|
||||||
}.singleOrNull()
|
}.singleOrNull()
|
||||||
|
|
||||||
println("$counter")
|
|
||||||
|
|
||||||
if(counter == null) {
|
if(counter == null) {
|
||||||
val newCounter = DailyCounter.new {
|
val newCounter = DailyCounter.new {
|
||||||
this.name = name
|
this.name = name
|
||||||
|
@@ -3,7 +3,7 @@
|
|||||||
<!-- 콘솔에 출력하는 기본 로그 설정 -->
|
<!-- 콘솔에 출력하는 기본 로그 설정 -->
|
||||||
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
|
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
|
||||||
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
|
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
|
||||||
<level>DEBUG</level>
|
<level>INFO</level>
|
||||||
</filter>
|
</filter>
|
||||||
<encoder>
|
<encoder>
|
||||||
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
|
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
|
||||||
|
Reference in New Issue
Block a user