Merge branch 'main' into fork

mastodon/src/main/java/org/joinmastodon/android/model/Instance.java

@@ -134,6 +134,8 @@ public class Instance extends BaseModel{
 	public static class Rule{
 		public String id;
 		public String text;
+
+		public transient CharSequence parsedText;
 	}
 
 	@Parcel

mastodon/src/main/java/org/joinmastodon/android/model/Marker.java

@@ -0,0 +1,21 @@
+package org.joinmastodon.android.model;
+
+import org.joinmastodon.android.api.AllFieldsAreRequired;
+
+import java.time.Instant;
+
+@AllFieldsAreRequired
+public class Marker extends BaseModel{
+	public String lastReadId;
+	public long version;
+	public Instant updatedAt;
+
+	@Override
+	public String toString(){
+		return "Marker{"+
+				"lastReadId='"+lastReadId+'\''+
+				", version="+version+
+				", updatedAt="+updatedAt+
+				'}';
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/model/Poll.java

@@ -13,7 +13,7 @@ public class Poll extends BaseModel{
 	@RequiredField
 	public String id;
 	public Instant expiresAt;
-	public boolean expired;
+	private boolean expired;
 	public boolean multiple;
 	public int votersCount;
 	public boolean voted;
@@ -48,6 +48,10 @@ public class Poll extends BaseModel{
 				'}';
 	}
 
+	public boolean isExpired(){
+		return expired || (expiresAt!=null && expiresAt.isBefore(Instant.now()));
+	}
+
 	@Parcel
 	public static class Option{
 		public String title;

mastodon/src/main/java/org/joinmastodon/android/model/Status.java

@@ -130,6 +130,7 @@ public class Status extends BaseModel implements DisplayItemsParent{
 		repliesCount=ev.replies;
 		favourited=ev.favorited;
 		reblogged=ev.reblogged;
+		bookmarked=ev.bookmarked;
 		pinned=ev.pinned;
 	}