Authenticated Media Support (#51)
* Fix AvatarField to work with authenticated media * Fix ViewMediaButton to work for user's media tab and reported events * remove console.log * cleanup AvatarField * use correct thumbnail size * fix AvatarField.test * ignore postgres data for watchman * fix new avatar preview * watchman should ignore testdata completely, instead of specific subdirs * update README * change user's media icon in sidebar - use the same icon as the media tab * Add preview for user media files if mimeType is image/* * Add new line in user media Dialog
This commit is contained in:
committed by
GitHub
parent
470f1b5455
commit
a79c3597d6
43
src/utils/fetchMedia.ts
Normal file
43
src/utils/fetchMedia.ts
Normal file
@@ -0,0 +1,43 @@
|
||||
import storage from "../storage";
|
||||
|
||||
export const getServerAndMediaIdFromMxcUrl = (mxcUrl: string): { serverName: string, mediaId: string } => {
|
||||
const re = /^mxc:\/\/([^/]+)\/(\w+)/;
|
||||
const ret = re.exec(mxcUrl);
|
||||
console.log("mxcClient " + ret);
|
||||
if (ret == null) {
|
||||
throw new Error("Invalid mxcUrl");
|
||||
}
|
||||
const serverName = ret[1];
|
||||
const mediaId = ret[2];
|
||||
return { serverName, mediaId };
|
||||
};
|
||||
|
||||
export type MediaType = "thumbnail" | "original";
|
||||
|
||||
export const fetchAuthenticatedMedia = async (mxcUrl: string, type: MediaType): Promise<Response> => {
|
||||
const homeserver = storage.getItem("base_url");
|
||||
const accessToken = storage.getItem("access_token");
|
||||
|
||||
const { serverName, mediaId } = getServerAndMediaIdFromMxcUrl(mxcUrl);
|
||||
if (!serverName || !mediaId) {
|
||||
throw new Error("Invalid mxcUrl");
|
||||
}
|
||||
|
||||
let url = "";
|
||||
if (type === "thumbnail") {
|
||||
// ref: https://spec.matrix.org/latest/client-server-api/#thumbnails
|
||||
url = `${homeserver}/_matrix/client/v1/media/thumbnail/${serverName}/${mediaId}?width=320&height=240&method=scale`;
|
||||
} else if (type === "original") {
|
||||
url = `${homeserver}/_matrix/client/v1/media/download/${serverName}/${mediaId}`;
|
||||
} else {
|
||||
throw new Error("Invalid authenticated media type");
|
||||
}
|
||||
|
||||
const response = await fetch(`${url}`, {
|
||||
headers: {
|
||||
authorization: `Bearer ${accessToken}`,
|
||||
},
|
||||
});
|
||||
|
||||
return response;
|
||||
};
|
||||
Reference in New Issue
Block a user