Merge branch 'develop' into marked-mfm
ci/woodpecker/push/woodpecker Pipeline was successful Details
ci/woodpecker/pr/woodpecker Pipeline was successful Details

This commit is contained in:
FloatingGhost 2022-07-15 10:58:41 +01:00
commit dba047ce34
4 changed files with 24 additions and 10 deletions

View File

@ -80,11 +80,16 @@
}
.nav-icon {
margin-left: 0.2em;
margin-left: 1em;
width: 2em;
height: 100%;
font-size: 130%;
text-align: center;
&-logout {
margin-left: 2em;
}
.svg-inline--fa {
color: $fallback--link;
color: var(--topBarLink, $fallback--link);

View File

@ -63,7 +63,7 @@
</a>
<button
v-if="currentUser"
class="button-unstyled nav-icon"
class="button-unstyled nav-icon nav-icon-logout"
@click.prevent="logout"
>
<FAIcon

View File

@ -112,17 +112,11 @@ const PostStatusForm = {
const preset = this.$route.query.message
let statusText = preset || ''
const { scopeCopy } = this.$store.getters.mergedConfig
if (this.replyTo) {
const currentUser = this.$store.state.users.currentUser
statusText = buildMentionsString({ user: this.repliedUser, attentions: this.attentions }, currentUser)
}
const scope = ((this.copyMessageScope && scopeCopy) || this.copyMessageScope === 'direct')
? this.copyMessageScope
: this.$store.state.users.currentUser.default_scope
const { postContentType: contentType, sensitiveByDefault, sensitiveIfSubject } = this.$store.getters.mergedConfig
return {
@ -139,7 +133,7 @@ const PostStatusForm = {
files: [],
poll: {},
mediaDescriptions: {},
visibility: scope,
visibility: this.suggestedVisibility(),
contentType
},
caret: 0,
@ -614,6 +608,19 @@ const PostStatusForm = {
},
openProfileTab () {
this.$store.dispatch('openSettingsModalTab', 'profile')
},
suggestedVisibility () {
if (this.copyMessageScope) {
if (this.copyMessageScope === 'direct') {
return this.copyMessageScope
}
if (this.$store.getters.mergedConfig.scopeCopy) {
if (this.copyMessageScope !== 'public' && this.$store.state.users.currentUser.default_scope !== 'private') {
return this.copyMessageScope
}
}
}
return this.$store.state.users.currentUser.default_scope
}
}
}

View File

@ -1,3 +1,5 @@
<h4>Terms of Service</h4>
<p>This is a placeholder, overwrite this by putting a file at <pre>instance/static/terms_of_service.html</pre><p>
<p>This is a placeholder, overwrite this by putting a file at <pre>$STATIC_DIR/static/terms-of-service.html</pre><p>
<p>See the <a href="https://docs.akkoma.dev/main/backend/configuration/static_dir/">Static Directory</a> docs for more info.</p>