-
-
Notifications
You must be signed in to change notification settings - Fork 615
feat: marketplace #5226
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.
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
Merged
Merged
feat: marketplace #5226
Changes from 26 commits
Commits
Show all changes
41 commits
Select commit
Hold shift + click to select a range
64480dc
few things
1zun4 570156b
Merge branch 'nextgen' into feat/marketplace
1zun4 78d6256
merge fix
1zun4 0a75484
Merge branch 'nextgen' into feat/marketplace
1zun4 e90fa75
continue marketplace implementation
1zun4 2cc622a
feat: filtering
1zun4 6160db4
chore: copyright header
1zun4 79f0f3b
chore: remove new lines
1zun4 195c08b
Merge branch 'nextgen' into feat/marketplace
1zun4 870a5bf
feat: marketplace interop
1zun4 673164a
feat: marketplace interop
1zun4 e99e90e
refactor
1zun4 abe3a91
continue a bit
1zun4 88532a2
Merge branch 'nextgen' into feat/marketplace
1zun4 3afbea5
fix: merge
1zun4 c743870
refactor(MarketplaceApi): type serialization
1zun4 737b878
feat: installation and auto-updating
1zun4 80f16c0
refactor: use suspendable handler
1zun4 12a2c56
fix: http client
1zun4 2408d19
refactor: featured query param
1zun4 4564c8b
fix: subscribe type check
1zun4 f4d26ef
feat: item click action
1zun4 528b138
fix: error on unsubscribe
1zun4 0105eb1
chore: no only featured by default
1zun4 63495c1
feat(list): featured only parameter
1zun4 8f363f5
fix(SubscribedItem): exclude directory from serialization
1zun4 799092f
feat(UnsubscribeCommand): ID auto-completion
1zun4 ced113e
fix: forgot to commit
1zun4 e3d51dd
feat: support theme selection
1zun4 211745c
fix: detekt
1zun4 0fc79a6
refactor(theme): README and publishing workflow
1zun4 1bc0c9e
feat(ScriptManager): loading marketplace items
1zun4 0b87c72
fix: do not list other
1zun4 f4c91da
fix: pre-load marketplace before update
1zun4 b621d56
feat: named choice on item type
1zun4 6079200
feat: auto reload on script
1zun4 8e8d22a
fix: complete anyway
1zun4 e5c8137
feat: update command
1zun4 4c72da4
fix: detekt
1zun4 b33b482
feat: nice to have messages
1zun4 4ec319b
fix: do not premark with a version tag
1zun4 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
src/main/kotlin/net/ccbluex/liquidbounce/api/models/marketplace/MarketplaceItem.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| /* | ||
| * This file is part of LiquidBounce (https://github.com/CCBlueX/LiquidBounce) | ||
| * | ||
| * Copyright (c) 2015 - 2025 CCBlueX | ||
| * | ||
| * LiquidBounce 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. | ||
| * | ||
| * LiquidBounce 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 LiquidBounce. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
| package net.ccbluex.liquidbounce.api.models.marketplace | ||
|
|
||
| import com.google.gson.annotations.SerializedName | ||
|
|
||
| data class MarketplaceItem( | ||
| val id: Int, | ||
| val uid: String, | ||
| val type: MarketplaceItemType, | ||
| val name: String, | ||
| val branch: String, | ||
| val description: String, | ||
| @SerializedName("thumbnail_pid") | ||
| val thumbnailPid: String?, | ||
| val featured: Boolean, | ||
| @SerializedName("created_at") | ||
| val createdAt: String, | ||
| val status: MarketplaceItemStatus | ||
| ) |
34 changes: 34 additions & 0 deletions
34
src/main/kotlin/net/ccbluex/liquidbounce/api/models/marketplace/MarketplaceItemRevision.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| /* | ||
| * This file is part of LiquidBounce (https://github.com/CCBlueX/LiquidBounce) | ||
| * | ||
| * Copyright (c) 2015 - 2025 CCBlueX | ||
| * | ||
| * LiquidBounce 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. | ||
| * | ||
| * LiquidBounce 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 LiquidBounce. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
| package net.ccbluex.liquidbounce.api.models.marketplace | ||
|
|
||
| import com.google.gson.annotations.SerializedName | ||
|
|
||
| data class MarketplaceItemRevision( | ||
| val id: Int, | ||
| @SerializedName("item_id") | ||
| val itemId: Int, | ||
| val version: String, | ||
| @SerializedName("file_pid") | ||
| val filePid: String, | ||
| val changelog: String?, | ||
| @SerializedName("created_at") | ||
| val createdAt: String, | ||
| val status: MarketplaceItemStatus | ||
| ) |
34 changes: 34 additions & 0 deletions
34
src/main/kotlin/net/ccbluex/liquidbounce/api/models/marketplace/MarketplaceItemStatus.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| /* | ||
| * This file is part of LiquidBounce (https://github.com/CCBlueX/LiquidBounce) | ||
| * | ||
| * Copyright (c) 2015 - 2025 CCBlueX | ||
| * | ||
| * LiquidBounce 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. | ||
| * | ||
| * LiquidBounce 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 LiquidBounce. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
| package net.ccbluex.liquidbounce.api.models.marketplace | ||
|
|
||
| import com.google.gson.annotations.SerializedName | ||
|
|
||
| enum class MarketplaceItemStatus { | ||
| @SerializedName("Active") | ||
| ACTIVE, | ||
| @SerializedName("Inactive") | ||
| INACTIVE, | ||
| @SerializedName("Pending") | ||
| PENDING, | ||
| @SerializedName("Rejected") | ||
| REJECTED, | ||
| @SerializedName("Deleted") | ||
| DELETED | ||
| } |
32 changes: 32 additions & 0 deletions
32
src/main/kotlin/net/ccbluex/liquidbounce/api/models/marketplace/MarketplaceItemType.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| /* | ||
| * This file is part of LiquidBounce (https://github.com/CCBlueX/LiquidBounce) | ||
| * | ||
| * Copyright (c) 2015 - 2025 CCBlueX | ||
| * | ||
| * LiquidBounce 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. | ||
| * | ||
| * LiquidBounce 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 LiquidBounce. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
| package net.ccbluex.liquidbounce.api.models.marketplace | ||
|
|
||
| import com.google.gson.annotations.SerializedName | ||
|
|
||
| enum class MarketplaceItemType(val isListable: Boolean, val isSubscribable: Boolean) { | ||
| @SerializedName("Config") | ||
| CONFIG(false, false), | ||
| @SerializedName("Script") | ||
| SCRIPT(true, true), | ||
| @SerializedName("Theme") | ||
| THEME(true, true), | ||
| @SerializedName("Other") | ||
| OTHER(true, true) | ||
| } |
32 changes: 32 additions & 0 deletions
32
src/main/kotlin/net/ccbluex/liquidbounce/api/models/marketplace/MarketplaceReview.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| /* | ||
| * This file is part of LiquidBounce (https://github.com/CCBlueX/LiquidBounce) | ||
| * | ||
| * Copyright (c) 2015 - 2025 CCBlueX | ||
| * | ||
| * LiquidBounce 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. | ||
| * | ||
| * LiquidBounce 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 LiquidBounce. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
| package net.ccbluex.liquidbounce.api.models.marketplace | ||
|
|
||
| import com.google.gson.annotations.SerializedName | ||
|
|
||
| data class MarketplaceReview( | ||
| val id: Int, | ||
| @SerializedName("item_id") | ||
| val itemId: Int, | ||
| val uid: String, | ||
| val rating: Int, | ||
| val review: String?, | ||
| @SerializedName("created_at") | ||
| val createdAt: String | ||
| ) |
33 changes: 33 additions & 0 deletions
33
...n/kotlin/net/ccbluex/liquidbounce/api/models/marketplace/MarketplaceRevisionDependency.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| /* | ||
| * This file is part of LiquidBounce (https://github.com/CCBlueX/LiquidBounce) | ||
| * | ||
| * Copyright (c) 2015 - 2025 CCBlueX | ||
| * | ||
| * LiquidBounce 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. | ||
| * | ||
| * LiquidBounce 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 LiquidBounce. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
| package net.ccbluex.liquidbounce.api.models.marketplace | ||
|
|
||
| import com.google.gson.annotations.SerializedName | ||
|
|
||
| data class MarketplaceRevisionDependency( | ||
| val id: Int, | ||
| @SerializedName("revision_id") | ||
| val revisionId: Int, | ||
| @SerializedName("dependency_revision_id") | ||
| val dependencyRevisionId: Int, | ||
| @SerializedName("created_at") | ||
| val createdAt: String, | ||
| @SerializedName("dependency_revision") | ||
| val dependencyRevision: MarketplaceItemRevision? | ||
| ) |
6 changes: 6 additions & 0 deletions
6
src/main/kotlin/net/ccbluex/liquidbounce/api/models/pagination/PaginatedResponse.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| package net.ccbluex.liquidbounce.api.models.pagination | ||
|
|
||
| data class PaginatedResponse<T>( | ||
| val items: List<T>, | ||
| val pagination: Pagination | ||
| ) |
7 changes: 7 additions & 0 deletions
7
src/main/kotlin/net/ccbluex/liquidbounce/api/models/pagination/Pagination.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| package net.ccbluex.liquidbounce.api.models.pagination | ||
|
|
||
| data class Pagination( | ||
| val current: Int, | ||
| val pages: Int, | ||
| val items: Int | ||
| ) |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.