mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-16 08:38:26 +00:00
implement mtxchat::MtxChat::listen()
This commit is contained in:
parent
9db7a3c2c5
commit
50f06e2f78
5 changed files with 72 additions and 43 deletions
|
|
@ -14,4 +14,10 @@ pub enum MtxchatOp {
|
|||
Quit,
|
||||
}
|
||||
|
||||
pub struct Msg {
|
||||
pub type_: String,
|
||||
pub body: Option<String>,
|
||||
pub sender: Option<String>,
|
||||
pub ts: Option<u64>,
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ pub mod api;
|
|||
mod url;
|
||||
mod web;
|
||||
|
||||
use crate::web::get_username;
|
||||
pub use api::*;
|
||||
use chat::{Chat, ChatOp};
|
||||
use locales::t;
|
||||
|
|
@ -11,6 +12,7 @@ use std::fmt::Write as _;
|
|||
use std::fs::File;
|
||||
use std::io::{Error, ErrorKind, Read, Write as StdWrite};
|
||||
use std::path::PathBuf;
|
||||
use xous_ipc::Buffer;
|
||||
|
||||
/// PDDB Dict for mtxchat keys
|
||||
const MTXCHAT_DICT: &str = "mtxchat";
|
||||
|
|
@ -346,6 +348,7 @@ impl<'a> MtxChat<'a> {
|
|||
.expect("failed to write server");
|
||||
if let Some(room_id) = web::get_room_id(&server, &room, &self.token) {
|
||||
self.set_debug(ROOM_ID_KEY, &room_id);
|
||||
self.chat.dialogue_set(MTXCHAT_DICT, &room);
|
||||
true
|
||||
} else {
|
||||
log::warn!("failed to return room_id");
|
||||
|
|
@ -354,8 +357,9 @@ impl<'a> MtxChat<'a> {
|
|||
}
|
||||
}
|
||||
|
||||
pub fn room_modal(&mut self){
|
||||
let mut builder = self.modals.alert_builder(t!("mtxchat.room.title", locales::LANG));
|
||||
pub fn redraw(&self) {
|
||||
self.chat.redraw();
|
||||
}
|
||||
let builder = match self.get(ROOM_NAME_KEY) {
|
||||
// TODO add TextValidationFn
|
||||
Ok(Some(room)) => builder.field_placeholder_persist(Some(room), None),
|
||||
|
|
@ -398,6 +402,9 @@ impl<'a> MtxChat<'a> {
|
|||
&self.get_or(USER_DOMAIN_KEY, DOMAIN_MATRIX)
|
||||
)
|
||||
.expect("failed to write server");
|
||||
if let Some(new_filter) =
|
||||
web::get_filter(&self.user_id, &user_server, &self.room_id, &self.token)
|
||||
{
|
||||
self.set_debug(FILTER_KEY, &new_filter);
|
||||
true
|
||||
} else {
|
||||
|
|
@ -411,24 +418,23 @@ impl<'a> MtxChat<'a> {
|
|||
log::info!("Already listening");
|
||||
return;
|
||||
}
|
||||
if ! self.logged_in {
|
||||
if !self.logged_in {
|
||||
log::info!("Not logged in");
|
||||
return;
|
||||
}
|
||||
if self.room_id.len() == 0 {
|
||||
if ! self.get_room_id() {
|
||||
if !self.get_room_id() {
|
||||
return;
|
||||
}
|
||||
}
|
||||
if self.filter.len() == 0 {
|
||||
if ! self.get_filter() {
|
||||
if !self.get_filter() {
|
||||
return;
|
||||
}
|
||||
}
|
||||
self.listening = true;
|
||||
log::info!("Started listening");
|
||||
std::thread::spawn({
|
||||
|
||||
let mut server = String::new();
|
||||
write!(
|
||||
server,
|
||||
|
|
@ -441,22 +447,29 @@ impl<'a> MtxChat<'a> {
|
|||
let since = self.since.clone();
|
||||
let room_id = self.room_id.clone();
|
||||
let token = self.token.clone();
|
||||
// let async_msg_conn = self.async_msg_conn.clone();
|
||||
// let async_msg_callback_id = self.async_msg_callback_id.clone();
|
||||
let chat_cid = self.chat.cid();
|
||||
move || {
|
||||
// log::info!("client_sync for {} ms...", MTX_LONG_TIMEOUT);
|
||||
let mut response = String::new();
|
||||
// response.push(SENTINEL);
|
||||
if let Some((since, messages)) = web::client_sync(&server, &filter, &since, MTX_LONG_TIMEOUT, &room_id, &token) {
|
||||
response.push_str(&since);
|
||||
// response.push(SENTINEL);
|
||||
response.push_str(&messages);
|
||||
// response.push(SENTINEL);
|
||||
if let Some((since, events)) =
|
||||
web::client_sync(&server, &filter, &since, MTX_LONG_TIMEOUT, &room_id, &token)
|
||||
{
|
||||
// TODO send "since" to mtxchat server
|
||||
for event in events {
|
||||
let sender = event.sender.unwrap_or("anon".to_string());
|
||||
let body = event.body.unwrap_or("...".to_string());
|
||||
let post = chat::Post {
|
||||
author: xous_ipc::String::from_str(&get_username(&sender)),
|
||||
timestamp: event.ts.unwrap_or(0),
|
||||
text: xous_ipc::String::from_str(&body),
|
||||
attach_url: None,
|
||||
};
|
||||
match Buffer::into_buf(post) {
|
||||
Ok(buf) => buf.send(chat_cid, ChatOp::PostAdd as u32).map(|_| ()),
|
||||
Err(_) => Err(xous::Error::InternalError),
|
||||
}
|
||||
.expect("failed to convert post into buffer");
|
||||
}
|
||||
}
|
||||
// let str_buf = StringBuffer::from_str(&response)
|
||||
// .expect("unable to create string message");
|
||||
// str_buf.send(async_msg_conn, async_msg_callback_id)
|
||||
// .expect("unable to send string message");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -82,6 +82,7 @@ fn wrapped_main() -> ! {
|
|||
.expect("notification failed");
|
||||
mtxchat.room_modal();
|
||||
}
|
||||
mtxchat.redraw();
|
||||
mtxchat.listen();
|
||||
}
|
||||
_ => (),
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
|
|||
use ureq;
|
||||
use ureq::serde_json::{Map, Value};
|
||||
|
||||
use crate::url;
|
||||
use crate::{url, Msg};
|
||||
|
||||
const ACCEPT: &str = "Accept";
|
||||
const ACCEPT_JSON: &str = "application/json";
|
||||
|
|
@ -292,6 +292,7 @@ impl FilterRequest {
|
|||
event_fields.push("type".to_string());
|
||||
event_fields.push("sender".to_string());
|
||||
event_fields.push("content.body".to_string());
|
||||
event_fields.push("origin_server_ts".to_string());
|
||||
let presence = EventFilter::new(0);
|
||||
let room = RoomFilter::new(room_id);
|
||||
FilterRequest {
|
||||
|
|
@ -335,36 +336,31 @@ pub fn get_filter(user: &str, server: &str, room_id: &str, token: &str) -> Optio
|
|||
}
|
||||
}
|
||||
|
||||
fn get_messages(body: Map<String, Value>, room_id: &str) -> String {
|
||||
fn get_messages(body: Map<String, Value>, room_id: &str) -> Vec<Msg> {
|
||||
log::info!("heap usage: {}", crate::heap_usage());
|
||||
let mut messages = String::new();
|
||||
let mut msgs = Vec::<Msg>::new();
|
||||
if let Some(Value::Object(rooms)) = body.get("rooms") {
|
||||
if let Some(Value::Object(join)) = rooms.get("join") {
|
||||
if let Some(Value::Object(room)) = join.get(room_id) {
|
||||
if let Some(Value::Object(timeline)) = room.get("timeline") {
|
||||
if let Some(Value::Array(events)) = timeline.get("events") {
|
||||
for event in events.iter() {
|
||||
log::info!("{:?}", event);
|
||||
if let Some(Value::String(type_)) = event.get("type") {
|
||||
if type_.eq("m.room.message") {
|
||||
if messages.len() > 0 {
|
||||
messages.push_str("\n");
|
||||
}
|
||||
if let Some(Value::String(sender)) = event.get("sender") {
|
||||
messages.push_str(&get_username(sender));
|
||||
} else {
|
||||
messages.push_str("unknown");
|
||||
}
|
||||
messages.push_str("> ");
|
||||
if let Some(Value::Object(content)) = event.get("content") {
|
||||
if let Some(Value::String(body)) = content.get("body") {
|
||||
messages.push_str(body);
|
||||
} else {
|
||||
messages.push_str("....");
|
||||
}
|
||||
} else {
|
||||
messages.push_str("...");
|
||||
}
|
||||
} // m.room.message
|
||||
msgs.push(Msg {
|
||||
type_: type_.to_string(),
|
||||
body: event
|
||||
.get("content")
|
||||
.map(|c| c.get("body").map(|b| b.to_string()))
|
||||
.flatten(),
|
||||
sender: event.get("sender").map(|s| s.to_string()),
|
||||
ts: event
|
||||
.get("origin_server_ts")
|
||||
.map(|t| t.as_u64())
|
||||
.flatten(),
|
||||
});
|
||||
}
|
||||
}
|
||||
} // event
|
||||
}
|
||||
|
|
@ -372,7 +368,7 @@ fn get_messages(body: Map<String, Value>, room_id: &str) -> String {
|
|||
}
|
||||
}
|
||||
}
|
||||
messages
|
||||
msgs
|
||||
}
|
||||
|
||||
pub fn client_sync(
|
||||
|
|
@ -382,7 +378,7 @@ pub fn client_sync(
|
|||
timeout: i32,
|
||||
room_id: &str,
|
||||
token: &str,
|
||||
) -> Option<(String, String)> {
|
||||
) -> Option<(String, Vec<Msg>)> {
|
||||
log::info!("heap usage: {}", crate::heap_usage());
|
||||
let mut url = String::from(server);
|
||||
url.push_str("/_matrix/client/r0/sync?filter=");
|
||||
|
|
|
|||
|
|
@ -38,6 +38,10 @@ impl Chat {
|
|||
Chat { cid: chat_cid }
|
||||
}
|
||||
|
||||
pub fn cid(&self) -> CID {
|
||||
self.cid
|
||||
}
|
||||
|
||||
pub fn read_only(pddb_dict: &str, pddb_key: &str) -> Self {
|
||||
let chat = Chat::new(None, None, None, None);
|
||||
chat.dialogue_set(pddb_dict, pddb_key).unwrap();
|
||||
|
|
@ -113,6 +117,15 @@ impl Chat {
|
|||
Err(xous::Error::InternalError)
|
||||
}
|
||||
|
||||
pub fn redraw(&self) {
|
||||
xous::send_message(
|
||||
self.cid,
|
||||
xous::Message::new_scalar(ChatOp::GamRedraw as usize, 0, 0, 0, 0),
|
||||
)
|
||||
.map(|_| ())
|
||||
.expect("failed to Redraw Chat UI");
|
||||
}
|
||||
|
||||
// set the text displayed on each of the Precursor Fn buttons
|
||||
pub fn ui_button(
|
||||
&self,
|
||||
|
|
|
|||
Loading…
Reference in a new issue