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

2021-11-06 00:15:38 +01:00
parent e0f3962697 6da135a493
commit 4bb6b1a1e7
24 changed files with 1097 additions and 825 deletions
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -391,7 +391,7 @@ class Status < ApplicationRecord
    def from_text(text)
      return [] if text.blank?

-      text.scan(FetchLinkCardService::URL_PATTERN).map(&:first).uniq.filter_map do |url|
+      text.scan(FetchLinkCardService::URL_PATTERN).map(&:second).uniq.filter_map do |url|
        status = begin
          if TagManager.instance.local_url?(url)
            ActivityPub::TagManager.instance.uri_to_resource(url, Status)