Merge remote-tracking branch 'origin/develop' into api-refactor

This commit is contained in:
Henry Jameson 2026-06-16 16:28:01 +03:00
commit de2ffbf241
11 changed files with 46 additions and 41 deletions

View file

@ -22,7 +22,7 @@
v-if="sortedChatList.length > 0"
class="timeline"
>
<List :items="sortedChatList">
<List :external-items="sortedChatList">
<template #item="{item}">
<ChatListItem
:key="item.id"

View file

@ -4,6 +4,7 @@
overflow: hidden;
box-sizing: border-box;
cursor: pointer;
width: 100%;
:focus {
outline: none;

View file

@ -33,6 +33,10 @@
&:not(:last-child) {
border-bottom: 1px dotted var(--border);
}
&:empty {
border: none;
}
}
.header {

View file

@ -1,5 +1,6 @@
.FrontendsTab {
padding: 0 1em;
.cards-list {
padding: 0;
}

View file

@ -20,8 +20,10 @@
flex-direction: column;
gap: 1em;
border-right: 1px solid var(--border);
padding: 0 1em;
padding: 1em;
margin-right: 1em;
overflow: auto visible;
flex: 0 0 auto;
> div {
flex: 0 1 auto;

View file

@ -3,9 +3,6 @@
class="UsersTab"
:label="$t('admin_dash.users.management')"
>
<h3>
{{ $t('admin_dash.users.title') }}
</h3>
<div class="splitter">
<div class="filters-section">
<label class="filter">
@ -136,7 +133,7 @@
<AdminUserCard :user-id="item.id" />
</template>
<template #empty>
<span>{{ $t('admin_dash.users.no_users_found')}}</span>
<span>{{ $t('admin_dash.users.no_users_found') }}</span>
</template>
</List>
</div>

View file

@ -131,40 +131,41 @@ const Status = {
Quote: defineAsyncComponent(() => import('src/components/quote/quote.vue')),
StatusActionButtons,
},
props: [
'statusoid',
'replies',
props: {
statusoid: Object,
replies: Array,
'expandable',
'focused',
'highlight',
'compact',
'isPreview',
'noHeading',
'inlineExpanded',
'showPinned',
'inProfile',
'inConversation',
'inQuote',
'profileUserId',
'simpleTree',
'showOtherRepliesAsButton',
'dive',
'ignoreMute',
expandable: Boolean,
focused: Boolean,
highlight: Boolean,
compact: Boolean,
isPreview: Boolean,
noHeading: Boolean,
inlineExpanded: Boolean,
showPinned: Boolean,
inProfile: Boolean,
inConversation: Boolean,
inQuote: Boolean,
'controlledThreadDisplayStatus',
'controlledToggleThreadDisplay',
'controlledShowingTall',
'controlledToggleShowingTall',
'controlledExpandingSubject',
'controlledToggleExpandingSubject',
'controlledShowingLongSubject',
'controlledToggleShowingLongSubject',
'controlledReplying',
'controlledToggleReplying',
'controlledMediaPlaying',
'controlledSetMediaPlaying',
],
profileUserId: String,
simpleTree: Boolean,
showOtherRepliesAsButton: Boolean,
dive: Function,
ignoreMute: Boolean,
controlledThreadDisplayStatus: String,
controlledToggleThreadDisplay: Function,
controlledShowingTall: Boolean,
controlledToggleShowingTall: Function,
controlledExpandingSubject: Boolean,
controlledToggleExpandingSubject: Function,
controlledShowingLongSubject: Boolean,
controlledToggleShowingLongSubject: Function,
controlledReplying: Boolean,
controlledToggleReplying: Function,
controlledMediaPlaying: Boolean,
controlledSetMediaPlaying: Function,
},
emits: ['goto', 'toggleExpanded'],
data() {
return {

View file

@ -56,6 +56,7 @@
.contents {
flex: 1 0 auto;
min-height: 0;
position: relative;
.hidden {
display: none;

View file

@ -33,6 +33,7 @@
:statusoid="item"
:in-conversation="false"
:focused="false"
ignore-mute
/>
</template>
</List>

View file

@ -31,7 +31,6 @@ const UserReportingModal = {
return !!this.$store.state.users.currentUser
},
isOpen() {
console.log(this.reportModal)
return this.isLoggedIn && this.reportModal.activated
},
userId() {

View file

@ -18,12 +18,10 @@ export const useReportsStore = defineStore('reports', {
}),
actions: {
openUserReportingModal({ userId, statusIds = [] }) {
console.log('ASS')
const preTickedStatuses = statusIds.map(
(id) => window.vuex.state.statuses.allStatusesObject[id],
)
const preTickedIds = statusIds
console.log(preTickedStatuses)
const statuses = preTickedStatuses.concat(
filter(
window.vuex.state.statuses.allStatuses,