mirror of
https://github.com/cheeaun/phanpy.git
synced 2025-03-22 05:39:20 +01:00
Quick fix for pinned post not showing pin
_pinned no longer stored with post, so pinned posts now can't be reactive
This commit is contained in:
parent
6d5b2ef9a6
commit
d16cd501d4
2 changed files with 10 additions and 5 deletions
|
@ -461,6 +461,7 @@ function TimelineItem({
|
||||||
view,
|
view,
|
||||||
}) {
|
}) {
|
||||||
const { id: statusID, reblog, items, type, _pinned } = status;
|
const { id: statusID, reblog, items, type, _pinned } = status;
|
||||||
|
if (_pinned) useItemID = false;
|
||||||
const actualStatusID = reblog?.id || statusID;
|
const actualStatusID = reblog?.id || statusID;
|
||||||
const url = instance
|
const url = instance
|
||||||
? `/${instance}/s/${actualStatusID}`
|
? `/${instance}/s/${actualStatusID}`
|
||||||
|
@ -496,11 +497,12 @@ function TimelineItem({
|
||||||
<li key={`timeline-${statusID}`} class="timeline-item-carousel">
|
<li key={`timeline-${statusID}`} class="timeline-item-carousel">
|
||||||
<StatusCarousel title={title} class={`${type}-carousel`}>
|
<StatusCarousel title={title} class={`${type}-carousel`}>
|
||||||
{items.map((item) => {
|
{items.map((item) => {
|
||||||
const { id: statusID, reblog } = item;
|
const { id: statusID, reblog, _pinned } = item;
|
||||||
const actualStatusID = reblog?.id || statusID;
|
const actualStatusID = reblog?.id || statusID;
|
||||||
const url = instance
|
const url = instance
|
||||||
? `/${instance}/s/${actualStatusID}`
|
? `/${instance}/s/${actualStatusID}`
|
||||||
: `/s/${actualStatusID}`;
|
: `/s/${actualStatusID}`;
|
||||||
|
if (_pinned) useItemID = false;
|
||||||
return (
|
return (
|
||||||
<li key={statusID}>
|
<li key={statusID}>
|
||||||
<Link class="status-carousel-link timeline-item-alt" to={url}>
|
<Link class="status-carousel-link timeline-item-alt" to={url}>
|
||||||
|
|
|
@ -152,16 +152,19 @@ function AccountStatuses() {
|
||||||
|
|
||||||
const results = [];
|
const results = [];
|
||||||
if (firstLoad) {
|
if (firstLoad) {
|
||||||
const { value: pinnedStatuses } = await masto.v1.accounts
|
const { value } = await masto.v1.accounts
|
||||||
.$select(id)
|
.$select(id)
|
||||||
.statuses.list({
|
.statuses.list({
|
||||||
pinned: true,
|
pinned: true,
|
||||||
})
|
})
|
||||||
.next();
|
.next();
|
||||||
if (pinnedStatuses?.length && !tagged && !media) {
|
if (value?.length && !tagged && !media) {
|
||||||
pinnedStatuses.forEach((status) => {
|
const pinnedStatuses = value.map((status) => {
|
||||||
saveStatus(status, instance);
|
saveStatus(status, instance);
|
||||||
status._pinned = true;
|
return {
|
||||||
|
...status,
|
||||||
|
_pinned: true,
|
||||||
|
};
|
||||||
});
|
});
|
||||||
if (pinnedStatuses.length >= 3) {
|
if (pinnedStatuses.length >= 3) {
|
||||||
const pinnedStatusesIds = pinnedStatuses.map((status) => status.id);
|
const pinnedStatusesIds = pinnedStatuses.map((status) => status.id);
|
||||||
|
|
Loading…
Reference in a new issue