diff --git a/extra/admin-api/Tests/Spacebar.Tests/Tests/MessageTests.cs b/extra/admin-api/Tests/Spacebar.Tests/Tests/MessageTests.cs
index 666afdfa..334572f0 100644
--- a/extra/admin-api/Tests/Spacebar.Tests/Tests/MessageTests.cs
+++ b/extra/admin-api/Tests/Spacebar.Tests/Tests/MessageTests.cs
@@ -92,7 +92,7 @@ public class MessageTests(ITestOutputHelper testOutputHelper, TestFixture fixtur
var res = await Assert.HttpSuccess(await Client.ApiHttpClient.PostAsync($"channels/{Channel.Id}/messages", content,
cancellationToken: TestContext.Current.CancellationToken));
- var json = (await res.Content.ReadFromJsonAsync<JsonObject>());
+ var json = (await res.Content.ReadFromJsonAsync<JsonObject>(cancellationToken: TestContext.Current.CancellationToken));
testOutputHelper.WriteLine(json.ToJson(indent: true));
var msg = json.Deserialize<Message>();
Assert.Equal("meow", msg.Content);
@@ -109,33 +109,40 @@ public class MessageTests(ITestOutputHelper testOutputHelper, TestFixture fixtur
}
]
}, cancellationToken: TestContext.Current.CancellationToken));
- var createAttRespContent = await createAttResp.Content.ReadFromJsonAsync<JsonObject>();
- testOutputHelper.WriteLine(createAttRespContent.ToString());
+ var createAttRespContent = await createAttResp.Content.ReadFromJsonAsync<JsonObject>(cancellationToken: TestContext.Current.CancellationToken);
+ testOutputHelper.WriteLine(createAttRespContent?.ToString());
var createAtt = createAttRespContent.Deserialize<CreateAttachmentResponse>();
- foreach (var attFile in createAtt.Attachments) {
- var ret = await Assert.HttpSuccess(await Client.ApiHttpClient.PutAsync(attFile.UploadUrl,
- new ByteArrayContent("Hellorld!"u8.ToArray()) {
- Headers = {
- ContentType = new MediaTypeHeaderValue("text/plain")
- }
- }));
- var retCon = await ret.Content.ReadFromJsonAsync<JsonObject>();
- testOutputHelper.WriteLine(retCon.ToString());
- }
+ foreach (var attFile in createAtt.Attachments)
+ await Assert.HttpSuccess(await Client.ApiHttpClient.PutAsync(attFile.UploadUrl, new ByteArrayContent("Hellorld!"u8.ToArray()) {
+ Headers = {
+ ContentType = new MediaTypeHeaderValue("text/plain")
+ }
+ }, TestContext.Current.CancellationToken));
- // var res = await Assert.HttpSuccess(await Client.ApiHttpClient.PostAsync($"channels/{Channel.Id}/messages", content,
- // cancellationToken: TestContext.Current.CancellationToken));
- // var json = (await res.Content.ReadFromJsonAsync<JsonObject>());
- // testOutputHelper.WriteLine(json.ToJson(indent: true));
- // var msg = json.Deserialize<Message>();
- // Assert.Equal("meow", msg.Content);
+ var content = new JsonObject() {
+ { "content", "meow" }, {
+ "attachments", new JsonArray() {
+ new JsonObject() {
+ { "id", createAtt.Attachments[0].Id.ToString() },
+ { "filename", "hellorld.txt" },
+ { "uploaded_filename", createAtt.Attachments[0].UploadFileName },
+ { "original_content_type", "text/plain" },
+ }
+ }
+ }
+ };
+ var res = await Assert.HttpSuccess(await Client.ApiHttpClient.PostAsJsonAsync($"channels/{Channel.Id}/messages", content,
+ cancellationToken: TestContext.Current.CancellationToken));
+ var json = (await res.Content.ReadFromJsonAsync<JsonObject>());
+ testOutputHelper.WriteLine(json.ToJson(indent: true));
+ var msg = json.Deserialize<Message>();
+ Assert.Equal("meow", msg.Content);
+ Assert.Single(msg.Attachments);
}
public static IEnumerable<object?[]> WebhookExecuteCombinations() {
- string[] contents = ["meow", "meowmeow", "emma was here", "# hi!!!", "https://spacebar.chat/favicon.ico", "@everyone", "@here"];
- string?[] usernames = [null, "meow"];
- string?[] avatarUrls = [null, "https://spacebar.chat/favicon.ico"];
+ string[] contents = ["meow", "# hi!!!", "https://spacebar.chat/favicon.ico", "@everyone", "@here"];
bool?[] ttsEnabled = [null, true, false];
int?[] messageFlags = [
null,
@@ -145,32 +152,33 @@ public class MessageTests(ITestOutputHelper testOutputHelper, TestFixture fixtur
1 << 13 // VOICE_MESSAGE
];
+ var i = 0;
foreach (var content in contents)
- // foreach (var avatarUrl in avatarUrls)
foreach (var tts in ttsEnabled)
- foreach (var flags in messageFlags)
- foreach (var withNonce in (bool[])[true, false])
- yield return [content, null /*avatarUrl*/, tts, flags, withNonce ? Guid.NewGuid().ToString() : null];
+ foreach (var flags in messageFlags) {
+ yield return [content, tts, flags, null];
+ if (i++ % 50 == 0) yield return [content, tts, flags, Guid.NewGuid().ToString()];
+ }
}
[Theory]
[MemberData(nameof(WebhookExecuteCombinations))]
- public async Task SendWebhookMessageWithData(string content, string? avatarUrl, bool? tts, int? flags, string? nonce) {
+ public async Task SendWebhookMessageWithData(string content, bool? tts, int? flags, string? nonce) {
var payload = new JsonObject() {
{ "content", content }
};
- if (avatarUrl != null) payload.Add("avatar_url", avatarUrl);
+ // BUG: figure out why this endpoint even accepts avatar_url in the first place...?
if (tts != null) payload.Add("tts", tts);
if (flags != null) payload.Add("flags", flags);
if (nonce != null) payload.Add("nonce", nonce);
var reqContent = new MultipartFormDataContent();
reqContent.Add(JsonContent.Create(payload), "payload_json");
- testOutputHelper.WriteLine(await reqContent.ReadAsStringAsync());
+ testOutputHelper.WriteLine(await reqContent.ReadAsStringAsync(TestContext.Current.CancellationToken));
var res = await Assert.HttpSuccess(await Client.ApiHttpClient.PostAsync($"channels/{Channel.Id}/messages", reqContent,
cancellationToken: TestContext.Current.CancellationToken));
- var json = (await res.Content.ReadFromJsonAsync<JsonObject>());
+ var json = (await res.Content.ReadFromJsonAsync<JsonObject>(cancellationToken: TestContext.Current.CancellationToken));
testOutputHelper.WriteLine(json.ToJson(indent: true));
var msg = json.Deserialize<Message>();
Assert.Equal(content, msg.Content);
diff --git a/extra/admin-api/Tests/Spacebar.Tests/Tests/WebhookTests.cs b/extra/admin-api/Tests/Spacebar.Tests/Tests/WebhookTests.cs
index b127aa92..b539aebb 100644
--- a/extra/admin-api/Tests/Spacebar.Tests/Tests/WebhookTests.cs
+++ b/extra/admin-api/Tests/Spacebar.Tests/Tests/WebhookTests.cs
@@ -119,7 +119,7 @@ public class WebhookTests(ITestOutputHelper testOutputHelper, TestFixture fixtur
}
public static IEnumerable<object?[]> WebhookExecuteCombinations() {
- string[] contents = ["meow", "meowmeow", "emma was here", "# hi!!!", "https://spacebar.chat/favicon.ico", "@everyone", "@here"];
+ string[] contents = ["meow", "# hi!!!", "https://spacebar.chat/favicon.ico", "@everyone", "@here"];
string?[] usernames = [null, "meow"];
string?[] avatarUrls = [null, "https://spacebar.chat/favicon.ico"];
bool?[] ttsEnabled = [null, true, false];
diff --git a/src/cdn/routes/app-assets.ts b/src/cdn/routes/app-assets.ts
index f67051ac..ed4bb63e 100644
--- a/src/cdn/routes/app-assets.ts
+++ b/src/cdn/routes/app-assets.ts
@@ -21,7 +21,7 @@ import { Router, Response, Request } from "express";
import { fileTypeFromBuffer } from "file-type";
import { HTTPError } from "lambert-server/HTTPError";
import { Config } from "@spacebar/util";
-import { storage, multer, cache, cacheNotFound } from "@spacebar/cdn/util";
+import { storage, multer, cache, cacheNotFound } from "../util";
// TODO: check premium and animated pfp are allowed in the config
// TODO: generate different sizes of icon
diff --git a/src/cdn/routes/app-icons.ts b/src/cdn/routes/app-icons.ts
index 46599ad9..0880c247 100644
--- a/src/cdn/routes/app-icons.ts
+++ b/src/cdn/routes/app-icons.ts
@@ -21,7 +21,7 @@ import { Router, Response, Request } from "express";
import { fileTypeFromBuffer } from "file-type";
import { HTTPError } from "lambert-server/HTTPError";
import { Config } from "@spacebar/util";
-import { storage, multer, cache, cacheNotFound } from "@spacebar/cdn/util";
+import { storage, multer, cache, cacheNotFound } from "../util";
// TODO: check premium and animated pfp are allowed in the config
// TODO: generate different sizes of icon
diff --git a/src/cdn/routes/attachments.ts b/src/cdn/routes/attachments.ts
index ef91b7d9..7453f811 100644
--- a/src/cdn/routes/attachments.ts
+++ b/src/cdn/routes/attachments.ts
@@ -22,7 +22,7 @@ import imageSize from "image-size";
import { HTTPError } from "lambert-server/HTTPError";
import { CloudAttachment } from "@spacebar/database";
import { Config, hasValidSignature, NewUrlUserSignatureData, Snowflake, UrlSignResult } from "@spacebar/util";
-import { storage, multer, cache } from "@spacebar/cdn/util";
+import { storage, multer, cache } from "../util";
const router = Router({ mergeParams: true });
diff --git a/src/cdn/routes/avatar-decoration-presets.ts b/src/cdn/routes/avatar-decoration-presets.ts
index e52ae710..c31b2306 100644
--- a/src/cdn/routes/avatar-decoration-presets.ts
+++ b/src/cdn/routes/avatar-decoration-presets.ts
@@ -19,7 +19,7 @@
import { Router, Response, Request } from "express";
import { HTTPError } from "lambert-server/HTTPError";
import { fileTypeFromBuffer } from "file-type";
-import { storage, cache } from "@spacebar/cdn/util";
+import { storage, cache } from "../util";
const router = Router({ mergeParams: true });
diff --git a/src/cdn/routes/avatars.ts b/src/cdn/routes/avatars.ts
index 099e0ad9..80580cd0 100644
--- a/src/cdn/routes/avatars.ts
+++ b/src/cdn/routes/avatars.ts
@@ -21,7 +21,7 @@ import { Router, Response, Request } from "express";
import { fileTypeFromBuffer } from "file-type";
import { Config } from "@spacebar/util";
import { HTTPError } from "lambert-server/HTTPError";
-import { storage, multer, cache } from "@spacebar/cdn/util";
+import { storage, multer, cache } from "../util";
// TODO: check premium and animated pfp are allowed in the config
// TODO: generate different sizes of icon
diff --git a/src/cdn/routes/badge-icons.ts b/src/cdn/routes/badge-icons.ts
index a2fc0ea0..9a33d720 100644
--- a/src/cdn/routes/badge-icons.ts
+++ b/src/cdn/routes/badge-icons.ts
@@ -19,7 +19,7 @@
import { Router, Response, Request } from "express";
import { HTTPError } from "lambert-server/HTTPError";
import { fileTypeFromBuffer } from "file-type";
-import { storage, cache } from "@spacebar/cdn/util";
+import { storage, cache } from "../util";
const router = Router({ mergeParams: true });
diff --git a/src/cdn/routes/banners.ts b/src/cdn/routes/banners.ts
index 6e3a6bf9..254b7bbb 100644
--- a/src/cdn/routes/banners.ts
+++ b/src/cdn/routes/banners.ts
@@ -21,7 +21,7 @@ import { Router, Response, Request } from "express";
import { fileTypeFromBuffer } from "file-type";
import { HTTPError } from "lambert-server/HTTPError";
import { Config } from "@spacebar/util";
-import { storage, multer, cache, cacheNotFound } from "@spacebar/cdn/util";
+import { storage, multer, cache, cacheNotFound } from "../util";
// TODO: check premium and animated pfp are allowed in the config
// TODO: generate different sizes of icon
diff --git a/src/cdn/routes/channel-icons.ts b/src/cdn/routes/channel-icons.ts
index 91bfe123..eb69ca14 100644
--- a/src/cdn/routes/channel-icons.ts
+++ b/src/cdn/routes/channel-icons.ts
@@ -21,7 +21,7 @@ import { Router, Response, Request } from "express";
import { fileTypeFromBuffer } from "file-type";
import { HTTPError } from "lambert-server/HTTPError";
import { Config } from "@spacebar/util";
-import { storage, multer, cache, cacheNotFound } from "@spacebar/cdn/util";
+import { storage, multer, cache, cacheNotFound } from "../util";
// TODO: check premium and animated pfp are allowed in the config
// TODO: generate different sizes of icon
diff --git a/src/cdn/routes/discover-splashes.ts b/src/cdn/routes/discover-splashes.ts
index c43f35f0..5f5c5424 100644
--- a/src/cdn/routes/discover-splashes.ts
+++ b/src/cdn/routes/discover-splashes.ts
@@ -21,7 +21,7 @@ import { Router, Response, Request } from "express";
import { fileTypeFromBuffer } from "file-type";
import { HTTPError } from "lambert-server/HTTPError";
import { Config } from "@spacebar/util";
-import { storage, multer, cache, cacheNotFound } from "@spacebar/cdn/util";
+import { storage, multer, cache, cacheNotFound } from "../util";
// TODO: check premium and animated pfp are allowed in the config
// TODO: generate different sizes of icon
diff --git a/src/cdn/routes/discovery-splashes.ts b/src/cdn/routes/discovery-splashes.ts
index d1c3f079..07ec9a0f 100644
--- a/src/cdn/routes/discovery-splashes.ts
+++ b/src/cdn/routes/discovery-splashes.ts
@@ -21,7 +21,7 @@ import { Router, Response, Request } from "express";
import { fileTypeFromBuffer } from "file-type";
import { HTTPError } from "lambert-server/HTTPError";
import { Config } from "@spacebar/util";
-import { storage, multer, cache, cacheNotFound } from "@spacebar/cdn/util";
+import { storage, multer, cache, cacheNotFound } from "../util";
// TODO: check premium and animated pfp are allowed in the config
// TODO: generate different sizes of icon
diff --git a/src/cdn/routes/embed.ts b/src/cdn/routes/embed.ts
index 965d6a94..5ed6505a 100644
--- a/src/cdn/routes/embed.ts
+++ b/src/cdn/routes/embed.ts
@@ -21,7 +21,7 @@ import { join } from "node:path";
import { Request, Response, Router } from "express";
import { fileTypeFromBuffer } from "file-type";
import { HTTPError } from "lambert-server/HTTPError";
-import { cache } from "@spacebar/cdn/util";
+import { cache } from "../util";
const defaultAvatarHashMap = new Map([
["0", "4a8562cf00887030c416d3ec2d46385a"],
diff --git a/src/cdn/routes/emojis.ts b/src/cdn/routes/emojis.ts
index aaf6af9f..d2fe786a 100644
--- a/src/cdn/routes/emojis.ts
+++ b/src/cdn/routes/emojis.ts
@@ -21,7 +21,7 @@ import { Router, Response, Request } from "express";
import { fileTypeFromBuffer } from "file-type";
import { HTTPError } from "lambert-server/HTTPError";
import { Config } from "@spacebar/util";
-import { storage, multer, cache, cacheNotFound } from "@spacebar/cdn/util";
+import { storage, multer, cache, cacheNotFound } from "../util";
// TODO: check premium and animated pfp are allowed in the config
// TODO: generate different sizes of icon
diff --git a/src/cdn/routes/guild-profiles.ts b/src/cdn/routes/guild-profiles.ts
index fe87e9a4..0a8690f3 100644
--- a/src/cdn/routes/guild-profiles.ts
+++ b/src/cdn/routes/guild-profiles.ts
@@ -21,7 +21,7 @@ import { Request, Response, Router } from "express";
import { fileTypeFromBuffer } from "file-type";
import { HTTPError } from "lambert-server/HTTPError";
import { Config } from "@spacebar/util";
-import { storage, multer, cache } from "@spacebar/cdn/util";
+import { storage, multer, cache } from "../util";
// TODO: check premium and animated pfp are allowed in the config
// TODO: generate different sizes of icon
diff --git a/src/cdn/routes/icons.ts b/src/cdn/routes/icons.ts
index bacc046b..098b125a 100644
--- a/src/cdn/routes/icons.ts
+++ b/src/cdn/routes/icons.ts
@@ -21,7 +21,7 @@ import { Router, Response, Request } from "express";
import { fileTypeFromBuffer } from "file-type";
import { HTTPError } from "lambert-server/HTTPError";
import { Config } from "@spacebar/util";
-import { storage, multer, cache, cacheNotFound } from "@spacebar/cdn/util";
+import { storage, multer, cache, cacheNotFound } from "../util";
// TODO: check premium and animated pfp are allowed in the config
// TODO: generate different sizes of icon
diff --git a/src/cdn/routes/role-icons.ts b/src/cdn/routes/role-icons.ts
index 86037cd3..1524c32d 100644
--- a/src/cdn/routes/role-icons.ts
+++ b/src/cdn/routes/role-icons.ts
@@ -21,7 +21,7 @@ import { Router, Response, Request } from "express";
import { fileTypeFromBuffer } from "file-type";
import { HTTPError } from "lambert-server/HTTPError";
import { Config } from "@spacebar/util";
-import { storage, multer, cache } from "@spacebar/cdn/util";
+import { storage, multer, cache } from "../util";
//Role icons ---> avatars.ts modified
diff --git a/src/cdn/routes/splashes.ts b/src/cdn/routes/splashes.ts
index 21556167..2222af0f 100644
--- a/src/cdn/routes/splashes.ts
+++ b/src/cdn/routes/splashes.ts
@@ -21,7 +21,7 @@ import crypto from "node:crypto";
import { fileTypeFromBuffer } from "file-type";
import { HTTPError } from "lambert-server/HTTPError";
import { Config } from "@spacebar/util";
-import { storage, multer, cache, cacheNotFound } from "@spacebar/cdn/util";
+import { storage, multer, cache, cacheNotFound } from "../util";
// TODO: check premium and animated pfp are allowed in the config
// TODO: generate different sizes of icon
diff --git a/src/cdn/routes/stickers.ts b/src/cdn/routes/stickers.ts
index dade992d..ba9984a2 100644
--- a/src/cdn/routes/stickers.ts
+++ b/src/cdn/routes/stickers.ts
@@ -21,7 +21,7 @@ import { Router, Response, Request } from "express";
import { fileTypeFromBuffer } from "file-type";
import { HTTPError } from "lambert-server/HTTPError";
import { Config } from "@spacebar/util";
-import { storage, multer, cache, cacheNotFound } from "@spacebar/cdn/util";
+import { storage, multer, cache, cacheNotFound } from "../util";
// TODO: check premium and animated pfp are allowed in the config
// TODO: generate different sizes of icon
diff --git a/src/cdn/routes/team-icons.ts b/src/cdn/routes/team-icons.ts
index e171dc75..4f92d0e4 100644
--- a/src/cdn/routes/team-icons.ts
+++ b/src/cdn/routes/team-icons.ts
@@ -21,7 +21,7 @@ import { Router, Response, Request } from "express";
import { fileTypeFromBuffer } from "file-type";
import { HTTPError } from "lambert-server/HTTPError";
import { Config } from "@spacebar/util";
-import { storage, multer, cache, cacheNotFound } from "@spacebar/cdn/util";
+import { storage, multer, cache, cacheNotFound } from "../util";
// TODO: check premium and animated pfp are allowed in the config
// TODO: generate different sizes of icon
|
