1 files changed, 6 insertions, 0 deletions
diff --git a/juick-server/src/main/java/com/juick/server/SignatureManager.java b/juick-server/src/main/java/com/juick/server/SignatureManager.java
index c39cdac9..869edbfc 100644
--- a/juick-server/src/main/java/com/juick/server/SignatureManager.java
+++ b/juick-server/src/main/java/com/juick/server/SignatureManager.java
@@ -3,10 +3,12 @@ package com.juick.server;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.juick.server.api.activity.model.Context;
 import com.juick.server.api.activity.model.Person;
+import com.juick.service.activities.DeleteUserEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.HttpClientErrorException;
@@ -83,6 +85,10 @@ public class SignatureManager {
             return Optional.of(new RestTemplate().getForEntity(contextUri, Context.class).getBody());
         } catch (HttpClientErrorException e) {
             logger.warn("Cannot identify {}", contextUri);
+            if (e.getStatusCode().equals(HttpStatus.GONE)) {
+                logger.warn("Server report {} is gone, deleting", contextUri);
+                new DeleteUserEvent(this, contextUri.toASCIIString());
+            }
         }
         return Optional.empty();
     }