Commit Diff


commit - 8f00c06467fbbe772e1c459438d6283db6b9b4d6
commit + ca9f20117a3bfa5e9f2455f88bf348c94219a637
blob - /dev/null
blob + 7bad76157166f8e9ed2a88853990ec7a6d0f1f24 (mode 644)
--- /dev/null
+++ mastodon/src/main/java/org/joinmastodon/android/model/Pleroma.java
@@ -0,0 +1,17 @@
+package org.joinmastodon.android.model;
+
+import org.parceler.Parcel;
+
+import java.util.List;
+@Parcel
+public class Pleroma extends BaseModel{
+	public List<EmojiReaction> emojiReactions; // akkoma
+
+	@Override
+	public String toString(){
+		return "Pleroma{"+
+				"emojiReactions="+emojiReactions+
+				'}';
+	}
+
+}
blob - 61071f98ece542f9de4584891a9846226c619c1d
blob + ba6ac9ddbb8ae3d9f7694b9c8c7b84e82465c45b
--- mastodon/src/main/java/org/joinmastodon/android/model/Status.java
+++ mastodon/src/main/java/org/joinmastodon/android/model/Status.java
@@ -91,7 +91,6 @@ public class Status extends BaseModel implements Displ
 	public Status quote; // can be boolean in calckey
 
 	public List<EmojiReaction> reactions;
-	protected List<EmojiReaction> emojiReactions; // akkoma
 
 	public transient boolean filterRevealed;
 	public transient boolean spoilerRevealed;
@@ -104,6 +103,8 @@ public class Status extends BaseModel implements Displ
 	public transient boolean fromStatusCreated;
 	public transient boolean preview;
 
+	public Pleroma pleroma;
+
 	public Status(){}
 
 	@Override
@@ -132,12 +133,14 @@ public class Status extends BaseModel implements Displ
 				fr.postprocess();
 		if(quote!=null)
 			quote.postprocess();
-
+		if(pleroma!=null){
+			pleroma.postprocess();
+			reactions=pleroma.emojiReactions;
+		}
 		spoilerRevealed=!hasSpoiler();
 		if(!spoilerRevealed) sensitive=true;
 		sensitiveRevealed=!sensitive;
 		if(visibility.equals(StatusPrivacy.LOCAL)) localOnly=true;
-		if(emojiReactions!=null) reactions=emojiReactions;
 		if(reactions==null) reactions=new ArrayList<>();
 	}