Fix issue that prevent from importing player own private map

EpiCanard · Sep 25, 2022 · 9105529 · 9105529
1 parent b558528
commit 9105529
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/scala/fr/epicanard/mapsaver/commands/ImportCommand.scala b/src/main/scala/fr/epicanard/mapsaver/commands/ImportCommand.scala
@@ -31,7 +31,7 @@ case class ImportCommand(mapRepository: MapRepository)(implicit ec: ExecutionCon
     (for {
       player <- EitherT.fromEither[Future](getPlayer(commandContext))
       args   <- EitherT.fromEither[Future](parseArguments(commandContext, player))
-      restrictVisibility = Option.unless(Permission.AdminImportMap.isSetOn(player))(Visibility.Public)
+      restrictVisibility = Visibility.getRestrictVisibility(commandContext, args.owner, Permission.AdminImportMap)
       mapViewWithData <- EitherT(
         mapRepository
           .findMapViewWithData(args.owner.getUniqueId, args.mapName, commandContext.server, restrictVisibility)

diff --git a/src/main/scala/fr/epicanard/mapsaver/models/map/Visibility.scala b/src/main/scala/fr/epicanard/mapsaver/models/map/Visibility.scala
@@ -15,7 +15,11 @@ object Visibility extends Enum[Visibility] with CirceEnumInsensitive[Visibility]
 
   val values = findValues
 
-  def getRestrictVisibility(commandContext: CommandContext, owner: OfflinePlayer, adminPermission: Permission) =
+  def getRestrictVisibility(
+      commandContext: CommandContext,
+      owner: OfflinePlayer,
+      adminPermission: Permission
+  ): Option[Visibility] =
     CommandContext
       .getPlayerOpt(commandContext)
       .filter(player => owner.getUniqueId != player.getUniqueId && !adminPermission.isSetOn(player))