1 files changed, 2 insertions, 57 deletions
diff --git a/app/src/main/java/net/lacolaco/smileessence/entity/DirectMessage.java b/app/src/main/java/net/lacolaco/smileessence/entity/DirectMessage.java
index 1f31171f..c7b3dfba 100644
--- a/app/src/main/java/net/lacolaco/smileessence/entity/DirectMessage.java
+++ b/app/src/main/java/net/lacolaco/smileessence/entity/DirectMessage.java
@@ -9,7 +9,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-public class DirectMessage {
+public class DirectMessage extends EntitySupport {
     // キャッシュ これも weak reference
     private static Cache<Long, DirectMessage> storage = CacheBuilder.newBuilder().weakValues().build();
 
@@ -43,12 +43,6 @@ public class DirectMessage {
     private String text;
     private Date createdAt;
 
-    private UserMentionEntity[] mentions;
-    private HashtagEntity[] hashtags;
-    private MediaEntity[] media;
-    private URLEntity[] urls;
-    private SymbolEntity[] symbols;
-
     private DirectMessage(twitter4j.DirectMessage st) {
         update(st);
     }
@@ -60,11 +54,7 @@ public class DirectMessage {
         text = message.getText();
         createdAt = message.getCreatedAt();
 
-        mentions = message.getUserMentionEntities();
-        hashtags = message.getHashtagEntities();
-        media = message.getExtendedMediaEntities().length > 0 ? message.getExtendedMediaEntities() : message.getMediaEntities();
-        urls = message.getURLEntities();
-        symbols = message.getSymbolEntities();
+        updateEntities(message);
     }
 
     public long getId() {
@@ -87,51 +77,6 @@ public class DirectMessage {
         return createdAt;
     }
 
-    public UserMentionEntity[] getMentions() {
-        return mentions;
-    }
-
-    public HashtagEntity[] getHashtags() {
-        return hashtags;
-    }
-
-    public MediaEntity[] getMedia() {
-        return media;
-    }
-
-    public URLEntity[] getUrls() {
-        return urls;
-    }
-
-    public SymbolEntity[] getSymbols() {
-        return symbols;
-    }
-
-    public List<String> getMentioningScreenNames(String excludeScreenName) {
-        List<String> names = getMentioningScreenNames();
-        if (excludeScreenName != null) {
-            names.remove(excludeScreenName);
-        }
-        return names;
-    }
-
-    public List<String> getMentioningScreenNames() {
-        List<String> names = new ArrayList<>();
-        names.add(getSender().getScreenName());
-        if (getSender() != getRecipient()) {
-            names.add(getRecipient().getScreenName());
-        }
-        if (getMentions() != null) {
-            for (UserMentionEntity entity : getMentions()) {
-                if (names.contains(entity.getScreenName())) {
-                    continue;
-                }
-                names.add(entity.getScreenName());
-            }
-        }
-        return names;
-    }
-
     public String getMessageSummary() {
         return String.format("@%s: %s", getSender().getScreenName(), getText());
     }