ReVanced/revanced-api
1
0
Fork 0
mirror of https://github.com/revanced/revanced-api.git synced 2025-04-29 22:24:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: Add URL and use friendly name for APIContributable

Browse Source
This commit is contained in:
oSumAtrIX 2024-11-01 18:43:39 +01:00
parent f91f3a65c5
commit a5498aba2b
No known key found for this signature in database
GPG Key ID: A9B3094ACDB604B4
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configuration.example.toml
View File

@ -2,14 +2,6 @@ organization = "revanced"
patches = { repository = "revanced-patches", asset-regex = "jar$", signature-asset-regex = "asc$", public-key-file = "patches-public-key.asc", public-key-id = 0 } patches = { repository = "revanced-patches", asset-regex = "jar$", signature-asset-regex = "asc$", public-key-file = "patches-public-key.asc", public-key-id = 0 }
integrations = { repository = "revanced-integrations", asset-regex = "apk$", signature-asset-regex = "asc$", public-key-file = "integrations-public-key.asc", public-key-id = 0 } integrations = { repository = "revanced-integrations", asset-regex = "apk$", signature-asset-regex = "asc$", public-key-file = "integrations-public-key.asc", public-key-id = 0 }
manager = { repository = "revanced-manager", asset-regex = "apk$" } manager = { repository = "revanced-manager", asset-regex = "apk$" }
contributors-repositories = [
"revanced-patcher",
"revanced-patches",
"revanced-integrations",
"revanced-website",
"revanced-cli",
"revanced-manager",
]
api-version = 1 api-version = 1
cors-allowed-hosts = [ cors-allowed-hosts = [
"revanced.app", "revanced.app",
@ -21,3 +13,9 @@ static-files-path = "static/root"
versioned-static-files-path = "static/versioned" versioned-static-files-path = "static/versioned"
about-json-file-path = "about.json" about-json-file-path = "about.json"
backend-service-name = "GitHub" backend-service-name = "GitHub"
[contributors-repositories]
revanced-patcher = "ReVanced Patcher"
revanced-patches = "ReVanced Patches"
revanced-website = "ReVanced Website"
revanced-cli = "ReVanced CLI"
revanced-manager = "ReVanced Manager"

4
src/main/kotlin/app/revanced/api/configuration/repository/ConfigurationRepository.kt
View File

@ -26,7 +26,7 @@ import kotlin.io.path.createDirectories
* @property patches The source of the patches. * @property patches The source of the patches.
* @property integrations The source of the integrations. * @property integrations The source of the integrations.
* @property manager The source of the manager. * @property manager The source of the manager.
* @property contributorsRepositoryNames The names of the repositories to get contributors from. * @property contributorsRepositoryNames The friendly name of repos mapped to the repository names to get contributors from.
* @property backendServiceName The name of the backend service to use for the repositories, contributors, etc. * @property backendServiceName The name of the backend service to use for the repositories, contributors, etc.
* @property apiVersion The version to use for the API. * @property apiVersion The version to use for the API.
* @property corsAllowedHosts The hosts allowed to make requests to the API. * @property corsAllowedHosts The hosts allowed to make requests to the API.
@ -44,7 +44,7 @@ internal class ConfigurationRepository(
val integrations: SignedAssetConfiguration, val integrations: SignedAssetConfiguration,
val manager: AssetConfiguration, val manager: AssetConfiguration,
@SerialName("contributors-repositories") @SerialName("contributors-repositories")
val contributorsRepositoryNames: Set<String>, val contributorsRepositoryNames: Map<String, String>,
@SerialName("backend-service-name") @SerialName("backend-service-name")
val backendServiceName: String, val backendServiceName: String,
@SerialName("api-version") @SerialName("api-version")

1
src/main/kotlin/app/revanced/api/configuration/schema/APISchema.kt
View File

@ -35,6 +35,7 @@ class ApiContributor(
@Serializable @Serializable
class APIContributable( class APIContributable(
val name: String, val name: String,
val url: String,
// Using a list instead of a set because set semantics are unnecessary here. // Using a list instead of a set because set semantics are unnecessary here.
val contributors: List<ApiContributor>, val contributors: List<ApiContributor>,
) )

11
src/main/kotlin/app/revanced/api/configuration/services/ApiService.kt
View File

@ -3,6 +3,7 @@ package app.revanced.api.configuration.services
import app.revanced.api.configuration.repository.BackendRepository import app.revanced.api.configuration.repository.BackendRepository
import app.revanced.api.configuration.repository.ConfigurationRepository import app.revanced.api.configuration.repository.ConfigurationRepository
import app.revanced.api.configuration.schema.* import app.revanced.api.configuration.schema.*
import io.ktor.http.*
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.async import kotlinx.coroutines.async
import kotlinx.coroutines.awaitAll import kotlinx.coroutines.awaitAll
@ -16,11 +17,15 @@ internal class ApiService(
val about = configurationRepository.about val about = configurationRepository.about
suspend fun contributors() = withContext(Dispatchers.IO) { suspend fun contributors() = withContext(Dispatchers.IO) {
configurationRepository.contributorsRepositoryNames.map { configurationRepository.contributorsRepositoryNames.map { (repository, name) ->
async { async {
APIContributable( APIContributable(
it, name,
backendRepository.contributors(configurationRepository.organization, it).map { URLBuilder().apply {
takeFrom(backendRepository.website)
path(configurationRepository.organization, repository)
}.buildString(),
backendRepository.contributors(configurationRepository.organization, repository).map {
ApiContributor(it.name, it.avatarUrl, it.url, it.contributions) ApiContributor(it.name, it.avatarUrl, it.url, it.contributions)
}, },
) )