diff --git a/packages/api/src/resolvers/filters/index.ts b/packages/api/src/resolvers/filters/index.ts index 3ee08715e..fd6193a6c 100644 --- a/packages/api/src/resolvers/filters/index.ts +++ b/packages/api/src/resolvers/filters/index.ts @@ -237,7 +237,7 @@ export const updateFilterResolver = authorized< } const filter = await getRepository(Filter).findOne({ - where: { id }, + where: { id, user: { id: uid } }, relations: ['user'], }) if (!filter) { diff --git a/packages/api/src/services/create_user.ts b/packages/api/src/services/create_user.ts index cfd66a09c..5324fd82d 100644 --- a/packages/api/src/services/create_user.ts +++ b/packages/api/src/services/create_user.ts @@ -110,7 +110,9 @@ const createDefaultFiltersForUser = { name: 'Continue Reading', filter: 'in:inbox sort:read-desc is:unread' }, { name: 'Non-Feed Items', filter: 'in:library' }, { name: 'Highlights', filter: 'has:highlights mode:highlights' }, - { name: 'Unlabelled', filter: 'no:label' }, + { name: 'Unlabeled', filter: 'no:label' }, + { name: 'Oldest First', filter: 'sort:saved-asc' }, + { name: 'Files', filter: 'type:file' }, { name: 'Archived', filter: 'in:archive' }, ].map((it, position) => ({ ...it, diff --git a/packages/db/migrations/0119.do.add_defaults_to_filters.sql b/packages/db/migrations/0119.do.add_defaults_to_filters.sql index 60b3a6f43..1d38162dd 100644 --- a/packages/db/migrations/0119.do.add_defaults_to_filters.sql +++ b/packages/db/migrations/0119.do.add_defaults_to_filters.sql @@ -47,12 +47,22 @@ FROM omnivore.user ON CONFLICT DO NOTHING; INSERT INTO omnivore.filters (user_id, category, name, filter, position, default_filter) -SELECT id, 'Search','Unlabelled', 'no:label', 4, true +SELECT id, 'Search','Unlabeled', 'no:label', 4, true FROM omnivore.user ON CONFLICT DO NOTHING; INSERT INTO omnivore.filters (user_id, category, name, filter, position, default_filter) -SELECT id, 'Search', 'Archived', 'in:archive', 5, true +SELECT id, 'Search','Oldest First', 'sort:saved-asc', 5, true +FROM omnivore.user + ON CONFLICT DO NOTHING; + +INSERT INTO omnivore.filters (user_id, category, name, filter, position, default_filter) +SELECT id, 'Search','Files', 'type:file', 6, true +FROM omnivore.user + ON CONFLICT DO NOTHING; + +INSERT INTO omnivore.filters (user_id, category, name, filter, position, default_filter) +SELECT id, 'Search', 'Archived', 'in:archive', 7, true FROM omnivore.user ON CONFLICT DO NOTHING;