shockrah/freechat
shockrah/freechat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

base for querying online users

Browse Source
This commit is contained in:
shockrah 2020-10-01 19:50:57 -07:00
parent d2f74b563b
commit 04dca141b5
3 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server-api/src/main.rs
View File

@ -59,6 +59,8 @@ async fn route_dispatcher(pool: &Pool, resp: &mut Response<Body>, meth: &Method,
(POST, routes::MESSAGE_SEND) => messages::send_message(pool, resp, params).await, (POST, routes::MESSAGE_SEND) => messages::send_message(pool, resp, params).await,
/* ADMIN */ /* ADMIN */
(POST, routes::SET_PERMS_BY_ADMIN) => admin::set_permissions(pool, resp, params).await, (POST, routes::SET_PERMS_BY_ADMIN) => admin::set_permissions(pool, resp, params).await,
/* MEMBERS */
(GET, routes::GET_ONLINE_MEMBERS) => members::get_online_members(pool, resp).await,
/* OWNER */ /* OWNER */
(POST, routes::SET_NEW_ADMIN) => admin::new_admin(pool, resp, params).await, (POST, routes::SET_NEW_ADMIN) => admin::new_admin(pool, resp, params).await,
_ => { _ => {

40
server-api/src/members.rs
View File

@ -1,6 +1,8 @@
use chrono::Utc; use chrono::Utc;
use mysql_async::{Conn, Pool, error::Error}; use hyper::{Response, Body};
use mysql_async::{Conn, Pool, error::Error as SqlError};
use mysql_async::prelude::{params, Queryable}; use mysql_async::prelude::{params, Queryable};
use serde_json::Value;
use serde::Serialize; use serde::Serialize;
use crate::db_types::{UBigInt, BigInt, Integer, VarChar}; use crate::db_types::{UBigInt, BigInt, Integer, VarChar};
@ -16,7 +18,12 @@ pub struct Member {
pub permissions: UBigInt, pub permissions: UBigInt,
} }
pub async fn insert_new_member(p: &Pool, name: VarChar, perms: u64) -> Result<Member, Error> { const STATUS_ONLINE: Integer = 0;
const STATUS_OFFLINE: Integer = 1;
const STATUS_AWAY: Integer = 2;
const STATUS_DO_NOT_DISTURB: Integer = 3;
pub async fn insert_new_member(p: &Pool, name: VarChar, perms: u64) -> Result<Member, SqlError> {
use crate::auth::generate_secret; use crate::auth::generate_secret;
let conn: Conn = p.get_conn().await?; let conn: Conn = p.get_conn().await?;
@ -34,7 +41,7 @@ pub async fn insert_new_member(p: &Pool, name: VarChar, perms: u64) -> Result<Me
"secret" => secret.clone(), "secret" => secret.clone(),
"name" => name.clone(), "name" => name.clone(),
"joindate" => now, "joindate" => now,
"status" => 0, "status" => STATUS_ONLINE,
"permissions" => perms "permissions" => perms
}).await?; }).await?;
@ -54,3 +61,30 @@ pub async fn insert_new_member(p: &Pool, name: VarChar, perms: u64) -> Result<Me
permissions: perms permissions: perms
}) })
} }
async fn select_online_default(p: &Pool) -> Result<Vec<(UBigInt, VarChar)>, SqlError> {
let conn = p.get_conn().await?;
let q = format!("SELECT id, name FROM members WHERE status = {} LIMIT 100", STATUS_ONLINE);
let data = conn.prep_exec(&q, ()).await?;
let (_, users) = data.map_and_drop(|row| {
let (id, nickname): (UBigInt, VarChar) = mysql_async::from_row(row);
(id, nickname)
}).await?;
return Ok(users);
}
pub async fn get_online_members(p: &Pool, response: &mut Response<Body>) {
/*
* Json {
* "members": [...],
* "start": 0,
* "count": 100
* }
*/
if let Ok(list) = select_online_default(p).await {
// unwrap_or`ing for serde_json since it shouldn't fail in theory(on paper)
*response.body_mut() = Body::from(serde_json::to_string(&list).unwrap_or("[]".into()));
}
println!("fuck bro");
}

2
server-api/src/routes.rs
View File

@ -1,3 +1,4 @@
// TODO: this whole ass module bro i mean c'mon.... just just clean it
pub const INVITE_CREATE: &'static str = "/invite/create"; // requires none pub const INVITE_CREATE: &'static str = "/invite/create"; // requires none
pub const CHANNELS_LIST: &'static str = "/channels/list"; // requires none pub const CHANNELS_LIST: &'static str = "/channels/list"; // requires none
@ -8,6 +9,7 @@ pub const MESSAGE_SEND: &'static str = "/message/send"; // requires @content
pub const SERVER_META: &'static str = "/meta"; // open pub const SERVER_META: &'static str = "/meta"; // open
pub const GET_ONLINE_MEMBERS: &'static str = "/members/get_online";
// @requires: admin permissions // @requires: admin permissions
// //
pub const SET_PERMS_BY_ADMIN: &'static str = "/admin/setpermisions"; pub const SET_PERMS_BY_ADMIN: &'static str = "/admin/setpermisions";