MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-29 18:22:50 +01:00
Code Issues Releases Wiki Activity

modules/media: Use standard b64 w/ padding for content.

Browse source
This commit is contained in:
Jason Volk 2020-08-21 03:10:31 -07:00
parent 58d61f4675
commit d9c9ee3bbe
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
matrix/media.cc
View file

@ -241,7 +241,7 @@ ircd::m::media::file::write(const m::room &room,
static_assert static_assert
( (
BLK_ENCODE_BUF_SZ >= b64::encode_unpadded_size(BLK_SZ) BLK_ENCODE_BUF_SZ >= b64::encode_size(BLK_SZ)
); );
const unique_mutable_buffer blk_encode_buf const unique_mutable_buffer blk_encode_buf
@ -275,23 +275,23 @@ ircd::m::media::file::write(const m::room &room,
const string_view blk const string_view blk
{ {
b64::encode_unpadded(blk_encode_buf, blk_raw) b64::encode(blk_encode_buf, blk_raw)
}; };
const auto event_id const auto event_id
{ {
send(room, user_id, "ircd.file.block", json::members send(room, user_id, "ircd.file.block", json::members
{ {
{ "data.ub64", blk }, { "data.b64", blk },
}) })
}; };
off += size(blk_raw); off += size(blk_raw);
wrote += size(blk); wrote += size(blk);
assert(size(blk) == b64::encode_unpadded_size(blk_raw)); assert(size(blk) == b64::encode_size(blk_raw));
} }
//assert(wrote == b64::encode_unpadded_size(off)); //assert(wrote == b64::encode_size(off));
assert(off == size(content)); assert(off == size(content));
return off; return off;
} }
@ -363,7 +363,7 @@ ircd::m::media::file::read(const m::room &room,
const json::string &blk_encoded const json::string &blk_encoded
{ {
content["data.ub64"] // unpadded base64 content["data.b64"]
}; };
const const_buffer blk const const_buffer blk