serguzim/teamspeak-query-lib
1
0
Fork 0
Code Issues Pull requests Projects Releases 4 Packages Wiki Activity Actions

Add quick action

Browse source
This commit is contained in:
Tobias Reisinger 2023-11-27 20:24:38 +01:00
parent ad58ab9bdd
commit 1f6d175a86
Signed by: serguzim
GPG key ID: 13AD60C237A28DFE
2 changed files with 67 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/wrappers.rs
View file

@ -42,9 +42,7 @@ pub fn login(connection: &mut Telnet) {
}
pub fn get_channels(connection: &mut Telnet, spacers: bool) -> Result<Vec<Channel>, String> {
match commands::channellist(connection) {
Ok(response) => {
match response {
match commands::channellist(connection)? {
Response::DataList(parameter_lists) => {
let channels: Vec<Channel> = parameter_lists.iter()
.map(|params| Channel::from(params.clone()))
@ -57,15 +55,10 @@ pub fn get_channels(connection: &mut Telnet, spacers: bool) -> Result<Vec<Channe
}
_ => Err(String::from("Received unexpected models from Teamspeak."))
}
}
Err(msg) => Err(msg)
}
}
pub fn find_channel(connection: &mut Telnet, name: &str, strict: bool) -> Result<Option<Channel>, String> {
match commands::channellist(connection) {
Ok(response) => {
match response {
match commands::channellist(connection)? {
Response::DataList(parameter_lists) => {
match parameter::parameter_list_find(&parameter_lists, "channel_name", name, strict) {
Some(params) => {
@ -78,15 +71,10 @@ pub fn find_channel(connection: &mut Telnet, name: &str, strict: bool) -> Result
}
_ => Err(String::from("Received unexpected models from Teamspeak."))
}
}
Err(msg) => Err(msg)
}
}
pub fn get_clients(connection: &mut Telnet) -> Result<Vec<Client>, String> {
match commands::clientlist(connection) {
Ok(response) => {
match response {
match commands::clientlist(connection)? {
Response::DataList(parameter_lists) => {
let mut clients: Vec<Client> = parameter_lists.iter()
.map(|params| Client::from(params.clone()))
@ -98,15 +86,10 @@ pub fn get_clients(connection: &mut Telnet) -> Result<Vec<Client>, String> {
}
_ => Err(String::from("Received unexpected models from Teamspeak."))
}
}
Err(msg) => Err(msg)
}
}
pub fn find_client(connection: &mut Telnet, name: &str, strict: bool) -> Result<Option<Client>, String> {
match commands::clientlist(connection) {
Ok(response) => {
match response {
match commands::clientlist(connection)? {
Response::DataList(parameter_lists) => {
match parameter::parameter_list_find(&parameter_lists, "client_nickname", name, strict) {
Some(params) => {
@ -119,15 +102,10 @@ pub fn find_client(connection: &mut Telnet, name: &str, strict: bool) -> Result<
}
_ => Err(String::from("Received unexpected models from Teamspeak."))
}
}
Err(msg) => Err(msg)
}
}
pub fn get_channel_clients(connection: &mut Telnet, channel: &Channel) -> Result<Vec<Client>, String> {
match commands::clientlist(connection) {
Ok(response) => {
match response {
match commands::clientlist(connection)? {
Response::DataList(parameter_lists) => {
let mut clients: Vec<Client> = Vec::new();
for client_params in parameter_list_find_all(&parameter_lists, "cid", &channel.cid.to_string(), true) {
@ -137,15 +115,10 @@ pub fn get_channel_clients(connection: &mut Telnet, channel: &Channel) -> Result
}
_ => Err(String::from("Received unexpected models from Teamspeak."))
}
}
Err(msg) => Err(msg)
}
}
fn get_self_clid(connection: &mut Telnet) -> Result<String, String> {
match commands::whoami(connection) {
Ok(response) => {
match response {
match commands::whoami(connection)? {
Response::Data(params) => {
match parameter::parameter_find(&params, "clid") {
None => Err(String::from("Could not find clid in models from Teamspeak.")),
@ -154,17 +127,12 @@ fn get_self_clid(connection: &mut Telnet) -> Result<String, String> {
}
_ => Err(String::from("Received unexpected models from Teamspeak for whoami."))
}
}
Err(msg) => Err(msg)
}
}
pub fn find_self(connection: &mut Telnet) -> Result<Client, String> {
let clid = get_self_clid(connection)?;
match commands::clientlist(connection) {
Ok(response) => {
match response {
match commands::clientlist(connection)? {
Response::DataList(parameter_lists) => {
match parameter::parameter_list_find(&parameter_lists, "clid", &clid, false) {
Some(params) => {
@ -177,9 +145,6 @@ pub fn find_self(connection: &mut Telnet) -> Result<Client, String> {
}
_ => Err(String::from("Received unexpected models from Teamspeak for clientlist."))
}
}
Err(msg) => Err(msg)
}
}
pub fn fetch_client(connection: &mut Telnet, clients: &[Client]) -> Result<Response, String> {

10
ts-control
View file

@ -1,6 +1,7 @@
#!/usr/bin/env sh
actions="move
actions="quick
move
fetch-client
fetch-channel
away
@ -37,6 +38,13 @@ _ts_control_fetch() {
}
case $action in
"quick")
action=$($DMENU < "$XDG_CONFIG_HOME/ts-control-quick")
if [ -z "$action" ]; then
exit 1
fi
eval "teamspeak-query-lib $action"
;;
"move")
_ts_control_move_self
;;