Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement link previews #7822

Merged
merged 6 commits into from
Aug 31, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
const ignorePatterns = [
'vue-material-design-icons',
'@juliushaertl',
'@nextcloud/vue-richtext',
'tributejs',
'@nextcloud/vue',
'splitpanes',
Expand Down
67 changes: 45 additions & 22 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
"stylelint:fix": "stylelint css/*.css css/*.scss src/**/*.scss src/**/*.vue --fix"
},
"dependencies": {
"@juliushaertl/vue-richtext": "^0.3.3",
"@nextcloud/auth": "^2.0.0",
"@nextcloud/axios": "^2.0.0",
"@nextcloud/browser-storage": "^0.1.1",
Expand All @@ -31,6 +30,7 @@
"@nextcloud/router": "^2.0.0",
"@nextcloud/vue": "^6.0.0-beta.4",
"@nextcloud/vue-dashboard": "^2.0.1",
"@nextcloud/vue-richtext": "^2.0.0",
"attachmediastream": "^2.1.0",
"color.js": "^1.2.0",
"crypto-js": "^4.1.1",
Expand Down
2 changes: 1 addition & 1 deletion src/components/LobbyScreen.vue
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@

<script>
import moment from '@nextcloud/moment'
import RichText from '@juliushaertl/vue-richtext'
import RichText from '@nextcloud/vue-richtext'
import SetGuestUsername from './SetGuestUsername.vue'
import Lobby from './missingMaterialDesignIcons/Lobby.vue'

Expand Down
28 changes: 23 additions & 5 deletions src/components/MessagesList/MessagesGroup/Message/Message.vue
Original file line number Diff line number Diff line change
Expand Up @@ -52,23 +52,35 @@ the main body of the message as well as a quote.
</div>
</div>
<div v-else-if="showJoinCallButton" class="message-body__main__text call-started">
<RichText :text="message" :arguments="richParameters" :autolink="true" />
<RichText :text="message"
:arguments="richParameters"
:autolink="true"
:reference-limit="10" />
<CallButton />
</div>
<div v-else-if="showResultsButton" class="message-body__main__text system-message">
<RichText :text="message" :arguments="richParameters" :autolink="true" />
<RichText :text="message"
:arguments="richParameters"
:autolink="true"
:reference-limit="10" />
<!-- Displays only the "see results" button with the results modal -->
<Poll :id="messageParameters.poll.id"
:poll-name="messageParameters.poll.name"
:token="token"
:show-as-button="true" />
</div>
<div v-else-if="isDeletedMessage" class="message-body__main__text deleted-message">
<RichText :text="message" :arguments="richParameters" :autolink="true" />
<RichText :text="message"
:arguments="richParameters"
:autolink="true"
:reference-limit="10" />
</div>
<div v-else class="message-body__main__text" :class="{'system-message': isSystemMessage}">
<Quote v-if="parent" :parent-id="parent" v-bind="quote" />
<RichText :text="message" :arguments="richParameters" :autolink="true" />
<RichText :text="message"
:arguments="richParameters"
:autolink="true"
:reference-limit="10" />
</div>
<div v-if="!isDeletedMessage" class="message-body__main__right">
<span v-tooltip.auto="messageDate"
Expand Down Expand Up @@ -187,7 +199,7 @@ import DeckCard from './MessagePart/DeckCard.vue'
import DefaultParameter from './MessagePart/DefaultParameter.vue'
import FilePreview from './MessagePart/FilePreview.vue'
import Mention from './MessagePart/Mention.vue'
import RichText from '@juliushaertl/vue-richtext'
import RichText from '@nextcloud/vue-richtext'
import AlertCircle from 'vue-material-design-icons/AlertCircle.vue'
import Check from 'vue-material-design-icons/Check.vue'
import CheckAll from 'vue-material-design-icons/CheckAll.vue'
Expand Down Expand Up @@ -811,6 +823,7 @@ export default {
</script>

<style lang="scss" scoped>
@import '@nextcloud/vue-richtext/dist/style.css';
@import '../../../../assets/variables';

.message:hover .normal-message-body {
Expand All @@ -836,6 +849,7 @@ export default {
min-width: 100%;
&__text {
flex: 0 1 600px;
max-width: 600px;
color: var(--color-text-light);
.single-emoji {
font-size: 250%;
Expand Down Expand Up @@ -866,6 +880,10 @@ export default {
::v-deep .rich-text--wrapper {
white-space: pre-wrap;
word-break: break-word;

.rich-text--reference-widget {
width: calc(100% + 132px);
}
}

&--quote {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Quote.vue
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ components.
<script>
import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
import Close from 'vue-material-design-icons/Close.vue'
import RichText from '@juliushaertl/vue-richtext'
import RichText from '@nextcloud/vue-richtext'
import FilePreview from './MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue'
import DefaultParameter from './MessagesList/MessagesGroup/Message/MessagePart/DefaultParameter.vue'
import { EventBus } from '../services/EventBus.js'
Expand Down
2 changes: 1 addition & 1 deletion webpack.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ webpackConfig.output.assetModuleFilename = '[name][ext]?v=[contenthash]'

// Edit JS rule
webpackRules.RULE_JS.exclude = BabelLoaderExcludeNodeModulesExcept([
'@juliushaertl/vue-richtext',
'@nextcloud/vue-richtext',
'@nextcloud/event-bus',
'@nextcloud/vue-dashboard',
'ansi-regex',
Expand Down