Zergling_man/thedesk
Zergling_man/thedesk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

to revert

Browse Source
This commit is contained in:
Cutls 2019-04-27 15:50:01 +09:00
parent 63b8822c05
commit aeda2b14c6
2 changed files with 58 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/AddColumn/PublicTimeline.vue
View File

@ -14,6 +14,7 @@
<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"

120
src/components/Timeline/Timeline.vue
View File

@ -13,11 +13,12 @@
</div>
<div id="timelines">
<div v-for="(value, key, index) in pubTL" :key="index" class="tl">
{{value.name}}
<!--とりあえずここに書かせて-->
<TimelineToot
v-for="[id,account,status] in value.statuses"
v-for="[id,status] in value.statuses"
:key="id"
:status="status"
:account="account"
:pref-static="pref.static"
/>
</div>
@ -32,24 +33,23 @@
</template>
<script lang="ts">
import { ipcRenderer } from "electron";
import { Component, Vue } from "vue-property-decorator";
import { Status } from "megalodon";
import { ipcRenderer } from "electron"
import { Component, Vue } from "vue-property-decorator"
import { Status } from "megalodon"
import TimelineToot from "@/components/Timeline/Toot.vue";
import TimelineToot from '@/components/Timeline/Toot.vue'
import "@/extensions/map-sortbyvalue"; // Add sortByValue function to Map prototype
import "@/extensions/map-sortbyvalue" // Add sortByValue function to Map prototype
type DeleteListener = (e: Event, id: number) => void;
type Instance = string;
type DeleteListener = (e: Event, id: number) => void
type Instance = string
type Timeline = {
type: string;
account: string;
statuses: Map<number, Status>;
error?: Error;
};
type Timelines = Timeline[];
type UpdateListener = (e: Event, status: Status) => void;
name: string
statuses: Map<number, Status>
error?: Error
}
type Timelines = Timeline[]
type UpdateListener = (e: Event, status: Status) => void
@Component({
components: {
@ -57,102 +57,94 @@ type UpdateListener = (e: Event, status: Status) => void;
}
})
export default class AddColumn extends Vue {
public instance: Instance = "";
public showInput: boolean = true;
public type: string = "";
public account: string = "";
public updateListeners: [string, UpdateListener][] = [];
public deleteListeners: [string, DeleteListener][] = [];
public TL: Timelines = [];
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);
});
ipcRenderer.removeListener(name, listener)
})
this.deleteListeners.forEach(([name, listener]) => {
ipcRenderer.removeListener(name, listener);
});
ipcRenderer.removeListener(name, listener)
})
}
public get hasDomain() {
return this.instance != "";
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;
return s1.created_at > s2.created_at ? -1 : 1
}
);
)
}
public addTL() {
let timeline: Timeline = {
type: this.type,
account: this.account,
statuses: new Map()
};
let timeline: Timeline = { name: this.instance, statuses: new Map() }
this.showInput = false;
this.type = "";
this.account = "";
this.TL.push(timeline);
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;
ipcRenderer.once(`timeline-${timeline.name}-no-auth`, (e: Event, statuses: Status[], error?: Error) => {
timeline.error = error
if (error === undefined) {
this.loadTL(timeline, statuses);
this.loadTL(timeline, statuses)
}
this.$forceUpdate();
}
);
ipcRenderer.send("no-auth-timeline", timeline.name);
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);
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);
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);
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");
ipcRenderer.send("open-streaming", timeline.name, "no-auth")
}
public showAccount(id: number) {
console.log("Account dialog:" + id);
console.log("Account dialog:" + id)
}
}
</script>