Skip to content

Fix synapse rejecting media upload #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
msrd0 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix synapse rejecting media upload #55

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c95b247
matrix: use /v3/ instead of /r0/
msrd0 Apr 8, 2025
99a9dc4
strip directories before uploading media
msrd0 Apr 8, 2025
45ff229
prevent // in uri
msrd0 Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions mstickerlib/src/matrix/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ use serde::{Deserialize, Deserializer, Serialize, Serializer};
use std::{
fmt::{Debug, Display},
ops::Deref,
path::Path,
sync::Arc
};
use stickerpicker::StickerWidget;
Expand Down Expand Up @@ -135,7 +136,7 @@ pub async fn set_widget(matrix: &Config, sender: String, url: String) -> Result<
let answer = CLIENT
.get()
.put(format!(
"{}/_matrix/client/r0/user/{}/account_data/m.widgets",
"{}/_matrix/client/v3/user/{}/account_data/m.widgets",
matrix.homeserver_url, matrix.user
))
.query(&[("access_token", &matrix.access_token)])
Expand All @@ -159,7 +160,7 @@ pub async fn whoami(matrix: &Config) -> Result<Whoami, Error> {
Url::parse(&matrix.homeserver_url)?; //check if homeserver_url is a valid url
let answer = CLIENT
.get()
.get(format!("{}/_matrix/client/r0/account/whoami", matrix.homeserver_url))
.get(format!("{}/_matrix/client/v3/account/whoami", matrix.homeserver_url))
.query(&[("access_token", &matrix.access_token)])
.send()
.await?;
Expand All @@ -176,17 +177,30 @@ pub async fn whoami(matrix: &Config) -> Result<Whoami, Error> {
}
}

pub(crate) async fn upload(matrix: &Config, filename: &String, data: Arc<Vec<u8>>, mimetype: &str) -> Result<Mxc, Error> {
let mut mxc = upload_ref(matrix, filename, data.as_slice(), mimetype).await?;
pub(crate) async fn upload<P>(matrix: &Config, path: P, data: Arc<Vec<u8>>, mimetype: &str) -> Result<Mxc, Error>
where
P: AsRef<Path>
{
let mut mxc = upload_ref(matrix, path, data.as_slice(), mimetype).await?;
mxc.data = Some(data);
Ok(mxc)
}

pub(crate) async fn upload_ref(matrix: &Config, filename: &String, data: &[u8], mimetype: &str) -> Result<Mxc, Error> {
pub(crate) async fn upload_ref<P>(matrix: &Config, path: P, data: &[u8], mimetype: &str) -> Result<Mxc, Error>
where
P: AsRef<Path>
{
let path = path.as_ref();
let filename = path
.file_name()
.unwrap_or_else(|| path.as_os_str())
.to_str()
.expect("Not valid UTF-8");
let slash = if matrix.homeserver_url.ends_with('/') { "" } else { "/" };
let answer = CLIENT
.get()
.post(&format!("{}/_matrix/media/r0/upload", matrix.homeserver_url))
.query(&[("access_token", &matrix.access_token), ("filename", filename)])
.post(&format!("{}{slash}_matrix/media/v3/upload", matrix.homeserver_url))
.query(&[("access_token", matrix.access_token.as_str()), ("filename", filename)])
.header("Content-Type", mimetype)
.body(data.to_owned()) //TODO check for better solution
.send()
Expand Down
Loading