about summary refs log tree commit diff
path: root/app/lib/ostatus
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-03-19 20:19:35 +0100
committerEugen Rochko <eugen@zeonfederated.com>2018-03-19 20:19:35 +0100
commitff6b8a6443c2c97d185927053bdc8816e0e03434 (patch)
tree160aa07b01886acdb0d1bd113c5d2e62c7e17115 /app/lib/ostatus
parent6b76a6212d8aa596379115b248ec145905946c42 (diff)
Serialize mentions in the order they are added (#6836)
Up until now, the order seemed to be in the *opposite* order,
which caused the WebUI to populate mentions in reversed order
when replying to toots local to one's instance.
Diffstat (limited to 'app/lib/ostatus')
-rw-r--r--app/lib/ostatus/atom_serializer.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/ostatus/atom_serializer.rb b/app/lib/ostatus/atom_serializer.rb
index 656e45822..46d0a8b37 100644
--- a/app/lib/ostatus/atom_serializer.rb
+++ b/app/lib/ostatus/atom_serializer.rb
@@ -351,7 +351,7 @@ class OStatus::AtomSerializer
     append_element(entry, 'summary', status.spoiler_text, 'xml:lang': status.language) if status.spoiler_text?
     append_element(entry, 'content', Formatter.instance.format(status).to_str, type: 'html', 'xml:lang': status.language)
 
-    status.mentions.each do |mentioned|
+    status.mentions.order(:id).each do |mentioned|
       append_element(entry, 'link', nil, rel: :mentioned, 'ostatus:object-type': OStatus::TagManager::TYPES[:person], href: OStatus::TagManager.instance.uri_for(mentioned.account))
     end