follow me / fedi export only if enabled

This commit is contained in:
les 2020-02-11 16:17:41 +01:00
parent df39f1aeb5
commit b1084a569f
3 changed files with 3 additions and 2 deletions

View file

@ -13,7 +13,7 @@
#links #links
a(href='https://gancio.org') Gancio {{settings.version}}</a> a(href='https://gancio.org') Gancio {{settings.version}}</a>
span span
a(rel='me' :href='settings.baseurl' @click.prevent='showFollowMe=true') follow me a(v-if='settings.enable_federation' rel='me' :href='settings.baseurl' @click.prevent='showFollowMe=true') follow me
nuxt-link(to='/about') about nuxt-link(to='/about') about
a(href='https://blog.gancio.org') blog a(href='https://blog.gancio.org') blog
a(href='https://framagit.org/les/gancio') source a(href='https://framagit.org/les/gancio') source

View file

@ -21,7 +21,7 @@
v-clipboard:copy='link' v-clipboard:success='copyLink' v-clipboard:copy='link' v-clipboard:success='copyLink'
type="primary" icon='el-icon-document' ) {{$t("common.copy")}} type="primary" icon='el-icon-document' ) {{$t("common.copy")}}
el-tab-pane.pt-1(:label="$t('common.fediverse')" name='fediverse') el-tab-pane.pt-1(v-if='settings.enable_federation' :label="$t('common.fediverse')" name='fediverse')
FollowMe FollowMe
el-tab-pane.pt-1(label='ics/ical' name='ics') el-tab-pane.pt-1(label='ics/ical' name='ics')

View file

@ -175,6 +175,7 @@ const eventController = {
async getUnconfirmed (req, res) { async getUnconfirmed (req, res) {
const events = await Event.findAll({ const events = await Event.findAll({
where: { where: {
parentId: null,
is_visible: false is_visible: false
}, },
order: [['start_datetime', 'ASC']], order: [['start_datetime', 'ASC']],