From 3174eb20e5dc963a992d6922dfd8473fc0cc991d Mon Sep 17 00:00:00 2001 From: Gabe Kangas Date: Fri, 25 Aug 2023 19:58:44 -0700 Subject: [PATCH] fix: updates for new linter rules. Closes #3277 --- core/chat/events/eventtype.go | 2 +- core/data/config.go | 96 ++++++++++++++++++----------------- 2 files changed, 50 insertions(+), 48 deletions(-) diff --git a/core/chat/events/eventtype.go b/core/chat/events/eventtype.go index 3bfde1f8a..3a8869845 100644 --- a/core/chat/events/eventtype.go +++ b/core/chat/events/eventtype.go @@ -33,7 +33,7 @@ const ( // ChatActionSent is a generic chat action that can be used for anything that doesn't need specific handling or formatting. ChatActionSent EventType = "CHAT_ACTION" // ErrorNeedsRegistration is an error returned when the client needs to perform registration. - ErrorNeedsRegistration EventType = "ERROR_NEEDS_REGISTRATION" + ErrorNeedsRegistration EventType = "ERROR_NEEDS_REGISTRATION" // nolint:gosec // ErrorMaxConnectionsExceeded is an error returned when the server determined it should not handle more connections. ErrorMaxConnectionsExceeded EventType = "ERROR_MAX_CONNECTIONS_EXCEEDED" // ErrorUserDisabled is an error returned when the connecting user has been previously banned/disabled. diff --git a/core/data/config.go b/core/data/config.go index d76c9e718..fe71c9371 100644 --- a/core/data/config.go +++ b/core/data/config.go @@ -16,53 +16,54 @@ import ( ) const ( - extraContentKey = "extra_page_content" - streamTitleKey = "stream_title" - adminPasswordKey = "admin_password_key" - logoPathKey = "logo_path" - logoUniquenessKey = "logo_uniqueness" - serverSummaryKey = "server_summary" - serverWelcomeMessageKey = "server_welcome_message" - serverNameKey = "server_name" - serverURLKey = "server_url" - httpPortNumberKey = "http_port_number" - httpListenAddressKey = "http_listen_address" - websocketHostOverrideKey = "websocket_host_override" - rtmpPortNumberKey = "rtmp_port_number" - serverMetadataTagsKey = "server_metadata_tags" - directoryEnabledKey = "directory_enabled" - directoryRegistrationKeyKey = "directory_registration_key" - socialHandlesKey = "social_handles" - peakViewersSessionKey = "peak_viewers_session" - peakViewersOverallKey = "peak_viewers_overall" - lastDisconnectTimeKey = "last_disconnect_time" - ffmpegPathKey = "ffmpeg_path" - nsfwKey = "nsfw" - s3StorageConfigKey = "s3_storage_config" - videoLatencyLevel = "video_latency_level" - videoStreamOutputVariantsKey = "video_stream_output_variants" - chatDisabledKey = "chat_disabled" - externalActionsKey = "external_actions" - customStylesKey = "custom_styles" - customJavascriptKey = "custom_javascript" - videoCodecKey = "video_codec" - blockedUsernamesKey = "blocked_usernames" - publicKeyKey = "public_key" - privateKeyKey = "private_key" - serverInitDateKey = "server_init_date" - federationEnabledKey = "federation_enabled" - federationUsernameKey = "federation_username" - federationPrivateKey = "federation_private" - federationGoLiveMessageKey = "federation_go_live_message" - federationShowEngagementKey = "federation_show_engagement" - federationBlockedDomainsKey = "federation_blocked_domains" - suggestedUsernamesKey = "suggested_usernames" - chatJoinMessagesEnabledKey = "chat_join_messages_enabled" - chatEstablishedUsersOnlyModeKey = "chat_established_users_only_mode" - notificationsEnabledKey = "notifications_enabled" - discordConfigurationKey = "discord_configuration" - browserPushConfigurationKey = "browser_push_configuration" - browserPushPublicKeyKey = "browser_push_public_key" + extraContentKey = "extra_page_content" + streamTitleKey = "stream_title" + adminPasswordKey = "admin_password_key" + logoPathKey = "logo_path" + logoUniquenessKey = "logo_uniqueness" + serverSummaryKey = "server_summary" + serverWelcomeMessageKey = "server_welcome_message" + serverNameKey = "server_name" + serverURLKey = "server_url" + httpPortNumberKey = "http_port_number" + httpListenAddressKey = "http_listen_address" + websocketHostOverrideKey = "websocket_host_override" + rtmpPortNumberKey = "rtmp_port_number" + serverMetadataTagsKey = "server_metadata_tags" + directoryEnabledKey = "directory_enabled" + directoryRegistrationKeyKey = "directory_registration_key" + socialHandlesKey = "social_handles" + peakViewersSessionKey = "peak_viewers_session" + peakViewersOverallKey = "peak_viewers_overall" + lastDisconnectTimeKey = "last_disconnect_time" + ffmpegPathKey = "ffmpeg_path" + nsfwKey = "nsfw" + s3StorageConfigKey = "s3_storage_config" + videoLatencyLevel = "video_latency_level" + videoStreamOutputVariantsKey = "video_stream_output_variants" + chatDisabledKey = "chat_disabled" + externalActionsKey = "external_actions" + customStylesKey = "custom_styles" + customJavascriptKey = "custom_javascript" + videoCodecKey = "video_codec" + blockedUsernamesKey = "blocked_usernames" + publicKeyKey = "public_key" + privateKeyKey = "private_key" + serverInitDateKey = "server_init_date" + federationEnabledKey = "federation_enabled" + federationUsernameKey = "federation_username" + federationPrivateKey = "federation_private" + federationGoLiveMessageKey = "federation_go_live_message" + federationShowEngagementKey = "federation_show_engagement" + federationBlockedDomainsKey = "federation_blocked_domains" + suggestedUsernamesKey = "suggested_usernames" + chatJoinMessagesEnabledKey = "chat_join_messages_enabled" + chatEstablishedUsersOnlyModeKey = "chat_established_users_only_mode" + notificationsEnabledKey = "notifications_enabled" + discordConfigurationKey = "discord_configuration" + browserPushConfigurationKey = "browser_push_configuration" + browserPushPublicKeyKey = "browser_push_public_key" + // nolint:gosec browserPushPrivateKeyKey = "browser_push_private_key" hasConfiguredInitialNotificationsKey = "has_configured_initial_notifications" hideViewerCountKey = "hide_viewer_count" @@ -647,6 +648,7 @@ func FindHighestVideoQualityIndex(qualities []models.StreamOutputVariant) int { return indexedQualities[a].quality.VideoBitrate > indexedQualities[b].quality.VideoBitrate }) + // nolint:gosec return indexedQualities[0].index }