blah/blahrs
1
0
Fork 0
mirror of https://github.com/Blah-IM/blahrs.git synced 2025-07-09 15:45:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(webapi): include member_permission in RoomMetadata

Browse source 
This is currently only included by `room_list` endpoint with
authentication.
This commit is contained in:
oxalica 2024-09-10 09:33:59 -04:00
parent 5eeb12c294
commit 4f48b390f7
3 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
blahd/src/lib.rs
View file

@ -212,6 +212,7 @@ async fn room_list(
let last_seen_cid =
Some(row.get::<_, Id>("last_seen_cid")?).filter(|cid| cid.0 != 0);
let unseen_cnt = row.get("unseen_cnt").ok();
let member_permission = row.get("member_perm").ok();
Ok(RoomMetadata {
rid,
title,
@ -219,6 +220,7 @@ async fn room_list(
last_item,
last_seen_cid,
unseen_cnt,
member_permission,
})
})?
.collect::<Result<Vec<_>, _>>()?;
@ -252,7 +254,7 @@ async fn room_list(
query(
r"
SELECT
`rid`, `title`, `attrs`, `last_seen_cid`,
`rid`, `title`, `attrs`, `last_seen_cid`, `room_member`.`permission` AS `member_perm`,
`cid`, `last_author`.`userkey`, `timestamp`, `nonce`, `sig`, `rich_text`
FROM `user`
JOIN `room_member` USING (`uid`)
@ -277,7 +279,7 @@ async fn room_list(
query(
r"
SELECT
`rid`, `title`, `attrs`, `last_seen_cid`,
`rid`, `title`, `attrs`, `last_seen_cid`, `room_member`.`permission` AS `member_perm`,
`cid`, `last_author`.`userkey`, `timestamp`, `nonce`, `sig`, `rich_text`,
(SELECT COUNT(*)
FROM `room_item` AS `unseen_item`
@ -456,6 +458,7 @@ async fn room_get_metadata(
last_item: None,
last_seen_cid: None,
unseen_cnt: None,
member_permission: None,
}))
}