From 8fd685a019fa5ff42f74c5a5bbeb5f0820ad749a Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Sat, 11 May 2019 19:36:50 +0900
Subject: [PATCH] Add column component

---
 src/components/Timeline/Column.vue   | 108 ++++++++++++++++++
 src/components/Timeline/Timeline.vue | 161 ---------------------------
 2 files changed, 108 insertions(+), 161 deletions(-)
 create mode 100644 src/components/Timeline/Column.vue
 delete mode 100644 src/components/Timeline/Timeline.vue

diff --git a/src/components/Timeline/Column.vue b/src/components/Timeline/Column.vue
new file mode 100644
index 00000000..68af5fdb
--- /dev/null
+++ b/src/components/Timeline/Column.vue
@@ -0,0 +1,108 @@
+<template>
+  <div class="timeline">
+    <div class="header">{{name}}</div>
+    <Toot v-for="[id,status] in statuses" :key="id" :status="status" :pref-static="pref.static"/>
+  </div>
+</template>
+
+<script lang="ts">
+import { ipcRenderer } from "electron"
+import { Component, Prop, Vue } from "vue-property-decorator"
+import { Status } from "megalodon"
+
+import Toot from '@/components/Timeline/Toot.vue'
+
+import "@/extensions/map-sortbyvalue" // Add sortByValue function to Map prototype
+
+type Statuses = Map<number, Status>
+
+@Component({
+  components: {
+    Toot
+  }
+})
+export default class Column extends Vue {
+  @Prop() public id?: string
+
+  //test
+  public pref = {
+    static: false
+  }
+
+  public statuses: Statuses = new Map()
+
+  public name!: string
+  public type!: string
+
+  beforeDestroy() {
+    ipcRenderer.removeListener(`update-${this.name}-${this.type}`, this.updateListener)
+    ipcRenderer.removeListener(`delete-${this.name}-${this.type}`, this.deleteListener)
+  }
+
+  public sortedStatus(statuses: Map<number, Status>): Map<number, Status> {
+    return statuses.sortByValue(
+      (s1, s2): number => {
+        return s1.created_at > s2.created_at ? -1 : 1
+      }
+    )
+  }
+
+  created() {
+    // timelineのnameとtypeをthis.idから取得する
+    this.name = ''
+    this.type = ''
+    // TODO: このイベントのchannel名、timelineのidがいいか？
+    ipcRenderer.once(`timeline-${this.name}-${this.type}`, (e: Event, statuses: Status[], error?: Error) => {
+      if (error === undefined) {
+        this.loadTL(statuses)
+      }
+      this.$forceUpdate()
+    })
+  }
+
+  mounted() {
+    if (this.type === 'no-auth') {
+      ipcRenderer.send("no-auth-timeline", this.name)
+    } else {
+      ipcRenderer.send("timeline", this.name, this.type)
+    }
+  }
+
+  public updateListener(_: Event, status: Status) {
+    this.statuses.set(status.id, status)
+    this.statuses = this.sortedStatus(this.statuses)
+    this.$forceUpdate()
+  }
+
+  public deleteListener(_: Event, id: number) {
+    this.statuses.delete(id)
+    this.$forceUpdate()
+  }
+
+  public loadTL(statuses: Status[]) {
+    this.statuses = new Map(
+      statuses.map((status): [number, Status] => [status.id, status])
+    )
+
+    // streamingを開始
+    this.subscribeStreaming()
+  }
+
+  public async subscribeStreaming() {
+    // updateイベントを購読
+    ipcRenderer.on(`update-${this.name}-${this.type}`, (e: Event, status: Status) => this.updateListener(e, status))
+
+    // deleteイベントを購読
+    ipcRenderer.on(`delete-${this.name}-${this.type}`, (e: Event, id: number) => this.deleteListener(e, id))
+
+    ipcRenderer.send("open-streaming", this.name, this.type)
+  }
+
+  public showAccount(id: number) {
+    console.log("Account dialog:" + id)
+  }
+}
+</script>
+
+<style scoped lang="postcss">
+</style>
\ No newline at end of file
diff --git a/src/components/Timeline/Timeline.vue b/src/components/Timeline/Timeline.vue
deleted file mode 100644
index c5d5f044..00000000
--- a/src/components/Timeline/Timeline.vue
+++ /dev/null
@@ -1,161 +0,0 @@
-<template>
-  <div>
-    <div v-if="showInput">
-      <form @submit.prevent="addTL">
-        <BaseInputText placeholder="e.g:mstdn.jp" v-model="instance"/>
-        <BaseButton
-          type="submit"
-          class="primary fill"
-          style="--font-size:.8em;"
-          :disabled="!hasDomain"
-        >Add Column</BaseButton>
-      </form>
-    </div>
-    <div id="timelines">
-      <div v-for="(value, key, index) in pubTL" :key="index" class="tl">
-        {{value.name}}
-        <!--とりあえずここに書かせて-->
-        <TimelineToot
-          v-for="[id,status] in value.statuses"
-          :key="id"
-          :status="status"
-          :pref-static="pref.static"
-        />
-      </div>
-    </div>
-    <BaseButton
-      v-if="!showInput"
-      @click.native="showInput = true"
-      class="primary fill"
-      style="--font-size:.8em;"
-    >Show Menu</BaseButton>
-  </div>
-</template>
-
-<script lang="ts">
-import { ipcRenderer } from "electron"
-import { Component, Vue } from "vue-property-decorator"
-import { Status } from "megalodon"
-
-import TimelineToot from '@/components/Timeline/Toot.vue'
-
-import "@/extensions/map-sortbyvalue" // Add sortByValue function to Map prototype
-
-type DeleteListener = (e: Event, id: number) => void
-type Instance = string
-type Timeline = {
-  name: string
-  statuses: Map<number, Status>
-  error?: Error
-}
-type Timelines = Timeline[]
-type UpdateListener = (e: Event, status: Status) => void
-
-@Component({
-  components: {
-    TimelineToot
-  }
-})
-export default class AddColumn extends Vue {
-  public instance: Instance = ""
-  public showInput: boolean = true
-  public updateListeners: [string, UpdateListener][] = []
-  public deleteListeners: [string, DeleteListener][] = []
-  public pubTL: Timelines = []
-  //test
-  public pref = {
-    static: false
-  }
-
-  beforeDestroy() {
-    this.updateListeners.forEach(([name, listener]) => {
-      ipcRenderer.removeListener(name, listener)
-    })
-    this.deleteListeners.forEach(([name, listener]) => {
-      ipcRenderer.removeListener(name, listener)
-    })
-  }
-
-  public get hasDomain() {
-    return this.instance != ""
-  }
-
-  public sortedStatus(statuses: Map<number, Status>): Map<number, Status> {
-    return statuses.sortByValue(
-      (s1, s2): number => {
-        return s1.created_at > s2.created_at ? -1 : 1
-      }
-    )
-  }
-
-  public addTL() {
-    let timeline: Timeline = { name: this.instance, statuses: new Map() }
-
-    this.showInput = false
-    this.instance = ""
-
-    this.pubTL.push(timeline)
-    // 最新のTLを取得
-    ipcRenderer.once(`timeline-${timeline.name}-no-auth`, (e: Event, statuses: Status[], error?: Error) => {
-      timeline.error = error
-      if (error === undefined) {
-        this.loadTL(timeline, statuses)
-      }
-      this.$forceUpdate()
-    })
-    ipcRenderer.send("no-auth-timeline", timeline.name)
-  }
-
-
-  public loadTL(timeline: Timeline, statuses: Status[]) {
-    timeline.statuses = new Map(
-      statuses.map((status): [number, Status] => [status.id, status])
-    )
-
-    // streamingを開始
-    this.subscribeStreaming(timeline)
-  }
-
-  public async subscribeStreaming(timeline: Timeline) {
-    // updateイベントを購読
-    let updateListener = (_: Event, status: Status) => {
-      timeline.statuses.set(status.id, status)
-      timeline.statuses = this.sortedStatus(timeline.statuses)
-      this.$forceUpdate()
-    }
-    ipcRenderer.on(`update-${timeline.name}-no-auth`, updateListener)
-    this.updateListeners.push([
-      `update-${timeline.name}-no-auth`,
-      updateListener
-    ])
-
-    // deleteイベントを購読
-    let deleteListener = (_: Event, id: number) => {
-      timeline.statuses.delete(id)
-      this.$forceUpdate()
-    }
-    ipcRenderer.on(`delete-${timeline.name}-no-auth`, deleteListener)
-    this.deleteListeners.push([
-      `delete-${timeline.name}-no-auth`,
-      deleteListener
-    ])
-
-    ipcRenderer.send("open-streaming", timeline.name, "no-auth")
-  }
-
-  public showAccount(id: number) {
-    console.log("Account dialog:" + id)
-  }
-}
-</script>
-
-<style scoped lang="postcss">
-#timelines {
-  display: flex;
-  width: 100%;
-}
-.tl {
-  height: 100%;
-  flex-grow: 4;
-}
-</style>
\ No newline at end of file