diff options
| author | Chocobozzz <florian.bigard@gmail.com> | 2017-01-23 22:16:48 +0100 |
|---|---|---|
| committer | Chocobozzz <florian.bigard@gmail.com> | 2017-01-23 22:18:53 +0100 |
| commit | 11ac88de40215783835cf6e6259ff0f6cee258dd (patch) | |
| tree | 9bdb69c0a4e3621b9b185d30a8a63f1ac6e8fbfa /server | |
| parent | 4f8c0eb0e9356ee2782ea6eb12a92e4dc5f66127 (diff) | |
| download | PeerTube-11ac88de40215783835cf6e6259ff0f6cee258dd.tar.gz PeerTube-11ac88de40215783835cf6e6259ff0f6cee258dd.tar.zst PeerTube-11ac88de40215783835cf6e6259ff0f6cee258dd.zip | |
Client: add basic support to report video abuses
Diffstat (limited to 'server')
| -rw-r--r-- | server/initializers/database.js | 2 | ||||
| -rw-r--r-- | server/models/video-abuse.js | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/server/initializers/database.js b/server/initializers/database.js index f8f68adeb..043152a0e 100644 --- a/server/initializers/database.js +++ b/server/initializers/database.js | |||
| @@ -70,7 +70,7 @@ function init (silent, callback) { | |||
| 70 | } | 70 | } |
| 71 | }) | 71 | }) |
| 72 | 72 | ||
| 73 | if (!silent) logger.info('Database is ready.') | 73 | if (!silent) logger.info('Database %s is ready.', dbname) |
| 74 | 74 | ||
| 75 | return callback(null) | 75 | return callback(null) |
| 76 | }) | 76 | }) |
diff --git a/server/models/video-abuse.js b/server/models/video-abuse.js index 766a7568d..67cead3af 100644 --- a/server/models/video-abuse.js +++ b/server/models/video-abuse.js | |||
| @@ -106,7 +106,8 @@ function toFormatedJSON () { | |||
| 106 | reporterPodHost, | 106 | reporterPodHost, |
| 107 | reason: this.reason, | 107 | reason: this.reason, |
| 108 | reporterUsername: this.reporterUsername, | 108 | reporterUsername: this.reporterUsername, |
| 109 | videoId: this.videoId | 109 | videoId: this.videoId, |
| 110 | createdAt: this.createdAt | ||
| 110 | } | 111 | } |
| 111 | 112 | ||
| 112 | return json | 113 | return json |