Check if user is active when giving boost rewards

loritta-api/src/commonMain/kotlin/net/perfectdreams/loritta/utils/daily/DailyGuildMissingRequirement.kt

@@ -1,6 +1,7 @@
 package net.perfectdreams.loritta.utils.daily
 
 enum class DailyGuildMissingRequirement {
+ USER_NOT_MEMBER,
  REQUIRES_MORE_TIME,
  REQUIRES_MORE_XP
 }

loritta-discord/src/main/java/net/perfectdreams/loritta/website/routes/api/v1/economy/GetLoriDailyRewardRoute.kt

@@ -309,6 +309,24 @@ class GetLoriDailyRewardRoute(loritta: LorittaDiscord) : RequiresAPIDiscordLogin
  ?: continue
  val id = guild.id.toLong()
 
+ val jdaUser = lorittaShards.getUserById(userIdentification.id.toLong())
+ val jdaGuild = lorittaShards.getGuildById(id)
+
+ if (jdaUser?.let { jdaGuild?.isMember(it) } == false) {
+ failedDailyServersInfo.add(
+ jsonObject(
+ "guild" to jsonObject(
+ "name" to guild.name,
+ "iconUrl" to guild.icon,
+ "id" to guild.id
+ ),
+ "type" to DailyGuildMissingRequirement.USER_NOT_MEMBER.toString(),
+ "multiplier" to getDailyMultiplier(donationValue)
+ )
+ )
+ continue
+ }
+
  val xp = GuildProfile.find { (GuildProfiles.guildId eq id) and (GuildProfiles.userId eq userIdentification.id.toLong()) }.firstOrNull()?.xp
  ?: 0L
 
@@ -320,8 +338,8 @@ class GetLoriDailyRewardRoute(loritta: LorittaDiscord) : RequiresAPIDiscordLogin
  "iconUrl" to guild.icon,
  "id" to guild.id
  ),
- "type" to DailyGuildMissingRequirement.REQUIRES_MORE_XP.toString(),
  "data" to 500 - xp,
+ "type" to DailyGuildMissingRequirement.REQUIRES_MORE_XP.toString(),
  "multiplier" to getDailyMultiplier(donationValue)
  )
  )

loritta-plugins/donators-ostentation/src/main/kotlin/net/perfectdreams/loritta/plugin/donatorsostentation/NitroBoostUtils.kt

@@ -57,9 +57,9 @@ object NitroBoostUtils {
  logger.info { "Guild $guild has donation features enabled! Giving sonhos to $boosters" }
 
  loritta.newSuspendedTransaction {
- Profiles.update({ Profiles.id inList boosters.map { it.user.idLong } }) {
+ Profiles.update({ Profiles.id inList boosters.filter { guild.isMember(it.user) }.map { it.user.idLong } }) {
  with(SqlExpressionBuilder) {
- it.update(money, money + 2)
+ it.update(money, money + 4)
  }
  }
  }

loritta-website/spicy-morenitta/src/main/kotlin/net/perfectdreams/spicymorenitta/routes/DailyRoute.kt

@@ -282,8 +282,10 @@ class DailyRoute(val m: SpicyMorenitta) : UpdateNavbarSizePostRender("/daily") {
  DailyGuildMissingRequirement.REQUIRES_MORE_XP -> {
  +"sendo mais ativo em "
  }
+ DailyGuildMissingRequirement.USER_NOT_MEMBER -> {
+ +"ou entrando novamente em "
+ }
  }
-
  +failedGuild.guild.name
  +"!"
  }