Bump some dependencies

This commit is contained in:
Timo Kösters 2022-10-09 15:34:36 +02:00 committed by Nyaaori
parent 1a7893dbbd
commit 275c6b447d
No known key found for this signature in database
GPG key ID: E7819C3ED4D1F82E
6 changed files with 518 additions and 633 deletions

View file

@ -1,5 +1,5 @@
use crate::{services, Result, Ruma};
use hmac::{Hmac, Mac, NewMac};
use hmac::{Hmac, Mac};
use ruma::{api::client::voip::get_turn_server_info, SecondsSinceUnixEpoch};
use sha1::Sha1;
use std::time::{Duration, SystemTime};

View file

@ -86,7 +86,7 @@ async fn main() {
if config.allow_jaeger {
opentelemetry::global::set_text_map_propagator(opentelemetry_jaeger::Propagator::new());
let tracer = opentelemetry_jaeger::new_pipeline()
let tracer = opentelemetry_jaeger::new_agent_pipeline()
.install_batch(opentelemetry::runtime::Tokio)
.unwrap();

View file

@ -40,7 +40,7 @@ pub struct Service {
pub config: Config,
keypair: Arc<ruma::signatures::Ed25519KeyPair>,
dns_resolver: TokioAsyncResolver,
jwt_decoding_key: Option<jsonwebtoken::DecodingKey<'static>>,
jwt_decoding_key: Option<jsonwebtoken::DecodingKey>,
federation_client: reqwest::Client,
default_client: reqwest::Client,
pub stable_room_versions: Vec<RoomVersionId>,
@ -105,7 +105,7 @@ impl Service {
let jwt_decoding_key = config
.jwt_secret
.as_ref()
.map(|secret| jsonwebtoken::DecodingKey::from_secret(secret.as_bytes()).into_static());
.map(|secret| jsonwebtoken::DecodingKey::from_secret(secret.as_bytes()));
let default_client = reqwest_client_builder(&config)?.build()?;
let name_override = Arc::clone(&tls_name_override);
@ -250,7 +250,7 @@ impl Service {
&self.dns_resolver
}
pub fn jwt_decoding_key(&self) -> Option<&jsonwebtoken::DecodingKey<'_>> {
pub fn jwt_decoding_key(&self) -> Option<&jsonwebtoken::DecodingKey> {
self.jwt_decoding_key.as_ref()
}

View file

@ -1,8 +1,10 @@
mod data;
use std::io::Cursor;
pub use data::Data;
use crate::{services, Result};
use image::{imageops::FilterType, GenericImageView};
use image::imageops::FilterType;
use tokio::{
fs::File,
@ -186,7 +188,10 @@ impl Service {
};
let mut thumbnail_bytes = Vec::new();
thumbnail.write_to(&mut thumbnail_bytes, image::ImageOutputFormat::Png)?;
thumbnail.write_to(
&mut Cursor::new(&mut thumbnail_bytes),
image::ImageOutputFormat::Png,
)?;
// Save thumbnail in database so we don't have to generate it again next time
let thumbnail_key = self.db.create_file_metadata(