From 9f96682783ff5e99f34610787f8e17f92f0801fe Mon Sep 17 00:00:00 2001 From: Sijawusz Pur Rahnama Date: Sun, 11 Jan 2026 23:17:05 +0100 Subject: [PATCH] Fix `Style/RedundantBegin` type of Ameba issues --- .ameba.yml | 3 --- src/invidious/user/preferences.cr | 24 +++++++++++------------- src/invidious/user/user.cr | 8 +++----- src/invidious/yt_backend/extractors.cr | 16 +++++++--------- 4 files changed, 21 insertions(+), 30 deletions(-) diff --git a/.ameba.yml b/.ameba.yml index 8a792e179..96d910be5 100644 --- a/.ameba.yml +++ b/.ameba.yml @@ -31,9 +31,6 @@ Lint/SpecFilename: # Style # -Style/RedundantBegin: - Enabled: false - Style/RedundantReturn: Enabled: false diff --git a/src/invidious/user/preferences.cr b/src/invidious/user/preferences.cr index df195dd69..18d7e3167 100644 --- a/src/invidious/user/preferences.cr +++ b/src/invidious/user/preferences.cr @@ -64,20 +64,18 @@ struct Preferences end def self.from_json(value : JSON::PullParser) : String - begin - result = value.read_string + result = value.read_string - if result.empty? - CONFIG.default_user_preferences.dark_mode - else - result - end - rescue ex - if value.read_bool - "dark" - else - "light" - end + if result.empty? + CONFIG.default_user_preferences.dark_mode + else + result + end + rescue ex + if value.read_bool + "dark" + else + "light" end end diff --git a/src/invidious/user/user.cr b/src/invidious/user/user.cr index a6d05fd19..fc0a58583 100644 --- a/src/invidious/user/user.cr +++ b/src/invidious/user/user.cr @@ -17,11 +17,9 @@ struct Invidious::User module PreferencesConverter def self.from_rs(rs) - begin - Preferences.from_json(rs.read(String)) - rescue ex - Preferences.from_json("{}") - end + Preferences.from_json(rs.read(String)) + rescue ex + Preferences.from_json("{}") end end end diff --git a/src/invidious/yt_backend/extractors.cr b/src/invidious/yt_backend/extractors.cr index 22c184eee..fcb1b83af 100644 --- a/src/invidious/yt_backend/extractors.cr +++ b/src/invidious/yt_backend/extractors.cr @@ -37,15 +37,13 @@ record AuthorFallback, name : String, id : String private module Parsers module BaseParser def parse(*args) - begin - return parse_internal(*args) - rescue ex - LOGGER.debug("#{{{ @type.name }}}: Failed to render item.") - LOGGER.debug("#{{{ @type.name }}}: Got exception: #{ex.message}") - ProblematicTimelineItem.new( - parse_exception: ex - ) - end + return parse_internal(*args) + rescue ex + LOGGER.debug("#{{{ @type.name }}}: Failed to render item.") + LOGGER.debug("#{{{ @type.name }}}: Got exception: #{ex.message}") + ProblematicTimelineItem.new( + parse_exception: ex + ) end end