projects
/
oweals
/
peertube.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add import.video.torrent configuration
[oweals/peertube.git]
/
server
/
lib
/
video-comment.ts
diff --git
a/server/lib/video-comment.ts
b/server/lib/video-comment.ts
index ef6a8f097b7c222fa37bf143fad14f29cb651802..70ba7c3039cd947c3636d65d64418e80f810d111 100644
(file)
--- a/
server/lib/video-comment.ts
+++ b/
server/lib/video-comment.ts
@@
-1,29
+1,32
@@
import * as Sequelize from 'sequelize'
import { ResultList } from '../../shared/models'
import { VideoCommentThreadTree } from '../../shared/models/videos/video-comment.model'
import * as Sequelize from 'sequelize'
import { ResultList } from '../../shared/models'
import { VideoCommentThreadTree } from '../../shared/models/videos/video-comment.model'
+import { AccountModel } from '../models/account/account'
import { VideoModel } from '../models/video/video'
import { VideoCommentModel } from '../models/video/video-comment'
import { VideoModel } from '../models/video/video'
import { VideoCommentModel } from '../models/video/video-comment'
-import { getVideoCommentActivityPubUrl
, sendVideoRateChangeToFollowers
} from './activitypub'
-import { sendCreateVideoComment
ToOrigin, sendCreateVideoCommentToVideoFollowers
} from './activitypub/send'
+import { getVideoCommentActivityPubUrl } from './activitypub'
+import { sendCreateVideoComment } from './activitypub/send'
async function createVideoComment (obj: {
text: string,
async function createVideoComment (obj: {
text: string,
- inReplyToComment: VideoCommentModel,
+ inReplyToComment: VideoCommentModel
| null
,
video: VideoModel
video: VideoModel
- account
Id: number
+ account
: AccountModel
}, t: Sequelize.Transaction) {
}, t: Sequelize.Transaction) {
- let originCommentId: number = null
+ let originCommentId: number | null = null
+ let inReplyToCommentId: number | null = null
- if (obj.inReplyToComment) {
+ if (obj.inReplyToComment
&& obj.inReplyToComment !== null
) {
originCommentId = obj.inReplyToComment.originCommentId || obj.inReplyToComment.id
originCommentId = obj.inReplyToComment.originCommentId || obj.inReplyToComment.id
+ inReplyToCommentId = obj.inReplyToComment.id
}
const comment = await VideoCommentModel.create({
text: obj.text,
originCommentId,
}
const comment = await VideoCommentModel.create({
text: obj.text,
originCommentId,
- inReplyToCommentId
: obj.inReplyToComment.id
,
+ inReplyToCommentId,
videoId: obj.video.id,
videoId: obj.video.id,
- accountId: obj.account
I
d,
+ accountId: obj.account
.i
d,
url: 'fake url'
}, { transaction: t, validate: false })
url: 'fake url'
}, { transaction: t, validate: false })
@@
-32,12
+35,9
@@
async function createVideoComment (obj: {
const savedComment = await comment.save({ transaction: t })
savedComment.InReplyToVideoComment = obj.inReplyToComment
savedComment.Video = obj.video
const savedComment = await comment.save({ transaction: t })
savedComment.InReplyToVideoComment = obj.inReplyToComment
savedComment.Video = obj.video
+ savedComment.Account = obj.account
- if (savedComment.Video.isOwned()) {
- await sendCreateVideoCommentToVideoFollowers(savedComment, t)
- } else {
- await sendCreateVideoCommentToOrigin(savedComment, t)
- }
+ await sendCreateVideoComment(savedComment, t)
return savedComment
}
return savedComment
}