added a few types

.eslintrc

@@ -48,6 +48,7 @@
       "never"
     ],
     "simple-import-sort/imports": "error",
-    "simple-import-sort/exports": "error"
+    "simple-import-sort/exports": "error",
+    "no-cond-assign": "off"
   }
 }

src/classes/Board.ts

@@ -1,13 +1,17 @@
 import BoardConfig from "../General/BoardConfig"
 import { d, g } from "../globals/globals"
+import Post from "./Post"
 import SimpleDict from "./SimpleDict"
+import Thread from "./Thread"
+
 
-/*
- * decaffeinate suggestions:
- * DS102: Remove unnecessary code created because of implicit returns
- * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
- */
 export default class Board {
+  ID: string
+  boardID: number | string
+  siteID: number
+  threads: SimpleDict<Thread>
+  posts: SimpleDict<Post>
+  config: any
   toString() { return this.ID }
 
   constructor(ID) {

src/classes/Callbacks.ts

@@ -1,12 +1,14 @@
 import Main from "../main/Main"
+import Post from "./Post"
+
 
-/*
- * decaffeinate suggestions:
- * DS102: Remove unnecessary code created because of implicit returns
- * DS206: Consider reworking classes to avoid initClass
- * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
- */
 export default class Callbacks {
+  static Post: Callbacks
+  static Thread: Callbacks
+  static CatalogThread: Callbacks
+  static CatalogThreadNative: Callbacks
+  type: string
+  keys: string[]
   static initClass() {
     this.Post = new Callbacks('Post')
     this.Thread = new Callbacks('Thread')

src/classes/CatalogThread.ts

@@ -1,11 +1,18 @@
 import $ from "../platform/$"
+import Board from "./Board"
+import Post from "./Post"
+import Thread from "./Thread"
 
 export default class CatalogThread {
+  ID: any
+  thread: Thread
+  board: any
+  nodes: { root: Post; thumb: HTMLElement; icons: any; postCount: number; fileCount: number; pageCount: number; replies: any }
   toString() { return this.ID }
 
-  constructor(root, thread) {
+  constructor(root: Post, thread: Thread) {
     this.thread = thread
-    this.ID    = this.thread.ID
+    this.ID = this.thread.ID + ''
     this.board = this.thread.board
     const { post } = this.thread.OP.nodes
     this.nodes = {

src/classes/CatalogThreadNative.ts

@@ -4,6 +4,13 @@ import Board from "./Board"
 import Thread from "./Thread"
 
 export default class CatalogThreadNative {
+  ID: number | string
+  nodes: { root: Thread; thumb: HTMLElement }
+  siteID: string
+  boardID: string
+  board: Board | import("/home/victor/proj/4chan-XZ/src/globals/globals").Board
+  threadID: number
+  thread: Thread
   toString() { return this.ID }
 
   constructor(root) {

src/classes/Connection.ts

@@ -1,13 +1,13 @@
 import { g } from "../globals/globals"
 import $ from "../platform/$"
+import Callbacks from "./Callbacks"
+
 
-/*
- * decaffeinate suggestions:
- * DS102: Remove unnecessary code created because of implicit returns
- * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
- */
 export default class Connection {
-  constructor(target, origin, cb={}) {
+  target: any
+  origin: any
+  cb: Callbacks
+  constructor(target: Window, origin: string, cb: Callbacks) {
     this.send = this.send.bind(this)
     this.onMessage = this.onMessage.bind(this)
     this.target = target
@@ -28,7 +28,7 @@ export default class Connection {
     return this.targetWindow().postMessage(`${g.NAMESPACE}${JSON.stringify(data)}`, this.origin)
   }
 
-  onMessage(e) {
+  onMessage(e: MessageEvent) {
     if ((e.source !== this.targetWindow()) ||
       (e.origin !== this.origin) ||
       (typeof e.data !== 'string') ||

src/classes/DataBoard.ts

@@ -11,6 +11,11 @@ import { dict, HOUR } from "../platform/helpers"
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
  */
 export default class DataBoard {
+  static keys: string[]
+  static changes: string[]
+  key: string
+  sync: VoidFunction
+  data: any
   static initClass() {
     this.keys = ['hiddenThreads', 'hiddenPosts', 'lastReadPosts', 'yourPosts', 'watchedThreads', 'watcherLastModified', 'customTitles']
 

src/classes/Fetcher.ts

@@ -21,6 +21,13 @@ import Thread from "./Thread"
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
  */
 export default class Fetcher {
+  archiveTags: { '\n': { innerHTML: string }; '[b]': { innerHTML: string }; '[/b]': { innerHTML: string }; '[spoiler]': { innerHTML: string }; '[/spoiler]': { innerHTML: string }; '[code]': { innerHTML: string }; '[/code]': { innerHTML: string }; '[moot]': { innerHTML: string }; '[/moot]': { innerHTML: string }; '[banned]': { innerHTML: string }; '[/banned]': { innerHTML: string }; '[fortune]'(text: string): { innerHTML: string }; '[/fortune]': { innerHTML: string }; '[i]': { innerHTML: string }; '[/i]': { innerHTML: string }; '[red]': { innerHTML: string }; '[/red]': { innerHTML: string }; '[green]': { innerHTML: string }; '[/green]': { innerHTML: string }; '[blue]': { innerHTML: string }; '[/blue]': { innerHTML: string } }
+  boardID: string
+  threadID: number
+  postID: number
+  root: HTMLElement
+  quoter: any
+  static flagCSS: any
   static initClass() {
 
     this.prototype.archiveTags = {
@@ -237,8 +244,7 @@ export default class Fetcher {
         } else {
           const greentext = text[0] === '>'
           text = text.replace(/(\[\/?[a-z]+):lit(\])/g, '$1$2')
-          text = text.split(/(>>(?:>\/[a-z\d]+\/)?\d+)/g).map((text2, j) =>
+          text = text.split(/(>>(?:>\/[a-z\d]+\/)?\d+)/g).map((text2, j) => { ((j % 2) ? "<span class=\"deadlink\">" + E(text2) + "</span>" : E(text2)) })
-            {((j % 2) ? "<span class=\"deadlink\">" + E(text2) + "</span>" : E(text2))})
           text = { innerHTML: ((greentext) ? "<span class=\"quote\">" + E.cat(text) + "</span>" : E.cat(text)) }
           result.push(text)
         }
@@ -259,7 +265,8 @@ export default class Fetcher {
       email: data.email,
       name: data.name || '',
       tripcode: data.trip,
-      capcode:  (() => { switch (data.capcode) {
+      capcode: (() => {
+        switch (data.capcode) {
           // https://github.com/pleebe/FoolFuuka/blob/bf4224eed04637a4d0bd4411c2bf5f9945dfec0b/assets/themes/foolz/foolfuuka-theme-fuuka/src/Partial/Board.php#L77
           case 'M': return 'Mod'
           case 'A': return 'Admin'
@@ -267,7 +274,8 @@ export default class Fetcher {
           case 'V': return 'Verified'
           case 'F': return 'Founder'
           case 'G': return 'Manager'
-      } })(),
+        }
+      })(),
       uniqueID: data.poster_hash,
       flagCode: data.poster_country,
       flagCodeTroll: data.troll_country_code,

src/classes/RandomAccessList.ts

@@ -4,6 +4,9 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
  */
 export default class RandomAccessList {
+  length: number
+  last: any
+  first: any
   constructor(items) {
     this.length = 0
     if (items) { for (const item of items) { this.push(item) } }

src/classes/ShimSet.ts

@@ -4,6 +4,8 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
  */
 class ShimSet {
+  elements: any
+  size: number
   constructor() {
     this.elements = $.dict()
     this.size = 0

src/classes/SimpleDict.ts

@@ -1,11 +1,5 @@
 import $ from "../platform/$"
 
-/*
- * decaffeinate suggestions:
- * DS101: Remove unnecessary use of Array.from
- * DS102: Remove unnecessary code created because of implicit returns
- * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
- */
 export default class SimpleDict<T> {
   keys: string[]
 
@@ -13,14 +7,14 @@ export default class SimpleDict<T> {
     this.keys = []
   }
 
-  push(key, data: T) {
+  push(key: string, data: T): T {
     key = `${key}`
     if (!this[key]) { this.keys.push(key) }
     return this[key] = data
   }
 
-  rm(key) {
+  rm(key: string) {
-    let i
+    let i: number
     key = `${key}`
     if ((i = this.keys.indexOf(key)) !== -1) {
       this.keys.splice(i, 1)
@@ -28,11 +22,11 @@ export default class SimpleDict<T> {
     }
   }
 
-  forEach(fn) { 
+  forEach(fn: (value: T) => void): void {
     for (const key of [...Array.from(this.keys)]) { fn(this[key]) }
   }
 
-  get(key): T {
+  get(key: string): T {
     if (key === 'keys') {
       return undefined
     } else {

src/classes/Thread.ts

@@ -1,16 +1,34 @@
 import { g } from "../globals/globals"
 import $ from "../platform/$"
+import Board from "./Board"
+import Post from "./Post"
 import SimpleDict from "./SimpleDict"
 
-/*
+
- * decaffeinate suggestions:
- * DS102: Remove unnecessary code created because of implicit returns
- * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
- */
 export default class Thread {
+  ID: number
+  OP: Post
+  isArchived: boolean
+  isClosed: boolean
+  lastPost: number
+  posts: SimpleDict<Post>
+  board: Board
+  threadID: number
+  boardID: number | string
+  siteID: number
+  fullID: string
+  isDead: boolean
+  isHidden: boolean
+  isSticky: boolean
+  postLimit: boolean
+  fileLimit: boolean
+  ipCount: number
+  json: JSON
+  catalogView: Node
+  nodes: { root: Post }
   toString() { return this.ID }
 
-  constructor(ID, board) {
+  constructor(ID: number | string, board: Board) {
     this.board = board
     this.ID = +ID
     this.threadID = this.ID
@@ -39,8 +57,8 @@ export default class Thread {
     g.threads.push(this.fullID, this)
   }
 
-  setPage(pageNum) {
+  setPage(pageNum: number) {
-    let icon
+    let icon: HTMLElement
     const { info, reply } = this.OP.nodes
     if (!(icon = $('.page-num', info))) {
       icon = $.el('span', { className: 'page-num' })
@@ -51,14 +69,14 @@ export default class Thread {
     if (this.catalogView) { return this.catalogView.nodes.pageCount.textContent = pageNum }
   }
 
-  setCount(type, count, reachedLimit) {
+  setCount(type: string, count: number, reachedLimit: boolean) {
     if (!this.catalogView) { return }
     const el = this.catalogView.nodes[`${type}Count`]
     el.textContent = count
     return (reachedLimit ? $.addClass : $.rmClass)(el, 'warning')
   }
 
-  setStatus(type, status) {
+  setStatus(type: string, status: boolean) {
     const name = `is${type}`
     if (this[name] === status) { return }
     this[name] = status
@@ -68,7 +86,7 @@ export default class Thread {
     return this.setIcon('Archived', this.isArchived)
   }
 
-  setIcon(type, status) {
+  setIcon(type: string, status: boolean) {
     const typeLC = type.toLowerCase()
     let icon = $(`.${typeLC}Icon`, this.OP.nodes.info)
     if (!!icon === status) { return }
@@ -84,8 +102,7 @@ export default class Thread {
       alt: type,
       title: type,
       className: `${typeLC}Icon retina`
-    }
+    }, g.BOARD.ID)
-    )
     if (g.BOARD.ID === 'f') {
       icon.style.cssText = 'height: 18px; width: 18px;'
     }

src/platform/$.ts

@@ -408,7 +408,7 @@ $.before = (root, el) => root.parentNode.insertBefore($.nodes(el), root)
 
 $.replace = (root, el) => root.parentNode.replaceChild($.nodes(el), root)
 
-$.el = function(tag, properties, properties2) {
+$.el = function (tag, properties, properties2?) {
   const el = d.createElement(tag)
   if (properties) { $.extend(el, properties) }
   if (properties2) { $.extend(el, properties2) }
@@ -813,7 +813,8 @@ if (platform === 'crx') {
       }
       return Promise.all((() => {
         const result = []
-        for (key of keys) {         result.push(GM.deleteValue(g.NAMESPACE + key))
+        for (key of keys) {
+          result.push(GM.deleteValue(g.NAMESPACE + key))
         }
         return result
       })()).then(function () {