permissionlesstech/bitchat
1
0
Fork 0
mirror of https://github.com/permissionlesstech/bitchat.git synced 2026-07-25 08:05:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor and Extract Media-related code (#1077)

Browse Source 
* Extract media-related code from ContentView

* Refactor hard-coded prefix and directory names
This commit is contained in:
Islam
2026-04-02 20:31:51 -05:00
committed by GitHub
parent 4b000b0785
commit 097d916da7
6 changed files with 181 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitchat/ViewModels/Extensions/ChatViewModel+PrivateChat.swift
+6 -9
View File
@@ -319,7 +319,7 @@ extension ChatViewModel {
}
let targetPeer = selectedPrivateChatPeer
let message = enqueueMediaMessage(content: "[voice] \(url.lastPathComponent)", targetPeer: targetPeer)
let message = enqueueMediaMessage(content: "\(MimeType.Category.audio.messagePrefix)\(url.lastPathComponent)", targetPeer: targetPeer)
let messageID = message.id
let transferId = makeTransferID(messageID: messageID)
@@ -428,7 +428,7 @@ extension ChatViewModel {
)
guard packet.encode() != nil else { throw MediaSendError.encodingFailed }
await MainActor.run {
let message = self.enqueueMediaMessage(content: "[image] \(outputURL.lastPathComponent)", targetPeer: targetPeer)
let message = self.enqueueMediaMessage(content: "\(MimeType.Category.image.messagePrefix)\(outputURL.lastPathComponent)", targetPeer: targetPeer)
let messageID = message.id
let transferId = self.makeTransferID(messageID: messageID)
self.registerTransfer(transferId: transferId, messageID: messageID)
@@ -547,13 +547,9 @@ extension ChatViewModel {
func cleanupLocalFile(forMessage message: BitchatMessage) {
// Check both outgoing and incoming directories for thorough cleanup
let prefixes = ["[voice] ", "[image] ", "[file] "]
let subdirs = ["voicenotes/outgoing", "voicenotes/incoming",
"images/outgoing", "images/incoming",
"files/outgoing", "files/incoming"]
guard let prefix = prefixes.first(where: { message.content.hasPrefix($0) }) else { return }
let rawFilename = String(message.content.dropFirst(prefix.count)).trimmingCharacters(in: .whitespacesAndNewlines)
let categories: [MimeType.Category] = [.audio, .image, .file]
guard let category = categories.first(where: { message.content.hasPrefix($0.messagePrefix) }) else { return }
let rawFilename = String(message.content.dropFirst(category.messagePrefix.count)).trimmingCharacters(in: .whitespacesAndNewlines)
guard !rawFilename.isEmpty, let base = try? applicationFilesDirectory() else { return }
// Security: Extract only the last path component to prevent directory traversal
@@ -561,6 +557,7 @@ extension ChatViewModel {
guard !safeFilename.isEmpty && safeFilename != "." && safeFilename != ".." else { return }
// Try all possible locations (outgoing and incoming)
let subdirs = categories.flatMap { ["\($0.mediaDir)/outgoing", "\($0.mediaDir)/incoming"] }
for subdir in subdirs {
let target = base.appendingPathComponent(subdir, isDirectory: true).appendingPathComponent(safeFilename)