ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-16 05:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix reply thread presentation

Browse Source
This commit is contained in:
Ali 2020-09-28 22:56:55 +03:00
parent 2ecb135006
commit 49055d2c8f
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/NotificationService/Serialization.m
View File

@ -1,5 +1,5 @@
#import "Serialization.h"
f
@implementation Serialization
- (NSUInteger)currentLayer {

4
Telegram/Telegram-iOS/en.lproj/Localizable.strings
View File

@ -5789,8 +5789,8 @@ Any member of this group will be able to see messages in the channel.";
"Conversation.TitleCommentsFormat" = "%1$@ %2$@";
"Conversation.TitleRepliesEmpty" = "Replies";
"Conversation.TitleReplies_1" = "[%@]Comment";
"Conversation.TitleReplies_any" = "[%@]Comments";
"Conversation.TitleReplies_1" = "[%@]Reply";
"Conversation.TitleReplies_any" = "[%@]Replies";
"Conversation.TitleRepliesFormat" = "%1$@ %2$@";
"Conversation.MessageLeaveComment" = "Leave a Comment";

21
submodules/TelegramCore/Sources/ReplyThreadHistory.swift
View File

@ -178,9 +178,17 @@ private class ReplyThreadHistoryContextImpl {
resolvedMaxMessage = nil
}
var isChannelPost = false
for attribute in topMessage.attributes {
if let _ = attribute as? SourceReferenceMessageAttribute {
isChannelPost = true
break
}
}
return .single(DiscussionMessage(
messageId: parsedIndex.id,
isChannelPost: true,
isChannelPost: isChannelPost,
maxMessage: resolvedMaxMessage,
maxReadIncomingMessageId: readInboxMaxId.flatMap { readMaxId in
MessageId(peerId: parsedIndex.id.peerId, namespace: Namespaces.Message.Cloud, id: readMaxId)
@ -472,9 +480,17 @@ public func fetchChannelReplyThreadMessage(account: Account, messageId: MessageI
resolvedMaxMessage = nil
}
var isChannelPost = false
for attribute in topMessage.attributes {
if let _ = attribute as? SourceReferenceMessageAttribute {
isChannelPost = true
break
}
}
return DiscussionMessage(
messageId: parsedIndex.id,
isChannelPost: true,
isChannelPost: isChannelPost,
maxMessage: resolvedMaxMessage,
maxReadIncomingMessageId: readInboxMaxId.flatMap { readMaxId in
MessageId(peerId: parsedIndex.id.peerId, namespace: Namespaces.Message.Cloud, id: readMaxId)
@ -511,6 +527,7 @@ public func fetchChannelReplyThreadMessage(account: Account, messageId: MessageI
guard let discussionMessageId = foundDiscussionMessageId else {
return nil
}
return DiscussionMessage(
messageId: discussionMessageId,
isChannelPost: true,