From 7ad9b9846c44d198a736183fb186c2039f5236b5 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Fri, 12 Oct 2018 15:26:04 +0200
Subject: Add ability for users to block an account/instance on server side

---
 shared/models/blocklist/account-block.model.ts | 7 +++++++
 shared/models/blocklist/index.ts               | 2 ++
 shared/models/blocklist/server-block.model.ts  | 9 +++++++++
 3 files changed, 18 insertions(+)
 create mode 100644 shared/models/blocklist/account-block.model.ts
 create mode 100644 shared/models/blocklist/index.ts
 create mode 100644 shared/models/blocklist/server-block.model.ts

(limited to 'shared/models/blocklist')

diff --git a/shared/models/blocklist/account-block.model.ts b/shared/models/blocklist/account-block.model.ts
new file mode 100644
index 000000000..d6f8840c5
--- /dev/null
+++ b/shared/models/blocklist/account-block.model.ts
@@ -0,0 +1,7 @@
+import { Account } from '../actors'
+
+export interface AccountBlock {
+  byAccount: Account
+  accountBlocked: Account
+  createdAt: Date | string
+}
diff --git a/shared/models/blocklist/index.ts b/shared/models/blocklist/index.ts
new file mode 100644
index 000000000..fc7873270
--- /dev/null
+++ b/shared/models/blocklist/index.ts
@@ -0,0 +1,2 @@
+export * from './account-block.model'
+export * from './server-block.model'
diff --git a/shared/models/blocklist/server-block.model.ts b/shared/models/blocklist/server-block.model.ts
new file mode 100644
index 000000000..efba672bd
--- /dev/null
+++ b/shared/models/blocklist/server-block.model.ts
@@ -0,0 +1,9 @@
+import { Account } from '../actors'
+
+export interface ServerBlock {
+  byAccount: Account
+  serverBlocked: {
+    host: string
+  }
+  createdAt: Date | string
+}
-- 
cgit v1.2.3


From af5767ffae41b2d5604e41ba9a7225c623dd6735 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Fri, 12 Oct 2018 17:26:40 +0200
Subject: Add user/instance block by users in the client

---
 shared/models/blocklist/account-block.model.ts | 2 +-
 shared/models/blocklist/server-block.model.ts  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'shared/models/blocklist')

diff --git a/shared/models/blocklist/account-block.model.ts b/shared/models/blocklist/account-block.model.ts
index d6f8840c5..a942ed614 100644
--- a/shared/models/blocklist/account-block.model.ts
+++ b/shared/models/blocklist/account-block.model.ts
@@ -2,6 +2,6 @@ import { Account } from '../actors'
 
 export interface AccountBlock {
   byAccount: Account
-  accountBlocked: Account
+  blockedAccount: Account
   createdAt: Date | string
 }
diff --git a/shared/models/blocklist/server-block.model.ts b/shared/models/blocklist/server-block.model.ts
index efba672bd..a8b8af0b7 100644
--- a/shared/models/blocklist/server-block.model.ts
+++ b/shared/models/blocklist/server-block.model.ts
@@ -2,7 +2,7 @@ import { Account } from '../actors'
 
 export interface ServerBlock {
   byAccount: Account
-  serverBlocked: {
+  blockedServer: {
     host: string
   }
   createdAt: Date | string
-- 
cgit v1.2.3