NoLog.cz/gancio
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

minor

Browse source
This commit is contained in:
les 2019-08-25 14:51:38 +02:00
parent 0eb41a1e12
commit 5c08a96fe7
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/Event.vue
View file

@ -17,7 +17,7 @@
ul.tags(v-if='showTags && event.tags') ul.tags(v-if='showTags && event.tags')
li(v-for='tag in event.tags' :key='tag') {{tag}} li(v-for='tag in event.tags' :key='tag') {{tag}}
li(v-if='event.comments.length') <u>{{$tc('common.comments', event.comments.length)}}</u> li(v-if='event.comments') <u>{{$tc('common.comments', event.comments.length)}}</u>
</template> </template>
<script> <script>
import { mapState, mapActions } from 'vuex' import { mapState, mapActions } from 'vuex'

1
server/api/controller/event.js
View file

@ -211,6 +211,7 @@ const eventController = {
attributes: { exclude: ['createdAt', 'updatedAt', 'placeId' ] }, attributes: { exclude: ['createdAt', 'updatedAt', 'placeId' ] },
order: [[Tag, 'weigth', 'DESC']], order: [[Tag, 'weigth', 'DESC']],
include: [ include: [
{ model: Comment, required: false, attributes: ['id'] },
{ model: Tag, required: false }, { model: Tag, required: false },
{ model: Place, required: false, attributes: ['id', 'name', 'address'] } { model: Place, required: false, attributes: ['id', 'name', 'address'] }
] ]

6
server/api/models/event.js
View file

@ -37,6 +37,10 @@ module.exports = (sequelize, DataTypes) => {
} }
event.prototype.toAP = function (username, follower) { event.prototype.toAP = function (username, follower) {
const tags = this.tags && '-' + this.tags.map(t => '#' + t.tag).join(' ')
const content = `<b><a href='${config.baseurl}/event/${this.id}'>${this.title}</a></b> @${this.place.name}
${moment.unix(this.start_datetime).format('dddd, D MMMM (HH:mm)')}<br/>
${this.description.length > 200 ? this.description.substr(0, 200) + '...' : this.description} ${tags} <br/>`
return { return {
id: `${config.baseurl}/federation/m/c_${this.id}`, id: `${config.baseurl}/federation/m/c_${this.id}`,
type: 'Create', type: 'Create',
@ -48,7 +52,7 @@ module.exports = (sequelize, DataTypes) => {
attributedTo: `${config.baseurl}/federation/u/${username}`, attributedTo: `${config.baseurl}/federation/u/${username}`,
to: 'https://www.w3.org/ns/activitystreams#Public', to: 'https://www.w3.org/ns/activitystreams#Public',
cc: follower ? follower: [], cc: follower ? follower: [],
content: `<b><a href='${config.baseurl}/event/${this.id}'>${this.title}</a></b> @${this.place.name} ${moment.unix(this.start_datetime).format('dddd, D MMMM (HH:mm)')}<br/>${this.description.length > 200 ? this.description.substr(0, 200) + '...' : this.description} - ${this.tags.map(t => '#' + t.tag).join(' ')} <br/>` content
} }
} }
} }