diff --git a/src/main/java/dev/kruhlmann/imgfloat/config/TwitchAuthorizationCodeGrantRequestEntityConverter.java b/src/main/java/dev/kruhlmann/imgfloat/config/TwitchAuthorizationCodeGrantRequestEntityConverter.java index 6c9e2cc..a14f9f7 100644 --- a/src/main/java/dev/kruhlmann/imgfloat/config/TwitchAuthorizationCodeGrantRequestEntityConverter.java +++ b/src/main/java/dev/kruhlmann/imgfloat/config/TwitchAuthorizationCodeGrantRequestEntityConverter.java @@ -6,13 +6,13 @@ import java.util.List; import org.springframework.core.convert.converter.Converter; import org.springframework.http.HttpMethod; import org.springframework.http.RequestEntity; +import org.springframework.lang.Nullable; import org.springframework.security.oauth2.client.endpoint.OAuth2AuthorizationCodeGrantRequest; import org.springframework.security.oauth2.client.endpoint.OAuth2AuthorizationCodeGrantRequestEntityConverter; import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; -import org.springframework.lang.Nullable; /** * Ensures Twitch token requests always include {@code client_id} and {@code client_secret} in the diff --git a/src/main/java/dev/kruhlmann/imgfloat/controller/ChannelApiController.java b/src/main/java/dev/kruhlmann/imgfloat/controller/ChannelApiController.java index 9d54c52..48da123 100644 --- a/src/main/java/dev/kruhlmann/imgfloat/controller/ChannelApiController.java +++ b/src/main/java/dev/kruhlmann/imgfloat/controller/ChannelApiController.java @@ -12,10 +12,10 @@ import dev.kruhlmann.imgfloat.model.PlaybackRequest; import dev.kruhlmann.imgfloat.model.TransformRequest; import dev.kruhlmann.imgfloat.model.TwitchUserProfile; import dev.kruhlmann.imgfloat.model.VisibilityRequest; -import dev.kruhlmann.imgfloat.util.LogSanitizer; import dev.kruhlmann.imgfloat.service.AuthorizationService; import dev.kruhlmann.imgfloat.service.ChannelDirectoryService; import dev.kruhlmann.imgfloat.service.TwitchUserLookupService; +import dev.kruhlmann.imgfloat.util.LogSanitizer; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.Valid; @@ -256,7 +256,12 @@ public class ChannelApiController { .updateTransform(broadcaster, assetId, request) .map(ResponseEntity::ok) .orElseThrow(() -> { - LOG.warn("Transform request for missing asset {} on {} by {}", logAssetId, logBroadcaster, logSessionUsername); + LOG.warn( + "Transform request for missing asset {} on {} by {}", + logAssetId, + logBroadcaster, + logSessionUsername + ); return createAsset404(); }); } diff --git a/src/main/java/dev/kruhlmann/imgfloat/controller/SettingsApiController.java b/src/main/java/dev/kruhlmann/imgfloat/controller/SettingsApiController.java index a8eb72a..87fe03d 100644 --- a/src/main/java/dev/kruhlmann/imgfloat/controller/SettingsApiController.java +++ b/src/main/java/dev/kruhlmann/imgfloat/controller/SettingsApiController.java @@ -36,6 +36,7 @@ import org.springframework.web.server.ResponseStatusException; @RequestMapping("/api/settings") @SecurityRequirement(name = "administrator") public class SettingsApiController { + private static final Logger LOG = LoggerFactory.getLogger(SettingsApiController.class); private final SettingsService settingsService; diff --git a/src/main/java/dev/kruhlmann/imgfloat/controller/ViewController.java b/src/main/java/dev/kruhlmann/imgfloat/controller/ViewController.java index f703d97..e169efb 100644 --- a/src/main/java/dev/kruhlmann/imgfloat/controller/ViewController.java +++ b/src/main/java/dev/kruhlmann/imgfloat/controller/ViewController.java @@ -6,12 +6,12 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import dev.kruhlmann.imgfloat.model.OauthSessionUser; import dev.kruhlmann.imgfloat.model.Settings; -import dev.kruhlmann.imgfloat.util.LogSanitizer; import dev.kruhlmann.imgfloat.service.AuthorizationService; import dev.kruhlmann.imgfloat.service.ChannelDirectoryService; -import dev.kruhlmann.imgfloat.service.SettingsService; import dev.kruhlmann.imgfloat.service.GitInfoService; +import dev.kruhlmann.imgfloat.service.SettingsService; import dev.kruhlmann.imgfloat.service.VersionService; +import dev.kruhlmann.imgfloat.util.LogSanitizer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken; @@ -100,11 +100,7 @@ public class ViewController { ); String logBroadcaster = LogSanitizer.sanitize(broadcaster); String logSessionUsername = LogSanitizer.sanitize(sessionUsername); - LOG.info( - "Rendering admin console for {} (requested by {})", - logBroadcaster, - logSessionUsername - ); + LOG.info("Rendering admin console for {} (requested by {})", logBroadcaster, logSessionUsername); Settings settings = settingsService.get(); model.addAttribute("broadcaster", broadcaster.toLowerCase()); model.addAttribute("username", sessionUsername); diff --git a/src/main/java/dev/kruhlmann/imgfloat/service/AuthorizationService.java b/src/main/java/dev/kruhlmann/imgfloat/service/AuthorizationService.java index 1b45dac..0003961 100644 --- a/src/main/java/dev/kruhlmann/imgfloat/service/AuthorizationService.java +++ b/src/main/java/dev/kruhlmann/imgfloat/service/AuthorizationService.java @@ -64,7 +64,10 @@ public class AuthorizationService { public void userIsSystemAdministratorOrThrowHttpError(String sessionUsername) { if (!userIsSystemAdministrator(sessionUsername)) { - LOG.warn("Access denied for system administrator-only action by user {}", LogSanitizer.sanitize(sessionUsername)); + LOG.warn( + "Access denied for system administrator-only action by user {}", + LogSanitizer.sanitize(sessionUsername) + ); throw new ResponseStatusException(FORBIDDEN, "You do not have permission to perform this action"); } } diff --git a/src/main/java/dev/kruhlmann/imgfloat/service/ChannelDirectoryService.java b/src/main/java/dev/kruhlmann/imgfloat/service/ChannelDirectoryService.java index 64c9587..6a54ed2 100644 --- a/src/main/java/dev/kruhlmann/imgfloat/service/ChannelDirectoryService.java +++ b/src/main/java/dev/kruhlmann/imgfloat/service/ChannelDirectoryService.java @@ -154,12 +154,8 @@ public class ChannelDirectoryService { .orElse("asset_" + System.currentTimeMillis()); boolean isAudio = optimized.mediaType().startsWith("audio/"); - double width = optimized.width() > 0 - ? optimized.width() - : isAudio ? 400 : 640; - double height = optimized.height() > 0 - ? optimized.height() - : isAudio ? 80 : 360; + double width = optimized.width() > 0 ? optimized.width() : isAudio ? 400 : 640; + double height = optimized.height() > 0 ? optimized.height() : isAudio ? 80 : 360; Asset asset = new Asset(channel.getBroadcaster(), safeName, "", width, height); asset.setOriginalMediaType(mediaType); diff --git a/src/main/java/dev/kruhlmann/imgfloat/service/GitInfoService.java b/src/main/java/dev/kruhlmann/imgfloat/service/GitInfoService.java index abd51cb..8b8e0de 100644 --- a/src/main/java/dev/kruhlmann/imgfloat/service/GitInfoService.java +++ b/src/main/java/dev/kruhlmann/imgfloat/service/GitInfoService.java @@ -93,7 +93,7 @@ public class GitInfoService { return null; } } catch (InterruptedException e) { - Thread.currentThread().interrupt(); + Thread.currentThread().interrupt(); LOG.debug("Thread interrupt during git command {}", String.join(" ", command), e); return null; } catch (IOException e) { diff --git a/src/main/node/app.js b/src/main/node/app.js index 075a637..d3ee918 100644 --- a/src/main/node/app.js +++ b/src/main/node/app.js @@ -89,10 +89,10 @@ function createWindow() { app.whenReady().then(() => { if (process.env.CI) { - process.on("uncaughtException", (err) => { - console.error("Uncaught exception:", err); - app.exit(1); - }); + process.on("uncaughtException", (err) => { + console.error("Uncaught exception:", err); + app.exit(1); + }); setTimeout(() => app.quit(), 3000); } autoUpdater.checkForUpdatesAndNotify(); diff --git a/src/main/resources/static/js/csrf.js b/src/main/resources/static/js/csrf.js index 5b916f5..623a419 100644 --- a/src/main/resources/static/js/csrf.js +++ b/src/main/resources/static/js/csrf.js @@ -1,4 +1,4 @@ -(function() { +(function () { const CSRF_COOKIE_NAME = "XSRF-TOKEN"; const DEFAULT_HEADER_NAME = "X-XSRF-TOKEN"; const SAFE_METHODS = new Set(["GET", "HEAD", "OPTIONS", "TRACE"]); diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 7ffdc95..e89318c 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -53,7 +53,9 @@ target="_blank" >unknown - unknown + unknown