integrate glitch

app/javascript/styles/mastodon/_custom.scss

@@ -16,7 +16,8 @@
   position: relative;
   top: 0;
   width: 100%;
-  background: url('../images/home.jpg') no-repeat fixed center;
+  //background: url('~flavours/glitch/bliss/images/home.jpg') no-repeat fixed center;
+  background: url('~flavours/glitch/images/wave-drawer.png') no-repeat fixed center;
   background-size: cover;
 
   // landing
@@ -32,7 +33,8 @@
   position: absolute;
   top: 0;
   width: 100%;
-  background: url('../images/bliss/auth_background.jpg') no-repeat fixed center;
+  //background: url('~flavours/glitch/bliss/images/auth_background.jpg') no-repeat fixed center;
+  background: url('~flavours/glitch/images/wave-drawer.png') no-repeat fixed center;
   background-size: cover;
 
   .form-container {

app/models/mute.rb

@@ -9,7 +9,6 @@
 #  hide_notifications :boolean          default(TRUE), not null
 #  account_id         :bigint(8)        not null
 #  target_account_id  :bigint(8)        not null
-#  hide_notifications :boolean          default(TRUE), not null
 #  expires_at         :datetime
 #
 

app/models/status.rb

@@ -21,11 +21,10 @@
 #  account_id             :bigint(8)        not null
 #  application_id         :bigint(8)
 #  in_reply_to_account_id :bigint(8)
-#  local_only             :boolean
-#  full_status_text       :text             default(""), not null
 #  poll_id                :bigint(8)
-#  content_type           :string
 #  deleted_at             :datetime
+#  local_only             :boolean
+#  content_type           :string
 #  edited_at              :datetime
 #
 

db/schema.rb

@@ -871,10 +871,10 @@ ActiveRecord::Schema.define(version: 2022_01_18_183123) do
     t.bigint "account_id", null: false
     t.bigint "application_id"
     t.bigint "in_reply_to_account_id"
-    t.boolean "local_only"
     t.bigint "poll_id"
-    t.string "content_type"
     t.datetime "deleted_at"
+    t.boolean "local_only"
+    t.string "content_type"
     t.datetime "edited_at"
     t.index ["account_id", "id", "visibility", "updated_at"], name: "index_statuses_20190820", order: { id: :desc }, where: "(deleted_at IS NULL)"
     t.index ["deleted_at"], name: "index_statuses_on_deleted_at", where: "(deleted_at IS NOT NULL)"