From 107e885aebd4a8077c03f1afc49d438105d5a28b Mon Sep 17 00:00:00 2001
From: AkiraFukushima
Date: Sun, 30 Apr 2023 00:21:01 +0900
Subject: [PATCH] Fix types
---
.../store/TimelineSpace/Modals/AddListMember.spec.ts | 1 +
.../store/TimelineSpace/Modals/ListMembership.spec.ts | 1 +
src/main/index.ts | 3 +++
src/main/websocket.ts | 5 ++++-
4 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/spec/renderer/integration/store/TimelineSpace/Modals/AddListMember.spec.ts b/spec/renderer/integration/store/TimelineSpace/Modals/AddListMember.spec.ts
index c24accb6..e3cd80ae 100644
--- a/spec/renderer/integration/store/TimelineSpace/Modals/AddListMember.spec.ts
+++ b/spec/renderer/integration/store/TimelineSpace/Modals/AddListMember.spec.ts
@@ -40,6 +40,7 @@ const account: Entity.Account = {
acct: 'h3poteto@pleroma.io',
display_name: 'h3poteto',
locked: false,
+ group: false,
created_at: '2019-03-26T21:30:32',
followers_count: 10,
following_count: 10,
diff --git a/spec/renderer/integration/store/TimelineSpace/Modals/ListMembership.spec.ts b/spec/renderer/integration/store/TimelineSpace/Modals/ListMembership.spec.ts
index fb825af4..38be22c1 100644
--- a/spec/renderer/integration/store/TimelineSpace/Modals/ListMembership.spec.ts
+++ b/spec/renderer/integration/store/TimelineSpace/Modals/ListMembership.spec.ts
@@ -70,6 +70,7 @@ const account: Entity.Account = {
acct: 'h3poteto@pleroma.io',
display_name: 'h3poteto',
locked: false,
+ group: false,
created_at: '2019-03-26T21:30:32',
followers_count: 10,
following_count: 10,
diff --git a/src/main/index.ts b/src/main/index.ts
index d49d31d0..f2757f02 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -441,6 +441,9 @@ app.on('activate', () => {
ipcMain.handle('add-server', async (_: IpcMainInvokeEvent, domain: string) => {
const proxy = await proxyConfiguration.forMastodon()
const sns = await detector(`https://${domain}`, proxy)
+ if (sns === 'friendica') {
+ return new Promise((_resolve, reject) => reject('friendica is not supported yet'))
+ }
const server = await insertServer(db, `https://${domain}`, domain, sns, null)
return server
})
diff --git a/src/main/websocket.ts b/src/main/websocket.ts
index 0cbf093b..54d03243 100644
--- a/src/main/websocket.ts
+++ b/src/main/websocket.ts
@@ -14,7 +14,10 @@ const StreamingURL = async (
}
const client = generator(sns, server.baseURL, account.accessToken, 'Whalebird', proxy)
const res = await client.getInstance()
- return res.data.urls.streaming_api
+ if (res.data.urls) {
+ return res.data.urls.streaming_api
+ }
+ return new Promise((_resolve, reject) => reject('streaming URL does not exist'))
}
export { StreamingURL }