Skip to content
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.

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

[pull] master from overtake:master #1

Merged
merged 255 commits into from
Sep 24, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
255 commits
Select commit Hold shift + click to select a range
345a531
Merge branch 'beta' into alpha
overtake Apr 26, 2021
c09433b
no message
overtake Apr 26, 2021
9d78221
Revert "update submodule"
overtake Apr 26, 2021
0278819
Revert "update submodule"
overtake Apr 26, 2021
4e8fddd
video chats
overtake Apr 27, 2021
d92deef
fixes
overtake Apr 27, 2021
d638a05
Merge branch 'beta' into alpha
overtake Apr 27, 2021
7bf60a8
fps
overtake Apr 27, 2021
15e6dda
video chats
overtake Apr 27, 2021
299172d
no message
overtake Apr 27, 2021
c979472
fixes
overtake Apr 28, 2021
0f3072b
voice chats
overtake Apr 29, 2021
f49f932
alpha
overtake Apr 30, 2021
3aa9707
voice chats
overtake Apr 30, 2021
fc25d65
voice chats
overtake Apr 30, 2021
2f9f228
voice chats
overtake Apr 30, 2021
2e569d8
no message
overtake Apr 30, 2021
3b47584
video calls
overtake May 4, 2021
2458b44
no message
overtake May 4, 2021
ddfb501
no message
overtake May 4, 2021
f679aa6
no message
overtake May 4, 2021
8edc03f
no message
overtake May 4, 2021
39469db
no message
overtake May 4, 2021
814ec89
no message
overtake May 4, 2021
dd35a71
no message
overtake May 7, 2021
1ca979b
no message
overtake May 7, 2021
b1a1665
no message
overtake May 11, 2021
efb0250
no message
overtake May 11, 2021
b9f68cb
no message
overtake May 11, 2021
c9a07a0
no message
overtake May 12, 2021
ec33250
no message
overtake May 13, 2021
6ee7d13
no message
overtake May 14, 2021
57df35e
no message
overtake May 14, 2021
72cc0dc
no message
overtake May 14, 2021
31ca68c
no message
overtake May 14, 2021
90e3817
no message
overtake May 14, 2021
3f2cfa4
video improvements
overtake May 15, 2021
b31d826
no message
overtake May 17, 2021
69d091a
no message
overtake May 17, 2021
2fe7c50
video calls fixes
overtake May 17, 2021
7424219
something
overtake May 17, 2021
b1867d3
no message
overtake May 17, 2021
9ea163b
video calls
overtake May 18, 2021
d32bc36
video calls
overtake May 18, 2021
bc3c2d1
no message
overtake May 18, 2021
307149e
video calls
overtake May 18, 2021
2ffb5b9
video calls
overtake May 18, 2021
ea1cc93
no message
overtake May 19, 2021
7ca6568
no message
overtake May 19, 2021
b3ed14c
no message
overtake May 20, 2021
d7d9364
no message
overtake May 21, 2021
d1527ee
no message
overtake May 21, 2021
3e5cfa9
no message
overtake May 21, 2021
9724dd4
calls
overtake May 21, 2021
64a0702
no message
overtake May 21, 2021
021f074
beta
overtake May 21, 2021
4b5eccf
no message
overtake May 25, 2021
69726d7
no message
overtake May 25, 2021
b8b7509
no message
overtake May 25, 2021
7aa5289
no message
overtake May 25, 2021
d5f7be0
no message
overtake May 25, 2021
b6b642f
video chats improvements
overtake May 26, 2021
24d839e
video chats improvements
overtake May 26, 2021
657dd19
fixes
overtake May 26, 2021
a76fa23
no message
overtake May 26, 2021
33f7b90
fixes
overtake May 27, 2021
330cc01
fixes
overtake May 27, 2021
89ad5f9
fixes
overtake May 28, 2021
13e4eb4
fixes
overtake May 28, 2021
901f5f0
fixes
overtake May 28, 2021
077ecec
fixes
overtake May 28, 2021
be48f18
fixes
overtake May 28, 2021
c1e819f
fixes
overtake May 28, 2021
716f841
fixes
overtake May 28, 2021
0acc436
no message
overtake May 31, 2021
7eb1d19
fixes
overtake May 31, 2021
c129187
fixes
overtake Jun 1, 2021
12cb3e4
no message
overtake Jun 1, 2021
74d6f50
no message
overtake Jun 1, 2021
823ccbb
fixes
overtake Jun 1, 2021
b47ba37
fixes
overtake Jun 1, 2021
aa56c55
fixes
overtake Jun 1, 2021
0f292db
no message
overtake Jun 1, 2021
540f0bc
no message
overtake Jun 3, 2021
e7eb3d4
no message
overtake Jun 3, 2021
e1011a2
fixes
overtake Jun 4, 2021
58a9e25
no message
overtake Jun 4, 2021
f932a60
fixes
overtake Jun 4, 2021
2490f47
fixes
overtake Jun 7, 2021
66ff8b6
fixes
overtake Jun 7, 2021
14038d2
no message
overtake Jun 8, 2021
bd4a402
fixes
overtake Jun 8, 2021
6ddce12
fixes
overtake Jun 8, 2021
758a6eb
no message
overtake Jun 8, 2021
64d5a12
fixes
overtake Jun 9, 2021
83004e2
fixes
overtake Jun 10, 2021
5f329fe
fixes
overtake Jun 10, 2021
1c06c8d
fixes
overtake Jun 10, 2021
ab9f120
fixes
overtake Jun 10, 2021
5f3a5e3
fixes
overtake Jun 11, 2021
e416b35
no message
overtake Jun 11, 2021
c1a75ce
fixes
overtake Jun 11, 2021
e7e4467
fixes
overtake Jun 11, 2021
52cf4a0
fixes
overtake Jun 12, 2021
9b2302f
fixes
overtake Jun 13, 2021
6b9a0ac
fixes
overtake Jun 13, 2021
4bf433a
fixes
overtake Jun 14, 2021
5791dbf
fixes
overtake Jun 15, 2021
6a7dc9e
fixes
overtake Jun 15, 2021
da6d7f7
fixes
overtake Jun 15, 2021
bd796d8
fixes
overtake Jun 15, 2021
60f5f4d
fixes
overtake Jun 15, 2021
48abfa0
fixes
overtake Jun 15, 2021
bb97f67
fixes
overtake Jun 16, 2021
b34e7d8
fixes
overtake Jun 16, 2021
3c84789
fixes
overtake Jun 17, 2021
86a79e3
fixes
overtake Jun 17, 2021
d14114b
fixes
overtake Jun 18, 2021
9631153
fixes
overtake Jun 18, 2021
41d2759
fixes
overtake Jun 18, 2021
fc4e4a9
no message
overtake Jun 20, 2021
d7f7e97
update
overtake Jun 22, 2021
5c0585c
fixes
overtake Jun 22, 2021
61e20a8
fixes
overtake Jun 22, 2021
244d9c0
fixes
overtake Jun 22, 2021
c162338
fixes
overtake Jun 22, 2021
49f1948
cmio fixes
overtake Jun 22, 2021
3ccd303
fixes
overtake Jun 23, 2021
cf2e3c7
fixes
overtake Jun 23, 2021
cc09b77
fixes
overtake Jun 23, 2021
26e2cb6
fixes
overtake Jun 23, 2021
6eb3df6
fixes
overtake Jun 24, 2021
0e04ef7
no message
overtake Jun 24, 2021
ae5a713
no message
overtake Jun 25, 2021
ed5af77
fixes
overtake Jun 25, 2021
37afad4
fixes
overtake Jun 26, 2021
1c8c33b
no message
overtake Jun 30, 2021
f4dc25a
improve render perfomance
overtake Jun 30, 2021
673cf29
metal drawing improvements
overtake Jul 1, 2021
20cacc7
metal drawing improvements
overtake Jul 1, 2021
3670361
metal drawing improvements
overtake Jul 1, 2021
0556722
metal drawing improvements
overtake Jul 1, 2021
1bf4312
metal drawing improvements
overtake Jul 2, 2021
e767b69
fixes
overtake Jul 2, 2021
dc2d95d
fixes
overtake Jul 2, 2021
47cd4ad
fixes
overtake Jul 2, 2021
2d520e4
fixes
overtake Jul 9, 2021
8bd1a1c
fixes
overtake Jul 9, 2021
6dfd7ae
empty
overtake Jul 13, 2021
3d8992e
fixes
overtake Jul 13, 2021
bcbdef4
fixes
overtake Jul 15, 2021
dd91a81
gradient refactor
overtake Jul 15, 2021
2c9a06c
no message
overtake Jul 15, 2021
f4965ae
animated bg
overtake Jul 22, 2021
79a1048
animated backgrounds
overtake Jul 22, 2021
d7167e2
animated backgrounds
overtake Jul 22, 2021
cf48bca
screen share in video calls
overtake Jul 23, 2021
c18309b
refactoring
overtake Jul 23, 2021
3b2d35e
refactoring
overtake Jul 23, 2021
14d5878
refactoring
overtake Jul 23, 2021
28f58e6
fixes
overtake Jul 27, 2021
b070a6e
fixes
overtake Jul 27, 2021
4525656
fixes
overtake Jul 27, 2021
c181c97
fixes
overtake Jul 28, 2021
d5f3223
no message
overtake Jul 29, 2021
260d0b3
fixes
overtake Jul 30, 2021
63b4dde
fixes
overtake Jul 30, 2021
157b0c3
fixes
overtake Aug 2, 2021
9d5ee59
no message
overtake Aug 2, 2021
46213b9
fixes
overtake Aug 2, 2021
725895d
floating avatars and groupping messages in bubbles mode
overtake Aug 4, 2021
f8dbcc6
floating avatars and groupping messages in bubbles mode
overtake Aug 4, 2021
8318b4c
floating avatars and groupping messages in bubbles mode
overtake Aug 4, 2021
7561538
floating avatars and groupping messages in bubbles mode
overtake Aug 4, 2021
c546ade
no message
overtake Aug 4, 2021
fb0dcc1
fixes
overtake Aug 5, 2021
f244a7e
fixes
overtake Aug 6, 2021
cb5f672
fixes
overtake Aug 6, 2021
14c9086
fixes
overtake Aug 6, 2021
5e2b8b7
fixes
overtake Aug 6, 2021
72ac789
fixes
overtake Aug 10, 2021
f0c9c4a
fixes
overtake Aug 10, 2021
b5c1025
fixes
overtake Aug 10, 2021
8dfc00b
fixes
overtake Aug 10, 2021
3e03cb8
fixes
overtake Aug 11, 2021
1d0bd5a
fixes
overtake Aug 12, 2021
8ea77e9
fixes
overtake Aug 13, 2021
391a284
fixes
overtake Aug 17, 2021
c10085b
fixes
overtake Aug 17, 2021
d3e1543
no message
overtake Aug 17, 2021
564a13e
no message
overtake Aug 17, 2021
e249fa9
fixes
overtake Aug 17, 2021
a522404
fixes
overtake Aug 19, 2021
1421619
syntax fixesfixes
overtake Aug 19, 2021
7572775
fixes
overtake Aug 19, 2021
eb695f2
fixes
overtake Aug 19, 2021
4cc00a5
fixes
overtake Aug 19, 2021
f7b17e3
fixes
overtake Aug 23, 2021
20e2d27
fixes
overtake Aug 24, 2021
b280a65
fixes
overtake Aug 24, 2021
31591b2
fixes
overtake Aug 26, 2021
6d6e398
fixes
overtake Aug 27, 2021
be12cee
fixes
overtake Aug 27, 2021
887af7c
fixes
overtake Aug 28, 2021
64a0da1
fixes
overtake Aug 29, 2021
240168c
fixes
overtake Aug 31, 2021
664d980
fixes
overtake Aug 31, 2021
07cc53c
fixes
overtake Aug 31, 2021
5d99198
new notifications api
overtake Sep 1, 2021
c98bafa
fixes
overtake Sep 2, 2021
433abca
fixes
overtake Sep 2, 2021
d71a65e
Merge branch 'release' into appstore
overtake Sep 2, 2021
ebc9b21
Merge branch 'appstore' into beta
overtake Sep 3, 2021
87db57c
no message
overtake Sep 5, 2021
791f0da
widget/themes
overtake Sep 7, 2021
35440c0
widget/themes
overtake Sep 7, 2021
a35f9cb
widget/themes
overtake Sep 7, 2021
5d0ad0b
widget/themes
overtake Sep 8, 2021
cb7bbb3
widget/themes
overtake Sep 8, 2021
cd3f871
widget/themes
overtake Sep 9, 2021
9129ad5
widget/themes
overtake Sep 9, 2021
9175cc6
forward improvements
overtake Sep 10, 2021
75d7cf2
forward improvements
overtake Sep 10, 2021
a884aa8
forward improvements
overtake Sep 10, 2021
8455ec3
no message
overtake Sep 10, 2021
36f8889
forward improvements
overtake Sep 10, 2021
7be5bb1
fixes
overtake Sep 13, 2021
02f32a3
fixes
overtake Sep 15, 2021
27bd6a4
fixes
overtake Sep 15, 2021
34d5d9d
fixes
overtake Sep 18, 2021
4ada1d0
fixes
overtake Sep 19, 2021
ec22d75
no message
overtake Sep 19, 2021
c8ded0e
fixes
overtake Sep 19, 2021
9a423cd
no message
overtake Sep 20, 2021
eca4f18
fixes
overtake Sep 20, 2021
a546b5d
fixes
overtake Sep 20, 2021
ec46bf1
fixes
overtake Sep 21, 2021
c8be656
fixes
overtake Sep 21, 2021
fc2b001
fixes
overtake Sep 21, 2021
901d8c4
fixes
overtake Sep 22, 2021
70904ca
fixes
overtake Sep 23, 2021
44031da
fixes
overtake Sep 23, 2021
e312419
fixes
overtake Sep 23, 2021
9aabf49
fixes
overtake Sep 23, 2021
b745cf5
fixes
overtake Sep 24, 2021
64ce325
no message
overtake Sep 24, 2021
2be464d
fixes
overtake Sep 24, 2021
75edbb9
fixes
overtake Sep 24, 2021
d250794
ios module update
overtake Sep 24, 2021
fa0bfbe
Merge branch 'master' of github.com:overtake/TelegramSwift
overtake Sep 24, 2021
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
Prev Previous commit
Next Next commit
fixes
  • Loading branch information
overtake committed Aug 27, 2021
commit be12ceed47a8c51beb8f35d9b72f2ae455b80e5a
13 changes: 13 additions & 0 deletions Telegram-Mac/ChatController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4469,6 +4469,8 @@ class ChatController: EditableViewController<ChatControllerView>, Notifable, Tab

var hasFailed: Bool = false

var readAds:[Data] = []

tableView.enumerateVisibleItems(with: { item in
if let item = item as? ChatRowItem {
if message == nil {
Expand Down Expand Up @@ -4515,6 +4517,11 @@ class ChatController: EditableViewController<ChatControllerView>, Notifable, Tab
} else {
topVisibleMessageRange = ChatTopVisibleMessageRange(lowerBound: message.id, upperBound: message.id, isLast: item.index == tableView.count - 1)
}
if let id = message.adAttribute?.opaqueId {
if item.height == item.view?.visibleRect.height {
readAds.append(id)
}
}
}


Expand All @@ -4532,6 +4539,11 @@ class ChatController: EditableViewController<ChatControllerView>, Notifable, Tab
strongSelf.topVisibleMessageRange.set(topVisibleMessageRange)
}

if !readAds.isEmpty {
for data in readAds {
strongSelf.adMessages?.markAsSeen(opaqueId: data)
}
}

strongSelf.genericView.updateFailedIds(strongSelf.genericView.failedIds, hasOnScreen: hasFailed, animated: true)

Expand Down Expand Up @@ -4706,6 +4718,7 @@ class ChatController: EditableViewController<ChatControllerView>, Notifable, Tab
} else {
self.interactiveReadingDisposable.set(nil)
}

default:
self.interactiveReadingDisposable.set(nil)
}
Expand Down
2 changes: 1 addition & 1 deletion Telegram-Mac/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>220880</string>
<string>220889</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.social-networking</string>
<key>LSFileQuarantineEnabled</key>
Expand Down
2 changes: 1 addition & 1 deletion TelegramShare/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>220880</string>
<string>220889</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSExtension</key>
Expand Down
2 changes: 1 addition & 1 deletion submodules/tgcalls