Hide map by author

Fixes #213
FAForever · May 2, 2018 · 5a60bd9 · 5a60bd9
1 parent 8b2c06c
commit 5a60bd9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/main/java/com/faforever/api/data/checks/IsEntityOwner.java b/src/main/java/com/faforever/api/data/checks/IsEntityOwner.java
@@ -18,6 +18,7 @@ public static class Inline extends InlineCheck<OwnableEntity> {
     public boolean ok(OwnableEntity entity, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
       Object opaqueUser = requestScope.getUser().getOpaqueUser();
       return opaqueUser instanceof FafUserDetails
+        && entity.getEntityOwner() != null
         && entity.getEntityOwner().getId() == ((FafUserDetails) opaqueUser).getId();
     }
 

diff --git a/src/main/java/com/faforever/api/data/domain/MapVersion.java b/src/main/java/com/faforever/api/data/domain/MapVersion.java
@@ -1,5 +1,6 @@
 package com.faforever.api.data.domain;
 
+import com.faforever.api.data.checks.IsEntityOwner;
 import com.faforever.api.data.checks.permission.IsModerator;
 import com.faforever.api.data.listeners.MapVersionEnricher;
 import com.yahoo.elide.annotation.Audit;
@@ -28,7 +29,7 @@
 @EntityListeners(MapVersionEnricher.class)
 @Table(name = "map_version")
 @Include(rootLevel = true, type = MapVersion.TYPE_NAME)
-public class MapVersion extends AbstractEntity {
+public class MapVersion extends AbstractEntity implements OwnableEntity {
 
   public static final String TYPE_NAME = "mapVersion";
 
@@ -85,7 +86,7 @@ public String getFilename() {
     return filename;
   }
 
-  @UpdatePermission(expression = IsModerator.EXPRESSION)
+  @UpdatePermission(expression = IsModerator.EXPRESSION + " or " + IsEntityOwner.EXPRESSION)
   @Audit(action = Action.UPDATE, logStatement = "Updated map version `{0}` attribute ranked to: {1}", logExpressions = {"${mapVersion.id}", "${mapVersion.ranked}"})
   @Column(name = "ranked")
   public boolean isRanked() {
@@ -147,4 +148,10 @@ public List<MapVersionReview> getReviews() {
   public MapVersionReviewsSummary getReviewsSummary() {
     return reviewsSummary;
   }
+
+  @Transient
+  @Override
+  public Login getEntityOwner() {
+    return map.getAuthor();
+  }
 }