From d3f5313bd81681ba2c543343ce2daacc2fe19bff Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Sat, 27 Apr 2019 06:45:45 +0900
Subject: [PATCH] Add username props to user timeline component

---
 src/components/AddColumn/UserTimeline.vue  |  2 ++
 src/components/Preferences/AccountAuth.vue | 13 +++++++++++--
 src/components/Welcome.vue                 | 20 +++++++++++++++-----
 src/main/Auth.ts                           |  4 ++--
 4 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/src/components/AddColumn/UserTimeline.vue b/src/components/AddColumn/UserTimeline.vue
index 78832b2d..5e44f6b1 100644
--- a/src/components/AddColumn/UserTimeline.vue
+++ b/src/components/AddColumn/UserTimeline.vue
@@ -23,6 +23,8 @@ import { Component, Prop, Vue } from "vue-property-decorator"
 
 @Component
 export default class UserTimeline extends Vue {
+  @Prop() public username!: string
+
   public timelineType: string = 'home'
   public userTimelineTypes: {
     [key: string]: string
diff --git a/src/components/Preferences/AccountAuth.vue b/src/components/Preferences/AccountAuth.vue
index 97a292dd..4c3f039f 100644
--- a/src/components/Preferences/AccountAuth.vue
+++ b/src/components/Preferences/AccountAuth.vue
@@ -22,7 +22,16 @@
 <script lang="ts">
 import { ipcRenderer } from "electron"
 import { Component, Vue } from "vue-property-decorator"
+
 type Instance = string
+interface Account {
+  domain: string
+  acct: string
+  avatar: string
+  avatarStatic: string
+  accessToken?: string
+}
+
 @Component
 export default class AccountAuth extends Vue {
   public instance: Instance = ""
@@ -44,8 +53,8 @@ export default class AccountAuth extends Vue {
     this.instance = ''
     ipcRenderer.once(
       `login-complete`,
-      (e: Event) => {
-        this.$emit('login-complete')
+      (e: Event, account: Account) => {
+        this.$emit('login-complete', account)
       }
     )
   }
diff --git a/src/components/Welcome.vue b/src/components/Welcome.vue
index b46625fc..c8b0762d 100644
--- a/src/components/Welcome.vue
+++ b/src/components/Welcome.vue
@@ -18,7 +18,7 @@
     >
       <Login v-if="status === 'login'" @login-complete="loggedIn"/>
       <PublicTimeline v-else-if="status === 'public_timeline'"/>
-      <Timeline v-else-if="status === 'select_timeline'"/>
+      <UserTimeline v-else-if="status === 'select_timeline'" :username="username"/>
     </BaseOverlay>
   </div>
 </template>
@@ -27,25 +27,35 @@
 import { Component, Vue } from 'vue-property-decorator'
 
 import Login from './Preferences/AccountAuth.vue'
-import Timeline from './AddColumn/UserTimeline.vue'
+import UserTimeline from './AddColumn/UserTimeline.vue'
 import PublicTimeline from './AddColumn/PublicTimeline.vue'
 
 type Status = 'welcome' | 'login' | 'public_timeline' | 'select_timeline'
+interface Account {
+  domain: string
+  acct: string
+  avatar: string
+  avatarStatic: string
+  accessToken?: string
+}
 
 @Component({
   components: {
     Login,
-    Timeline,
+    UserTimeline,
     PublicTimeline,
   }
 })
 export default class Welcome extends Vue {
-  public status: Status = 'welcome'
   public loginButton: string = 'Login'
   public publicTLButton: string = 'Streaming Public Timeline'
   public selectTimeline: string = 'Select Timeline'
 
-  public loggedIn() {
+  public username: string = ''
+  public status: Status = 'welcome'
+
+  public loggedIn(account: Account) {
+    this.username = `@${account.acct}@${account.domain}`
     this.status = 'select_timeline'
   }
 }
diff --git a/src/main/Auth.ts b/src/main/Auth.ts
index ef305b7e..c67d5717 100644
--- a/src/main/Auth.ts
+++ b/src/main/Auth.ts
@@ -68,7 +68,7 @@ export default class Auth {
                     autoload: true
                   })
                   let docs = {
-                    domain: url,
+                    domain: instance,
                     acct: you.acct,
                     avatar: you.avatar,
                     avatarStatic: you.avatar_static,
@@ -82,7 +82,7 @@ export default class Auth {
                         message: "You cannot login already logined account."
                       })
                     } else {
-                      event.sender.send(`login-complete`)
+                      event.sender.send(`login-complete`, newDocs)
                     }
                   })
                 })