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

2021-01-18 13:57:12 +01:00
parent a7a47834e5 e46b50e805
commit e202314a75
18 changed files with 48 additions and 43 deletions
--- a/app/models/account.rb
+++ b/app/models/account.rb
@ -277,7 +277,7 @@ class Account < ApplicationRecord
  end

  def tags_as_strings=(tag_names)
-    hashtags_map = Tag.find_or_create_by_names(tag_names).each_with_object({}) { |tag, h| h[tag.name] = tag }
+    hashtags_map = Tag.find_or_create_by_names(tag_names).index_by(&:name)

    # Remove hashtags that are to be deleted
    tags.each do |tag|