Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow...

diff --cc lib/pleroma/user.ex
Simple merge

diff --cc lib/pleroma/web/twitter_api/twitter_api.ex
Simple merge

diff --cc test/support/factory.ex
index b7dead7f62d020551e6abb993771f757a07dbe8a,d7c16f0e0997edd92e609a4bdf00032064ef1d21..1662d4cd60f4699770fec4940ca58af7959010b3
--- 1/test/support/factory.ex
--- 2/test/support/factory.ex
+++ b/test/support/factory.ex
@@@ -65,20 -65,13 +65,30 @@@ defmodule Pleroma.Factory d
      }
    end
  
 +  def follow_activity_factory do
 +    follower = insert(:user)
 +    followed = insert(:user)
 +
 +    data = %{
 +      "id" => Pleroma.Web.ActivityPub.ActivityPub.generate_activity_id,
 +      "actor" => follower.ap_id,
 +      "type" => "Follow",
 +      "object" => followed.ap_id,
 +      "published_at" => DateTime.utc_now() |> DateTime.to_iso8601
 +    }
 +
 +    %Pleroma.Activity{
 +      data: data
 +    }
 +  end
++
+   def websub_subscription_factory do
+     %Pleroma.Web.Websub.WebsubServerSubscription{
+       topic: "http://example.org",
+       callback: "http://example/org/callback",
+       secret: "here's a secret",
+       valid_until: NaiveDateTime.add(NaiveDateTime.utc_now, 100),
+       state: "requested"
+     }
+   end
  end