This repository was archived by the owner on May 23, 2025. It is now read-only.
File tree Expand file tree Collapse file tree 4 files changed +12
-5
lines changed
app/src/main/java/com/keylesspalace/tusky Expand file tree Collapse file tree 4 files changed +12
-5
lines changed Original file line number Diff line number Diff line change @@ -4,7 +4,6 @@ import com.keylesspalace.tusky.TabData
44import com.keylesspalace.tusky.entity.Account
55import com.keylesspalace.tusky.entity.Notification
66import com.keylesspalace.tusky.entity.Poll
7- import com.keylesspalace.tusky.entity.ScheduledStatus
87import com.keylesspalace.tusky.entity.Status
98
109data class StatusChangedEvent (val status : Status ) : Event
@@ -13,7 +12,7 @@ data class BlockEvent(val accountId: String) : Event
1312data class MuteEvent (val accountId : String ) : Event
1413data class StatusDeletedEvent (val statusId : String ) : Event
1514data class StatusComposedEvent (val status : Status ) : Event
16- data class StatusScheduledEvent (val scheduledStatus : ScheduledStatus ) : Event
15+ data class StatusScheduledEvent (val scheduledStatusId : String ) : Event
1716data class ProfileEditedEvent (val newProfileData : Account ) : Event
1817data class PreferenceChangedEvent (val preferenceKey : String ) : Event
1918data class MainTabsChangedEvent (val newTabs : List <TabData >) : Event
Original file line number Diff line number Diff line change @@ -25,3 +25,10 @@ data class ScheduledStatus(
2525 val params : StatusParams ,
2626 @Json(name = " media_attachments" ) val mediaAttachments : List <Attachment >
2727)
28+
29+ // minimal class to avoid json parsing errors with servers that don't support scheduling
30+ // https://github.com/tuskyapp/Tusky/issues/4703
31+ @JsonClass(generateAdapter = true )
32+ data class ScheduledStatusReply (
33+ val id : String ,
34+ )
Original file line number Diff line number Diff line change @@ -39,6 +39,7 @@ import com.keylesspalace.tusky.entity.NotificationSubscribeResult
3939import com.keylesspalace.tusky.entity.Poll
4040import com.keylesspalace.tusky.entity.Relationship
4141import com.keylesspalace.tusky.entity.ScheduledStatus
42+ import com.keylesspalace.tusky.entity.ScheduledStatusReply
4243import com.keylesspalace.tusky.entity.SearchResult
4344import com.keylesspalace.tusky.entity.Status
4445import com.keylesspalace.tusky.entity.StatusContext
@@ -207,7 +208,7 @@ interface MastodonApi {
207208 @Header(DOMAIN_HEADER ) domain : String ,
208209 @Header(" Idempotency-Key" ) idempotencyKey : String ,
209210 @Body status : NewStatus
210- ): NetworkResult <ScheduledStatus >
211+ ): NetworkResult <ScheduledStatusReply >
211212
212213 @GET(" api/v1/statuses/{id}" )
213214 suspend fun status (@Path(" id" ) statusId : String ): NetworkResult <Status >
Original file line number Diff line number Diff line change @@ -47,7 +47,7 @@ import com.keylesspalace.tusky.entity.Attachment
4747import com.keylesspalace.tusky.entity.MediaAttribute
4848import com.keylesspalace.tusky.entity.NewPoll
4949import com.keylesspalace.tusky.entity.NewStatus
50- import com.keylesspalace.tusky.entity.ScheduledStatus
50+ import com.keylesspalace.tusky.entity.ScheduledStatusReply
5151import com.keylesspalace.tusky.entity.Status
5252import com.keylesspalace.tusky.network.MastodonApi
5353import com.keylesspalace.tusky.util.getParcelableExtraCompat
@@ -290,7 +290,7 @@ class SendStatusService : Service() {
290290 mediaUploader.cancelUploadScope(* statusToSend.media.map { it.localId }.toIntArray())
291291
292292 if (scheduled) {
293- eventHub.dispatch(StatusScheduledEvent (sentStatus as ScheduledStatus ))
293+ eventHub.dispatch(StatusScheduledEvent (( sentStatus as ScheduledStatusReply ).id ))
294294 } else if (! isNew) {
295295 eventHub.dispatch(StatusChangedEvent (sentStatus as Status ))
296296 } else {
You can’t perform that action at this time.
0 commit comments