feat(media): save user id of uploader

src/database/key_value/media.rs

@@ -1,4 +1,4 @@
-use ruma::{api::client::error::ErrorKind, ServerName};
+use ruma::{api::client::error::ErrorKind, ServerName, UserId};
 use sha2::{digest::Output, Sha256};
 use tracing::error;
 
@@ -17,6 +17,7 @@ impl service::media::Data for KeyValueDatabase {
         media_id: &str,
         filename: Option<&str>,
         content_type: Option<&str>,
+        user_id: Option<&UserId>,
     ) -> Result<()> {
         let metadata = FilehashMetadata::new(file_size);
 
@@ -39,7 +40,26 @@ impl service::media::Data for KeyValueDatabase {
         value.push(0xff);
         value.extend_from_slice(content_type.map(|f| f.as_bytes()).unwrap_or_default());
 
-        self.servernamemediaid_metadata.insert(&key, &value)
+        self.servernamemediaid_metadata.insert(&key, &value)?;
+
+        if let Some(user_id) = user_id {
+            let mut key = servername.as_bytes().to_vec();
+            key.push(0xff);
+            key.extend_from_slice(user_id.localpart().as_bytes());
+            key.push(0xff);
+            key.extend_from_slice(media_id.as_bytes());
+
+            self.servername_userlocalpart_mediaid.insert(&key, &[])?;
+
+            let mut key = servername.as_bytes().to_vec();
+            key.push(0xff);
+            key.extend_from_slice(media_id.as_bytes());
+
+            self.servernamemediaid_userlocalpart
+                .insert(&key, user_id.localpart().as_bytes())?;
+        }
+
+        Ok(())
     }
 
     fn search_file_metadata(&self, servername: &ServerName, media_id: &str) -> Result<DbFileMeta> {

src/database/mod.rs

@@ -179,6 +179,8 @@ pub struct KeyValueDatabase {
     pub(super) servernamemediaid_metadata: Arc<dyn KvTree>, // Servername + MediaID -> content sha256 + Filename + ContentType + extra 0xff byte if media is allowed on unauthenticated endpoints
     pub(super) filehash_servername_mediaid: Arc<dyn KvTree>, // sha256 of content + Servername + MediaID, used to delete dangling references to filehashes from servernamemediaid
     pub(super) filehash_metadata: Arc<dyn KvTree>, // sha256 of content -> file size + creation time +  last access time
+    pub(super) servername_userlocalpart_mediaid: Arc<dyn KvTree>, // Servername + User Localpart + MediaID
+    pub(super) servernamemediaid_userlocalpart: Arc<dyn KvTree>, // Servername + MediaID -> User Localpart, used to remove keys from above when files are deleted by unrelated means
     pub(super) thumbnailid_metadata: Arc<dyn KvTree>, // ThumbnailId = Servername + MediaID + width + height -> Filename + ContentType + extra 0xff byte if media is allowed on unauthenticated endpoints
     pub(super) filehash_thumbnailid: Arc<dyn KvTree>, // sha256 of content + "ThumbnailId", as defined above. Used to dangling references to filehashes from thumbnailIds
     //pub key_backups: key_backups::KeyBackups,
@@ -387,6 +389,10 @@ impl KeyValueDatabase {
             servernamemediaid_metadata: builder.open_tree("servernamemediaid_metadata")?,
             filehash_servername_mediaid: builder.open_tree("filehash_servername_mediaid")?,
             filehash_metadata: builder.open_tree("filehash_metadata")?,
+            servername_userlocalpart_mediaid: builder
+                .open_tree("servername_userlocalpart_mediaid")?,
+            servernamemediaid_userlocalpart: builder
+                .open_tree("servernamemediaid_userlocalpart")?,
             thumbnailid_metadata: builder.open_tree("thumbnailid_metadata")?,
             filehash_thumbnailid: builder.open_tree("filehash_thumbnailid")?,
             backupid_algorithm: builder.open_tree("backupid_algorithm")?,