Merge pull request #3 from IanKeen/RTMAPI-cleanup

RTMAPI Updates
IanKeen · Jun 15, 2016 · 4540a80 · 4540a80
2 parents d7340b8 + 3bfb619
commit 4540a80
Show file tree

Hide file tree

Showing 67 changed files with 294 additions and 201 deletions.
diff --git a/Sources/App/Services/HelloBot.swift b/Sources/App/Services/HelloBot.swift
@@ -1,6 +1,6 @@
 //
 //  HelloBot.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 4/06/2016.
 //

diff --git a/Sources/App/Services/KarmaBot.swift b/Sources/App/Services/KarmaBot.swift
@@ -1,6 +1,6 @@
 //
 //  KarmaBot.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 21/05/2016.
 //  Copyright © 2016 Mustard. All rights reserved.

diff --git a/Sources/App/main.swift b/Sources/App/main.swift
@@ -1,6 +1,6 @@
 //
 //  main.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 28/05/2016.
 //  Copyright © 2016 Mustard. All rights reserved.

diff --git a/Sources/Bot/Adaptors/MessageAdaptor.swift b/Sources/Bot/Adaptors/MessageAdaptor.swift
@@ -1,6 +1,6 @@
 //
 //  MessageAdaptor.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 21/05/2016.
 //  Copyright © 2016 Mustard. All rights reserved.
@@ -73,7 +73,7 @@ public struct MessageAdaptor {
     }
 
     //MARK: - Lifecycle
-    internal init(message: Message, slackModels: SlackBot.SlackModelClosure) {
+    init(message: Message, slackModels: SlackBot.SlackModelClosure) {
         self.message = message
         self.slackModels = slackModels
     }
@@ -84,7 +84,7 @@ extension MessageAdaptor {
         public let link: String
         public let displayText: String
 
-        internal init?(link: String) {
+        init?(link: String) {
             let components = link.components(separatedBy: "|")
 
             guard
@@ -98,7 +98,7 @@ extension MessageAdaptor {
 }
 
 extension Message {
-    internal func toAdaptor(slackModels: SlackBot.SlackModelClosure) -> MessageAdaptor {
+    func toAdaptor(slackModels: SlackBot.SlackModelClosure) -> MessageAdaptor {
         return MessageAdaptor(message: self, slackModels: slackModels)
     }
 }
diff --git a/Sources/Bot/Builders/SlackMessageBuilder+Operators.swift b/Sources/Bot/Builders/SlackMessageBuilder+Operators.swift
@@ -1,6 +1,6 @@
 //
 //  SlackMessageBuilder+Operators.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 6/06/2016.
 //

diff --git a/Sources/Bot/Builders/SlackMessageBuilder.swift b/Sources/Bot/Builders/SlackMessageBuilder.swift
@@ -1,6 +1,6 @@
 //
 //  SlackMessageBuilder.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 6/06/2016.
 //

diff --git a/Sources/Bot/Services/Storage/MemoryStorage.swift b/Sources/Bot/Services/Storage/MemoryStorage.swift
@@ -1,6 +1,6 @@
 //
 //  MemoryStorage.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 24/05/2016.
 //  Copyright © 2016 Mustard. All rights reserved.

diff --git a/Sources/Bot/Services/Storage/PlistStorage.swift b/Sources/Bot/Services/Storage/PlistStorage.swift
@@ -1,6 +1,6 @@
 ////
 ////  PlistStorage.swift
-////  Slack
+//// Chameleon
 ////
 ////  Created by Ian Keen on 23/05/2016.
 ////  Copyright © 2016 Mustard. All rights reserved.

diff --git a/Sources/Bot/Services/Storage/Storage.swift b/Sources/Bot/Services/Storage/Storage.swift
@@ -1,6 +1,6 @@
 //
 //  Storage.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 23/05/2016.
 //  Copyright © 2016 Mustard. All rights reserved.

diff --git a/Sources/Bot/SlackBot+API.swift b/Sources/Bot/SlackBot+API.swift
@@ -1,6 +1,6 @@
 //
 //  SlackBot+API.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 19/05/2016.
 //  Copyright © 2016 Mustard. All rights reserved.

diff --git a/Sources/Bot/SlackBot+Config.swift b/Sources/Bot/SlackBot+Config.swift
@@ -1,6 +1,6 @@
 //
 //  SlackBot+Config.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 19/05/2016.
 //  Copyright © 2016 Mustard. All rights reserved.

diff --git a/Sources/Bot/SlackBot+Convenience.swift b/Sources/Bot/SlackBot+Convenience.swift
@@ -1,6 +1,6 @@
 //
 //  SlackBot+Convenience.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 7/06/2016.
 //

diff --git a/Sources/Bot/SlackBot+Interaction.swift b/Sources/Bot/SlackBot+Interaction.swift
@@ -1,6 +1,6 @@
 //
 //  SlackBot+Interaction.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 21/05/2016.
 //  Copyright © 2016 Mustard. All rights reserved.

diff --git a/Sources/Bot/SlackBot.swift b/Sources/Bot/SlackBot.swift
@@ -1,6 +1,6 @@
 //
 //  SlackBot.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 19/05/2016.
 //  Copyright © 2016 Mustard. All rights reserved.
@@ -37,16 +37,16 @@ public class SlackBot {
         }
     }
 
-    //MARK: - Internal Properties
-    internal let webAPI: WebAPI
-    internal let rtmAPI: RTMAPI
-    internal private(set) var botUser: BotUser?
-    internal private(set) var team: Team?
-    internal private(set) var users: [User] = []
-    internal private(set) var channels: [Channel] = []
-    internal private(set) var groups: [Group] = []
-    internal private(set) var ims: [IM] = []
-    //internal private(set) var mpims: [MPIM] = []
+    //MARK: - Properties
+    let webAPI: WebAPI
+    let rtmAPI: RTMAPI
+    private(set) var botUser: BotUser?
+    private(set) var team: Team?
+    private(set) var users: [User] = []
+    private(set) var channels: [Channel] = []
+    private(set) var groups: [Group] = []
+    private(set) var ims: [IM] = []
+    //private(set) var mpims: [MPIM] = []
 
     //MARK: - Public Properties
     public private(set) var storage: Storage
@@ -189,7 +189,7 @@ extension SlackBot {
         guard self.state.ready else { return }
         self.apis.forEach { $0.event(slackBot: self, event: event, webApi: self.webAPI) }
     }
-    internal func notify(error: ErrorProtocol) {
+    func notify(error: ErrorProtocol) {
         guard self.state.ready else { return }
         self.apis.forEach { $0.error(slackBot: self, error: error) }
     }
@@ -257,7 +257,7 @@ extension SlackBot {
 
 //MARK: - Model Helpers
 extension SlackBot {
-    internal typealias SlackModelClosure = WebAPI.SlackModelClosure
+    typealias SlackModelClosure = WebAPI.SlackModelClosure
 
     private func slackModels() -> SlackModelClosure {
         return {

diff --git a/Sources/Common/Box.swift b/Sources/Common/Box.swift
@@ -1,6 +1,6 @@
 //
 //  Box.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 22/05/2016.
 //  Copyright © 2016 Mustard. All rights reserved.

diff --git a/Sources/Common/Dictionary+Extensions.swift b/Sources/Common/Dictionary+Extensions.swift
@@ -1,6 +1,6 @@
 //
 //  Dictionary+Extensions.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 11/05/2016.
 //  Copyright © 2016 Mustard. All rights reserved.

diff --git a/Sources/Common/Int+Extensions.swift b/Sources/Common/Int+Extensions.swift
@@ -1,6 +1,6 @@
 //
 //  Int+Extensions.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 8/06/2016.
 //

diff --git a/Sources/Common/JSON+KeyPath.swift b/Sources/Common/JSON+KeyPath.swift
@@ -1,6 +1,6 @@
 //
 //  JSON+KeyPath.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 8/06/2016.
 //

diff --git a/Sources/Common/Sequence+Extensions.swift b/Sources/Common/Sequence+Extensions.swift
@@ -1,6 +1,6 @@
 //
 //  Sequence+Extensions.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 10/06/2016.
 //

diff --git a/Sources/Models/BotUser.swift b/Sources/Models/BotUser.swift
@@ -1,6 +1,6 @@
 //
 //  BotUser.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 20/05/2016.
 //  Copyright © 2016 Mustard. All rights reserved.

diff --git a/Sources/Models/Channel.swift b/Sources/Models/Channel.swift
@@ -1,6 +1,6 @@
 //
 //  Channel.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 25/05/2016.
 //  Copyright © 2016 Mustard. All rights reserved.

diff --git a/Sources/Models/CustomEmoji.swift b/Sources/Models/CustomEmoji.swift
@@ -1,6 +1,6 @@
 //
 //  CustomEmoji.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 6/06/2016.
 //

diff --git a/Sources/Models/DefaultValueType.swift b/Sources/Models/DefaultValueType.swift
@@ -1,6 +1,6 @@
 //
 //  DefaultValueType.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 20/05/2016.
 //  Copyright © 2016 Mustard. All rights reserved.

diff --git a/Sources/Models/Emoji.swift b/Sources/Models/Emoji.swift
@@ -1,6 +1,6 @@
 //
 //  Emoji.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 6/06/2016.
 //

diff --git a/Sources/Models/Extensions/User+Extensions.swift b/Sources/Models/Extensions/User+Extensions.swift
@@ -1,6 +1,6 @@
 //
 //  User+Extensions.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 21/05/2016.
 //  Copyright © 2016 Mustard. All rights reserved.

diff --git a/Sources/Models/Group.swift b/Sources/Models/Group.swift
@@ -1,6 +1,6 @@
 //
 //  Group.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 25/05/2016.
 //  Copyright © 2016 Mustard. All rights reserved.

diff --git a/Sources/Models/IM.swift b/Sources/Models/IM.swift
@@ -1,6 +1,6 @@
 //
 //  IM.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 25/05/2016.
 //  Copyright © 2016 Mustard. All rights reserved.

diff --git a/Sources/Models/IdentifiableType.swift b/Sources/Models/IdentifiableType.swift
@@ -1,6 +1,6 @@
 //
 //  IdentifiableType.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 21/05/2016.
 //  Copyright © 2016 Mustard. All rights reserved.

diff --git a/Sources/Models/Message+Attachment.swift b/Sources/Models/Message+Attachment.swift
@@ -1,6 +1,6 @@
 //
 //  Message+Attachment.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 23/05/2016.
 //  Copyright © 2016 Mustard. All rights reserved.

diff --git a/Sources/Models/Message+Edit.swift b/Sources/Models/Message+Edit.swift
@@ -1,6 +1,6 @@
 //
 //  Message+Edit.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 23/05/2016.
 //  Copyright © 2016 Mustard. All rights reserved.

diff --git a/Sources/Models/Message+ItemType.swift b/Sources/Models/Message+ItemType.swift
@@ -1,6 +1,6 @@
 //
 //  Message+ItemType.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 23/05/2016.
 //  Copyright © 2016 Mustard. All rights reserved.

diff --git a/Sources/Models/Message+Reaction.swift b/Sources/Models/Message+Reaction.swift
@@ -1,6 +1,6 @@
 //
 //  Message+Reaction.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 23/05/2016.
 //  Copyright © 2016 Mustard. All rights reserved.

diff --git a/Sources/Models/Message+SubType.swift b/Sources/Models/Message+SubType.swift
@@ -1,6 +1,6 @@
 //
 //  Message+SubType.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 23/05/2016.
 //  Copyright © 2016 Mustard. All rights reserved.

diff --git a/Sources/Models/Message.swift b/Sources/Models/Message.swift
@@ -1,6 +1,6 @@
 //
 //  Message.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 21/05/2016.
 //  Copyright © 2016 Mustard. All rights reserved.

diff --git a/Sources/Models/Purpose.swift b/Sources/Models/Purpose.swift
@@ -1,6 +1,6 @@
 //
 //  Purpose.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 23/05/2016.
 //  Copyright © 2016 Mustard. All rights reserved.

diff --git a/Sources/Models/SlackModelBuilder.swift b/Sources/Models/SlackModelBuilder.swift
@@ -1,6 +1,6 @@
 //
 //  SlackModelBuilder.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 20/05/2016.
 //  Copyright © 2016 Mustard. All rights reserved.

diff --git a/Sources/Models/SlackModelType.swift b/Sources/Models/SlackModelType.swift
@@ -1,6 +1,6 @@
 //
 //  SlackModelType.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 20/05/2016.
 //  Copyright © 2016 Mustard. All rights reserved.
@@ -14,7 +14,7 @@ public protocol SlackModelType {
     static func make(builder: SlackModelBuilder) throws -> Self
 }
 
-internal func tryMake<T: SlackModelType>(_ op: @autoclosure () throws -> T) throws -> T {
+func tryMake<T: SlackModelType>(_ op: @autoclosure () throws -> T) throws -> T {
     do { return try op() }
     catch let error { throw SlackModelTypeError.BuildError(type: T.self, error: error) }
 }
diff --git a/Sources/Models/SlackModelTypeIdentifiable.swift b/Sources/Models/SlackModelTypeIdentifiable.swift
@@ -1,6 +1,6 @@
 //
 //  SlackModelTypeIdentifiable.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 20/05/2016.
 //  Copyright © 2016 Mustard. All rights reserved.

diff --git a/Sources/Models/Target.swift b/Sources/Models/Target.swift
@@ -1,6 +1,6 @@
 //
 //  Target.swift
-//  Slack
+// Chameleon
 //
 //  Created by Ian Keen on 20/05/2016.
 //  Copyright © 2016 Mustard. All rights reserved.