owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'megalodon_main/main'

Browse Source 
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
This commit is contained in:
LucasGGamerM
2023-06-21 15:50:10 -03:00
parent 1810821983 a70d39065c
commit fd0a741ff2
43 changed files with 3253 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetHashtagTimeline.java
View File

@@ -2,6 +2,8 @@ package org.joinmastodon.android.api.requests.timelines;
import com.google.gson.reflect.TypeToken;
import android.text.TextUtils;
import org.joinmastodon.android.GlobalUserPreferences;
import org.joinmastodon.android.api.MastodonAPIRequest;
import org.joinmastodon.android.model.Status;
@@ -9,6 +11,23 @@ import org.joinmastodon.android.model.Status;
import java.util.List;
public class GetHashtagTimeline extends MastodonAPIRequest<List<Status>>{
public GetHashtagTimeline(String hashtag, String maxID, String minID, int limit, List<String> containsAny, List<String> containsAll, List<String> containsNone, boolean localOnly){
super(HttpMethod.GET, "/timelines/tag/"+hashtag, new TypeToken<>(){});
if (localOnly) addQueryParameter("local", "true");
if(maxID!=null)
addQueryParameter("max_id", maxID);
if(minID!=null)
addQueryParameter("min_id", minID);
if(limit>0)
addQueryParameter("limit", ""+limit);
if(containsAny!=null && !containsAny.isEmpty())
addQueryParameter("any[]", "[" + TextUtils.join(",", containsAny) + "]");
if(containsAll!=null && !containsAll.isEmpty())
addQueryParameter("all[]", "[" + TextUtils.join(",", containsAll) + "]");
if(containsNone!=null && !containsNone.isEmpty())
addQueryParameter("none[]", "[" + TextUtils.join(",", containsNone) + "]");
}
public GetHashtagTimeline(String hashtag, String maxID, String minID, int limit){
super(HttpMethod.GET, "/timelines/tag/"+hashtag, new TypeToken<>(){});
if(maxID!=null)