Only backport mention syntax when the author is local
We don't need to change new to old syntax when we receive a post from a newer pod, since we can handle the new syntax. This is only needed when sending it to older pods. related to #7392
This commit is contained in:
parent
06b61b6480
commit
d0fcdc254e
2 changed files with 8 additions and 1 deletions
|
|
@ -5,7 +5,7 @@ module Diaspora
|
|||
included do
|
||||
before_create do
|
||||
# TODO: remove when most of the posts can handle the new syntax
|
||||
self.text = Diaspora::Mentionable.backport_mention_syntax(text) if text
|
||||
self.text = Diaspora::Mentionable.backport_mention_syntax(text) if text && author.local?
|
||||
end
|
||||
|
||||
after_create :create_mentions
|
||||
|
|
|
|||
|
|
@ -18,6 +18,13 @@ shared_examples_for "it is mentions container" do
|
|||
obj.save
|
||||
expect(obj.text).to eq(expected_text)
|
||||
end
|
||||
|
||||
it "doesn't backport mention syntax if author is not local" do
|
||||
text = "mention @{#{people[0].diaspora_handle}} text"
|
||||
obj = FactoryGirl.build(described_class.to_s.underscore.to_sym, text: text, author: remote_raphael)
|
||||
obj.save
|
||||
expect(obj.text).to eq(text)
|
||||
end
|
||||
end
|
||||
|
||||
describe ".after_create" do
|
||||
|
|
|
|||
Loading…
Reference in a new issue