diff options
| author | Starfall <us@starfall.systems> | 2021-02-21 13:10:39 -0600 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2021-02-21 13:10:39 -0600 |
| commit | 86de4ec5559164a49b2790d774f8bba5af02c64f (patch) | |
| tree | 804ac22f8ea54824346d336f9fe7664e205719ff /app/models | |
| parent | 3693000bf6a94219e3cc4a29a6cb4ac51b78cf2a (diff) | |
| parent | 8792128f38e19b0d7882468a4f1f9362b98793a0 (diff) | |
Merge remote-tracking branch 'glitchsoc/main' into main
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/concerns/account_finder_concern.rb | 2 | ||||
| -rw-r--r-- | app/models/media_attachment.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/models/concerns/account_finder_concern.rb b/app/models/concerns/account_finder_concern.rb index 04b2c981b..0dadddad1 100644 --- a/app/models/concerns/account_finder_concern.rb +++ b/app/models/concerns/account_finder_concern.rb @@ -14,6 +14,8 @@ module AccountFinderConcern def representative Account.find(-99) + rescue ActiveRecord::RecordNotFound + Account.create!(id: -99, actor_type: 'Application', locked: true, username: Rails.configuration.x.local_domain) end def find_local(username) diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb index cc81b648c..96386d841 100644 --- a/app/models/media_attachment.rb +++ b/app/models/media_attachment.rb @@ -59,7 +59,7 @@ class MediaAttachment < ApplicationRecord IMAGE_STYLES = { original: { - pixels: 1_638_400, # 1280x1280px + pixels: 2_073_600, # 1920x1080px file_geometry_parser: FastGeometryParser, }.freeze, |