fix: 💚 eslint fixes

.vscode/tasks.json

@@ -0,0 +1,16 @@
+{
+ "version": "2.0.0",
+ "tasks": [
+ {
+ "type": "npm",
+ "script": "lint",
+ "problemMatcher": [],
+ "label": "npm: lint",
+ "detail": "eslint --ext .ts ./src",
+ "group": {
+ "kind": "test",
+ "isDefault": true
+ }
+ }
+ ]
+}

schema/events.graphql

@@ -135,9 +135,6 @@ type NftIssuedEventData {
 
  "NFT's initial owner."
  nftOwner: NftOwner!
-
- "init transactional status"
- transactionalStatus: TransactionalStatus!
 }
 
 # Atlas use-case: `GetNftActivities`, `GetNftHistory`

src/mappings/content/commentsAndReactions.ts

@@ -29,7 +29,6 @@ import {
  CommentTextUpdatedEventData,
  Event,
  MemberRecipient,
- Membership,
  MetaprotocolTransactionResult,
  MetaprotocolTransactionResultCommentCreated,
  MetaprotocolTransactionResultCommentDeleted,

src/mappings/content/metadata.ts

@@ -74,7 +74,6 @@ import {
  ASSETS_MAP,
  EntityAssetProps,
  EntityAssetsMap,
- getAccountForMember,
  getChannelOwnerAccount,
  MetaNumberProps,
 } from './utils'

src/mappings/content/nft.ts

@@ -8,7 +8,6 @@ import {
  englishAuctionNotifiers,
  findTopBid,
  finishAuction,
- getChannelOwnerAccount,
  getChannelTitle,
  getCurrentAuctionFromVideo,
  getNftOwnerMemberId,
@@ -44,9 +43,7 @@ import {
  TransactionalStatusIdle,
  TransactionalStatusInitiatedOfferToMember,
  Video,
- Channel,
  MemberRecipient,
- NftOffered,
  NotificationData,
  NewAuction,
  NewNftOnSale,
@@ -73,7 +70,6 @@ import {
  timedAuctionExpiredLink,
  timedAuctionExpiredText,
 } from '../../utils/notification'
-import { channel } from 'diagnostics_channel'
 
 export async function processOpenAuctionStartedEvent({
  overlay,
@@ -599,9 +595,6 @@ export async function processOpenAuctionBidAcceptedEvent({
 
 export async function processOfferStartedEvent({
  overlay,
- block,
- indexInBlock,
- extrinsicHash,
  event: {
  asV1000: [videoId, , memberId, price],
  },
@@ -628,7 +621,6 @@ export async function processOfferAcceptedEvent({
 }: EventHandlerContext<'Content.OfferAccepted'>): Promise<void> {
  // load NFT
  const nft = await overlay.getRepository(OwnedNft).getByIdOrFail(videoId.toString())
- const previousNftOwnerId = await getNftOwnerMemberId(overlay, nft.owner)
 
  // read member from offer
  const memberId = (nft.transactionalStatus as TransactionalStatusInitiatedOfferToMember).member

src/mappings/content/utils.ts

@@ -51,13 +51,11 @@ import {
  NotificationData,
  NewAuctionBid,
  ChannelRecipient,
- Notification,
  NotificationType,
  OpenAuctionWon,
  OpenAuctionLost,
  EnglishAuctionWon,
  EnglishAuctionLost,
- RoyaltyPaid,
 } from '../../model'
 import { criticalError } from '../../utils/misc'
 import { EntityManagerOverlay, Flat } from '../../utils/overlay'
@@ -82,18 +80,15 @@ import {
  higherBidPlacedLink,
  nftBidOutbidText,
  nftBidReceivedText,
- nftRoyaltyPaymentReceivedText,
  openAuctionBidLostText,
  openAuctionBidWonText,
  openAuctionLostLink,
  openAuctionWonLink,
- royaltiesReceivedLink,
  timedAuctionBidLostText,
  timedAuctionBidWonText,
  timedAuctionLostLink,
  timedAuctionWonLink,
 } from '../../utils/notification'
-import { type } from 'os'
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type AsDecoded<MetaClass> = MetaClass extends { create: (props?: infer I) => any }
@@ -263,7 +258,6 @@ export async function processNft(
  actor: parseContentActor(issuer),
  nft: nft.id,
  nftOwner: nft.owner,
- transactionalStatus: nft.transactionalStatus!,
  }),
  })
 
@@ -675,9 +669,9 @@ export async function getFollowersAccountsForChannel(
 ): Promise<Account[]> {
  const followers = await overlay.getEm().getRepository(ChannelFollow).findBy({ channelId })
 
- const followersUserIds = await Promise.all(
- followers.filter((follower) => follower.userId).map((follower) => follower.userId!)
- )
+ const followersUserIds = followers
+ .filter((follower) => follower?.userId)
+  .map((follower) => follower.userId as string)
 
  const followersAccounts = await Promise.all(
  followersUserIds.map(
@@ -815,9 +809,9 @@ export async function notifyBiddersOnAuctionCompletion(
  },
  event: Event
 ) {
- for (const bidderId of biddersMemberIds.map((id) => id)) {
+ for (const bidderId of biddersMemberIds.filter((id) => id)) {
  const account = await getAccountForMember(overlay.getEm(), bidderId)
- const memberHandle = (await memberHandleById(overlay, bidderId!)) || ''
+ const memberHandle = (await memberHandleById(overlay, bidderId)) || ''
  const notification =
  bidderId === winnerId.toString() ? notifier.won(memberHandle) : notifier.lost(memberHandle)
 
@@ -829,6 +823,12 @@ export type PageLinkData = {
  em: EntityManager
  videoId: string
 }
+
+export type AuctionNotifiers = {
+ won: (memberHandle: string) => NotificationType
+ lost: (memberHandle: string) => NotificationType
+}
+
 export const openAuctionNotifiers = async (
  { em, videoId }: PageLinkData,
  videoTitle: string
@@ -859,11 +859,6 @@ export const openAuctionNotifiers = async (
  }
 }
 
-export type AuctionNotifiers = {
- won: (memberHandle: string) => NotificationType
- lost: (memberHandle: string) => NotificationType
-}
-
 export const englishAuctionNotifiers = async (
  { em, videoId }: PageLinkData,
  videoTitle: string

src/mappings/utils.ts

@@ -2,13 +2,7 @@ import { metaToObject } from '@joystream/metadata-protobuf/utils'
 import { AnyMetadataClass, DecodedMetadataObject } from '@joystream/metadata-protobuf/types'
 import { Logger } from '../logger'
 import { SubstrateBlock } from '@subsquid/substrate-processor'
-import {
- Event,
- MetaprotocolTransactionResultFailed,
- NftActivity,
- NftHistoryEntry,
- Account,
-} from '../model'
+import { Event, MetaprotocolTransactionResultFailed, NftActivity, NftHistoryEntry } from '../model'
 import { encodeAddress } from '@polkadot/util-crypto'
 import { EntityManagerOverlay } from '../utils/overlay'
 import { Bytes } from '@polkadot/types/primitive'

src/model/generated/index.ts

@@ -24,11 +24,6 @@ export * from "./_nftOwnerChannel"
 export * from "./_nftOwnerMember"
 export * from "./_englishAuctionStartedEventData"
 export * from "./_nftIssuedEventData"
-export * from "./_transactionalStatus"
-export * from "./_transactionalStatusIdle"
-export * from "./_transactionalStatusInitiatedOfferToMember"
-export * from "./_transactionalStatusBuyNow"
-export * from "./_transactionalStatusAuction"
 export * from "./_nftOfferedEventData"
 export * from "./_auctionBidMadeEventData"
 export * from "./_auctionBidCanceledEventData"
@@ -169,6 +164,11 @@ export * from "./_avatarObject"
 export * from "./_avatarUri"
 export * from "./membership.model"
 export * from "./ownedNft.model"
+export * from "./_transactionalStatus"
+export * from "./_transactionalStatusIdle"
+export * from "./_transactionalStatusInitiatedOfferToMember"
+export * from "./_transactionalStatusBuyNow"
+export * from "./_transactionalStatusAuction"
 export * from "./auction.model"
 export * from "./_auctionType"
 export * from "./_auctionTypeEnglish"

src/server-extension/resolvers/AccountResolver/index.ts

@@ -1,5 +1,5 @@
 import 'reflect-metadata'
-import { Query, Resolver, Mutation, UseMiddleware, Ctx, Info, Args } from 'type-graphql'
+import { Query, Resolver, UseMiddleware, Ctx, Info } from 'type-graphql'
 import { EntityManager } from 'typeorm'
 import { AccountOnly } from '../middleware'
 import { AccountData, FollowedChannel } from './types'

src/server-extension/resolvers/AccountResolver/types.ts

@@ -1,4 +1,4 @@
-import { Field, ObjectType, ArgsType } from 'type-graphql'
+import { Field, ObjectType } from 'type-graphql'
 
 @ObjectType()
 export class FollowedChannel {

src/server-extension/resolvers/AdminResolver/index.ts

@@ -47,7 +47,7 @@ import { parseObjectTree } from '@subsquid/openreader/lib/opencrud/tree'
 import { getResolveTree } from '@subsquid/openreader/lib/util/resolve-tree'
 import { EntityByIdQuery } from '@subsquid/openreader/lib/sql/query'
 import { getObjectSize } from '@subsquid/openreader/lib/limit.size'
-import { VideoHero, VideosConnection } from '../baseTypes'
+import { VideoHero } from '../baseTypes'
 import { model } from '../model'
 import { ed25519PairFromString, ed25519Sign } from '@polkadot/util-crypto'
 import { u8aToHex, hexToU8a, isHex } from '@polkadot/util'

src/server-extension/resolvers/ChannelsResolver/index.ts

@@ -227,13 +227,14 @@ export class ChannelsResolver {
 
  const ownerAccount = await getChannelOwnerAccount(em, channel)
  if (ownerAccount) {
- const { account: followerAccount } = ctx // non-null because of @UseMiddleware(AccountOnly)
+ if (ctx.account === undefined) {
+ // account not null because of the UseMiddleware(AccountOnly) decorator
+ throw new Error('Account not specified')
+ }
+ const followerAccount = ctx.account as Account
  const followerHandle =
- (
- await em
- .getRepository(Membership)
- .findOneByOrFail({ id: followerAccount!.membershipId })
- )?.handle || ''
+ (await em.getRepository(Membership).findOneByOrFail({ id: followerAccount.membershipId }))
+ ?.handle || ''
  const linkPage = await newChannelFollowerLink(em, followerHandle)
  const channelTitle = channel.title || ''
  await addNotification(

src/server-extension/resolvers/NotificationResolver/index.ts

@@ -4,7 +4,7 @@ import { EntityManager } from 'typeorm'
 import { AccountOnly } from '../middleware'
 import { Context } from '../../check'
 import { withHiddenEntities } from '../../../utils/sql'
-import { Notification, NotificationPreference, Read } from '../../../model'
+import { Account, Notification, NotificationPreference, Read } from '../../../model'
 import {
  AccountNotificationPreferencesInput,
  AccountNotificationPreferencesOutput,
@@ -29,7 +29,7 @@ export class NotificationResolver {
  return withHiddenEntities(em, async () => {
  const notificationsReadIds: string[] = []
  for (const notificationId of notificationIds.filter((id) => id)) {
- const notification = await em.getRepository(Notification).findOneBy({ id: notificationId! })
+ const notification = await em.getRepository(Notification).findOneBy({ id: notificationId })
  if (notification?.accountId) {
  if (notification.accountId !== ctx.accountId) {
  throw new Error('This notification cannot be read from this account')
@@ -55,10 +55,12 @@ export class NotificationResolver {
  const em = await this.em()
 
  return withHiddenEntities(em, async () => {
- const account = ctx.account
- if (!account) {
- throw new Error('Account not found')
+ if (ctx.account === undefined) {
+  // account not null because of the UseMiddleware(AccountOnly) decorator
+ throw new Error('Account not specified')
  }
+ const account = ctx.account as Account // avoid ctx.account! due to eslint
+
  maybeUpdateNotificationPreference(
  newPreferences.channelExcludedFromAppNotificationEnabled,
  account.notificationPreferences.channelExcludedFromAppNotificationEnabled
@@ -189,7 +191,7 @@ export class NotificationResolver {
  )
  await em.save(account)
 
- return toOutputGQL(account!.notificationPreferences)
+ return toOutputGQL(account.notificationPreferences)
  })
  }
 }

src/utils/notification/helpers.ts

@@ -133,22 +133,22 @@ export async function addNotification(
  const notificationChainTag = event ? 'OffChainNotification' : 'OnChainNotification'
  // create notification as disabled = true
  const { inAppEnabled, emailEnabled } = preferencesForNotification(
- account!.notificationPreferences,
+ account.notificationPreferences,
  notificationType
  )
  // create notification (for the notification center)
  const nextNotificationId = await getNextIdForEntity(em, notificationChainTag)
  const notification = new Notification({
  id: notificationChainTag + '-' + nextNotificationId.toString(),
- accountId: account!.id,
+ accountId: account.id,
  notificationType,
  eventId: event?.id,
  status: new Unread(),
  })
 
  // deliver via mail if enabled
  if (emailEnabled) {
- await deliverNotificationViaEmail(em, account!, notification)
+ await deliverNotificationViaEmail(em, account, notification)
  }
 
  // deliver via in app if enabled

src/utils/offchainState.ts

@@ -75,12 +75,12 @@ function migrateExportDataToV300(data: ExportedData): ExportedData {
 
 function migrateExportDataToV310(data: ExportedData): ExportedData {
  // account will find himself with all notification pref. enabled by default
- data.Account?.values.map((account) => {
+ data.Account?.values.forEach((account) => {
  account.notificationPreferences = defaultNotificationPreferences()
  })
 
  // setting channel native Orion verification status to false
- data.Channel?.values.map((channel) => {
+ data.Channel?.values.forEach((channel) => {
  channel.isVerified = false
  })
 
@@ -275,17 +275,19 @@ export class OffchainState {
  }
 
  private async migrateCounters(exportedVersion: string, em: EntityManager): Promise<void> {
- Object.entries(this.globalCountersMigration)
- .sort(([a], [b]) => this.versionToNumber(a) - this.versionToNumber(b)) // sort in increasing order
- .forEach(([version, counters]) => {
- if (this.versionToNumber(exportedVersion) < this.versionToNumber(version)) {
- this.logger.info(`Migrating global counters to version ${version}`)
- counters.forEach(async (entityName) => {
- // build query that gets the entityName with the highest id
- const latestId = await em.query(`SELECT id FROM ${entityName} ORDER BY id DESC LIMIT 1`)
- await em.save(new NextEntityId({ entityName, nextId: Number(latestId) + 1 }))
- })
+ const migrationData = Object.entries(this.globalCountersMigration).sort(
+ ([a], [b]) => this.versionToNumber(a) - this.versionToNumber(b)
+ ) // sort in increasing order
+
+ for (const [version, counters] of migrationData) {
+ if (this.versionToNumber(exportedVersion) < this.versionToNumber(version)) {
+ this.logger.info(`Migrating global counters to version ${version}`)
+ for (const entityName of counters) {
+ // build query that gets the entityName with the highest id
+ const latestId = await em.query(`SELECT id FROM ${entityName} ORDER BY id DESC LIMIT 1`)
+ await em.save(new NextEntityId({ entityName, nextId: Number(latestId) + 1 }))
  }
- })
+ }
+ }
  }
 }