Vapor3

.travis.yml

@@ -1,11 +1,11 @@
 matrix:
   include:
     - os: linux
-      dist: trusty
+      dist: bionic
       sudo: required
       language: generic
     - os: osx
-      osx_image: xcode9.3
+      osx_image: xcode11
       language: objective-c
 branches:
   only:

.travis/before_install.sh

@@ -7,9 +7,9 @@ if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
     brew install libsodium
     brew install opus
 else
-    # Install Swift, Vapor and Opus
+    # Install Vapor and Opus
     eval "$(curl -sL https://apt.vapor.sh)"
-    sudo apt-get install swift vapor libopus-dev
+    sudo apt-get install vapor libopus-dev
 
     # Sodium
     wget https://download.libsodium.org/libsodium/releases/libsodium-1.0.16.tar.gz

.travis/run.sh

@@ -1,7 +1,16 @@
 #!/bin/bash
 
 if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
-    swift test -Xlinker -L/usr/local/lib -Xlinker -lopus -Xcc -I/usr/local/include
+    swift test
 else
-    swift test -Xlinker -L/usr/lib -Xlinker -lopus -Xcc -I/usr/include
+    git clone https://github.com/kylef/swiftenv.git ~/.swiftenv
+    echo 'export SWIFTENV_ROOT="$HOME/.swiftenv"' >> ~/.bash_profile
+    echo 'export PATH="$SWIFTENV_ROOT/bin:$PATH"' >> ~/.bash_profile
+    echo 'eval "$(swiftenv init -)"' >> ~/.bash_profile
+    source ~/.bash_profile
+
+    # Swift
+    swiftenv install 5.1 && swiftenv global 5.1
+    swift --version
+    swift test
 fi

Package.resolved

@@ -2,12 +2,12 @@
   "object": {
     "pins": [
       {
-        "package": "Bits",
-        "repositoryURL": "https://github.com/vapor/bits.git",
+        "package": "Socket",
+        "repositoryURL": "https://github.com/IBM-Swift/BlueSocket",
         "state": {
           "branch": null,
-          "revision": "c32f5e6ae2007dccd21a92b7e33eba842dd80d2f",
-          "version": "1.1.0"
+          "revision": "c46a3d41f5b2401d18bcb46d0101cdc5cd13e307",
+          "version": "1.0.52"
         }
       },
       {
@@ -20,84 +20,48 @@
         }
       },
       {
-        "package": "Core",
-        "repositoryURL": "https://github.com/vapor/core.git",
-        "state": {
-          "branch": null,
-          "revision": "f9f3a585ab0ea5764b46d7a36d9c0d9d508b9c63",
-          "version": "2.2.0"
-        }
-      },
-      {
-        "package": "Crypto",
-        "repositoryURL": "https://github.com/vapor/crypto.git",
-        "state": {
-          "branch": null,
-          "revision": "946edc6642d6825982a2f52a268a8ba9bd520a3d",
-          "version": "2.1.2"
-        }
-      },
-      {
-        "package": "CTLS",
-        "repositoryURL": "https://github.com/vapor/ctls.git",
-        "state": {
-          "branch": null,
-          "revision": "fba1297f4986a4dac8b02f7ac4e84a77fd492e4c",
-          "version": "1.1.3"
-        }
-      },
-      {
-        "package": "Debugging",
-        "repositoryURL": "https://github.com/vapor/debugging.git",
-        "state": {
-          "branch": null,
-          "revision": "fc5a27d6eb236141dc24e5f14eedaa2e035ae7b3",
-          "version": "1.1.1"
-        }
-      },
-      {
-        "package": "Engine",
-        "repositoryURL": "https://github.com/vapor/engine",
+        "package": "Sodium",
+        "repositoryURL": "https://github.com/nuclearace/Sodium",
         "state": {
           "branch": null,
-          "revision": "0ecc50fa8c7bc03ec9af78ca37e3b57f192bd258",
-          "version": "2.2.4"
+          "revision": "5812a3d879b77aae0fdfbd62d0e8354e914d15ae",
+          "version": "2.0.0"
         }
       },
       {
-        "package": "Random",
-        "repositoryURL": "https://github.com/vapor/random.git",
+        "package": "swift-log",
+        "repositoryURL": "https://github.com/apple/swift-log.git",
         "state": {
           "branch": null,
-          "revision": "d7c4397d125caba795d14d956efacfe2a27a63d0",
+          "revision": "74d7b91ceebc85daf387ebb206003f78813f71aa",
           "version": "1.2.0"
         }
       },
       {
-        "package": "Sockets",
-        "repositoryURL": "https://github.com/vapor/sockets.git",
+        "package": "swift-nio",
+        "repositoryURL": "https://github.com/apple/swift-nio.git",
         "state": {
           "branch": null,
-          "revision": "79fc180cdcb451dbbb01b1156be36720adde80e0",
-          "version": "2.2.3"
+          "revision": "c5fa0b456524cd73dc3ddbb263d4f46c20b86ca3",
+          "version": "2.17.0"
         }
       },
       {
-        "package": "Sodium",
-        "repositoryURL": "https://github.com/nuclearace/Sodium",
+        "package": "swift-nio-ssl",
+        "repositoryURL": "https://github.com/apple/swift-nio-ssl.git",
         "state": {
           "branch": null,
-          "revision": "5812a3d879b77aae0fdfbd62d0e8354e914d15ae",
-          "version": "2.0.0"
+          "revision": "ccf96bbe65ecc7c1558ab0dba7ffabdea5c1d31f",
+          "version": "2.4.4"
         }
       },
       {
-        "package": "TLS",
-        "repositoryURL": "https://github.com/vapor/tls.git",
+        "package": "websocket-kit",
+        "repositoryURL": "https://github.com/vapor/websocket-kit",
         "state": {
           "branch": null,
-          "revision": "02a47309249e69358aa3c28b5853897585d7a750",
-          "version": "2.1.2"
+          "revision": "021edd1ca55451ad15b3e84da6b4064e4b877b34",
+          "version": "2.1.0"
         }
       }
     ]

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:4.0
+// swift-tools-version:5.1
 
 // The MIT License (MIT)
 // Copyright (c) 2016 Erik Little
@@ -20,27 +20,26 @@
 import PackageDescription
 
 var deps: [Package.Dependency] = [
+    .package(url: "https://github.com/vapor/websocket-kit", .upToNextMinor(from: "2.1.0")),
+    .package(url: "https://github.com/IBM-Swift/BlueSocket", .upToNextMinor(from: "1.0.0")),
     .package(url: "https://github.com/nuclearace/copus", .upToNextMinor(from: "2.1.1")),
     .package(url: "https://github.com/nuclearace/Sodium", .upToNextMinor(from: "2.0.0")),
-    .package(url: "https://github.com/vapor/engine", .upToNextMinor(from: "2.2.0")),
+    .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
 ]
 
-var targetDeps: [Target.Dependency] = ["WebSockets"]
-
-#if !os(Linux)
-deps += [.package(url: "https://github.com/daltoniam/Starscream", .upToNextMinor(from: "3.0.0")),]
-targetDeps += ["Starscream"]
-#endif
-
+var targetDeps: [Target.Dependency] = ["WebSocketKit", "COPUS", "Sodium", "Socket", "Logging"]
 
 let package = Package(
     name: "SwiftDiscord",
+    platforms: [.macOS(.v10_15)],
     products: [
         .library(name: "SwiftDiscord", targets: ["SwiftDiscord"])
     ],
     dependencies: deps,
     targets: [
         .target(name: "SwiftDiscord", dependencies: targetDeps),
+//        .systemLibrary(name: "COPUS", pkgConfig: "opus"),
+//        .systemLibrary(name: "Sodium", pkgConfig: "libsodium"),
         .testTarget(name: "SwiftDiscordTests", dependencies: ["SwiftDiscord"]),
     ]
 )

Sources/COPUS/module.modulemap

@@ -0,0 +1,5 @@
+module COPUS [system] {
+  header "shim.h"
+  link "opus"
+  export *
+}

Sources/COPUS/shim.h

@@ -0,0 +1,22 @@
+#ifndef __COPUS_SHIM_H__
+#define __COPUS_SHIM_H__
+
+#include <opus.h>
+
+int configure_encoder(OpusEncoder *enc, int bitrate, int vbr)
+{
+    int err;
+
+    err = opus_encoder_ctl(enc, OPUS_SET_BITRATE(bitrate));
+    err = opus_encoder_ctl(enc, OPUS_SET_VBR(vbr));
+
+    return err;
+}
+
+int configure_decoder(OpusDecoder *dec, int gain)
+{
+    return opus_decoder_ctl(dec, OPUS_SET_GAIN(gain));
+}
+
+
+#endif

Sources/Sodium/module.modulemap

@@ -0,0 +1,5 @@
+module Sodium [system] {
+  header "shim.h"
+  link "sodium"
+  export *
+}

Sources/Sodium/shim.h

@@ -0,0 +1,6 @@
+#ifndef __SODIUM_SHIM_H__
+#define __SODIUM_SHIM_H__
+
+#include <sodium.h>
+
+#endif

Sources/SwiftDiscord/Audit/DiscordAuditLogEntry.swift

@@ -32,7 +32,7 @@ public struct DiscordAuditLogEntry {
 
     // TODO An actual struct for this?
     /// Optional audit entry information for certain action types.
-    /// [Structure](https://discordapp.com/developers/docs/resources/audit-log#audit-log-entry-object-optional-audit-entry-info)
+    /// [Structure](https://discord.com/developers/docs/resources/audit-log#audit-log-entry-object-optional-audit-entry-info)
     public let options: [String: Any]
 
     /// The reason for this entry.

Sources/SwiftDiscord/Channel/DiscordChannel.swift

@@ -16,8 +16,15 @@
 // DEALINGS IN THE SOFTWARE.
 
 import Foundation
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
+import Logging
+
 import class Dispatch.DispatchSemaphore
 
+fileprivate let logger = Logger(label: "DiscordChannel")
+
 /// Protocol that declares a type will be a Discord channel.
 public protocol DiscordChannel : DiscordClientHolder {
     // MARK: Properties
@@ -56,7 +63,7 @@ public extension DiscordChannel {
     // MARK: Properties
 
     /// - returns: The guild that this channel is associated with. Or nil if this channel has no guild.
-    public var guild: DiscordGuild? {
+    var guild: DiscordGuild? {
         return client?.guildForChannel(id)
     }
 
@@ -65,10 +72,10 @@ public extension DiscordChannel {
     ///
     /// Deletes this channel.
     ///
-    public func delete(reason: String? = nil) {
+    func delete(reason: String? = nil) {
         guard let client = self.client else { return }
 
-        DefaultDiscordLogger.Logger.log("Deleting channel: \(id)", type: "DiscordChannel")
+        logger.info("Deleting channel: \(id)")
 
         client.deleteChannel(id, reason: reason)
     }
@@ -78,7 +85,7 @@ public extension DiscordChannel {
     ///
     /// - parameter options: An array of `DiscordEndpointOptions.ModifyChannel`
     ///
-    public func modifyChannel(options: [DiscordEndpoint.Options.ModifyChannel], reason: String? = nil) {
+    func modifyChannel(options: [DiscordEndpoint.Options.ModifyChannel], reason: String? = nil) {
         guard let client = self.client else { return }
 
         client.modifyChannel(id, options: options, reason: reason)
@@ -93,7 +100,7 @@ public extension DiscordTextChannel {
     ///
     /// - parameter message: The message to pin
     ///
-    public func pinMessage(_ message: DiscordMessage) {
+    func pinMessage(_ message: DiscordMessage) {
         guard let client = self.client else { return }
 
         client.addPinnedMessage(message.id, on: id)
@@ -104,7 +111,7 @@ public extension DiscordTextChannel {
     ///
     /// - parameter message: The message to delete
     ///
-    public func deleteMessage(_ message: DiscordMessage) {
+    func deleteMessage(_ message: DiscordMessage) {
         guard let client = self.client else { return }
 
         client.deleteMessage(message.id, on: id)
@@ -115,7 +122,7 @@ public extension DiscordTextChannel {
     ///
     /// - parameter callback: The callback.
     ///
-    public func getPinnedMessages(callback: @escaping ([DiscordMessage], HTTPURLResponse?) -> ()) {
+    func getPinnedMessages(callback: @escaping ([DiscordMessage], HTTPURLResponse?) -> ()) {
         guard let client = self.client else { return callback([], nil) }
 
         client.getPinnedMessages(for: id) {pins, response in
@@ -144,7 +151,7 @@ public extension DiscordTextChannel {
     ///
     /// - parameter message: The message to send.
     ///
-    public func send(_ message: DiscordMessage) {
+    func send(_ message: DiscordMessage) {
         guard let client = self.client else { return }
 
         client.sendMessage(message, to: id)
@@ -153,7 +160,7 @@ public extension DiscordTextChannel {
     ///
     /// Sends that this user is typing on this channel.
     ///
-    public func triggerTyping() {
+    func triggerTyping() {
         guard let client = self.client else { return }
 
         client.triggerTyping(on: id)
@@ -164,7 +171,7 @@ public extension DiscordTextChannel {
     ///
     /// - parameter message: The message to unpin.
     ///
-    public func unpinMessage(_ message: DiscordMessage) {
+    func unpinMessage(_ message: DiscordMessage) {
         guard let client = self.client else { return }
 
         client.deletePinnedMessage(message.id, on: id)