Commit 84ec00fa authored by Dennis Schubert's avatar Dennis Schubert
Browse files

Merge pull request #6873 from SuperTux88/federation-gem-salmon 

Federation rewrite with diaspora_federation gem
parents 1bbe4923 3b1d113a

Changelog.md

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ before. 
* Removed deprecated `REDISTOGO_URL` environment variable [#6863](https://github.com/diaspora/diaspora/pull/6863)

* Use Poltergeist instead of Selenium [#6768](https://github.com/diaspora/diaspora/pull/6768)

* Redesigned the landing page and added dedicated notes for podmins [#6268](https://github.com/diaspora/diaspora/pull/6268)

* Moved the entire federation implementation into its own gem. 🎉 [#6873](https://github.com/diaspora/diaspora/pull/6873)



## Bug fixes

* Destroy Participation when removing interactions with a post [#5852](https://github.com/diaspora/diaspora/pull/5852)

Gemfile

+2 −3
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ gem "unicorn-worker-killer", "0.4.4" 


# Federation



gem "diaspora_federation-rails", "0.0.13"

gem "diaspora_federation-rails", "0.1.0"



# API and JSON
@@ -136,7 +136,6 @@ gem "leaflet-rails", "0.7.7" 
gem "nokogiri",          "1.6.8"

gem "redcarpet",         "3.3.4"

gem "twitter-text",      "1.13.4"

gem "roxml",             "3.1.6"

gem "ruby-oembed",       "0.10.1"

gem "open_graph_reader", "0.6.1"
@@ -289,7 +288,7 @@ group :test do 
  gem "webmock",            "2.1.0", require: false

  gem "shoulda-matchers",   "3.1.1"



  gem "diaspora_federation-test", "0.0.13"

  gem "diaspora_federation-test", "0.1.0"

end



group :development, :test do

Gemfile.lock

+9 −13
Original line number Diff line number Diff line
@@ -172,18 +172,18 @@ GEM 
      devise

      rails (>= 3.0.4)

    diaspora-prosody-config (0.0.5)

    diaspora_federation (0.0.13)

    diaspora_federation (0.1.0)

      faraday (~> 0.9.0)

      faraday_middleware (~> 0.10.0)

      nokogiri (~> 1.6, >= 1.6.7.2)

      nokogiri (~> 1.6, >= 1.6.8)

      typhoeus (~> 1.0)

      valid (~> 1.0)

    diaspora_federation-rails (0.0.13)

      diaspora_federation (= 0.0.13)

    diaspora_federation-rails (0.1.0)

      diaspora_federation (= 0.1.0)

      rails (~> 4.2)

    diaspora_federation-test (0.0.13)

      diaspora_federation (= 0.0.13)

      factory_girl (~> 4.5, >= 4.5.0)

    diaspora_federation-test (0.1.0)

      diaspora_federation (= 0.1.0)

      factory_girl (~> 4.7)

    diff-lcs (1.2.5)

    docile (1.1.5)

    domain_name (0.5.20160310)
@@ -725,9 +725,6 @@ GEM 
    request_store (1.3.1)

    responders (2.2.0)

      railties (>= 4.2.0, < 5.1)

    roxml (3.1.6)

      activesupport (>= 2.3.0)

      nokogiri (>= 1.3.3)

    rspec (3.4.0)

      rspec-core (~> 3.4.0)

      rspec-expectations (~> 3.4.0)
@@ -927,8 +924,8 @@ DEPENDENCIES 
  devise-token_authenticatable (= 0.4.6)

  devise_lastseenable (= 0.0.6)

  diaspora-prosody-config (= 0.0.5)

  diaspora_federation-rails (= 0.0.13)

  diaspora_federation-test (= 0.0.13)

  diaspora_federation-rails (= 0.1.0)

  diaspora_federation-test (= 0.1.0)

  entypo-rails (= 3.0.0.pre.rc2)

  eye (= 0.8.1)

  factory_girl_rails (= 4.7.0)
@@ -1015,7 +1012,6 @@ DEPENDENCIES 
  redcarpet (= 3.3.4)

  remotipart (= 1.2.1)

  responders (= 2.2.0)

  roxml (= 3.1.6)

  rspec-rails (= 3.4.2)

  rubocop (= 0.40.0)

  ruby-oembed (= 0.10.1)

app/controllers/blocks_controller.rb

+1 −3
Original line number Diff line number Diff line
@@ -35,9 +35,7 @@ class BlocksController < ApplicationController 
  private



  def disconnect_if_contact(person)

    if contact = current_user.contact_for(person)

      current_user.disconnect(contact, :force => true)

    end

    current_user.contact_for(person).try {|contact| current_user.disconnect(contact) }

  end



  def block_params

app/controllers/conversations_controller.rb

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ class ConversationsController < ApplicationController 


    @response = {}

    if person_ids.present? && @conversation.save

      Postzord::Dispatcher.build(current_user, @conversation).post

      Diaspora::Federation::Dispatcher.defer_dispatch(current_user, @conversation)

      @response[:success] = true

      @response[:message] = I18n.t('conversations.create.sent')

      @response[:conversation_id] = @conversation.id