diff --git a/backend/routers/ImageRouter.ts b/backend/routers/ImageRouter.ts index 4a55a30..bcd3156 100644 --- a/backend/routers/ImageRouter.ts +++ b/backend/routers/ImageRouter.ts @@ -71,6 +71,18 @@ export default class ImageRouter extends AppRouter { return (await page.apply(cursor.sort({ created: -1 })).toArray()).map(v => ImageRouter.deserialize(v, jwt?.name)); } + @rest('GET', '/likes/:username') + async likeFeed(username: string, @page() page: Page, @jwt('salt', false) @auth() jwt?: JWTPayload) { + const user = await this.db.users.findOne({ username }); + if (user === undefined) throw new HttpError("User not found."); + + const cursor = this.db.images.find({ $or: [ + { _id: { $in: user.likes }, visibility: Visibility.Public, }, + { _id: { $in: user.likes }, author: user.username, } + ] }); + + return (await page.apply(cursor.sort({ created: -1 })).toArray()).map(v => ImageRouter.deserialize(v, jwt?.name)); + } @rest('POST', '/upload') async upload(@body() body: Blob, @headers() headers: Headers, @jwt(v => v.salt, true) @auth() jwt: JWTPayload) { @@ -172,7 +184,7 @@ export default class ImageRouter extends AppRouter { if (!user) throw new HttpError("You don't exist."); const res = await this.db.images.updateOne( - { _id: id }, + { _id: id, visibility: { $not: { $eq: Visibility.Private } } }, { $addToSet: { likes: jwt.name } } ); if (res.matchedCount === 0) throw new HttpError("Image doesn't exist."); @@ -190,7 +202,7 @@ export default class ImageRouter extends AppRouter { if (!user) throw new HttpError("You don't exist."); const res = await this.db.images.updateOne( - { _id: id }, + { _id: id, visibility: { $not: { $eq: Visibility.Private } } }, { $pull: { likes: jwt.name } } ); if (res.matchedCount === 0) throw new HttpError("Image doesn't exist."); diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts index 84860c8..d54e83c 100644 --- a/frontend/src/app/app-routing.module.ts +++ b/frontend/src/app/app-routing.module.ts @@ -6,6 +6,7 @@ import { PageSignupComponent } from './page-signup/page-signup.component'; import { PageUploadComponent } from './page-upload/page-upload.component'; import { PageUserComponent } from './page-user/page-user.component'; import { PageImageComponent } from './page-image/page-image.component'; +import { PageLikesComponent } from './page-likes/page-likes.component'; const routes: Routes = [ { path: '', component: PageHomeComponent }, @@ -13,6 +14,7 @@ const routes: Routes = [ { path: 'signup', component: PageSignupComponent }, { path: 'upload', component: PageUploadComponent }, { path: 'user/:name', component: PageUserComponent }, + { path: 'likes/:name', component: PageLikesComponent }, { path: 'image/:id', component: PageImageComponent }, ]; diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index c98f792..6cee781 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -16,6 +16,7 @@ import { MessageComponent } from './message/message.component'; import { PageImageComponent } from './page-image/page-image.component'; import { SecurePipe } from './secure.pipe'; import { AuthorizerInterceptor } from './authorizer.interceptor'; +import { PageLikesComponent } from './page-likes/page-likes.component'; @NgModule({ declarations: [ @@ -25,6 +26,7 @@ import { AuthorizerInterceptor } from './authorizer.interceptor'; PageSignupComponent, PageUploadComponent, PageUserComponent, + PageLikesComponent, ImagesComponent, ImageComponent, MessageComponent, diff --git a/frontend/src/app/page-likes/page-likes.component.html b/frontend/src/app/page-likes/page-likes.component.html new file mode 100644 index 0000000..9a228d7 --- /dev/null +++ b/frontend/src/app/page-likes/page-likes.component.html @@ -0,0 +1,4 @@ +