From ee0e5298aacb1fc37773044559f34609dda89d19 Mon Sep 17 00:00:00 2001 From: dzikoysk Date: Fri, 7 Jul 2023 00:11:04 +0200 Subject: [PATCH] =?UTF-8?q?GH-1853=20List=20sponsors=20at=20startup=20&=20?= =?UTF-8?q?update=20sponsors=20list=20=F0=9F=92=9C=20(Resolve=20#1853)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/README.md | 8 +++++--- .../main/kotlin/com/reposilite/ReposiliteFactory.kt | 2 +- .../com/reposilite/auth/AuthenticationFacade.kt | 6 +++--- .../reposilite/console/application/ConsolePlugin.kt | 4 +--- .../com/reposilite/status/application/StatusPlugin.kt | 11 ++++++++++- 5 files changed, 20 insertions(+), 11 deletions(-) diff --git a/.github/README.md b/.github/README.md index 9956589a0..17aa092cf 100644 --- a/.github/README.md +++ b/.github/README.md @@ -94,8 +94,9 @@ Thanks to all contributors and people that decided to support my work financiall milkyway0308, andrm, - insertt, - oskarscot, + insertt, + Andreas R., + rdehuyss, Koressi, tipsy, Kamilkime, @@ -105,7 +106,7 @@ Thanks to all contributors and people that decided to support my work financiall crejk, Rollczi, scheidtp, - Andreas R. + Szczurowsky, @@ -128,6 +129,7 @@ Thanks to all contributors and people that decided to support my work financiall Szczurowsky, that-apex, Kamilkime, + oskarscot, zugazagoitia, FlawCra, mattwelke, diff --git a/reposilite-backend/src/main/kotlin/com/reposilite/ReposiliteFactory.kt b/reposilite-backend/src/main/kotlin/com/reposilite/ReposiliteFactory.kt index 3434a5cb8..499e807d9 100644 --- a/reposilite-backend/src/main/kotlin/com/reposilite/ReposiliteFactory.kt +++ b/reposilite-backend/src/main/kotlin/com/reposilite/ReposiliteFactory.kt @@ -47,7 +47,7 @@ object ReposiliteFactory { ) journalist.logger.info("") - journalist.logger.info("${Effect.GREEN}Reposilite ${Effect.RESET}$VERSION") + journalist.logger.info("${Effect.MAGENTA_BOLD}Reposilite $VERSION${Effect.RESET}") journalist.logger.info("") journalist.logger.info("--- Environment") journalist.logger.info("Platform: ${System.getProperty("java.version")} (${System.getProperty("os.name")} :: ${System.getProperty("os.arch")})") diff --git a/reposilite-backend/src/main/kotlin/com/reposilite/auth/AuthenticationFacade.kt b/reposilite-backend/src/main/kotlin/com/reposilite/auth/AuthenticationFacade.kt index 98d4af407..4b4ec3e64 100644 --- a/reposilite-backend/src/main/kotlin/com/reposilite/auth/AuthenticationFacade.kt +++ b/reposilite-backend/src/main/kotlin/com/reposilite/auth/AuthenticationFacade.kt @@ -62,9 +62,9 @@ class AuthenticationFacade( accessTokenFacade.getAccessTokenById(identifier) ?.let { SessionDetails( - it, - accessTokenFacade.getPermissions(it.identifier), - accessTokenFacade.getRoutes(it.identifier) + accessToken = it, + permissions = accessTokenFacade.getPermissions(it.identifier), + routes = accessTokenFacade.getRoutes(it.identifier) ) } ?.asSuccess() diff --git a/reposilite-backend/src/main/kotlin/com/reposilite/console/application/ConsolePlugin.kt b/reposilite-backend/src/main/kotlin/com/reposilite/console/application/ConsolePlugin.kt index e5e21af3b..176069b7a 100644 --- a/reposilite-backend/src/main/kotlin/com/reposilite/console/application/ConsolePlugin.kt +++ b/reposilite-backend/src/main/kotlin/com/reposilite/console/application/ConsolePlugin.kt @@ -78,13 +78,11 @@ internal class ConsolePlugin : ReposilitePlugin() { if (!parameters().testEnv) { event { _: ReposiliteStartedEvent -> reposilite().ioService.execute { - consoleFacade.executeCommand("help") - logger.info("") logger.info("Collecting status metrics...") logger.info("") consoleFacade.executeCommand("status") logger.info("") - logger.info("Startup done! For help, type 'help' or '?'") + logger.info("For help, type 'help' or '?'") } } } diff --git a/reposilite-backend/src/main/kotlin/com/reposilite/status/application/StatusPlugin.kt b/reposilite-backend/src/main/kotlin/com/reposilite/status/application/StatusPlugin.kt index cd2edb0e1..645714a16 100644 --- a/reposilite-backend/src/main/kotlin/com/reposilite/status/application/StatusPlugin.kt +++ b/reposilite-backend/src/main/kotlin/com/reposilite/status/application/StatusPlugin.kt @@ -16,6 +16,7 @@ package com.reposilite.status.application +import com.reposilite.VERSION import com.reposilite.configuration.local.LocalConfiguration import com.reposilite.console.ConsoleFacade import com.reposilite.plugin.api.Plugin @@ -40,6 +41,7 @@ import com.reposilite.web.api.RoutingSetupEvent import panda.std.reactive.Completable import panda.std.reactive.Reference.Dependencies.dependencies import panda.std.reactive.Reference.computed +import panda.utilities.console.Effect import java.nio.file.Files import java.nio.file.StandardOpenOption @@ -84,8 +86,15 @@ internal class StatusPlugin : ReposilitePlugin() { } event { _: ReposiliteStartedEvent -> - logger.info("Done (${TimeUtils.getPrettyUptimeInSeconds(statusFacade.getUptime())})!") logger.info("") + logger.info("${Effect.GREEN}Done (${TimeUtils.getPrettyUptimeInSeconds(statusFacade.getUptime())})!${Effect.RESET}") + logger.info("") + logger.info("${Effect.YELLOW_BOLD}$VERSION version has been sponsored by:${Effect.RESET}") + logger.info(" ${Effect.BOLD}milkyway0308, andrm, Koressi, insertt, Andreas R., rdehuyss") + logger.info(" tipsy, Kamilkime, that-apex") + logger.info(" neg4n, mattwelke, crejk, scheidtp, Rollczi, Szczurowsky") + logger.info("") + logger.info("${Effect.RESET}") } event { _: ReposiliteStartedEvent ->