qugalet/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into fixes-batch

Browse source
This commit is contained in:
Henry Jameson 2024-12-19 14:54:40 +02:00
parent 619423eacb 3d68dda5a2
commit 76f340ce2d
54 changed files with 129 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
changelog.d/backend-repo-url.skip Normal file
View file

1
changelog.d/checkbox.fix Normal file
View file

@ -0,0 +1 @@
checkbox vertical alignment has been fixed

1
changelog.d/deprecate-subscribe.change Normal file
View file

@ -0,0 +1 @@
Use /api/v1/accounts/:id/follow for account subscriptions instead of the deprecated routes

1
changelog.d/misc-markup.fix Normal file
View file

@ -0,0 +1 @@
Fix small markup inconsistencies

1
changelog.d/show-bookmarks-on-mobile.fix Normal file
View file

@ -0,0 +1 @@
Bookmarks visible again on mobile

1
changelog.d/user-link.add Normal file
View file

@ -0,0 +1 @@
Make UserLink wrappable

1
changelog.d/weird-absolute-time-format.fix Normal file
View file

@ -0,0 +1 @@
Show only month and day instead of weird "day, hour" format. While at it, fixed typo "defualt" in a comment.

3
src/boot/after_store.js
View file

@ -243,7 +243,7 @@ const resolveStaffAccounts = ({ store, accounts }) => {
const getNodeInfo = async ({ store }) => {
try {
const res = await preloadFetch('/nodeinfo/2.0.json')
const res = await preloadFetch('/nodeinfo/2.1.json')
if (res.ok) {
const data = await res.json()
const metadata = data.metadata
@ -280,6 +280,7 @@ const getNodeInfo = async ({ store }) => {
const software = data.software
store.dispatch('setInstanceOption', { name: 'backendVersion', value: software.version })
store.dispatch('setInstanceOption', { name: 'backendRepository', value: software.repository })
store.dispatch('setInstanceOption', { name: 'pleromaBackend', value: software.name === 'pleroma' })
const priv = metadata.private

5
src/components/announcement_editor/announcement_editor.vue
View file

@ -34,8 +34,9 @@
id="announcement-all-day"
v-model="announcement.allDay"
:disabled="disabled"
/>
<label for="announcement-all-day">{{ $t('announcements.all_day_prompt') }}</label>
>
{{ $t('announcements.all_day_prompt') }}
</Checkbox>
</span>
</div>
</template>

4
src/components/announcements_page/announcements_page.vue
View file

@ -1,9 +1,9 @@
<template>
<div class="panel panel-default announcements-page">
<div class="panel-heading">
<span>
<h1 class="title">
{{ $t('announcements.page_header') }}
</span>
</h1>
</div>
<div class="panel-body">
<section

4
src/components/bookmark_folder_edit/bookmark_folder_edit.vue
View file

@ -13,7 +13,7 @@
icon="chevron-left"
/>
</button>
<div class="title">
<h1 class="title">
<i18n-t
v-if="id"
keypath="bookmark_folders.editing_folder"
@ -26,7 +26,7 @@
v-else
keypath="bookmark_folders.creating_folder"
/>
</div>
</h1>
</div>
<div class="panel-body">
<div class="input-wrap">

4
src/components/bookmark_folders/bookmark_folders.vue
View file

@ -1,9 +1,9 @@
<template>
<div class="Bookmark-folders panel panel-default">
<div class="panel-heading">
<div class="title">
<h1 class="title">
{{ $t('nav.bookmark_folders') }}
</div>
</h1>
<router-link
:to="{ name: 'bookmark-folder-new' }"
class="button-default btn new-folder-button"

4
src/components/chat_list/chat_list.vue
View file

@ -7,9 +7,9 @@
class="chat-list panel panel-default"
>
<div class="panel-heading -sticky">
<span class="title">
<h1 class="title">
{{ $t("chats.chats") }}
</span>
</h1>
<button
class="button-default"
@click="newChat"

13
src/components/checkbox/checkbox.vue
View file

@ -70,21 +70,26 @@ export default {
display: inline-block;
min-height: 1.2em;
&-indicator,
& .label {
vertical-align: middle;
}
& > &-indicator {
/* Reset .input stuff */
padding: 0;
margin: 0;
position: relative;
line-height: inherit;
display: inline;
padding-left: 1.2em;
display: inline-block;
width: 1.2em;
height: 1.2em;
box-shadow: none;
}
&-indicator::before {
position: absolute;
right: 0;
top: 0;
inset: 0;
display: block;
content: "✓";
transition: color 200ms;

4
src/components/conversation/conversation.vue
View file

@ -9,7 +9,9 @@
v-if="isExpanded"
class="panel-heading conversation-heading -sticky"
>
<span class="title"> {{ $t('timeline.conversation') }} </span>
<h1 class="title">
{{ $t('timeline.conversation') }}
</h1>
<button
v-if="collapsable"
class="button-unstyled -link"

4
src/components/dialog_modal/dialog_modal.vue
View file

@ -8,9 +8,9 @@
@click.stop=""
>
<div class="panel-heading dialog-modal-heading">
<div class="title">
<h1 class="title">
<slot name="header" />
</div>
</h1>
</div>
<div class="panel-body dialog-modal-content">
<slot name="default" />

4
src/components/edit_status_modal/edit_status_modal.vue
View file

@ -6,7 +6,9 @@
>
<div class="edit-form-modal-panel panel">
<div class="panel-heading">
{{ $t('post_status.edit_status') }}
<h1 class="title">
{{ $t('post_status.edit_status') }}
</h1>
</div>
<PostStatusForm
class="panel-body"

4
src/components/features_panel/features_panel.vue
View file

@ -2,9 +2,9 @@
<div class="features-panel">
<div class="panel panel-default base01-background">
<div class="panel-heading timeline-heading base02-background base04">
<div class="title">
<h1 class="title">
{{ $t('features_panel.title') }}
</div>
</h1>
</div>
<div class="panel-body features-panel">
<ul>

4
src/components/follow_requests/follow_requests.vue
View file

@ -1,9 +1,9 @@
<template>
<div class="settings panel panel-default">
<div class="panel-heading">
<div class="title">
<h1 class="title">
{{ $t('nav.friend_requests') }}
</div>
</h1>
</div>
<div class="panel-body">
<FollowRequestCard

4
src/components/interactions/interactions.vue
View file

@ -1,9 +1,9 @@
<template>
<div class="panel panel-default">
<div class="panel-heading">
<div class="title">
<h1 class="title">
{{ $t("nav.interactions") }}
</div>
</h1>
</div>
<tab-switcher
ref="tabSwitcher"

4
src/components/lists/lists.vue
View file

@ -2,7 +2,9 @@
<div class="Lists panel panel-default">
<div class="panel-heading">
<div class="title">
{{ $t('lists.lists') }}
<h1 class="title">
{{ $t('lists.lists') }}
</h1>
</div>
<router-link
:to="{ name: 'lists-new' }"

2
src/components/login_form/login_form.vue
View file

@ -3,7 +3,7 @@
<!-- Default panel contents -->
<div class="panel-heading">
{{ $t('login.login') }}
<h1 class="title">{{ $t('login.login') }}</h1>
</div>
<div class="panel-body">

4
src/components/mfa_form/recovery_form.vue
View file

@ -3,7 +3,9 @@
<!-- Default panel contents -->
<div class="panel-heading">
{{ $t('login.heading.recovery') }}
<h1 class="title">
{{ $t('login.heading.recovery') }}
</h1>
</div>
<div class="panel-body">

4
src/components/mfa_form/totp_form.vue
View file

@ -3,7 +3,9 @@
<!-- Default panel contents -->
<div class="panel-heading">
{{ $t('login.heading.totp') }}
<h1 class="title">
{{ $t('login.heading.totp') }}
</h1>
</div>
<div class="panel-body">

4
src/components/mobile_nav/mobile_nav.vue
View file

@ -50,13 +50,13 @@
@touchmove.stop="notificationsTouchMove"
>
<div class="panel-heading mobile-notifications-header">
<span class="title">
<h1 class="title">
{{ $t('notifications.notifications') }}
<span
v-if="unseenCountBadgeText"
class="badge -notification unseen-count"
>{{ unseenCountBadgeText }}</span>
</span>
</h1>
<span class="spacer" />
<button
v-if="notificationsAtTop"

4
src/components/notifications/notifications.vue
View file

@ -14,13 +14,13 @@
v-if="!noHeading"
class="notifications-heading panel-heading -sticky"
>
<div class="title">
<h1 class="title">
{{ $t('notifications.notifications') }}
<span
v-if="unseenCountBadgeText"
class="badge -notification unseen-count"
>{{ unseenCountBadgeText }}</span>
</div>
</h1>
<div
v-if="showScrollTop"
class="rightside-button"

4
src/components/password_reset/password_reset.vue
View file

@ -1,7 +1,9 @@
<template>
<div class="settings panel panel-default">
<div class="panel-heading">
{{ $t('password_reset.password_reset') }}
<h1 class="title">
{{ $t('password_reset.password_reset') }}
</h1>
</div>
<div class="panel-body">
<form

4
src/components/post_status_modal/post_status_modal.vue
View file

@ -7,7 +7,9 @@
>
<div class="post-form-modal-panel panel">
<div class="panel-heading">
{{ $t('post_status.new_status') }}
<h1 class="title">
{{ $t('post_status.new_status') }}
</h1>
</div>
<PostStatusForm
class="panel-body"

4
src/components/registration/registration.vue
View file

@ -1,7 +1,9 @@
<template>
<div class="settings panel panel-default">
<div class="panel-heading">
{{ $t('registration.registration') }}
<h1 class="title">
{{ $t('registration.registration') }}
</h1>
</div>
<div
v-if="!hasSignUpNotice"

4
src/components/remote_user_resolver/remote_user_resolver.vue
View file

@ -1,7 +1,9 @@
<template>
<div class="panel panel-default">
<div class="panel-heading">
{{ $t('remote_user_resolver.remote_user_resolver') }}
<h1 class="title">
{{ $t('remote_user_resolver.remote_user_resolver') }}
</h1>
</div>
<div class="panel-body">
<p>

4
src/components/search/search.vue
View file

@ -1,9 +1,9 @@
<template>
<div class="Search panel panel-default">
<div class="panel-heading">
<div class="title">
<h1 class="title">
{{ $t('nav.search') }}
</div>
</h1>
</div>
<div class="panel-body search-input-container">
<input

4
src/components/settings_modal/settings_modal.vue
View file

@ -7,9 +7,9 @@
>
<div class="settings-modal-panel panel">
<div class="panel-heading">
<span class="title">
<h1 class="title">
{{ modalMode === 'user' ? $t('settings.settings') : $t('admin_dash.window_title') }}
</span>
</h1>
<transition name="fade">
<div
v-if="currentSaveStateNotice"

4
src/components/settings_modal/tabs/theme_tab/theme_preview.vue
View file

@ -3,12 +3,12 @@
<div class="underlay underlay-preview" />
<div class="panel dummy">
<div class="panel-heading">
<div class="title">
<h1 class="title">
{{ $t('settings.style.preview.header') }}
<span class="badge -notification">
99
</span>
</div>
</h1>
<span class="faint">
{{ $t('settings.style.preview.header_faint') }}
</span>

7
src/components/settings_modal/tabs/version_tab.js
View file

@ -1,22 +1,17 @@
import { extractCommit } from 'src/services/version/version.service'
const pleromaFeCommitUrl = 'https://git.pleroma.social/pleroma/pleroma-fe/commit/'
const pleromaBeCommitUrl = 'https://git.pleroma.social/pleroma/pleroma/commit/'
const VersionTab = {
data () {
const instance = this.$store.state.instance
return {
backendVersion: instance.backendVersion,
backendRepository: instance.backendRepository,
frontendVersion: instance.frontendVersion
}
},
computed: {
frontendVersionLink () {
return pleromaFeCommitUrl + this.frontendVersion
},
backendVersionLink () {
return pleromaBeCommitUrl + extractCommit(this.backendVersion)
}
}
}

2
src/components/settings_modal/tabs/version_tab.vue
View file

@ -7,7 +7,7 @@
<ul class="option-list">
<li>
<a
:href="backendVersionLink"
:href="backendRepository"
target="_blank"
>{{ backendVersion }}</a>
</li>

4
src/components/shout_panel/shout_panel.vue
View file

@ -9,14 +9,14 @@
:class="{ 'shout-heading': floating }"
@click.stop.prevent="togglePanel"
>
<div class="title">
<h1 class="title">
{{ $t('shoutbox.title') }}
<FAIcon
v-if="floating"
icon="times"
class="close-icon"
/>
</div>
</h1>
</div>
<div class="panel-body shout-window">
<div

15
src/components/side_drawer/side_drawer.vue
View file

@ -76,6 +76,21 @@
/> {{ $t("nav.lists") }}
</router-link>
</li>
<li
v-if="currentUser"
@click="toggleDrawer"
>
<router-link
:to="{ name: 'bookmarks' }"
class="menu-item"
>
<FAIcon
fixed-width
class="fa-scale-110 fa-old-padding"
icon="bookmark"
/> {{ $t("nav.bookmarks") }}
</router-link>
</li>
<li
v-if="currentUser && pleromaChatMessagesAvailable"
@click="toggleDrawer"

4
src/components/status_history_modal/status_history_modal.vue
View file

@ -6,7 +6,9 @@
>
<div class="status-history-modal-panel panel">
<div class="panel-heading">
{{ $t('status.status_history') }} ({{ historyCount }})
<h1 class="title">
{{ $t('status.status_history') }} ({{ historyCount }})
</h1>
</div>
<div class="panel-body">
<div

2
src/components/timeago/timeago.vue
View file

@ -61,7 +61,7 @@ export default {
})
} else if (DateUtils.isSameMonth(this.timeAsDate, now)) {
return new Intl.DateTimeFormat(this.browserLocale, {
hour: 'numeric',
month: 'short',
day: 'numeric'
})
} else if (DateUtils.isSameYear(this.timeAsDate, now)) {

4
src/components/timeline_menu/timeline_menu.vue
View file

@ -29,8 +29,8 @@
</ul>
</template>
<template #trigger>
<span class="button-unstyled title timeline-menu-title">
<span class="timeline-title">{{ timelineName() }}</span>
<span class="button-unstyled timeline-menu-title">
<h1 class="title timeline-title">{{ timelineName() }}</h1>
<span>
<FAIcon
size="sm"

4
src/components/update_notification/update_notification.vue
View file

@ -9,9 +9,9 @@
:class="{ '-peek': !showingMore }"
>
<div class="panel-heading">
<span class="title">
<h1 class="title">
{{ $t('update.big_update_title') }}
</span>
</h1>
</div>
<div class="panel-body">
<div

2
src/components/user_card/user_card.vue
View file

@ -208,7 +208,7 @@
/>
<template v-if="relationship.following">
<ProgressButton
v-if="!relationship.subscribing"
v-if="!relationship.notifying"
class="btn button-default"
:click="subscribeUser"
:title="$t('user_card.subscribe')"

20
src/components/user_link/user_link.vue
View file

@ -1,12 +1,16 @@
<template>
<router-link
:title="user.screen_name_ui"
:to="userProfileLink(user)"
>
{{ at ? '@' : '' }}{{ user.screen_name_ui }}<UnicodeDomainIndicator
:user="user"
/>
</router-link>
<div class="user-profile-link">
<router-link
:title="user.screen_name_ui"
:to="userProfileLink(user)"
>
<slot>
{{ at ? '@' : '' }}{{ user.screen_name_ui }}<UnicodeDomainIndicator
:user="user"
/>
</slot>
</router-link>
</div>
</template>
<script>

4
src/components/user_profile/user_profile.vue
View file

@ -142,9 +142,9 @@
class="panel user-profile-placeholder"
>
<div class="panel-heading">
<div class="title">
<h1 class="title">
{{ $t('settings.profile_tab') }}
</div>
</h1>
</div>
<div>
<span v-if="error">{{ error }}</span>

2
src/components/user_reporting_modal/user_reporting_modal.vue
View file

@ -6,7 +6,7 @@
<div class="user-reporting-panel panel">
<div class="panel-heading">
<i18n-t
tag="div"
tag="h1"
keypath="user_reporting.title"
class="title"
>

4
src/components/who_to_follow/who_to_follow.vue
View file

@ -1,7 +1,9 @@
<template>
<div class="panel panel-default">
<div class="panel-heading">
{{ $t('who_to_follow.who_to_follow') }}
<h1 class="title">
{{ $t('who_to_follow.who_to_follow') }}
</h1>
</div>
<div class="panel-body">
<FollowCard

4
src/components/who_to_follow_panel/who_to_follow_panel.vue
View file

@ -2,9 +2,9 @@
<div class="who-to-follow-panel">
<div class="panel panel-default base01-background">
<div class="panel-heading timeline-heading base02-background base04">
<div class="title">
<h1 class="title">
{{ $t('who_to_follow.who_to_follow') }}
</div>
</h1>
</div>
<div class="who-to-follow">
<p

2
src/modules/config.js
View file

@ -185,7 +185,7 @@ export const defaultState = {
closingDrawerMarksAsSeen: undefined, // instance default
unseenAtTop: undefined, // instance default
ignoreInactionableSeen: undefined, // instance default
useAbsoluteTimeFormat: undefined, // instance defualt
useAbsoluteTimeFormat: undefined, // instance default
absoluteTimeFormatMinAge: undefined // instance default
}

1
src/modules/instance.js
View file

@ -159,6 +159,7 @@ const defaultState = {
// Version Information
backendVersion: '',
backendRepository: '',
frontendVersion: '',
pollsAvailable: false,

4
src/modules/users.js
View file

@ -452,11 +452,11 @@ const users = {
commit('clearFollowers', userId)
},
subscribeUser ({ rootState, commit }, id) {
return rootState.api.backendInteractor.subscribeUser({ id })
return rootState.api.backendInteractor.followUser({ id, notify: true })
.then((relationship) => commit('updateUserRelationship', [relationship]))
},
unsubscribeUser ({ rootState, commit }, id) {
return rootState.api.backendInteractor.unsubscribeUser({ id })
return rootState.api.backendInteractor.followUser({ id, notify: false })
.then((relationship) => commit('updateUserRelationship', [relationship]))
},
toggleActivationStatus ({ rootState, commit }, { user }) {

2
src/panel.scss
View file

@ -115,6 +115,8 @@
.title {
font-size: 1.3em;
margin: 0;
font-weight: normal;
}
.alert {

13
src/services/api/api.service.js
View file

@ -68,8 +68,6 @@ const MASTODON_UNBLOCK_USER_URL = id => `/api/v1/accounts/${id}/unblock`
const MASTODON_MUTE_USER_URL = id => `/api/v1/accounts/${id}/mute`
const MASTODON_UNMUTE_USER_URL = id => `/api/v1/accounts/${id}/unmute`
const MASTODON_REMOVE_USER_FROM_FOLLOWERS = id => `/api/v1/accounts/${id}/remove_from_followers`
const MASTODON_SUBSCRIBE_USER = id => `/api/v1/pleroma/accounts/${id}/subscribe`
const MASTODON_UNSUBSCRIBE_USER = id => `/api/v1/pleroma/accounts/${id}/unsubscribe`
const MASTODON_USER_NOTE_URL = id => `/api/v1/accounts/${id}/note`
const MASTODON_BOOKMARK_STATUS_URL = id => `/api/v1/statuses/${id}/bookmark`
const MASTODON_UNBOOKMARK_STATUS_URL = id => `/api/v1/statuses/${id}/unbookmark`
@ -275,6 +273,7 @@ const followUser = ({ id, credentials, ...options }) => {
const url = MASTODON_FOLLOW_URL(id)
const form = {}
if (options.reblogs !== undefined) { form.reblogs = options.reblogs }
if (options.notify !== undefined) { form.notify = options.notify }
return fetch(url, {
body: JSON.stringify(form),
headers: {
@ -1180,14 +1179,6 @@ const unmuteUser = ({ id, credentials }) => {
return promisedRequest({ url: MASTODON_UNMUTE_USER_URL(id), credentials, method: 'POST' })
}
const subscribeUser = ({ id, credentials }) => {
return promisedRequest({ url: MASTODON_SUBSCRIBE_USER(id), credentials, method: 'POST' })
}
const unsubscribeUser = ({ id, credentials }) => {
return promisedRequest({ url: MASTODON_UNSUBSCRIBE_USER(id), credentials, method: 'POST' })
}
const fetchBlocks = ({ maxId, credentials }) => {
const query = new URLSearchParams({ with_relationships: true })
if (maxId) {
@ -1978,8 +1969,6 @@ const apiService = {
fetchMutes,
muteUser,
unmuteUser,
subscribeUser,
unsubscribeUser,
fetchBlocks,
fetchOAuthTokens,
revokeOAuthToken,

6
src/services/version/version.service.js
View file

@ -1,6 +0,0 @@
export const extractCommit = versionString => {
const regex = /-g(\w+)/i
const matches = versionString.match(regex)
return matches ? matches[1] : ''
}

11
test/unit/specs/services/version/version.service.spec.js
View file

@ -1,11 +0,0 @@
import { extractCommit } from 'src/services/version/version.service.js'
describe('extractCommit', () => {
it('return short commit hash following "-g" characters', () => {
expect(extractCommit('1.0.0-45-g5e7aeebc')).to.eql('5e7aeebc')
})
it('return short commit hash without branch name', () => {
expect(extractCommit('1.0.0-45-g5e7aeebc-branch')).to.eql('5e7aeebc')
})
})