Merge branch 'feature/twitterapi-unrepeat' into 'develop'

Add TwitterAPI unretweet endpoint and cleanup AP.unannounce

See merge request pleroma/pleroma!218

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

diff --cc lib/pleroma/web/activity_pub/transmogrifier.ex
Simple merge

diff --cc lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
Simple merge

diff --cc lib/pleroma/web/router.ex
index 0e6369147652982072500b8e4c39d6ff40cd178a,95627f8fdc408d21812ca006eecb9c16f8bbf8da..1c1c26c563b695a207e7a90c47270945b58b17d6
--- 1/lib/pleroma/web/router.ex
--- 2/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -244,12 -238,9 +244,13 @@@ defmodule Pleroma.Web.Router d
  
      post("/statuses/update", TwitterAPI.Controller, :status_update)
      post("/statuses/retweet/:id", TwitterAPI.Controller, :retweet)
+     post("/statuses/unretweet/:id", TwitterAPI.Controller, :unretweet)
      post("/statuses/destroy/:id", TwitterAPI.Controller, :delete_post)
  
 +    get("/pleroma/friend_requests", TwitterAPI.Controller, :friend_requests)
 +    post("/pleroma/friendships/approve", TwitterAPI.Controller, :approve_friend_request)
 +    post("/pleroma/friendships/deny", TwitterAPI.Controller, :deny_friend_request)
 +
      post("/friendships/create", TwitterAPI.Controller, :follow)
      post("/friendships/destroy", TwitterAPI.Controller, :unfollow)
      post("/blocks/create", TwitterAPI.Controller, :block)

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

diff --cc test/web/twitter_api/twitter_api_controller_test.exs
Simple merge