Skip to content

Commit 40f078a

Browse files
authored
Merge pull request #171 from fwcd/discord-api-v10
Migrate to Discord API v10
2 parents dac0f5f + f915bd6 commit 40f078a

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

Diff for: Package.resolved

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"originHash" : "c6ae4c140de386ef7bd40fa61d968c22c06b4f89a844cb2bc394fb2bde4599c6",
2+
"originHash" : "9990b4979d5f1ffd728d0e5c2ddb5f8f39df4cfd47ed6db5500a970eaf4f1507",
33
"pins" : [
44
{
55
"identity" : "async-http-client",
@@ -167,8 +167,8 @@
167167
"kind" : "remoteSourceControl",
168168
"location" : "https://github.com/fwcd/swift-discord.git",
169169
"state" : {
170-
"revision" : "fb02932ae2984cb12286a993ad518a1df54d02b1",
171-
"version" : "12.0.2"
170+
"revision" : "2f8b9079488b0d8f78377a8d7ac6d6669efcc381",
171+
"version" : "13.0.0"
172172
}
173173
},
174174
{

Diff for: Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ let package = Package(
1111
],
1212
dependencies: [
1313
// Dependencies declare other packages that this package depends on.
14-
.package(url: "https://github.com/fwcd/swift-discord.git", .upToNextMinor(from: "12.0.2")),
14+
.package(url: "https://github.com/fwcd/swift-discord.git", from: "13.0.0"),
1515
.package(url: "https://github.com/attaswift/BigInt.git", from: "5.3.0"),
1616
.package(url: "https://github.com/scinfu/SwiftSoup.git", from: "2.4.3"),
1717
.package(url: "https://github.com/apple/swift-log.git", from: "1.4.2"),

Diff for: Sources/D2DiscordIO/DiscordMessageConverter.swift

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@ import Discord
55

66
extension Message: DiscordAPIConvertible {
77
public var usingDiscordAPI: DiscordMessage {
8-
let embed: Embed? = embeds.first
98
return DiscordMessage(
109
content: content,
11-
embed: embed?.usingDiscordAPI,
10+
embeds: embeds.usingDiscordAPI,
1211
files: files.usingDiscordAPI,
1312
tts: tts,
1413
components: components.usingDiscordAPI
@@ -20,7 +19,7 @@ extension Message.Edit: DiscordAPIConvertible {
2019
public var usingDiscordAPI: DiscordMessage.Edit {
2120
return DiscordMessage.Edit(
2221
content: content,
23-
embed: embed?.usingDiscordAPI,
22+
embeds: embeds?.usingDiscordAPI,
2423
components: components?.usingDiscordAPI
2524
)
2625
}

Diff for: Sources/D2MessageIO/Structures/Message.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -109,16 +109,16 @@ public struct Message: ExpressibleByStringLiteral {
109109

110110
public struct Edit {
111111
public var content: String?
112-
public var embed: Embed?
112+
public var embeds: [Embed]?
113113
public var components: [Component]?
114114

115115
public init(
116116
content: String? = nil,
117-
embed: Embed? = nil,
117+
embeds: [Embed]? = nil,
118118
components: [Component]? = nil
119119
) {
120120
self.content = content
121-
self.embed = embed
121+
self.embeds = embeds
122122
self.components = components
123123
}
124124
}

0 commit comments

Comments
 (0)