Skip to content

Private Messages: Sent and Custom Folders #1231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dfsm wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Private Messages: Sent and Custom Folders #1231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4acba65
Initial commit for Sent and custom folder support in private messages
dfsm Jan 7, 2026
3c66564
Fixed missing avatars in private messages caused by a duplicate empty…
dfsm Jan 7, 2026
0b2cec7
Fix issue with > character being added to subject lines in private me…
dfsm Jan 7, 2026
93160d3
Cleanup pass
dfsm Jan 7, 2026
44b29f6
Fixed positioning of Move and Delete buttons while editing messages.
dfsm Jan 7, 2026
46f1f36
Final cleanup
dfsm Jan 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 31 additions & 6 deletions App/Data Sources/MessageListDataSource.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,18 @@ final class MessageListDataSource: NSObject {
weak var deletionDelegate: MessageListDataSourceDeletionDelegate?
private let resultsController: NSFetchedResultsController<PrivateMessage>
private let tableView: UITableView
private let folder: PrivateMessageFolder?

init(managedObjectContext: NSManagedObjectContext, tableView: UITableView) throws {
init(managedObjectContext: NSManagedObjectContext, tableView: UITableView, folder: PrivateMessageFolder?) throws {
let fetchRequest = PrivateMessage.makeFetchRequest()
fetchRequest.sortDescriptors = [NSSortDescriptor(key: #keyPath(PrivateMessage.sentDate), ascending: false)]

if let folder = folder {
fetchRequest.predicate = NSPredicate(format: "folder == %@", folder)
}

resultsController = NSFetchedResultsController(fetchRequest: fetchRequest, managedObjectContext: managedObjectContext, sectionNameKeyPath: nil, cacheName: nil)
self.folder = folder

self.tableView = tableView
super.init()
Expand All @@ -34,6 +41,10 @@ final class MessageListDataSource: NSObject {
func message(at indexPath: IndexPath) -> PrivateMessage {
return resultsController.object(at: indexPath)
}

func indexPath(for message: PrivateMessage) -> IndexPath? {
return resultsController.indexPath(forObject: message)
}
}

private let cellReuseIdentifier = "MessageCell"
Expand Down Expand Up @@ -98,11 +109,16 @@ extension MessageListDataSource: UITableViewDataSource {
private func viewModelForMessage(at indexPath: IndexPath) -> MessageListCell.ViewModel {
let message = self.message(at: indexPath)
let theme = Theme.defaultTheme()


let displayName = message.isSent
? (message.to?.username ?? "Unknown")
: (message.fromUsername ?? "")
let labelPrefix = message.isSent ? "To: " : ""

return MessageListCell.ViewModel(
backgroundColor: theme["listBackgroundColor"]!,
selectedBackgroundColor: theme["listSelectedBackgroundColor"]!,
sender: NSAttributedString(string: message.fromUsername ?? "", attributes: [
sender: NSAttributedString(string: labelPrefix + displayName, attributes: [
.font: UIFont.preferredFontForTextStyle(.body, fontName: nil, sizeAdjustment: theme[double: "messageListSenderFontSizeAdjustment"]!, weight: .semibold),
.foregroundColor: theme[uicolor: "listSecondaryTextColor"]!]),
sentDate: message.sentDate ?? .distantPast,
Expand All @@ -117,7 +133,16 @@ extension MessageListDataSource: UITableViewDataSource {
.foregroundColor: theme[uicolor: "listTextColor"]!]),
tagImage: .image(name: message.threadTag?.imageName, placeholder: .privateMessage),
tagOverlayImage: {
if message.replied {
if message.isSent {
let image = UIImage(named: "pmforwarded")?
.stroked(with: theme["listBackgroundColor"]!, thickness: 3, quality: 1)
.withRenderingMode(.alwaysTemplate)

let imageView = UIImageView(image: image)
imageView.tintColor = theme["tintColor"]!

return imageView
} else if message.replied {
let image = UIImage(named: "pmreplied")?
.stroked(with: theme["listBackgroundColor"]!, thickness: 3, quality: 1)
.withRenderingMode(.alwaysTemplate)
Expand All @@ -126,7 +151,7 @@ extension MessageListDataSource: UITableViewDataSource {
imageView.tintColor = theme["listBackgroundColor"]!

return imageView
} else if message.forwarded {
} else if message.forwarded && !message.isSent {
let image = UIImage(named: "pmforwarded")?
.stroked(with: theme["listBackgroundColor"]!, thickness: 3, quality: 1)
.withRenderingMode(.alwaysTemplate)
Expand All @@ -135,7 +160,7 @@ extension MessageListDataSource: UITableViewDataSource {
imageView.tintColor = theme["listBackgroundColor"]!

return imageView
} else if !message.seen {
} else if !message.seen && !message.isSent {
let image = UIImage(named: "newpm")
let imageView = UIImageView(image: image)

Expand Down
Loading
Loading