Merge branch 'master' into glitch-soc/merge-upstream

app/serializers/rest/announcement_serializer.rb

@@ -41,5 +41,9 @@ class REST::AnnouncementSerializer < ActiveModel::Serializer
     def url
       ActivityPub::TagManager.instance.url_for(object)
     end
+
+    def acct
+      object.pretty_acct
+    end
   end
 end

app/serializers/rest/status_serializer.rb

@@ -147,7 +147,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
     end
 
     def acct
-      object.account_acct
+      object.account.pretty_acct
     end
   end