Skip to content

Revert "Correctly indicate if the last message was from yourself" #1598

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

Merged
Ivansss merged 1 commit into from
Mar 27, 2024
Merged

Revert "Correctly indicate if the last message was from yourself" #1598

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 0 additions & 16 deletions NextcloudTalk/NCRoom.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,17 +360,6 @@ - (NSString *)stringForMessageExpiration:(NSInteger)messageExpiration
return levelString;
}

- (NSString * _Nullable)getFederatedActorId
{
TalkAccount *activeAccount = [[NCDatabaseManager sharedInstance] activeAccount];

if ([self isFederated]) {
return [NSString stringWithFormat:@"%@@%@", activeAccount.userId, self.remoteServer];
}

return nil;
}

- (NSString *)lastMessageString
{
NCChatMessage *lastMessage = self.lastMessage;
Expand All @@ -386,11 +375,6 @@ - (NSString *)lastMessageString

TalkAccount *activeAccount = [[NCDatabaseManager sharedInstance] activeAccount];
BOOL ownMessage = [lastMessage.actorId isEqualToString:activeAccount.userId];

if (!ownMessage && [self isFederated]) {
ownMessage = [lastMessage.actorId isEqualToString:[self getFederatedActorId]];
}

NSString *actorName = [[lastMessage.actorDisplayName componentsSeparatedByString:@" "] objectAtIndex:0];
// For own messages
if (ownMessage) {
Expand Down