From e25170f960bdc890e4f8a6b1373ab55192669629 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 13 Jan 2017 03:24:41 +0100
Subject: Add extended about page stub

---
 app/models/account.rb | 1 +
 app/models/setting.rb | 5 ++---
 app/models/web.rb     | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'app/models')

diff --git a/app/models/account.rb b/app/models/account.rb
index ec0e81f7c..5f07615fc 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -159,6 +159,7 @@ class Account < ApplicationRecord
     end
 
     def find_remote!(username, domain)
+      return if username.blank?
       where(arel_table[:username].matches(username.gsub(/[%_]/, '\\\\\0'))).where(domain.nil? ? { domain: nil } : arel_table[:domain].matches(domain.gsub(/[%_]/, '\\\\\0'))).take!
     end
 
diff --git a/app/models/setting.rb b/app/models/setting.rb
index f3c65c054..3796253d4 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -9,10 +9,9 @@ class Setting < RailsSettings::Base
   end
 
   class << self
-
     def [](key)
       return super(key) unless rails_initialized?
-      
+
       val = Rails.cache.fetch(cache_key(key, @object)) do
         db_val = object(key)
 
@@ -25,7 +24,7 @@ class Setting < RailsSettings::Base
           default_settings[key]
         end
       end
-      
+
       val
     end
 
diff --git a/app/models/web.rb b/app/models/web.rb
index 3c6eebbe2..58654fd77 100644
--- a/app/models/web.rb
+++ b/app/models/web.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Web
   def self.table_name_prefix
     'web_'
-- 
cgit