Revert "Merge branch 'revert-4fabf83a' into 'develop'"
authorEgor Kislitsyn <egor@kislitsyn.com>
Mon, 16 Sep 2019 10:03:37 +0000 (17:03 +0700)
committerAriadne Conill <ariadne@dereferenced.org>
Fri, 4 Oct 2019 16:01:31 +0000 (16:01 +0000)
commit7d5f20b50f299c96ccb12c7dd0fdae10c3f8d9c0
treebb293c6a2089da2f8845d36c5f60e5a916c9aecc
parenta553ed542774891b6b0b7a57372a2c0300bbe2ba
Revert "Merge branch 'revert-4fabf83a' into 'develop'"

This reverts commit fe7fd331263007e0fb2877ef7370a09a9704da36, reversing
changes made to 4fabf83ad01352442906d79187aeab4c777f4df8.
26 files changed:
.gitignore
config/config.exs
lib/pleroma/activity/ir/topics.ex [new file with mode: 0644]
lib/pleroma/application.ex
lib/pleroma/notification.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/mastodon_api/websocket_handler.ex
lib/pleroma/web/streamer.ex [deleted file]
lib/pleroma/web/streamer/ping.ex [new file with mode: 0644]
lib/pleroma/web/streamer/state.ex [new file with mode: 0644]
lib/pleroma/web/streamer/streamer.ex [new file with mode: 0644]
lib/pleroma/web/streamer/streamer_socket.ex [new file with mode: 0644]
lib/pleroma/web/streamer/supervisor.ex [new file with mode: 0644]
lib/pleroma/web/streamer/worker.ex [new file with mode: 0644]
lib/pleroma/web/views/streamer_view.ex [new file with mode: 0644]
mix.exs
mix.lock
test/activity/ir/topics_test.exs [new file with mode: 0644]
test/integration/mastodon_websocket_test.exs
test/notification_test.exs
test/support/conn_case.ex
test/support/data_case.ex
test/web/activity_pub/activity_pub_test.exs
test/web/streamer/ping_test.exs [new file with mode: 0644]
test/web/streamer/state_test.exs [new file with mode: 0644]
test/web/streamer/streamer_test.exs [moved from test/web/streamer_test.exs with 86% similarity]