Merge pull request 'Make favicon next to post username use Still-Image functionality' (#327) from Mergan/pleroma-fe:still-image-instance-favicon into develop

Reviewed-on: AkkomaGang/akkoma-fe#327
This commit is contained in:
floatingghost 2023-08-04 15:09:56 +00:00
commit 856324fa26
2 changed files with 5 additions and 3 deletions

View file

@ -20,6 +20,7 @@ import generateProfileLink from 'src/services/user_profile_link_generator/user_p
import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js' import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
import { muteWordHits } from '../../services/status_parser/status_parser.js' import { muteWordHits } from '../../services/status_parser/status_parser.js'
import { unescape, uniqBy } from 'lodash' import { unescape, uniqBy } from 'lodash'
import StillImage from '../still-image/still-image.vue'
import { library } from '@fortawesome/fontawesome-svg-core' import { library } from '@fortawesome/fontawesome-svg-core'
import { import {
@ -117,7 +118,8 @@ const Status = {
RichContent, RichContent,
MentionLink, MentionLink,
MentionsLine, MentionsLine,
QuoteButton QuoteButton,
StillImage
}, },
props: [ props: [
'statusoid', 'statusoid',

View file

@ -174,12 +174,12 @@
> >
@{{ status.user.screen_name_ui }} @{{ status.user.screen_name_ui }}
</router-link> </router-link>
<img <StillImage
v-if="!!(status.user && status.user.favicon)" v-if="!!(status.user && status.user.favicon)"
class="status-favicon" class="status-favicon"
:src="status.user.favicon" :src="status.user.favicon"
:title="faviconAlt(status)" :title="faviconAlt(status)"
> />
</span> </span>
</div> </div>