Skip to content

Commit b31a128

Browse files
author
overtake
committed
- bug fixes and improvements
1 parent e61a2d0 commit b31a128

File tree

9 files changed

+13
-1888
lines changed

9 files changed

+13
-1888
lines changed

‎Telegram-Mac.xcworkspace/xcuserdata/keepcoder.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

-1,573
This file was deleted.

‎Telegram-Mac.xcworkspace/xcuserdata/overtake.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

-302
This file was deleted.

‎Telegram-Mac/ChatController.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -3150,8 +3150,8 @@ class ChatController: EditableViewController<ChatControllerView>, Notifable, Tab
31503150
chatInteraction.update(animated: !wasEmpty, { current in
31513151
var current = current.updatedHistoryCount(genericView.tableView.count - 1).updatedKeyboardButtonsMessage(initialData.buttonKeyboardMessage)
31523152

3153-
if let message = initialData.buttonKeyboardMessage, let replyMarkup = message.replyMarkup {
3154-
if replyMarkup.flags.contains(.setupReply) {
3153+
if let message = initialData.buttonKeyboardMessage {
3154+
if message.requestsSetupReply {
31553155
if message.id != current.interfaceState.dismissedForceReplyId {
31563156
current = current.updatedInterfaceState({$0.withUpdatedReplyMessageId(message.id)})
31573157
}

‎Telegram-Mac/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</dict>
3737
</array>
3838
<key>CFBundleVersion</key>
39-
<string>186601</string>
39+
<string>186679</string>
4040
<key>LSApplicationCategoryType</key>
4141
<string>public.app-category.social-networking</string>
4242
<key>LSFileQuarantineEnabled</key>

‎Telegram-Mac/RecentCallsViewController.swift

+1-3
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@ private func makeEntries(from: [CallListViewEntry], state: RecentCallsController
270270
let outgoing: Bool = !message.flags.contains(.Incoming)
271271
if let action = message.media.first as? TelegramMediaAction {
272272
if case .phoneCall(_, let discardReason, _) = action.action {
273-
274273
var missed: Bool = false
275274
if let reason = discardReason {
276275
switch reason {
@@ -281,7 +280,6 @@ private func makeEntries(from: [CallListViewEntry], state: RecentCallsController
281280
}
282281
}
283282
failed = !outgoing && missed
284-
285283
}
286284
}
287285
entries.append(.calls( message, messages, state.editing, failed))
@@ -358,7 +356,7 @@ class LayoutRecentCallsViewController: EditableViewController<TableView> {
358356

359357
let first:Atomic<Bool> = Atomic(value: true)
360358
let signal: Signal<CallListView, NoError> = location.get() |> distinctUntilChanged |> mapToSignal { index in
361-
return context.account.viewTracker.callListView(type: .all, index: index, count: 200)
359+
return context.account.viewTracker.callListView(type: .all, index: index, count: 100)
362360
}
363361

364362
let transition:Signal<TableUpdateTransition, NoError> = combineLatest(queue: queue, signal, statePromise.get(), appearanceSignal) |> map { result in

‎Telegram-Mac/Spotlight.swift

+7-5
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,14 @@ final class SpotlightContext {
9696
init(account: Account) {
9797
self.account = account
9898
if #available(OSX 10.12, *) {
99-
let accountPeer = account.postbox.peerView(id: account.peerId) |> map {
100-
return peerViewMainPeer($0)
101-
} |> filter { $0 != nil } |> map { $0! } |> take(1)
99+
let accountPeer = account.postbox.loadedPeerWithId(account.peerId)
102100

103101

104102
let recently = recentlySearchedPeers(postbox: account.postbox) |> map {
105103
$0.compactMap { $0.peer.chatMainPeer }
106-
}
104+
} |> distinctUntilChanged(isEqual: { previous, current -> Bool in
105+
return previous.count == current.count
106+
})
107107

108108
let peers:Signal<[Peer], NoError> = combineLatest(recently, recentPeers(account: account) |> mapToSignal { recent in
109109
switch recent {
@@ -114,7 +114,9 @@ final class SpotlightContext {
114114
}
115115
}) |> map {
116116
$0 + $1
117-
}
117+
} |> distinctUntilChanged(isEqual: { previous, current -> Bool in
118+
return previous.count == current.count
119+
})
118120

119121

120122

‎TelegramShare/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<key>CFBundleShortVersionString</key>
2222
<string>5.8.2</string>
2323
<key>CFBundleVersion</key>
24-
<string>186601</string>
24+
<string>186679</string>
2525
<key>LSMinimumSystemVersion</key>
2626
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
2727
<key>NSExtension</key>

‎submodules/telegram-ios

Submodule telegram-ios updated from 502456e to edd477e

0 commit comments

Comments
 (0)