mirrors/Fedilab
1
0
Fork 1
mirror of https://codeberg.org/tom79/Fedilab.git synced 2025-04-05 22:50:02 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix issue #1130 - Follow Pixelfed instance from the discover timeline

Browse source
This commit is contained in:
Thomas 2025-03-01 16:06:39 +01:00
parent 885e8eb5d8
commit e0b8b60fed
7 changed files with 123 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -100,7 +100,7 @@ allprojects {
}
}
dependencies {
implementation 'org.unifiedpush.android:connector:3.0.4'
implementation 'org.unifiedpush.android:connector:3.0.5'
playstoreImplementation('org.unifiedpush.android:embedded-fcm-distributor:3.0.0')

2
app/src/main/java/app/fedilab/android/mastodon/activities/ReorderTimelinesActivity.java
View file

@ -200,7 +200,7 @@ public class ReorderTimelinesActivity extends BaseBarActivity implements OnStart
} else if (popupSearchInstanceBinding.setAttachmentGroup.getCheckedRadioButtonId() == R.id.peertube_instance) {
url = "https://" + instanceName + "/api/v1/videos/";
} else if (popupSearchInstanceBinding.setAttachmentGroup.getCheckedRadioButtonId() == R.id.pixelfed_instance) {
url = "https://" + instanceName + "/api/v1/timelines/public";
url = "https://" + instanceName + "/api/pixelfed/v2/discover/posts/trending?range=daily";
} else if (popupSearchInstanceBinding.setAttachmentGroup.getCheckedRadioButtonId() == R.id.misskey_instance) {
url = "https://" + instanceName + "/api/notes/local-timeline";
getCall = false;

5
app/src/main/java/app/fedilab/android/mastodon/client/endpoints/MastodonTimelinesService.java
View file

@ -231,6 +231,11 @@ public interface MastodonTimelinesService {
Call<List<MisskeyNote>> getMisskey(@Body MisskeyNote.MisskeyParams params);
@GET("discover/posts/trending")
Call<List<Status>> getPixelDiscoverTrending(
@Query("range") String range
);
@GET("api/v3/post/list?sort=New")
Call<LemmyPost.LemmyPosts> getLemmyMain(@Query("limit") Integer limit,
@Query("page") String page);

32
app/src/main/java/app/fedilab/android/mastodon/client/endpoints/PixelfedTimelinesService.java Normal file
View file

@ -0,0 +1,32 @@
package app.fedilab.android.mastodon.client.endpoints;
/* Copyright 2025 Thomas Schneider
*
* This file is a part of Fedilab
*
* This program is free software; you can redistribute it and/or modify it under the terms of the
* GNU General Public License as published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
* Public License for more details.
*
* You should have received a copy of the GNU General Public License along with Fedilab; if not,
* see <http://www.gnu.org/licenses>. */
import java.util.List;
import app.fedilab.android.mastodon.client.entities.api.Status;
import retrofit2.Call;
import retrofit2.http.GET;
import retrofit2.http.Query;
public interface PixelfedTimelinesService {
//Public timelines
@GET("discover/posts/trending")
Call<List<Status>> getTrending(
@Query("range") String range
);
}

7
app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonTimeline.java
View file

@ -1127,7 +1127,12 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter.
}
});
}
} else { //Other remote timelines
} else if (pinnedTimeline != null && pinnedTimeline.remoteInstance.type == RemoteInstance.InstanceType.PIXELFED) {
if (direction == null) {
timelinesVM.getPixelfedDiscoverTrending(remoteInstance)
.observe(getViewLifecycleOwner(), this::initializeStatusesCommonView);
}
}else { //Other remote timelines
routeCommon(direction, fetchingMissing, fetchStatus);
}
} else if (timelineType == Timeline.TimeLineEnum.LIST) { //LIST TIMELINE

30
app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/TimelinesVM.java
View file

@ -39,6 +39,7 @@ import java.util.List;
import app.fedilab.android.R;
import app.fedilab.android.activities.MainActivity;
import app.fedilab.android.mastodon.client.endpoints.MastodonTimelinesService;
import app.fedilab.android.mastodon.client.endpoints.PixelfedTimelinesService;
import app.fedilab.android.mastodon.client.entities.api.Account;
import app.fedilab.android.mastodon.client.entities.api.Conversation;
import app.fedilab.android.mastodon.client.entities.api.Conversations;
@ -330,6 +331,35 @@ public class TimelinesVM extends AndroidViewModel {
return statusesMutableLiveData;
}
/**
* Public discover timeline for Pixelfed
*
* @param instance String Pixelfed instance
* @return {@link LiveData} containing a {@link Statuses}
*/
public LiveData<Statuses> getPixelfedDiscoverTrending(String instance) {
statusesMutableLiveData = new MutableLiveData<>();
MastodonTimelinesService mastodonTimelinesService = initInstanceOnly(instance+"/api/pixelfed/v2/");
new Thread(() -> {
Statuses statuses = new Statuses();
Call<List<Status>> timelineCall = mastodonTimelinesService.getPixelDiscoverTrending("daily");
if (timelineCall != null) {
try {
Response<List<Status>> timelineResponse = timelineCall.execute();
if (timelineResponse.isSuccessful()) {
statuses.statuses = timelineResponse.body();
}
} catch (Exception e) {
e.printStackTrace();
}
}
Handler mainHandler = new Handler(Looper.getMainLooper());
Runnable myRunnable = () -> statusesMutableLiveData.setValue(statuses);
mainHandler.post(myRunnable);
}).start();
return statusesMutableLiveData;
}
/**
* Public timeline for Lemmy

90
app/src/main/res/layouts/mastodon/layout/popup_search_instance.xml
View file

@ -2,63 +2,69 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:orientation="vertical">
<AutoCompleteTextView
android:layout_marginTop="10dp"
android:id="@+id/search_instance"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/instance"
android:inputType="textWebEmailAddress"
android:singleLine="true" />
<RadioGroup
android:id="@+id/set_attachment_group"
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<RadioButton
android:id="@+id/mastodon_instance"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<RadioGroup
android:layout_marginTop="5dp"
android:id="@+id/set_attachment_group"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:checked="true"
android:text="@string/mastodon_instance" />
android:orientation="vertical">
<RadioButton
android:id="@+id/peertube_instance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/peertube_instance" />
<RadioButton
android:id="@+id/mastodon_instance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true"
android:text="@string/mastodon_instance" />
<RadioButton
android:id="@+id/pixelfed_instance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pixelfed_instance" />
<RadioButton
android:id="@+id/peertube_instance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/peertube_instance" />
<RadioButton
android:id="@+id/misskey_instance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/misskey_instance" />
<RadioButton
android:id="@+id/pixelfed_instance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pixelfed_instance" />
<RadioButton
android:id="@+id/lemmy_instance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lemmy_instance" />
<RadioButton
android:id="@+id/misskey_instance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/misskey_instance" />
<RadioButton
android:id="@+id/gnu_instance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/gnu_instance" />
<RadioButton
android:id="@+id/lemmy_instance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lemmy_instance" />
<RadioButton
android:id="@+id/twitter_accounts"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/twitter_accounts" />
</RadioGroup>
<RadioButton
android:id="@+id/gnu_instance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/gnu_instance" />
<RadioButton
android:id="@+id/twitter_accounts"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/twitter_accounts" />
</RadioGroup>
</ScrollView>
</LinearLayout>