Unverified Commit 746ff522 authored by Benjamin Neff's avatar Benjamin Neff Committed by Dennis Schubert
Browse files

Fix mention in #newhere message when invited by another person 

fixes #7701
closes #7702
parent f23966ef

Changelog.md

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
## Bug fixes

* Fix invite link on the contacts page when the user has no contacts [#7690](https://github.com/diaspora/diaspora/pull/7690)

* Fixed the mobile bookmarklet when called without parameters [#7698](https://github.com/diaspora/diaspora/pull/7698)

* Properly build the #newhere message for people who got invited [#7702](https://github.com/diaspora/diaspora/pull/7702)



## Features

* Check if redis is running in script/server [#7685](https://github.com/diaspora/diaspora/pull/7685)

app/assets/javascripts/app/views/publisher_view.js

+3 −0
Original line number Diff line number Diff line
@@ -178,6 +178,9 @@ app.views.Publisher = Backbone.View.extend({ 
    if (gon.preloads.getting_started) {

      this.open();

      this.viewGettingStarted.show();

      if (gon.preloads.mentioned_person) {

        this.mention.addPersonToMentions(gon.preloads.mentioned_person);

      }

    }

  },

app/controllers/streams_controller.rb

+6 −1
Original line number Diff line number Diff line
@@ -30,7 +30,12 @@ class StreamsController < ApplicationController 
  end



  def multi

    gon.preloads[:getting_started] = current_user.getting_started

    if current_user.getting_started

      gon.preloads[:getting_started] = true

      inviter = current_user.invited_by.try(:person)

      gon.preloads[:mentioned_person] = {name: inviter.name, handle: inviter.diaspora_handle} if inviter

    end



    stream_responder(Stream::Multi)

  end

app/helpers/interim_stream_hackiness_helper.rb

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ module InterimStreamHackinessHelper 
    if params[:prefill].present?

      params[:prefill]

    elsif defined?(@stream)

      @stream.publisher.text

      @stream.publisher.prefill

    else

      nil

    end

lib/publisher.rb

+0 −8
Original line number Diff line number Diff line
@@ -9,12 +9,4 @@ class Publisher 
    self.prefill = opts[:prefill]

    self.public = opts[:public]

  end



  def text

    return unless prefill.present?

    Diaspora::MessageRenderer.new(

      prefill,

      mentioned_people: Diaspora::Mentionable.people_from_string(prefill)

    ).plain_text

  end

end