Merge branch 'feature/follow_hashtags' into fork

Fixes #31, mastodon#233
2022-11-09 15:48:18 +01:00
parent f4b1629a1d cf864e6f49
commit 7d38f031f1
10 changed files with 104 additions and 5 deletions
--- a/mastodon/src/main/java/org/joinmastodon/android/model/Hashtag.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/Hashtag.java
@@ -11,6 +11,7 @@ public class Hashtag extends BaseModel{
 	public String name;
 	@RequiredField
 	public String url;
+	public boolean following;
 	public List<History> history;

 	@Override
@@ -18,6 +19,7 @@ public class Hashtag extends BaseModel{
 		return "Hashtag{"+
 				"name='"+name+'\''+
 				", url='"+url+'\''+
+				", following="+following+
 				", history="+history+
 				'}';
 	}