about summary refs log tree commit diff
path: root/app/helpers
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-03-12 11:51:25 +0100
committerClaire <claire.github-309c@sitedethib.com>2022-03-12 11:51:25 +0100
commitbb9a6fb5c239f4846e2e20c8435edb46f0c7c548 (patch)
tree2f6120abc31a698b1e1a7dbf442383a79d42ee77 /app/helpers
parent2c8bb1745359a3bf200d37383dc56d5951e2b6bc (diff)
parentd3aa9cf7744eede43c5c1b9097eb1f0720185ccd (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/jsonld_helper.rb10
1 files changed, 9 insertions, 1 deletions
diff --git a/app/helpers/jsonld_helper.rb b/app/helpers/jsonld_helper.rb
index c6557817d..102e4b132 100644
--- a/app/helpers/jsonld_helper.rb
+++ b/app/helpers/jsonld_helper.rb
@@ -15,6 +15,14 @@ module JsonLdHelper
     value.is_a?(Array) ? value.first : value
   end
 
+  def uri_from_bearcap(str)
+    if str&.start_with?('bear:')
+      Addressable::URI.parse(str).query_values['u']
+    else
+      str
+    end
+  end
+
   # The url attribute can be a string, an array of strings, or an array of objects.
   # The objects could include a mimeType. Not-included mimeType means it's text/html.
   def url_to_href(value, preferred_type = nil)
@@ -54,7 +62,7 @@ module JsonLdHelper
   end
 
   def unsupported_uri_scheme?(uri)
-    !uri.start_with?('http://', 'https://')
+    uri.nil? || !uri.start_with?('http://', 'https://')
   end
 
   def invalid_origin?(url)