diff --git a/killstream/kill_stream.py b/killstream/kill_stream.py index 4f9590d..765c1f9 100644 --- a/killstream/kill_stream.py +++ b/killstream/kill_stream.py @@ -75,7 +75,7 @@ BODY_TEXT = "Killed session ID '{id}'. Reason: {message}" BODY_TEXT_USER = "Killed {user}'s stream. Reason: {message}." -SELECTOR = ['stream', 'allStreams', 'multiIpStreams', 'paused'] +SELECTOR = ['stream', 'allStreams', 'paused'] RICH_TYPE = ['discord', 'slack'] @@ -621,16 +621,6 @@ if __name__ == "__main__": tautulli_server.terminate_session(session_id=a_stream.session_id, message=kill_message) notify(opts, kill_message, 'All Streams', a_stream, tautulli_server) - elif opts.jbop == 'multiIpStreams': - if not opts.richMessage: - tautulli_stream.get_all_stream_info() - user_streams = get_all_streams(tautulli_server, opts.userId) - for a_stream in user_streams: - if a_stream.ip_address != tautulli_stream.ip_address: - tautulli_stream.terminate(kill_message) - notify(opts, kill_message, 'Multiple IP Streams', tautulli_stream, tautulli_server) - exit(0) - elif opts.jbop == 'paused': killed_stream = tautulli_stream.terminate_long_pause(kill_message, opts.limit, opts.interval) if killed_stream: diff --git a/killstream/readme.md b/killstream/readme.md index 82931f2..a1eb471 100644 --- a/killstream/readme.md +++ b/killstream/readme.md @@ -65,30 +65,13 @@ Arguments: ### Limit User streams to one unique IP Triggers: Playback Start +Settings: +* Notifications & Newsletters > Show Advanced > `User Concurrent Streams Notifications by IP Address` | `Checked` +* Notifications & Newsletters > `User Concurrent Stream Threshold` | `2` Arguments: ``` ---jbop multiIpStreams --userId {user_id} --username {username} --sessionId {session_id} --killMessage 'You are only allowed to stream from one location at a time.' -``` - -### Limit User streams to one unique IP excluding house account - -Triggers: Playback Start -Conditions: \[ `Username` | `is not` | `Bob` \] - -Arguments: -``` ---jbop multiIpStreams --userId {user_id} --username {username} --sessionId {session_id} --killMessage 'You are only allowed to stream from one location at a time.' -``` - -### Limit User streams to 3 unique IPs - -Triggers: Playback Start -Conditions: \[ `User Streams` | `is greater than` | `3` \] - -Arguments: -``` ---jbop multiIpStreams --userId {user_id} --username {username} --sessionId {session_id} --killMessage 'You are only allowed to stream from one location at a time.' +--jbop stream --username {username} --sessionId {session_id} --killMessage 'You are only allowed to stream from one location at a time.' ``` ### IP Whitelist