From 324d36af7dde0a1866a3b1891ecb28c5150e1dc3 Mon Sep 17 00:00:00 2001 From: Jack Cook Date: Mon, 12 Jun 2017 21:56:30 -0400 Subject: [PATCH] Temporarily revert mixer.com -> beam.pro --- MixerAPI.podspec | 4 ++-- Pod/Classes/Clients/ConstellationClient.swift | 2 +- Pod/Classes/Routes/ChannelsRoutes.swift | 2 +- Pod/Classes/Routes/ChatRoutes.swift | 2 +- Pod/Classes/Utilities/MixerRequest.swift | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MixerAPI.podspec b/MixerAPI.podspec index 82841f8..3f41462 100644 --- a/MixerAPI.podspec +++ b/MixerAPI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "MixerAPI" - s.version = "1.6.1" + s.version = "1.6.2" s.summary = "An interface to communicate with Mixer's backend." s.homepage = "https://github.com/mixer/mixer-client-swift" s.license = "MIT" @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.requires_arc = true s.ios.deployment_target = "8.2" - s.source = { :git => "https://github.com/mixer/mixer-client-swift.git", :tag => "1.6.1" } + s.source = { :git => "https://github.com/mixer/mixer-client-swift.git", :tag => "1.6.2" } s.source_files = "Pod/Classes/**/*" s.dependency "Starscream", "~> 2.0" diff --git a/Pod/Classes/Clients/ConstellationClient.swift b/Pod/Classes/Clients/ConstellationClient.swift index bec499e..f4e437c 100644 --- a/Pod/Classes/Clients/ConstellationClient.swift +++ b/Pod/Classes/Clients/ConstellationClient.swift @@ -37,7 +37,7 @@ public class ConstellationClient: WebSocketDelegate { public func connect(_ delegate: ConstellationClientDelegate) { self.delegate = delegate - socket = WebSocket(url: URL(string: "wss://constellation.mixer.com")!) + socket = WebSocket(url: URL(string: "wss://constellation.beam.pro")!) socket?.delegate = self socket?.headers["User-Agent"] = "IOSApp/\(MixerRequest.version) (iOS; \(MixerRequest.deviceName()))" socket?.connect() diff --git a/Pod/Classes/Routes/ChannelsRoutes.swift b/Pod/Classes/Routes/ChannelsRoutes.swift index 99001c1..6783bb0 100644 --- a/Pod/Classes/Routes/ChannelsRoutes.swift +++ b/Pod/Classes/Routes/ChannelsRoutes.swift @@ -340,7 +340,7 @@ public class ChannelsRoutes { :param: completion An optional completion block with the retrieved emoticon packs' data. */ public func getDefaultEmoticons(_ completion: ((_ packs: [MixerEmoticonPack]?, _ error: MixerRequestError?) -> Void)?) { - MixerRequest.dataRequest("https://mixer.com/_latest/emoticons/manifest.json") { (data, error) in + MixerRequest.dataRequest("https://beam.pro/_latest/emoticons/manifest.json") { (data, error) in guard let data = data, let packs = JSON(data: data).dictionary else { completion?(nil, error) return diff --git a/Pod/Classes/Routes/ChatRoutes.swift b/Pod/Classes/Routes/ChatRoutes.swift index 4f37150..27983ab 100644 --- a/Pod/Classes/Routes/ChatRoutes.swift +++ b/Pod/Classes/Routes/ChatRoutes.swift @@ -191,7 +191,7 @@ public class ChatRoutes { :returns: The finished spacesuit image. */ public func getSpaceSuit(_ userId: Int) -> UIImage? { - let imageUrl = "https://mixer.com/api/v1/users/\(userId)/avatar?w=64&h=64" + let imageUrl = "https://beam.pro/api/v1/users/\(userId)/avatar?w=64&h=64" guard let url = URL(string: imageUrl) else { return nil diff --git a/Pod/Classes/Utilities/MixerRequest.swift b/Pod/Classes/Utilities/MixerRequest.swift index 3c4dcb6..7302df2 100644 --- a/Pod/Classes/Utilities/MixerRequest.swift +++ b/Pod/Classes/Utilities/MixerRequest.swift @@ -45,7 +45,7 @@ public class MixerRequest { :param: completion An optional completion block with retrieved JSON data. */ public class func request(_ endpoint: String, requestType: String = "GET", headers: [String: String] = [String: String](), params: [String: String] = [String: String](), body: AnyObject? = nil, options: MixerRequestOptions = [], completion: ((_ json: JSON?, _ error: MixerRequestError?) -> Void)?) { - MixerRequest.dataRequest("https://mixer.com/api/v1\(endpoint)", requestType: requestType, headers: headers, params: params, body: body, options: options) { (data, error) in + MixerRequest.dataRequest("https://beam.pro/api/v1\(endpoint)", requestType: requestType, headers: headers, params: params, body: body, options: options) { (data, error) in guard let data = data else { completion?(nil, error) return