graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-12-23 22:23:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix: ピン留め投稿の表示順がおかしい (#4906)

Browse source 
* Fix: syuilo#4904

* fix comment
This commit is contained in:
MeiMei 2019-05-12 09:37:00 +09:00 committed by syuilo
parent 24c6dff3e4
commit 410b9ad6bc
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/models/repositories/user.ts
View file

@ -72,7 +72,10 @@ export class UserRepository extends Repository<User> {
const meId = me ? typeof me === 'string' ? me : me.id : null;
const relation = meId && (meId !== user.id) && opts.detail ? await this.getRelation(meId, user.id) : null;
const pins = opts.detail ? await UserNotePinings.find({ userId: user.id }) : [];
const pins = opts.detail ? await UserNotePinings.find({
where: { userId: user.id },
order: { id: 'DESC' }
}) : [];
const profile = opts.detail ? await UserProfiles.findOne(user.id).then(ensure) : null;
const falsy = opts.detail ? false : undefined;

8
src/remote/activitypub/models/person.ts
View file

@ -474,9 +474,15 @@ export async function updateFeatured(userId: User['id']) {
.slice(0, 5)
.map(item => limit(() => resolveNote(item, resolver))));
// delete
await UserNotePinings.delete({ userId: user.id });
// とりあえずidを別の時間で生成して順番を維持
let td = 0;
for (const note of featuredNotes.filter(note => note != null)) {
td -= 1000;
UserNotePinings.save({
id: genId(),
id: genId(new Date(Date.now() + td)),
createdAt: new Date(),
userId: user.id,
noteId: note!.id

5
src/server/activitypub/featured.ts
View file

@ -21,7 +21,10 @@ export default async (ctx: Router.IRouterContext) => {
return;
}
const pinings = await UserNotePinings.find({ userId: user.id });
const pinings = await UserNotePinings.find({
where: { userId: user.id },
order: { id: 'DESC' }
});
const pinnedNotes = await Promise.all(pinings.map(pining =>
Notes.findOne(pining.noteId).then(ensure)));