Отключение работы с закрытыми группами

build.gradle.kts

@@ -1,9 +1,9 @@
 plugins {
 //    `java-library`
-    kotlin("jvm") version "1.9.0"
-    kotlin("kapt") version "1.9.0"
+    kotlin("jvm") version "1.9.23"
+    kotlin("kapt") version "1.9.23"
     id("com.github.johnrengelman.shadow") version "8.1.1"
-    id("io.micronaut.minimal.application") version "4.0.2"
+    id("io.micronaut.minimal.application") version "4.3.4"
 }
 
 group = "ru.spliterash"

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style=official
-micronautVersion=4.0.3
+micronautVersion=4.3.4

src/main/java/ru/spliterash/vkVideoUnlocker/group/WorkUserGroupService.kt

@@ -1,5 +1,6 @@
 package ru.spliterash.vkVideoUnlocker.group
 
+import io.micronaut.context.annotation.Value
 import jakarta.inject.Singleton
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
@@ -13,7 +14,9 @@ import ru.spliterash.vkVideoUnlocker.vk.api.VkApi
 
 @Singleton
 class WorkUserGroupService(
-    @WorkUser private val user: VkApi
+    @WorkUser private val user: VkApi,
+    @Value("\${vk-unlocker.private-groups:false}") private val privateGroupWork: Boolean
+
 ) {
     private val groups = hashMapOf<Int, GroupInfo>()
     private val lock = Mutex()
@@ -46,6 +49,7 @@ class WorkUserGroupService(
         try {
             when (actualInfo.groupStatus) {
                 GroupStatus.CLOSE -> {
+                    if (!privateGroupWork) return GroupStatus.CLOSE
                     when (actualInfo.memberStatus) {
                         MemberStatus.NO -> {
                             user.groups.join(groupId)

src/main/java/ru/spliterash/vkVideoUnlocker/video/exceptions/PrivateVideoDisabledException.kt

@@ -0,0 +1,7 @@
+package ru.spliterash.vkVideoUnlocker.video.exceptions
+
+import ru.spliterash.vkVideoUnlocker.common.exceptions.VkUnlockerException
+
+class PrivateVideoDisabledException : VkUnlockerException() {
+    override fun messageForUser() = "Видео из закрытых групп временно отключены"
+}

src/main/java/ru/spliterash/vkVideoUnlocker/video/service/VideoReUploadService.kt

@@ -1,10 +1,12 @@
 package ru.spliterash.vkVideoUnlocker.video.service
 
+import io.micronaut.context.annotation.Value
 import jakarta.inject.Singleton
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.async
 import ru.spliterash.vkVideoUnlocker.common.CoroutineHelper
 import ru.spliterash.vkVideoUnlocker.video.entity.VideoEntity
+import ru.spliterash.vkVideoUnlocker.video.exceptions.PrivateVideoDisabledException
 import ru.spliterash.vkVideoUnlocker.video.exceptions.SelfVideoException
 import ru.spliterash.vkVideoUnlocker.video.exceptions.VideoOpenException
 import ru.spliterash.vkVideoUnlocker.video.holder.VideoContentHolder
@@ -23,6 +25,7 @@ class VideoReUploadService(
     private val videoRepository: VideoRepository,
     @WorkUser private val workUser: VkApi,
     @GroupUser private val groupUser: VkApi,
+    @Value("\${vk-unlocker.private-groups:false}") private val privateGroupWork: Boolean
 ) {
     private val inProgress = Collections.synchronizedMap(hashMapOf<String, Deferred<UnlockResult>>())
     private val scope = CoroutineHelper.scope
@@ -71,8 +74,10 @@ class VideoReUploadService(
         val fullVideo = holder.fullVideo()
 
         val originalAttachmentId = holder.attachmentId
-        val videoAccessor = fullVideo.toAccessor()
         val private = fullVideo.shouldBeLocked()
+        if (private && !privateGroupWork) throw PrivateVideoDisabledException()
+
+        val videoAccessor = fullVideo.toAccessor()
 
         val reUploadedId = workUser.videos.upload(
             groupUser.id,

src/main/resources/application.yml

@@ -24,4 +24,5 @@ vk-unlocker:
     token: action_user_token
   # Пользователь для "тыканья" видосов на наличие блокировки
   poke-user:
-    token: poke_user_token
+    token: poke_user_token
+  private-groups: false