diff options
Diffstat (limited to 'app/src/main/java/app/fedilab/android/client')
4 files changed, 46 insertions, 3 deletions
diff --git a/app/src/main/java/app/fedilab/android/client/endpoints/MastodonTimelinesService.java b/app/src/main/java/app/fedilab/android/client/endpoints/MastodonTimelinesService.java index 36d8c9f65..09d6da1c7 100644 --- a/app/src/main/java/app/fedilab/android/client/endpoints/MastodonTimelinesService.java +++ b/app/src/main/java/app/fedilab/android/client/endpoints/MastodonTimelinesService.java @@ -21,6 +21,7 @@ import app.fedilab.android.client.entities.api.Conversation; import app.fedilab.android.client.entities.api.Marker; import app.fedilab.android.client.entities.api.MastodonList; import app.fedilab.android.client.entities.api.Status; +import app.fedilab.android.client.entities.api.Tag; import app.fedilab.android.client.entities.misskey.MisskeyNote; import app.fedilab.android.client.entities.nitter.Nitter; import app.fedilab.android.client.entities.peertube.PeertubeVideo; @@ -52,6 +53,14 @@ public interface MastodonTimelinesService { @Query("limit") Integer limit ); + + @GET("trends/statuses") + Call<List<Status>> getStatusTrends(@Header("Authorization") String token); + + + @GET("trends/tags") + Call<List<Tag>> getTagTrends(@Header("Authorization") String token); + //Public Tags timelines @GET("timelines/tag/{hashtag}") Call<List<Status>> getHashTag( diff --git a/app/src/main/java/app/fedilab/android/client/entities/api/Attachment.java b/app/src/main/java/app/fedilab/android/client/entities/api/Attachment.java index 2d06c3143..3cd5e3c08 100644 --- a/app/src/main/java/app/fedilab/android/client/entities/api/Attachment.java +++ b/app/src/main/java/app/fedilab/android/client/entities/api/Attachment.java @@ -43,7 +43,37 @@ public class Attachment implements Serializable { public long size; @SerializedName("local_path") public String local_path; + @SerializedName("meta") + public Meta meta; public String peertubeHost = null; public String peertubeId = null; + public String focus = null; + + public static class Meta implements Serializable { + @SerializedName("focus") + public Focus focus; + @SerializedName("original") + public MediaData original; + @SerializedName("small") + public MediaData small; + } + + public static class Focus implements Serializable { + @SerializedName("x") + public float x; + @SerializedName("y") + public float y; + } + + public static class MediaData implements Serializable { + @SerializedName("width") + public int width; + @SerializedName("height") + public int height; + @SerializedName("size") + public String size; + @SerializedName("aspect") + public float aspect; + } } diff --git a/app/src/main/java/app/fedilab/android/client/entities/app/QuickLoad.java b/app/src/main/java/app/fedilab/android/client/entities/app/QuickLoad.java index fc1d0b190..d3f56ce41 100644 --- a/app/src/main/java/app/fedilab/android/client/entities/app/QuickLoad.java +++ b/app/src/main/java/app/fedilab/android/client/entities/app/QuickLoad.java @@ -309,7 +309,7 @@ public class QuickLoad { QuickLoad localQuickLoad = getSavedValue(account, Timeline.TimeLineEnum.LOCAL, null); QuickLoad publicQuickLoad = getSavedValue(account, Timeline.TimeLineEnum.PUBLIC, null); - if (homeQuickLoad != null && homeQuickLoad.statuses != null) { + if (homeQuickLoad != null && homeQuickLoad.statuses != null && newStatus != null) { for (int i = 0; i < homeQuickLoad.statuses.size(); i++) { if (homeQuickLoad.statuses.get(i).id.equals(newStatus.id)) { homeQuickLoad.statuses.set(i, newStatus); @@ -327,7 +327,7 @@ public class QuickLoad { e.printStackTrace(); } } - if (localQuickLoad != null && localQuickLoad.statuses != null) { + if (localQuickLoad != null && localQuickLoad.statuses != null && newStatus != null) { for (int i = 0; i < localQuickLoad.statuses.size(); i++) { if (localQuickLoad.statuses.get(i).id.equals(newStatus.id)) { localQuickLoad.statuses.set(i, newStatus); @@ -345,7 +345,7 @@ public class QuickLoad { e.printStackTrace(); } } - if (publicQuickLoad != null && publicQuickLoad.statuses != null) { + if (publicQuickLoad != null && publicQuickLoad.statuses != null && newStatus != null) { for (int i = 0; i < publicQuickLoad.statuses.size(); i++) { if (publicQuickLoad.statuses.get(i).id.equals(newStatus.id)) { publicQuickLoad.statuses.set(i, newStatus); diff --git a/app/src/main/java/app/fedilab/android/client/entities/app/Timeline.java b/app/src/main/java/app/fedilab/android/client/entities/app/Timeline.java index b8a4846c0..d26badc9e 100644 --- a/app/src/main/java/app/fedilab/android/client/entities/app/Timeline.java +++ b/app/src/main/java/app/fedilab/android/client/entities/app/Timeline.java @@ -370,6 +370,10 @@ public class Timeline { LIST("LIST"), @SerializedName("REMOTE") REMOTE("REMOTE"), + @SerializedName("TREND_TAG") + TREND_TAG("TREND_TAG"), + @SerializedName("TREND_MESSAGE") + TREND_MESSAGE("TREND_MESSAGE"), @SerializedName("ACCOUNT_TIMELINE") ACCOUNT_TIMELINE("ACCOUNT_TIMELINE"), @SerializedName("MUTED_TIMELINE") |