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 merge conflicts

Browse Source
This commit is contained in:
Isaac 2024-06-07 15:44:12 +04:00
parent a2bbf58b76
commit 26b539041d
7 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
submodules/AccountContext/Sources/AccountContext.swift
View File

@ -886,7 +886,7 @@ public enum CollectibleItemInfoScreenSubject {
public enum StorySearchControllerScope { public enum StorySearchControllerScope {
case query(String) case query(String)
case location(coordinates: MediaArea.Coordinates, venue: MediaArea.Venue, address: MediaArea.Address?) case location(coordinates: MediaArea.Coordinates, venue: MediaArea.Venue)
} }
public protocol SharedAccountContext: AnyObject { public protocol SharedAccountContext: AnyObject {

2
submodules/HashtagSearchUI/Sources/HashtagSearchControllerNode.swift
View File

@ -478,7 +478,7 @@ final class HashtagSearchControllerNode: ASDisplayNode, ASGestureRecognizerDeleg
guard let self else { guard let self else {
return return
} }
let searchController = self.context.sharedContext.makeStorySearchController(context: self.context, query: self.query, listContext: self.globalStorySearchContext) let searchController = self.context.sharedContext.makeStorySearchController(context: self.context, scope: .query(self.query), listContext: self.globalStorySearchContext)
self.controller?.push(searchController) self.controller?.push(searchController)
} }
)), )),

17
submodules/TelegramCore/Sources/ApiUtils/StoreMessage_Telegram.swift
View File

@ -494,12 +494,12 @@ func mediaAreaFromApiMediaArea(_ mediaArea: Api.MediaArea) -> MediaArea? {
longitude = 0.0 longitude = 0.0
} }
var mappedAddress: MediaArea.Address? var mappedAddress: MapGeoAddress?
if let address { if let address {
switch address { switch address {
case let .geoPointAddress(_, countryIso2, state, city, street): case let .geoPointAddress(_, countryIso2, state, city, street):
mappedAddress = MediaArea.Address( mappedAddress = MapGeoAddress(
countryIso2: countryIso2, country: countryIso2,
state: state, state: state,
city: city, city: city,
street: street street: street
@ -507,7 +507,14 @@ func mediaAreaFromApiMediaArea(_ mediaArea: Api.MediaArea) -> MediaArea? {
} }
} }
return .venue(coordinates: coodinatesFromApiMediaAreaCoordinates(coordinates), venue: MediaArea.Venue(latitude: latitude, longitude: longitude, venue: nil, queryId: nil, resultId: nil), address: mappedAddress) return .venue(coordinates: coodinatesFromApiMediaAreaCoordinates(coordinates), venue: MediaArea.Venue(
latitude: latitude,
longitude: longitude,
venue: nil,
address: mappedAddress,
queryId: nil,
resultId: nil
))
case let .mediaAreaVenue(coordinates, geo, title, address, provider, venueId, venueType): case let .mediaAreaVenue(coordinates, geo, title, address, provider, venueId, venueType):
let latitude: Double let latitude: Double
let longitude: Double let longitude: Double
@ -546,7 +553,7 @@ func apiMediaAreasFromMediaAreas(_ mediaAreas: [MediaArea], transaction: Transac
let coordinates = area.coordinates let coordinates = area.coordinates
let inputCoordinates = Api.MediaAreaCoordinates.mediaAreaCoordinates(x: coordinates.x, y: coordinates.y, w: coordinates.width, h: coordinates.height, rotation: coordinates.rotation) let inputCoordinates = Api.MediaAreaCoordinates.mediaAreaCoordinates(x: coordinates.x, y: coordinates.y, w: coordinates.width, h: coordinates.height, rotation: coordinates.rotation)
switch area { switch area {
case let .venue(_, venue, address): case let .venue(_, venue):
if let queryId = venue.queryId, let resultId = venue.resultId { if let queryId = venue.queryId, let resultId = venue.resultId {
apiMediaAreas.append(.inputMediaAreaVenue(coordinates: inputCoordinates, queryId: queryId, resultId: resultId)) apiMediaAreas.append(.inputMediaAreaVenue(coordinates: inputCoordinates, queryId: queryId, resultId: resultId))
} else if let venueInfo = venue.venue { } else if let venueInfo = venue.venue {

3
submodules/TelegramUI/Components/MediaEditor/Sources/Drawing/CodableDrawingEntity.swift
View File

@ -119,8 +119,7 @@ public enum CodableDrawingEntity: Equatable {
address: entity.location.address, address: entity.location.address,
queryId: entity.queryId, queryId: entity.queryId,
resultId: entity.resultId resultId: entity.resultId
), )
address: nil
) )
case let .sticker(entity): case let .sticker(entity):
if case let .link(url, _, _, _, _, _, _) = entity.content { if case let .link(url, _, _, _, _, _, _) = entity.content {

13
submodules/TelegramUI/Components/PeerInfo/PeerInfoStoryGridScreen/Sources/StorySearchGridScreen.swift
View File

@ -24,13 +24,16 @@ final class StorySearchGridScreenComponent: Component {
let context: AccountContext let context: AccountContext
let scope: StorySearchControllerScope let scope: StorySearchControllerScope
let listContext: SearchStoryListContext?
init( init(
context: AccountContext, context: AccountContext,
scope: StorySearchControllerScope scope: StorySearchControllerScope,
listContext: SearchStoryListContext?
) { ) {
self.context = context self.context = context
self.scope = scope self.scope = scope
self.listContext = listContext
} }
static func ==(lhs: StorySearchGridScreenComponent, rhs: StorySearchGridScreenComponent) -> Bool { static func ==(lhs: StorySearchGridScreenComponent, rhs: StorySearchGridScreenComponent) -> Bool {
@ -98,8 +101,8 @@ final class StorySearchGridScreenComponent: Component {
switch component.scope { switch component.scope {
case let .query(query): case let .query(query):
paneNodeScope = .search(query: query) paneNodeScope = .search(query: query)
case let .location(coordinates, venue, address): case let .location(coordinates, venue):
paneNodeScope = .location(coordinates: coordinates, venue: venue, address: address) paneNodeScope = .location(coordinates: coordinates, venue: venue)
} }
paneNode = PeerInfoStoryPaneNode( paneNode = PeerInfoStoryPaneNode(
@ -235,10 +238,10 @@ public final class StorySearchGridScreen: ViewControllerComponentContainer {
} }
@objc private func sharePressed() { @objc private func sharePressed() {
guard case let .location(_, venue, _) = self.scope else { guard case let .location(_, venue) = self.scope else {
return return
} }
let locationMap = TelegramMediaMap(latitude: venue.latitude, longitude: venue.longitude, heading: nil, accuracyRadius: nil, geoPlace: nil, venue: nil, liveBroadcastingTimeout: nil, liveProximityNotificationRadius: nil) let locationMap = TelegramMediaMap(latitude: venue.latitude, longitude: venue.longitude, heading: nil, accuracyRadius: nil, venue: nil, address: venue.address, liveBroadcastingTimeout: nil, liveProximityNotificationRadius: nil)
let presentationData = self.context.sharedContext.currentPresentationData.with({ $0 }) let presentationData = self.context.sharedContext.currentPresentationData.with({ $0 })

10
submodules/TelegramUI/Components/PeerInfo/PeerInfoVisualMediaPaneNode/Sources/PeerInfoStoryPaneNode.swift
View File

@ -1445,7 +1445,7 @@ public final class PeerInfoStoryPaneNode: ASDisplayNode, PeerInfoPaneNode, ASScr
public enum Scope { public enum Scope {
case peer(id: EnginePeer.Id, isSaved: Bool, isArchived: Bool) case peer(id: EnginePeer.Id, isSaved: Bool, isArchived: Bool)
case search(query: String) case search(query: String)
case location(coordinates: MediaArea.Coordinates, venue: MediaArea.Venue, address: MediaArea.Address?) case location(coordinates: MediaArea.Coordinates, venue: MediaArea.Venue)
} }
public struct ZoomLevel { public struct ZoomLevel {
@ -1667,8 +1667,8 @@ public final class PeerInfoStoryPaneNode: ASDisplayNode, PeerInfoPaneNode, ASScr
self.listSource = PeerStoryListContext(account: context.account, peerId: id, isArchived: isArchived) self.listSource = PeerStoryListContext(account: context.account, peerId: id, isArchived: isArchived)
case let .search(query): case let .search(query):
self.listSource = SearchStoryListContext(account: context.account, source: .hashtag(query)) self.listSource = SearchStoryListContext(account: context.account, source: .hashtag(query))
case let .location(coordinates, venue, address): case let .location(coordinates, venue):
self.listSource = SearchStoryListContext(account: context.account, source: .location(coordinates: coordinates, venue: venue, address: address)) self.listSource = SearchStoryListContext(account: context.account, source: .mediaArea(.venue(coordinates: coordinates, venue: venue)))
} }
} }
self.calendarSource = nil self.calendarSource = nil
@ -2163,7 +2163,7 @@ public final class PeerInfoStoryPaneNode: ASDisplayNode, PeerInfoPaneNode, ASScr
self.preloadArchiveListContext = PeerStoryListContext(account: context.account, peerId: context.account.peerId, isArchived: true) self.preloadArchiveListContext = PeerStoryListContext(account: context.account, peerId: context.account.peerId, isArchived: true)
} }
if case let .location(_, venue, _) = scope, let mapNode = self.mapNode { if case let .location(_, venue) = scope, let mapNode = self.mapNode {
let locationCoordinate = CLLocationCoordinate2D(latitude: venue.latitude, longitude: venue.longitude) let locationCoordinate = CLLocationCoordinate2D(latitude: venue.latitude, longitude: venue.longitude)
var initialMapState = LocationViewState() var initialMapState = LocationViewState()
@ -2230,7 +2230,7 @@ public final class PeerInfoStoryPaneNode: ASDisplayNode, PeerInfoPaneNode, ASScr
let subjectLocation = CLLocation(latitude: locationCoordinate.latitude, longitude: locationCoordinate.longitude) let subjectLocation = CLLocation(latitude: locationCoordinate.latitude, longitude: locationCoordinate.longitude)
let distance = userLocation.flatMap { subjectLocation.distance(from: $0) } let distance = userLocation.flatMap { subjectLocation.distance(from: $0) }
let locationMap = TelegramMediaMap(latitude: locationCoordinate.latitude, longitude: locationCoordinate.longitude, heading: nil, accuracyRadius: nil, geoPlace: nil, venue: nil, liveBroadcastingTimeout: nil, liveProximityNotificationRadius: nil) let locationMap = TelegramMediaMap(latitude: locationCoordinate.latitude, longitude: locationCoordinate.longitude, heading: nil, accuracyRadius: nil, venue: nil, address: venue.address, liveBroadcastingTimeout: nil, liveProximityNotificationRadius: nil)
let mapInfoData = MapInfoData( let mapInfoData = MapInfoData(
location: locationMap, location: locationMap,

6
submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemSetContainerViewSendMessage.swift
View File

@ -2919,7 +2919,7 @@ final class StoryItemSetContainerSendMessage {
} }
if !hashtag.isEmpty { if !hashtag.isEmpty {
if peerName == nil { if peerName == nil {
let searchController = component.context.sharedContext.makeStorySearchController(context: component.context, scope: .query(hashtag)) let searchController = component.context.sharedContext.makeStorySearchController(context: component.context, scope: .query(hashtag), listContext: nil)
navigationController.pushViewController(searchController) navigationController.pushViewController(searchController)
} else { } else {
let searchController = component.context.sharedContext.makeHashtagSearchController(context: component.context, peer: peer.flatMap(EnginePeer.init), query: hashtag, all: true) let searchController = component.context.sharedContext.makeHashtagSearchController(context: component.context, peer: peer.flatMap(EnginePeer.init), query: hashtag, all: true)
@ -3346,7 +3346,7 @@ final class StoryItemSetContainerSendMessage {
var actions: [ContextMenuAction] = [] var actions: [ContextMenuAction] = []
switch mediaArea { switch mediaArea {
case let .venue(_, venue): case let .venue(coordinates, venue):
let action = { [weak controller, weak view] in let action = { [weak controller, weak view] in
let _ = view let _ = view
/*let subject = EngineMessage(stableId: 0, stableVersion: 0, id: EngineMessage.Id(peerId: PeerId(0), namespace: 0, id: 0), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, threadId: nil, timestamp: 0, flags: [], tags: [], globalTags: [], localTags: [], customTags: [], forwardInfo: nil, author: nil, text: "", attributes: [], media: [.geo(TelegramMediaMap(latitude: venue.latitude, longitude: venue.longitude, heading: nil, accuracyRadius: nil, geoPlace: nil, venue: venue.venue, liveBroadcastingTimeout: nil, liveProximityNotificationRadius: nil))], peers: [:], associatedMessages: [:], associatedMessageIds: [], associatedMedia: [:], associatedThreadInfo: nil, associatedStories: [:]) /*let subject = EngineMessage(stableId: 0, stableVersion: 0, id: EngineMessage.Id(peerId: PeerId(0), namespace: 0, id: 0), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, threadId: nil, timestamp: 0, flags: [], tags: [], globalTags: [], localTags: [], customTags: [], forwardInfo: nil, author: nil, text: "", attributes: [], media: [.geo(TelegramMediaMap(latitude: venue.latitude, longitude: venue.longitude, heading: nil, accuracyRadius: nil, geoPlace: nil, venue: venue.venue, liveBroadcastingTimeout: nil, liveProximityNotificationRadius: nil))], peers: [:], associatedMessages: [:], associatedMessageIds: [], associatedMedia: [:], associatedThreadInfo: nil, associatedStories: [:])
@ -3373,7 +3373,7 @@ final class StoryItemSetContainerSendMessage {
} }
controller?.push(locationController)*/ controller?.push(locationController)*/
let searchController = context.sharedContext.makeStorySearchController(context: context, scope: .location(coordinates: coordinates, venue: venue, address: address)) let searchController = context.sharedContext.makeStorySearchController(context: context, scope: .location(coordinates: coordinates, venue: venue), listContext: nil)
controller?.push(searchController) controller?.push(searchController)
} }
if immediate { if immediate {