Skip to content

Commit

Permalink
Merge pull request #886 from Hylozoic/hylo-evo-1343-fix-group-descrip…
Browse files Browse the repository at this point in the history
…tion

Updates Hylo-shared
  • Loading branch information
lorenjohnson authored Nov 6, 2022
2 parents 1ffc7c6 + 1054fff commit c1736f4
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion api/controllers/CommentController.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ module.exports = {
// TODO: fix
const { groupId, userId } = res.locals.tokenData

const replyText = postId => TextHelpers.markdown(req.param(`post-${postId}`))
const replyText = postId => TextHelpers.markdown(req.param(`post-${postId}`, { disableAutolinking: true }))

const postIds = flow(
Object.keys,
Expand Down
2 changes: 1 addition & 1 deletion api/models/Comment.js
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ module.exports = bookshelf.Model.extend(Object.assign({
})

const finalText = cutoff ? lines.slice(0, cutoff).join('\n') : text
return opts.useMarkdown ? TextHelpers.markdown(finalText || '') : finalText
return opts.useMarkdown ? TextHelpers.markdown(finalText || '', { disableAutolinking: true }) : finalText
},

notifyAboutMessage,
Expand Down
2 changes: 1 addition & 1 deletion api/services/InvitationService.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ module.exports = {
if (tag) {
opts.tagId = tag.id
} else {
opts.message = TextHelpers.markdown(message)
opts.message = TextHelpers.markdown(message, { disableAutolinking: true })
opts.moderator = isModerator
opts.subject = subject
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
"hast-util-to-string": "^1.0.1",
"hastscript": "^3.1.0",
"he": "^1.2.0",
"hylo-shared": "5.0.0",
"hylo-shared": "5.1.0",
"image-size": "^0.3.5",
"insane": "^2.6.2",
"jade": "^1.11.0",
Expand Down
18 changes: 9 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7036,15 +7036,15 @@ https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1:
agent-base "6"
debug "4"

hylo-shared@5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/hylo-shared/-/hylo-shared-5.0.0.tgz#7cc76a87d092947b9c78aafb270e059d29866e41"
integrity sha512-72wTvmE1VfZEZ6Hk6jdrmXz4ocF66Y6FkHFDjqRwO9KYe5FSRwOY9tImperx12sB8GZY+Ss1R8sn0JF8IhOyyA==
hylo-shared@5.1.0:
version "5.1.0"
resolved "https://registry.yarnpkg.com/hylo-shared/-/hylo-shared-5.1.0.tgz#e4cdb43a2d65926d195bb70e6a24b874efc03f52"
integrity sha512-YWXEs8F/Sw6yazUi6Nii8JMoLa9P5HfnUJ8B+JcyZNs3EaDbf04FVZdi1bFYMgzcl+uNNx9ebRWY+2mJPGRqoQ==
dependencies:
coordinate-parser "^1.0.7"
html-to-text "^8.1.0"
lodash "~4.17.21"
marked "^4.0.12"
marked "^4.2.1"
pretty-date "^0.2.0"
querystring "^0.2.1"
trunc-html "^1.1.2"
Expand Down Expand Up @@ -8645,10 +8645,10 @@ map-visit@^1.0.0:
dependencies:
object-visit "^1.0.0"

marked@^4.0.12:
version "4.1.1"
resolved "https://registry.yarnpkg.com/marked/-/marked-4.1.1.tgz#2f709a4462abf65a283f2453dc1c42ab177d302e"
integrity sha512-0cNMnTcUJPxbA6uWmCmjWz4NJRe/0Xfk2NhXCUHjew9qJzFN20krFnsUe7QynwqOwa5m1fZ4UDg0ycKFVC0ccw==
marked@^4.2.1:
version "4.2.1"
resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.1.tgz#eaa32594e45b4e58c02e4d118531fd04345de3b4"
integrity sha512-VK1/jNtwqDLvPktNpL0Fdg3qoeUZhmRsuiIjPEy/lHwXW4ouLoZfO4XoWd4ClDt+hupV1VLpkZhEovjU0W/kqA==

math-interval-parser@^2.0.1:
version "2.0.1"
Expand Down

0 comments on commit c1736f4

Please sign in to comment.