aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
Diffstat (limited to 'server')
-rw-r--r--server/initializers/constants.ts2
-rw-r--r--server/lib/activitypub/process/process-undo.ts2
-rw-r--r--server/middlewares/validators/follows.ts6
-rw-r--r--server/models/account/account-follow-interface.ts11
-rw-r--r--server/models/account/account-follow.ts26
5 files changed, 35 insertions, 12 deletions
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index 9c7c31a61..c46043931 100644
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -134,7 +134,7 @@ const CONSTRAINTS_FIELDS = {
134 VIEWS: { min: 0 }, 134 VIEWS: { min: 0 },
135 LIKES: { min: 0 }, 135 LIKES: { min: 0 },
136 DISLIKES: { min: 0 }, 136 DISLIKES: { min: 0 },
137 FILE_SIZE: { min: 10, max: 1024 * 1024 * 1024 * 3 /* 3Go */ }, 137 FILE_SIZE: { min: 10, max: 1024 * 1024 * 1024 * 10 /* 10Go */ },
138 URL: { min: 3, max: 2000 } // Length 138 URL: { min: 3, max: 2000 } // Length
139 }, 139 },
140 ACCOUNTS: { 140 ACCOUNTS: {
diff --git a/server/lib/activitypub/process/process-undo.ts b/server/lib/activitypub/process/process-undo.ts
index 5d09423e1..610b800fb 100644
--- a/server/lib/activitypub/process/process-undo.ts
+++ b/server/lib/activitypub/process/process-undo.ts
@@ -10,7 +10,7 @@ async function processUndoActivity (activity: ActivityUndo) {
10 const following = await db.Account.loadByUrl(activityToUndo.object) 10 const following = await db.Account.loadByUrl(activityToUndo.object)
11 const accountFollow = await db.AccountFollow.loadByAccountAndTarget(follower.id, following.id) 11 const accountFollow = await db.AccountFollow.loadByAccountAndTarget(follower.id, following.id)
12 12
13 if (!accountFollow) throw new Error(`'Unknown account follow (${follower.id} -> ${following.id}.`) 13 if (!accountFollow) throw new Error(`'Unknown account follow ${follower.id} -> ${following.id}.`)
14 14
15 await accountFollow.destroy() 15 await accountFollow.destroy()
16 16
diff --git a/server/middlewares/validators/follows.ts b/server/middlewares/validators/follows.ts
index e22349726..dfd6e7f03 100644
--- a/server/middlewares/validators/follows.ts
+++ b/server/middlewares/validators/follows.ts
@@ -1,12 +1,12 @@
1import * as express from 'express' 1import * as express from 'express'
2import { body } from 'express-validator/check' 2import { body, param } from 'express-validator/check'
3import { isTestInstance } from '../../helpers/core-utils' 3import { isTestInstance } from '../../helpers/core-utils'
4import { isAccountIdValid } from '../../helpers/custom-validators/activitypub/account'
5import { isEachUniqueHostValid } from '../../helpers/custom-validators/servers' 4import { isEachUniqueHostValid } from '../../helpers/custom-validators/servers'
6import { logger } from '../../helpers/logger' 5import { logger } from '../../helpers/logger'
7import { CONFIG, database as db } from '../../initializers' 6import { CONFIG, database as db } from '../../initializers'
8import { checkErrors } from './utils' 7import { checkErrors } from './utils'
9import { getServerAccount } from '../../helpers/utils' 8import { getServerAccount } from '../../helpers/utils'
9import { isIdOrUUIDValid } from '../../helpers/custom-validators/misc'
10 10
11const followValidator = [ 11const followValidator = [
12 body('hosts').custom(isEachUniqueHostValid).withMessage('Should have an array of unique hosts'), 12 body('hosts').custom(isEachUniqueHostValid).withMessage('Should have an array of unique hosts'),
@@ -28,7 +28,7 @@ const followValidator = [
28] 28]
29 29
30const removeFollowingValidator = [ 30const removeFollowingValidator = [
31 body('accountId').custom(isAccountIdValid).withMessage('Should have a valid account id'), 31 param('accountId').custom(isIdOrUUIDValid).withMessage('Should have a valid account id'),
32 32
33 (req: express.Request, res: express.Response, next: express.NextFunction) => { 33 (req: express.Request, res: express.Response, next: express.NextFunction) => {
34 logger.debug('Checking follow parameters', { parameters: req.body }) 34 logger.debug('Checking follow parameters', { parameters: req.body })
diff --git a/server/models/account/account-follow-interface.ts b/server/models/account/account-follow-interface.ts
index 21fda98ce..6f228c790 100644
--- a/server/models/account/account-follow-interface.ts
+++ b/server/models/account/account-follow-interface.ts
@@ -1,18 +1,19 @@
1import * as Sequelize from 'sequelize'
2import * as Bluebird from 'bluebird' 1import * as Bluebird from 'bluebird'
3import { FollowState } from '../../../shared/models/accounts/follow.model' 2import * as Sequelize from 'sequelize'
3import { AccountFollow, FollowState } from '../../../shared/models/accounts/follow.model'
4import { ResultList } from '../../../shared/models/result-list.model' 4import { ResultList } from '../../../shared/models/result-list.model'
5import { AccountInstance } from './account-interface' 5import { AccountInstance } from './account-interface'
6 6
7export namespace AccountFollowMethods { 7export namespace AccountFollowMethods {
8 export type LoadByAccountAndTarget = (accountId: number, targetAccountId: number) => Bluebird<AccountFollowInstance> 8 export type LoadByAccountAndTarget = (accountId: number, targetAccountId: number) => Bluebird<AccountFollowInstance>
9 9
10 export type ListFollowingForApi = (id: number, start: number, count: number, sort: string) => Bluebird< ResultList<AccountInstance> > 10 export type ListFollowingForApi = (id: number, start: number, count: number, sort: string) => Bluebird< ResultList<AccountFollowInstance>>
11 export type ListFollowersForApi = (id: number, start: number, count: number, sort: string) => Bluebird< ResultList<AccountInstance> > 11 export type ListFollowersForApi = (id: number, start: number, count: number, sort: string) => Bluebird< ResultList<AccountFollowInstance>>
12 12
13 export type ListAcceptedFollowerUrlsForApi = (accountId: number[], start?: number, count?: number) => Promise< ResultList<string> > 13 export type ListAcceptedFollowerUrlsForApi = (accountId: number[], start?: number, count?: number) => Promise< ResultList<string> >
14 export type ListAcceptedFollowingUrlsForApi = (accountId: number[], start?: number, count?: number) => Promise< ResultList<string> > 14 export type ListAcceptedFollowingUrlsForApi = (accountId: number[], start?: number, count?: number) => Promise< ResultList<string> >
15 export type ListAcceptedFollowerSharedInboxUrls = (accountId: number[]) => Promise< ResultList<string> > 15 export type ListAcceptedFollowerSharedInboxUrls = (accountId: number[]) => Promise< ResultList<string> >
16 export type ToFormattedJSON = (this: AccountFollowInstance) => AccountFollow
16} 17}
17 18
18export interface AccountFollowClass { 19export interface AccountFollowClass {
@@ -38,6 +39,8 @@ export interface AccountFollowInstance extends AccountFollowClass, AccountFollow
38 39
39 AccountFollower?: AccountInstance 40 AccountFollower?: AccountInstance
40 AccountFollowing?: AccountInstance 41 AccountFollowing?: AccountInstance
42
43 toFormattedJSON: AccountFollowMethods.ToFormattedJSON
41} 44}
42 45
43export interface AccountFollowModel extends AccountFollowClass, Sequelize.Model<AccountFollowInstance, AccountFollowAttributes> {} 46export interface AccountFollowModel extends AccountFollowClass, Sequelize.Model<AccountFollowInstance, AccountFollowAttributes> {}
diff --git a/server/models/account/account-follow.ts b/server/models/account/account-follow.ts
index f00c7dcd9..34ba3f8db 100644
--- a/server/models/account/account-follow.ts
+++ b/server/models/account/account-follow.ts
@@ -12,6 +12,7 @@ let listFollowersForApi: AccountFollowMethods.ListFollowersForApi
12let listAcceptedFollowerUrlsForApi: AccountFollowMethods.ListAcceptedFollowerUrlsForApi 12let listAcceptedFollowerUrlsForApi: AccountFollowMethods.ListAcceptedFollowerUrlsForApi
13let listAcceptedFollowingUrlsForApi: AccountFollowMethods.ListAcceptedFollowingUrlsForApi 13let listAcceptedFollowingUrlsForApi: AccountFollowMethods.ListAcceptedFollowingUrlsForApi
14let listAcceptedFollowerSharedInboxUrls: AccountFollowMethods.ListAcceptedFollowerSharedInboxUrls 14let listAcceptedFollowerSharedInboxUrls: AccountFollowMethods.ListAcceptedFollowerSharedInboxUrls
15let toFormattedJSON: AccountFollowMethods.ToFormattedJSON
15 16
16export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.DataTypes) { 17export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.DataTypes) {
17 AccountFollow = sequelize.define<AccountFollowInstance, AccountFollowAttributes>('AccountFollow', 18 AccountFollow = sequelize.define<AccountFollowInstance, AccountFollowAttributes>('AccountFollow',
@@ -46,7 +47,10 @@ export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.Da
46 listAcceptedFollowingUrlsForApi, 47 listAcceptedFollowingUrlsForApi,
47 listAcceptedFollowerSharedInboxUrls 48 listAcceptedFollowerSharedInboxUrls
48 ] 49 ]
49 addMethodsToModel(AccountFollow, classMethods) 50 const instanceMethods = [
51 toFormattedJSON
52 ]
53 addMethodsToModel(AccountFollow, classMethods, instanceMethods)
50 54
51 return AccountFollow 55 return AccountFollow
52} 56}
@@ -73,6 +77,22 @@ function associate (models) {
73 }) 77 })
74} 78}
75 79
80toFormattedJSON = function (this: AccountFollowInstance) {
81 const follower = this.AccountFollower.toFormattedJSON()
82 const following = this.AccountFollowing.toFormattedJSON()
83
84 const json = {
85 id: this.id,
86 follower,
87 following,
88 state: this.state,
89 createdAt: this.createdAt,
90 updatedAt: this.updatedAt
91 }
92
93 return json
94}
95
76loadByAccountAndTarget = function (accountId: number, targetAccountId: number) { 96loadByAccountAndTarget = function (accountId: number, targetAccountId: number) {
77 const query = { 97 const query = {
78 where: { 98 where: {
@@ -122,7 +142,7 @@ listFollowingForApi = function (id: number, start: number, count: number, sort:
122 142
123 return AccountFollow.findAndCountAll(query).then(({ rows, count }) => { 143 return AccountFollow.findAndCountAll(query).then(({ rows, count }) => {
124 return { 144 return {
125 data: rows.map(r => r.AccountFollowing), 145 data: rows,
126 total: count 146 total: count
127 } 147 }
128 }) 148 })
@@ -154,7 +174,7 @@ listFollowersForApi = function (id: number, start: number, count: number, sort:
154 174
155 return AccountFollow.findAndCountAll(query).then(({ rows, count }) => { 175 return AccountFollow.findAndCountAll(query).then(({ rows, count }) => {
156 return { 176 return {
157 data: rows.map(r => r.AccountFollower), 177 data: rows,
158 total: count 178 total: count
159 } 179 }
160 }) 180 })