mr_tesla/discover-desktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- Added functions to alter some user state

Browse source 
- Hooked in new RPC commands
This commit is contained in:
Trigg 2022-04-14 22:01:54 +00:00
parent 77ec14b4d2
commit c8122b2cca
2 changed files with 67 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

35
discover_overlay/discord_connector.py
View file

@ -275,7 +275,7 @@ class DiscordConnector:
deaf = j["data"]["voice_state"]["deaf"] or j["data"]["voice_state"]["self_deaf"]
thisuser["mute"] = mute
thisuser["deaf"] = deaf
if self.current_voice!="0":
if self.current_voice != "0":
self.update_user(thisuser)
self.set_in_room(thisuser["id"], True)
elif j["evt"] == "VOICE_STATE_CREATE":
@ -376,7 +376,7 @@ class DiscordConnector:
if 'data' in j and j['data'] and 'id' in j['data']:
self.set_channel(j['data']['id'])
self.list_altered = True
self.in_room=[]
self.in_room = []
for u in j['data']['voice_states']:
thisuser = u["user"]
nick = u["nick"]
@ -406,6 +406,10 @@ class DiscordConnector:
return
elif j["cmd"] == "SELECT_VOICE_CHANNEL":
return
elif j["cmd"] == "SET_VOICE_SETTINGS":
return
elif j["cmd"] == "GET_VOICE_SETTINGS":
return
log.warning(j)
def check_guilds(self):
@ -610,6 +614,33 @@ class DiscordConnector:
self.unsub_channel("SPEAKING_START", channel)
self.unsub_channel("SPEAKING_STOP", channel)
def get_voice_settings(self):
"""
Request a recent version of voice settings
"""
cmd = {
"cmd": "GET_VOICE_SETTINGS",
"args": {},
"nonce": "deadbeef"
}
self.websocket.send(json.dumps(cmd))
def set_mute(self, muted):
cmd = {
"cmd": "SET_VOICE_SETTINGS",
"args": {"mute": muted},
"nonce": "deadbeef"
}
self.websocket.send(json.dumps(cmd))
def set_deaf(self, deaf):
cmd = {
"cmd": "SET_VOICE_SETTINGS",
"args": {"deaf": deaf},
"nonce": "deadbeef"
}
self.websocket.send(json.dumps(cmd))
def change_voice_room(self, id):
"""
Switch to another voice room

44
discover_overlay/discover_overlay.py
View file

@ -14,13 +14,14 @@
import os
import time
import sys
import re
try:
# pylint: disable=wrong-import-position,wrong-import-order
import dbus # nopep8
import dbus # nopep8
# pylint: disable=wrong-import-position,wrong-import-order
from dbus.mainloop.glib import DBusGMainLoop # nopep8
from dbus.mainloop.glib import DBusGMainLoop # nopep8
except:
dbus=None
dbus = None
pass
import logging
import gi
@ -40,6 +41,9 @@ try:
except ModuleNotFoundError:
from xdg import XDG_CONFIG_HOME as xdg_config_home
log = logging.getLogger(__name__)
class Discover:
"""Main application class"""
@ -87,7 +91,7 @@ class Discover:
monitor.connect("changed", self.rpc_changed)
Gtk.main()
def set_about_warning(self, message):
self.settings.about_settings.set_warning(message)
@ -142,7 +146,8 @@ class Discover:
elif 'image_data' in dictionary:
noti['icon_raw'] = dictionary['image_data']
self.notification_messages.append(noti)
self.notification_overlay.set_content(self.notification_messages, True)
self.notification_overlay.set_content(
self.notification_messages, True)
def do_args(self, data, normal_close):
"""
@ -160,6 +165,11 @@ class Discover:
print(" --hide Hide overlay")
print(" --show Show overlay")
print(" --rpc Send command, not start new instance. Only needed if running in flatpak")
print(" --mute Set own user to mute")
print(" --unmute Set unmuted")
print(" --deaf Set own user to deafened")
print(" --undeaf Unset user deafened state")
print(" --moveto=XX Move the user into voice room, by Room ID")
print("")
print("For gamescope compatibility ensure ENV has 'GDK_BACKEND=x11'")
if normal_close:
@ -183,6 +193,22 @@ class Discover:
self.voice_overlay.set_hidden(False)
if self.text_overlay:
self.text_overlay.set_hidden(False)
if "--mute" in data:
if self.connection:
self.connection.set_mute(True)
if "--unmute" in data:
if self.connection:
self.connection.set_mute(False)
if "--deaf" in data:
if self.connection:
self.connection.set_deaf(True)
if "--undeaf" in data:
if self.connection:
self.connection.set_deaf(False)
pattern = re.compile("--moveto=([0-9]+)")
if any((match := pattern.match(x)) for x in data):
if self.connection:
self.connection.change_voice_room(match.group(1))
def rpc_changed(self, _a=None, _b=None, _c=None, _d=None):
"""
@ -191,7 +217,7 @@ class Discover:
with open(self.rpc_file, "r") as tfile:
data = tfile.readlines()
if len(data) >= 1:
self.do_args(data[0], False)
self.do_args(data[0].split(" "), False)
def create_gui(self):
"""
@ -324,8 +350,6 @@ def entrypoint():
Otherwise start up the overlay!
"""
config_dir = os.path.join(xdg_config_home, "discover_overlay")
os.makedirs(config_dir, exist_ok=True)
line = ""
@ -353,14 +377,14 @@ def entrypoint():
log.warning("Sent RPC command")
else:
log.info("Flatpak compat mode started")
Discover(rpc_file, debug_file, line)
Discover(rpc_file, debug_file, sys.argv[1:])
return
# Normal usage
try:
with pidfile.PIDFile(pid_file):
Discover(rpc_file, debug_file, line)
Discover(rpc_file, debug_file, sys.argv[1:])
except pidfile.AlreadyRunningError:
log.warning("Discover overlay is currently running")