diff --git a/packages/api/src/resolvers/function_resolvers.ts b/packages/api/src/resolvers/function_resolvers.ts index 386da6a21..276c9e508 100644 --- a/packages/api/src/resolvers/function_resolvers.ts +++ b/packages/api/src/resolvers/function_resolvers.ts @@ -429,11 +429,11 @@ export const functionResolvers = { // return await ctx.models.reaction.batchGetFromHighlight(id) // }, async createdByMe( - highlight: { userId: string; createdByMe?: boolean }, + highlight: { userId: string; createdByMe: boolean }, __: unknown, ctx: WithDataSourcesContext ) { - return highlight.createdByMe ?? highlight.userId === ctx.uid + return highlight.createdByMe || highlight.userId === ctx.uid }, }, // Reaction: { diff --git a/packages/api/src/resolvers/highlight/index.ts b/packages/api/src/resolvers/highlight/index.ts index 2dcd44b96..36707aad1 100644 --- a/packages/api/src/resolvers/highlight/index.ts +++ b/packages/api/src/resolvers/highlight/index.ts @@ -42,7 +42,7 @@ const highlightDataToHighlight = (highlight: HighlightData): Highlight => ({ replies: [], reactions: [], type: highlight.highlightType, - createdByMe: true, + createdByMe: false, user: { ...highlight.user, sharedArticles: [], @@ -181,6 +181,7 @@ export const updateHighlightResolver = authorized< annotation: input.annotation, html: input.html, quote: input.quote, + color: input.color, }, uid, pubsub diff --git a/packages/api/src/routers/auth/auth_router.ts b/packages/api/src/routers/auth/auth_router.ts index 8f005c60f..366c10ada 100644 --- a/packages/api/src/routers/auth/auth_router.ts +++ b/packages/api/src/routers/auth/auth_router.ts @@ -347,7 +347,7 @@ export function authRouter() { const state = JSON.parse((req.query?.state || '') as string) redirectUri = state?.redirect_uri } catch (err) { - logger.warn( + logger.error( 'handleSuccessfulLogin: failed to parse redirect query state param', err )