Skip to content

Add Tumblr support #1995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Tlaster wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Add Tumblr support #1995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36f305a
Add Tumblr OAuth2 support
Tlaster Apr 8, 2026
87b0756
Tighten Tumblr visibility
Tlaster Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/UiIconExt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import compose.icons.fontawesomeicons.Regular
import compose.icons.fontawesomeicons.Solid
import compose.icons.fontawesomeicons.brands.Bluesky
import compose.icons.fontawesomeicons.brands.Mastodon
import compose.icons.fontawesomeicons.brands.Tumblr
import compose.icons.fontawesomeicons.brands.Weibo
import compose.icons.fontawesomeicons.brands.XTwitter
import compose.icons.fontawesomeicons.regular.Bookmark
Expand Down Expand Up @@ -95,6 +96,7 @@ public fun UiIcon.toImageVector(): ImageVector =
UiIcon.Mastodon -> FontAwesomeIcons.Brands.Mastodon
UiIcon.Misskey -> FontAwesomeIcons.Brands.Misskey
UiIcon.Bluesky -> FontAwesomeIcons.Brands.Bluesky
UiIcon.Tumblr -> FontAwesomeIcons.Brands.Tumblr
UiIcon.Nostr -> FontAwesomeIcons.Brands.Nostr
UiIcon.Twitter -> FontAwesomeIcons.Brands.XTwitter
UiIcon.X -> FontAwesomeIcons.Brands.XTwitter
Expand Down
2 changes: 2 additions & 0 deletions compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/model/PlatformTypeIcon.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import compose.icons.FontAwesomeIcons
import compose.icons.fontawesomeicons.Brands
import compose.icons.fontawesomeicons.brands.Bluesky
import compose.icons.fontawesomeicons.brands.Mastodon
import compose.icons.fontawesomeicons.brands.Tumblr
import compose.icons.fontawesomeicons.brands.Weibo
import compose.icons.fontawesomeicons.brands.XTwitter
import dev.dimension.flare.model.PlatformType
Expand All @@ -18,6 +19,7 @@ public val PlatformType.brandIcon: ImageVector
PlatformType.Mastodon -> FontAwesomeIcons.Brands.Mastodon
PlatformType.Misskey -> FontAwesomeIcons.Brands.Misskey
PlatformType.Bluesky -> FontAwesomeIcons.Brands.Bluesky
PlatformType.Tumblr -> FontAwesomeIcons.Brands.Tumblr
PlatformType.xQt -> FontAwesomeIcons.Brands.XTwitter
PlatformType.VVo -> FontAwesomeIcons.Brands.Weibo
}
32 changes: 32 additions & 0 deletions ...rc/commonMain/kotlin/dev/dimension/flare/ui/screen/login/ServiceSelectionScreenContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,38 @@ public fun ServiceSelectionScreenContent(
}
}

PlatformType.Tumblr -> {
registerDeeplinkCallback {
state.tumblrLoginState.resume(it)
}
state.tumblrLoginState.resumedState
?.onLoading {
PlatformText(
text = stringResource(Res.string.mastodon_login_verify_message),
)
PlatformLinearProgressIndicator()
}?.onError {
PlatformText(text = it.message ?: "Unknown error")
} ?: run {
PlatformFilledTonalButton(
onClick = {
state.tumblrLoginState.login(
launchUrl = openUri,
)
},
modifier = Modifier.width(300.dp),
enabled = !state.tumblrLoginState.loading,
) {
PlatformText(
text = stringResource(Res.string.service_select_next_button),
)
}
state.tumblrLoginState.error?.let {
PlatformText(text = it)
}
}
}

PlatformType.Misskey -> {
registerDeeplinkCallback {
state.misskeyLoginState.resume(it)
Expand Down
34 changes: 34 additions & 0 deletions shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/PostEvent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import dev.dimension.flare.ui.model.mapper.misskeyReact
import dev.dimension.flare.ui.model.mapper.misskeyRenote
import dev.dimension.flare.ui.model.mapper.nostrLike
import dev.dimension.flare.ui.model.mapper.nostrRepost
import dev.dimension.flare.ui.model.mapper.tumblrLike
import dev.dimension.flare.ui.model.mapper.tumblrReblog
import dev.dimension.flare.ui.model.mapper.vvoFavorite
import dev.dimension.flare.ui.model.mapper.vvoLike
import dev.dimension.flare.ui.model.mapper.vvoLikeComment
Expand Down Expand Up @@ -429,6 +431,38 @@ internal sealed interface PostEvent {
val accountKey: MicroBlogKey,
) : Nostr
}

@Serializable
sealed interface Tumblr : PostEvent {
@Serializable
data class Like(
override val postKey: MicroBlogKey,
val liked: Boolean,
val accountKey: MicroBlogKey,
) : Tumblr,
UpdatePostActionMenuEvent {
override fun nextActionMenu(): ActionMenu.Item =
ActionMenu.tumblrLike(
statusKey = postKey,
liked = !liked,
accountKey = accountKey,
)
}

@Serializable
data class Reblog(
override val postKey: MicroBlogKey,
val canReblog: Boolean,
val accountKey: MicroBlogKey,
) : Tumblr {
fun nextActionMenu(): ActionMenu.Item =
ActionMenu.tumblrReblog(
statusKey = postKey,
canReblog = false,
accountKey = accountKey,
)
}
}
}

internal interface UpdatePostActionMenuEvent : PostEvent {
Expand Down
Loading
Loading